From 1406528428ff354f1fc48ca617eb163dda519166 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 2 Jul 2015 21:24:22 +0300
Subject: [PATCH 001/354] Replace config_item() with $this->config->item()

---
 application/libraries/REST_Controller.php | 104 +++++++++++-----------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 64e2cf04..0e2d0406 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -228,7 +228,7 @@ public function __construct($config = 'rest')
         }
 
         // Set the default value of global xss filtering. Same approach as CodeIgniter 3
-        $this->_enable_xss = (config_item('global_xss_filtering') === TRUE);
+        $this->_enable_xss = ($this->config->item('global_xss_filtering') === TRUE);
 
         // Start the timer for how long the request takes
         $this->_start_rtime = microtime(TRUE);
@@ -305,9 +305,9 @@ public function __construct($config = 'rest')
         $this->early_checks();
 
         // Load DB if its enabled
-        if (config_item('rest_database_group') && (config_item('rest_enable_keys') || config_item('rest_enable_logging')))
+        if ($this->config->item('rest_database_group') && ($this->config->item('rest_enable_keys') || $this->config->item('rest_enable_logging')))
         {
-            $this->rest->db = $this->load->database(config_item('rest_database_group'), TRUE);
+            $this->rest->db = $this->load->database($this->config->item('rest_database_group'), TRUE);
         }
 
         // Use whatever database is in use (isset returns FALSE)
@@ -322,24 +322,24 @@ public function __construct($config = 'rest')
 
         // Checking for keys? GET TO WorK!
         // Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'
-        if (config_item('rest_enable_keys') && $this->auth_override !== TRUE)
+        if ($this->config->item('rest_enable_keys') && $this->auth_override !== TRUE)
         {
             $this->_allow = $this->_detect_api_key();
         }
 
         // Only allow ajax requests
-        if ($this->input->is_ajax_request() === FALSE && config_item('rest_ajax_only'))
+        if ($this->input->is_ajax_request() === FALSE && $this->config->item('rest_ajax_only'))
         {
             // Display an error response
             $this->response(
                 [
-                    config_item('rest_status_field_name') => FALSE,
-                    config_item('rest_message_field_name') => 'Only AJAX requests are acceptable'
+                    $this->config->item('rest_status_field_name') => FALSE,
+                    $this->config->item('rest_message_field_name') => 'Only AJAX requests are acceptable'
                 ], 406); // Set status to 406 NOT ACCEPTABLE
         }
 
         // When there is no specific override for the current class/method, use the default auth value set in the config
-        if ($this->auth_override === FALSE && !(config_item('rest_enable_keys') && $this->_allow === TRUE))
+        if ($this->auth_override === FALSE && !($this->config->item('rest_enable_keys') && $this->_allow === TRUE))
         {
             $rest_auth = strtolower($this->config->item('rest_auth'));
             switch ($rest_auth)
@@ -373,7 +373,7 @@ public function __destruct()
         $this->_end_rtime = microtime(TRUE);
 
         // Log the loading time to the log table
-        if (config_item('rest_enable_logging') === TRUE)
+        if ($this->config->item('rest_enable_logging') === TRUE)
         {
             $this->_log_access_time();
         }
@@ -392,9 +392,9 @@ public function __destruct()
     public function _remap($object_called, $arguments)
     {
         // Should we answer if not over SSL?
-        if (config_item('force_https') && $this->request->ssl === FALSE)
+        if ($this->config->item('force_https') && $this->request->ssl === FALSE)
         {
-            $this->response([config_item('rest_status_field_name') => FALSE, config_item('rest_message_field_name') => 'Unsupported protocol'], 403);
+            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Unsupported protocol'], 403);
         }
 
         // Remove the supported format from the function name e.g. index.json => index
@@ -409,40 +409,40 @@ public function _remap($object_called, $arguments)
         $use_key = !(isset($this->methods[$controller_method]['key']) && $this->methods[$controller_method]['key'] == FALSE);
 
         // They provided a key, but it wasn't valid, so get them out of here.
-        if (config_item('rest_enable_keys') && $use_key && $this->_allow === FALSE)
+        if ($this->config->item('rest_enable_keys') && $use_key && $this->_allow === FALSE)
         {
-            if (config_item('rest_enable_logging') && $log_method)
+            if ($this->config->item('rest_enable_logging') && $log_method)
             {
                 $this->_log_request();
             }
 
-            $this->response([config_item('rest_status_field_name') => FALSE, config_item('rest_message_field_name') => 'Invalid API Key ' . $this->rest->key], 403);
+            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Invalid API Key ' . $this->rest->key], 403);
         }
 
         // Check to see if this key has access to the requested controller.
-        if (config_item('rest_enable_keys') && $use_key && !empty($this->rest->key) && !$this->_check_access())
+        if ($this->config->item('rest_enable_keys') && $use_key && !empty($this->rest->key) && !$this->_check_access())
         {
-            if (config_item('rest_enable_logging') && $log_method)
+            if ($this->config->item('rest_enable_logging') && $log_method)
             {
                 $this->_log_request();
             }
 
-            $this->response([config_item('rest_status_field_name') => FALSE, config_item('rest_message_field_name') => 'This API key does not have access to the requested controller.'], 401);
+            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key does not have access to the requested controller.'], 401);
         }
 
         // Sure it exists, but can they do anything with it?
         if (!method_exists($this, $controller_method))
         {
-            $this->response([config_item('rest_status_field_name') => FALSE, config_item('rest_message_field_name') => 'Unknown method.'], 404);
+            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Unknown method.'], 404);
         }
 
         // Doing key related stuff? Can only do it if they have a key right?
-        if (config_item('rest_enable_keys') && !empty($this->rest->key))
+        if ($this->config->item('rest_enable_keys') && !empty($this->rest->key))
         {
             // Check the limit
-            if (config_item('rest_enable_limits') && !$this->_check_limit($controller_method))
+            if ($this->config->item('rest_enable_limits') && !$this->_check_limit($controller_method))
             {
-                $response = [config_item('rest_status_field_name') => FALSE, config_item('rest_message_field_name') => 'This API key has reached the hourly limit for this method.'];
+                $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key has reached the hourly limit for this method.'];
                 $this->response($response, 401);
             }
 
@@ -453,18 +453,18 @@ public function _remap($object_called, $arguments)
             $authorized = $level <= $this->rest->level;
 
             // IM TELLIN!
-            if (config_item('rest_enable_logging') && $log_method)
+            if ($this->config->item('rest_enable_logging') && $log_method)
             {
                 $this->_log_request($authorized);
             }
 
             // They don't have good enough perms
-            $response = [config_item('rest_status_field_name') => FALSE, config_item('rest_message_field_name') => 'This API key does not have enough permissions.'];
+            $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key does not have enough permissions.'];
             $authorized || $this->response($response, 401);
         }
 
         // No key stuff, but record that stuff is happening
-        elseif (config_item('rest_enable_logging') && $log_method)
+        elseif ($this->config->item('rest_enable_logging') && $log_method)
         {
             $this->_log_request($authorized = TRUE);
         }
@@ -479,8 +479,8 @@ public function _remap($object_called, $arguments)
             // If the method doesn't exist, then the error will be caught and an error response shown
             $this->response(
                 [
-                    config_item('rest_status_field_name') => FALSE,
-                    config_item('rest_message_field_name') => [
+                    $this->config->item('rest_status_field_name') => FALSE,
+                    $this->config->item('rest_message_field_name') => [
                         'classname' => get_class($ex),
                         'message' => $ex->getMessage()
                     ]
@@ -569,7 +569,7 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
         set_status_header($http_code);
 
         // JC: Log response code only if rest logging enabled
-        if (config_item('rest_enable_logging') === TRUE)
+        if ($this->config->item('rest_enable_logging') === TRUE)
         {
             $this->_log_response_code($http_code);
         }
@@ -700,7 +700,7 @@ protected function _detect_output_format()
         }
 
         // Just use the default format
-        return config_item('rest_default_format');
+        return $this->config->item('rest_default_format');
     }
 
     /**
@@ -743,7 +743,7 @@ protected function _detect_method()
     protected function _detect_api_key()
     {
         // Get the api key name variable set in the rest config file
-        $api_key_variable = config_item('rest_key_name');
+        $api_key_variable = $this->config->item('rest_key_name');
 
         // Work out the name of the SERVER entry based on config
         $key_name = 'HTTP_' . strtoupper(str_replace('-', '_', $api_key_variable));
@@ -756,12 +756,12 @@ 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(config_item('rest_key_column'), $key)->get(config_item('rest_keys_table'))->row()))
+            if (!($row = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row()))
             {
                 return FALSE;
             }
 
-            $this->rest->key = $row->{config_item('rest_key_column')};
+            $this->rest->key = $row->{$this->config->item('rest_key_column')};
 
             isset($row->user_id) && $this->rest->user_id = $row->user_id;
             isset($row->level) && $this->rest->level = $row->level;
@@ -855,10 +855,10 @@ protected function _log_request($authorized = FALSE)
         // Insert the request into the log table
         $isInserted = $this->rest->db
             ->insert(
-                config_item('rest_logs_table'), [
+                $this->config->item('rest_logs_table'), [
                 'uri' => $this->uri->uri_string(),
                 'method' => $this->request->method,
-                'params' => $this->_args ? (config_item('rest_logs_json_params') === TRUE ? json_encode($this->_args) : serialize($this->_args)) : NULL,
+                'params' => $this->_args ? ($this->config->item('rest_logs_json_params') === TRUE ? json_encode($this->_args) : serialize($this->_args)) : NULL,
                 'api_key' => isset($this->rest->key) ? $this->rest->key : '',
                 'ip_address' => $this->input->ip_address(),
                 'time' => now(), // Used to be: function_exists('now') ? now() : time()
@@ -896,14 +896,14 @@ protected function _check_limit($controller_method)
         $result = $this->rest->db
             ->where('uri', $this->uri->uri_string())
             ->where('api_key', $this->rest->key)
-            ->get(config_item('rest_limits_table'))
+            ->get($this->config->item('rest_limits_table'))
             ->row();
 
         // No calls have been made for this key
         if (!$result)
         {
             // Create a new row for the following key
-            $this->rest->db->insert(config_item('rest_limits_table'), [
+            $this->rest->db->insert($this->config->item('rest_limits_table'), [
                 'uri' => $this->uri->uri_string(),
                 'api_key' => isset($this->rest->key) ? $this->rest->key : '',
                 'count' => 1,
@@ -920,7 +920,7 @@ protected function _check_limit($controller_method)
                 ->where('api_key', isset($this->rest->key) ? $this->rest->key : '')
                 ->set('hour_started', time())
                 ->set('count', 1)
-                ->update(config_item('rest_limits_table'));
+                ->update($this->config->item('rest_limits_table'));
         }
 
         // They have called within the hour, so lets update
@@ -937,7 +937,7 @@ protected function _check_limit($controller_method)
                 ->where('uri', $this->uri->uri_string())
                 ->where('api_key', $this->rest->key)
                 ->set('count', 'count + 1', FALSE)
-                ->update(config_item('rest_limits_table'));
+                ->update($this->config->item('rest_limits_table'));
         }
 
         return TRUE;
@@ -1572,8 +1572,8 @@ protected function _check_php_session()
             // Display an error response
             $this->response(
                 [
-                    config_item('rest_status_field_name') => FALSE,
-                    config_item('rest_message_field_name') => 'Not Authorized'
+                    $this->config->item('rest_status_field_name') => FALSE,
+                    $this->config->item('rest_message_field_name') => 'Not Authorized'
                 ], 401);
         }
     }
@@ -1586,7 +1586,7 @@ protected function _check_php_session()
     protected function _prepare_basic_auth()
     {
         // If whitelist is enabled it has the first chance to kick them out
-        if (config_item('rest_ip_whitelist_enabled'))
+        if ($this->config->item('rest_ip_whitelist_enabled'))
         {
             $this->_check_whitelist_auth();
         }
@@ -1626,7 +1626,7 @@ protected function _prepare_basic_auth()
     protected function _prepare_digest_auth()
     {
         // If whitelist is enabled it has the first chance to kick them out
-        if (config_item('rest_ip_whitelist_enabled'))
+        if ($this->config->item('rest_ip_whitelist_enabled'))
         {
             $this->_check_whitelist_auth();
         }
@@ -1673,8 +1673,8 @@ protected function _prepare_digest_auth()
             // Display an error response
             $this->response(
                 [
-                    config_item('rest_status_field_name') => 0,
-                    config_item('rest_message_field_name') => 'Invalid credentials'
+                    $this->config->item('rest_status_field_name') => 0,
+                    $this->config->item('rest_message_field_name') => 'Invalid credentials'
                 ], 401);
         }
     }
@@ -1690,7 +1690,7 @@ protected function _check_blacklist_auth()
         $pattern = sprintf('/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m', $this->input->ip_address());
 
         // Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE
-        if (preg_match($pattern, config_item('rest_ip_blacklist')))
+        if (preg_match($pattern, $this->config->item('rest_ip_blacklist')))
         {
             // Display an error response
             $this->response(
@@ -1709,7 +1709,7 @@ protected function _check_blacklist_auth()
      */
     protected function _check_whitelist_auth()
     {
-        $whitelist = explode(',', config_item('rest_ip_whitelist'));
+        $whitelist = explode(',', $this->config->item('rest_ip_whitelist'));
 
         array_push($whitelist, '127.0.0.1', '0.0.0.0');
 
@@ -1720,7 +1720,7 @@ protected function _check_whitelist_auth()
 
         if (!in_array($this->input->ip_address(), $whitelist))
         {
-            $this->response([config_item('rest_status_field_name') => FALSE, config_item('rest_message_field_name') => 'IP not authorized'], 401);
+            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'IP not authorized'], 401);
         }
     }
 
@@ -1753,8 +1753,8 @@ protected function _force_login($nonce = '')
         // Display an error response
         $this->response(
             [
-                config_item('rest_status_field_name') => FALSE,
-                config_item('rest_message_field_name') => 'Not authorized'
+                $this->config->item('rest_status_field_name') => FALSE,
+                $this->config->item('rest_message_field_name') => 'Not authorized'
             ], 401);
     }
 
@@ -1772,7 +1772,7 @@ protected function _log_access_time()
 
         return $this->rest->db
             ->update(
-                config_item('rest_logs_table'), $payload, [
+                $this->config->item('rest_logs_table'), $payload, [
                 'id' => $this->_insert_id
             ]);
     }
@@ -1792,7 +1792,7 @@ protected function _log_response_code($http_code)
         $payload['response_code'] = $http_code;
 
         return $this->rest->db->update(
-            config_item('rest_logs_table'), $payload, [
+            $this->config->item('rest_logs_table'), $payload, [
             'id' => $this->_insert_id
         ]);
     }
@@ -1806,7 +1806,7 @@ protected function _log_response_code($http_code)
     protected function _check_access()
     {
         // If we don't want to check access, just return TRUE
-        if (config_item('rest_enable_access') === FALSE)
+        if ($this->config->item('rest_enable_access') === FALSE)
         {
             return TRUE;
         }
@@ -1825,7 +1825,7 @@ protected function _check_access()
         return $this->rest->db
                    ->where('key', $this->rest->key)
                    ->where('controller', $controller)
-                   ->get(config_item('rest_access_table'))
+                   ->get($this->config->item('rest_access_table'))
                    ->num_rows() > 0;
     }
 

From 9eac95ad454ba62ae78aa32859ed59c9a6571c68 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 2 Jul 2015 21:27:16 +0300
Subject: [PATCH 002/354] Updated comments for request, response and rest

It outlines the properties i.e. fields of the objects
---
 application/libraries/REST_Controller.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 0e2d0406..ed1ad3e1 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -38,22 +38,27 @@ abstract class REST_Controller extends CI_Controller {
     protected $allowed_http_methods = ['get', 'delete', 'post', 'put', 'options', 'patch', 'head'];
 
     /**
-     * General request data and information.
-     * Stores accept, language, body, headers, etc.
+     * Contains details about the request
+     * Fields: body, format, method, ssl
+     * Note: This is a dynamic object (stdClass)
      *
      * @var object
      */
     protected $request = NULL;
 
-    /**
-     * What is gonna happen in output?
+        /**
+     * Contains details about the response
+     * Fields: format, lang
+     * Note: This is a dynamic object (stdClass)
      *
      * @var object
      */
     protected $response = NULL;
 
     /**
-     * Stores DB, keys, key level, etc
+     * Contains details about the REST API
+     * Fields: db, ignore_limits, key, level, user_id
+     * Note: This is a dynamic object (stdClass)
      *
      * @var object
      */

From 9d89a904087ce00dc844a1ae3cb982264ff598c6 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 2 Jul 2015 21:32:42 +0300
Subject: [PATCH 003/354] Updated method readability

---
 application/libraries/REST_Controller.php | 29 ++++++++++++++---------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index ed1ad3e1..6e6e1efa 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -600,25 +600,32 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
     }
 
     /**
-     * Detect which format the HTTP Body is provided in
+     * Get the input format e.g. json or xml
      *
-     * @access protected
+     * @access private
+     * @return string|NULL Supported input format; otherwise, NULL
      */
-    protected function _detect_input_format()
+    private function _detect_input_format()
     {
-        if ($this->input->server('CONTENT_TYPE'))
+        // Get the CONTENT-TYPE value from the SERVER variable
+        $contentType = $this->input->server('CONTENT_TYPE');
+
+        if (empty($contentType) === FALSE)
         {
             // Check all formats against the HTTP_ACCEPT header
-            foreach ($this->_supported_formats as $format => $mime)
+            foreach ($this->_supported_formats as $key => $value)
             {
-                if (strpos($match = $this->input->server('CONTENT_TYPE'), ';'))
-                {
-                    $match = current(explode(';', $match));
-                }
+                // $key = format e.g. csv
+                // $value = mime type e.g. application/csv
+
+                // If a semi-colon exists in the string, then explode by ; and get the value of where
+                // the current array pointer resides. This will generally be the first element of the array
+                $contentType = (strpos($contentType, ';') !== FALSE ? current(explode(';', $contentType)) : $contentType);
 
-                if ($match == $mime)
+                // If both the mime types match, then return the format
+                if ($contentType === $value)
                 {
-                    return $format;
+                    return $key;
                 }
             }
         }

From 3149ff102922d6dad04a76c51b815f21162d2f8b Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 2 Jul 2015 21:36:58 +0300
Subject: [PATCH 004/354] Update parsing GET variables function

---
 application/libraries/REST_Controller.php | 27 ++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 6e6e1efa..a928369b 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1050,22 +1050,39 @@ protected function _auth_override_check()
     }
 
     /**
-     * Parse GET
+     * Parse the GET request arguments
      *
      * @access protected
+     * @return void
      */
     protected function _parse_get()
     {
+        // Declare a variable that will hold the REQUEST_URI
+        $request_uri = NULL;
+
         // Fix for Issue #247
         if (is_cli())
         {
-            $args = $_SERVER['argv'];
+            $args = $this->input->server('argv');
             unset($args[0]);
-            $_SERVER['QUERY_STRING'] = $_SERVER['PATH_INFO'] = $_SERVER['REQUEST_URI'] = '/' . implode('/', $args) . '/';
+            // Combine the arguments using '/' as the delimiter
+            $request_uri = '/' . implode('/', $args) . '/';
+
+            // Set the following server variables
+            $_SERVER['REQUEST_URI'] = $request_uri;
+            $_SERVER['PATH_INFO'] = $request_uri;
+            $_SERVER['QUERY_STRING'] = $request_uri;
+        }
+        else
+        {
+            $request_uri = $this->input->server('REQUEST_URI');
         }
 
-        // Grab proper GET variables
-        parse_str(parse_url(http://github.com/$_SERVER['REQUEST_URI'],%20PHP_URL_QUERY), $get);
+        // Declare a variable that will hold the parameters
+        $get = NULL;
+
+        // Grab the GET variables from the query string
+        parse_str(parse_url(http://github.com/$request_uri,%20PHP_URL_QUERY), $get);
 
         // Merge both the URI segments and GET params
         $this->_get_args = array_merge($this->_get_args, $get);

From 3ad8dd658c3331b5766652a84bb4e8e5e43d23da Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 2 Jul 2015 21:37:44 +0300
Subject: [PATCH 005/354] Updated parsing POST variables function

---
 application/libraries/REST_Controller.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index a928369b..272f5dc1 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1089,15 +1089,19 @@ protected function _parse_get()
     }
 
     /**
-     * Parse POST
+     * Parse the POST request arguments
      *
      * @access protected
+     * @return void
      */
     protected function _parse_post()
     {
         $this->_post_args = $_POST;
 
-        $this->request->format && $this->request->body = file_get_contents('php://input');
+        if ($this->request->format)
+        {
+            $this->request->body = $this->input->raw_input_stream;
+        }
     }
 
     /**

From df64259449d702a98f75b2b4cf18d4f265dc9957 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 2 Jul 2015 21:40:24 +0300
Subject: [PATCH 006/354] Updated parsing PUT variables function

---
 application/libraries/REST_Controller.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 272f5dc1..32fa6e03 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1105,27 +1105,25 @@ protected function _parse_post()
     }
 
     /**
-     * Parse PUT
+     * Parse the PUT request arguments
      *
      * @access protected
+     * @return void
      */
     protected function _parse_put()
     {
-        // It might be a HTTP body
         if ($this->request->format)
         {
-            $this->request->body = file_get_contents('php://input');
+            $this->request->body = $this->input->raw_input_stream;
         }
-
-        // If no file type is provided, this is probably just arguments
         else
         {
+            // If no filetype is provided, then there are probably just arguments
             if ($this->input->method() === 'put')
             {
                 $this->_put_args = $this->input->input_stream();
             }
         }
-
     }
 
     /**

From 0532769fab7a3569f430090606300a07268873be Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 2 Jul 2015 21:43:02 +0300
Subject: [PATCH 007/354] Updated parsing PUT variables function

---
 application/libraries/REST_Controller.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 32fa6e03..17b352ca 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1155,21 +1155,21 @@ protected function _parse_options()
     }
 
     /**
-     * Parse PATCH
+     * Parse the PATCH request arguments
      *
      * @access protected
+     * @return void
      */
     protected function _parse_patch()
     {
         // It might be a HTTP body
         if ($this->request->format)
         {
-            $this->request->body = file_get_contents('php://input');
+            $this->request->body = $this->input->raw_input_stream;
         }
-
-        // If no file type is provided, this is probably just arguments
         else
         {
+            // If no filetype is provided, then there are probably just arguments
             if ($this->input->method() === 'patch')
             {
                 $this->_patch_args = $this->input->input_stream();

From 942475ce08dff4070391883e6a00fcdd0b3ac847 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 2 Jul 2015 21:43:57 +0300
Subject: [PATCH 008/354] Updated parsing DELETE variables function

---
 application/libraries/REST_Controller.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 17b352ca..d8bfd49f 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1178,13 +1178,14 @@ protected function _parse_patch()
     }
 
     /**
-     * Parse DELETE
+     * Parse the DELETE request arguments
      *
      * @access protected
+     * @return void
      */
     protected function _parse_delete()
     {
-        // Set up out DELETE variables (which shouldn't really exist, but sssh!)
+        // These should exist if a DELETE request
         if ($this->input->method() === 'delete')
         {
             $this->_delete_args = $this->input->input_stream();

From b83180df0c69bdd7db6b8741acf42d13de681a43 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 2 Jul 2015 21:46:20 +0300
Subject: [PATCH 009/354] Updated parsing OPTIONS variables

---
 application/libraries/REST_Controller.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index d8bfd49f..a8899503 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1141,14 +1141,15 @@ protected function _parse_head()
     }
 
     /**
-     * Parse OPTIONS
+     * Parse the OPTIONS request arguments
      *
      * @access protected
+     * @return void
      */
     protected function _parse_options()
     {
-        // Grab proper OPTIONS variables
-        parse_str(parse_url(http://github.com/$_SERVER['REQUEST_URI'],%20PHP_URL_QUERY), $options);
+        // Parse the OPTIONS variables
+        parse_str(parse_url(http://github.com/$this-%3Einput-%3Eserver('REQUEST_URI'), PHP_URL_QUERY), $options);
 
         // Merge both the URI segments and OPTIONS params
         $this->_options_args = array_merge($this->_options_args, $options);

From 5e366838e40447da0c23b08aa2844d39d4baaf06 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 2 Jul 2015 21:48:00 +0300
Subject: [PATCH 010/354] Updated parsing HEAD variables function

---
 application/libraries/REST_Controller.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index a8899503..b6cc5366 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1127,14 +1127,15 @@ protected function _parse_put()
     }
 
     /**
-     * Parse HEAD
+     * Parse the HEAD request arguments
      *
      * @access protected
+     * @return void
      */
     protected function _parse_head()
     {
-        // Grab proper HEAD variables
-        parse_str(parse_url(http://github.com/$_SERVER['REQUEST_URI'],%20PHP_URL_QUERY), $head);
+        // Parse the HEAD variables
+        parse_str(parse_url$this->input->server('REQUEST_URI'), PHP_URL_QUERY), $head);
 
         // Merge both the URI segments and HEAD params
         $this->_head_args = array_merge($this->_head_args, $head);

From e5fe7611774aa22962e106bcaaf940b2c045103d Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 2 Jul 2015 21:50:08 +0300
Subject: [PATCH 011/354] Fixed redundant whitespace

---
 application/libraries/REST_Controller.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index b6cc5366..c1b56460 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1418,7 +1418,6 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
 
         if ($ldapconn)
         {
-
             log_message('debug', 'Setting timeout to ' . $ldap['timeout'] . ' seconds');
 
             ldap_set_option($ldapconn, LDAP_OPT_NETWORK_TIMEOUT, $ldap['timeout']);
@@ -1439,7 +1438,6 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
 
                 return FALSE;
             }
-
         }
 
         // search for user

From ee5d64cc7fad756e6edd9b00e4faae6975436ecb Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 2 Jul 2015 21:53:53 +0300
Subject: [PATCH 012/354] Commented unused variable

Closes #479
---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index c1b56460..df28d17c 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1411,7 +1411,7 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
         log_message('debug', 'LDAP Auth: Connect to ' . (isset($ldaphost) ? $ldaphost : '[ldap not configured]'));
 
         // Appears to be unused
-        $ldapconfig['authrealm'] = $this->config->item('domain', 'ldap');
+        // $ldapconfig['authrealm'] = $this->config->item('domain', 'ldap');
 
         // connect to ldap server
         $ldapconn = ldap_connect($ldap['host'], $ldap['port']);

From 47ef72639bbbc092de83d8c88e9eb6ee2d183e57 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 2 Jul 2015 22:13:30 +0300
Subject: [PATCH 013/354] Fixed comparison checking to check both value and
 type

---
 application/libraries/REST_Controller.php | 36 +++++++++++------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index df28d17c..1c6bfa15 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -264,7 +264,7 @@ public function __construct($config = 'rest')
         $this->request->method = $this->_detect_method();
 
         // Create an argument container if it doesn't exist e.g. _get_args
-        if (!isset($this->{'_' . $this->request->method . '_args'}))
+        if (isset($this->{'_' . $this->request->method . '_args'}) === FALSE)
         {
             $this->{'_' . $this->request->method . '_args'} = [];
         }
@@ -425,7 +425,7 @@ public function _remap($object_called, $arguments)
         }
 
         // Check to see if this key has access to the requested controller.
-        if ($this->config->item('rest_enable_keys') && $use_key && !empty($this->rest->key) && !$this->_check_access())
+        if ($this->config->item('rest_enable_keys') && $use_key && empty($this->rest->key) === FALSE && $this->_check_access() === FALSE)
         {
             if ($this->config->item('rest_enable_logging') && $log_method)
             {
@@ -436,16 +436,16 @@ public function _remap($object_called, $arguments)
         }
 
         // Sure it exists, but can they do anything with it?
-        if (!method_exists($this, $controller_method))
+        if (method_exists($this, $controller_method) === FALSE)
         {
             $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Unknown method.'], 404);
         }
 
         // Doing key related stuff? Can only do it if they have a key right?
-        if ($this->config->item('rest_enable_keys') && !empty($this->rest->key))
+        if ($this->config->item('rest_enable_keys') && empty($this->rest->key) === FALSE)
         {
             // Check the limit
-            if ($this->config->item('rest_enable_limits') && !$this->_check_limit($controller_method))
+            if ($this->config->item('rest_enable_limits') && $this->_check_limit($controller_method) === FALSE)
             {
                 $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key has reached the hourly limit for this method.'];
                 $this->response($response, 401);
@@ -637,7 +637,7 @@ private function _detect_input_format()
      * Detect which format should be used to output the data
      *
      * @access protected
-     * @return string The output format.
+     * @return mixed|NULL|string Output format
      */
     protected function _detect_output_format()
     {
@@ -651,9 +651,9 @@ protected function _detect_output_format()
         }
 
         // Check if a file extension is used
-        elseif ($this->_get_args && !is_array(end($this->_get_args)) && preg_match($pattern, end($this->_get_args), $matches))
+        elseif ($this->_get_args && is_array(end($this->_get_args)) === FALSE && preg_match($pattern, end($this->_get_args), $matches))
         {
-            //elseif ($this->_get_args and !is_array(end($this->_get_args)) and preg_match($pattern, end(array_keys($this->_get_args)), $matches)) {
+            //elseif ($this->_get_args and is_array(end($this->_get_args)) === FALSE and preg_match($pattern, end(array_keys($this->_get_args)), $matches)) {
             // The key of the last argument
             $arg_keys = array_keys($this->_get_args);
             $last_key = end($arg_keys);
@@ -681,7 +681,7 @@ protected function _detect_output_format()
                 if (strpos($this->input->server('HTTP_ACCEPT'), $format) !== FALSE)
                 {
                     // If not HTML or XML assume its right and send it on its way
-                    if ($format != 'html' && $format != 'xml')
+                    if ($format !== 'html' && $format !== 'xml')
                     {
                         return $format;
                     }
@@ -706,7 +706,7 @@ protected function _detect_output_format()
         } // End HTTP_ACCEPT checking
 
         // Well, none of that has worked! Let's see if the controller has a default
-        if (!empty($this->rest_format))
+        if (empty($this->rest_format) === FALSE)
         {
             return $this->rest_format;
         }
@@ -785,7 +785,7 @@ protected function _detect_api_key()
              * If "is private key" is enabled, compare the ip address with the list
              * of valid ip addresses stored in the database.
              */
-            if (!empty($row->is_private_key))
+            if (empty($row->is_private_key) === FALSE)
             {
                 // Check for a list of valid ip addresses
                 if (isset($row->ip_addresses))
@@ -895,7 +895,7 @@ protected function _log_request($authorized = FALSE)
     protected function _check_limit($controller_method)
     {
         // They are special, or it might not even have a limit
-        if (!empty($this->rest->ignore_limits) || !isset($this->methods[$controller_method]['limit']))
+        if (empty($this->rest->ignore_limits) === FALSE || isset($this->methods[$controller_method]['limit']) === FALSE)
         {
             // Everything is fine
             return TRUE;
@@ -912,7 +912,7 @@ protected function _check_limit($controller_method)
             ->row();
 
         // No calls have been made for this key
-        if (!$result)
+        if ($result === NULL)
         {
             // Create a new row for the following key
             $this->rest->db->insert($this->config->item('rest_limits_table'), [
@@ -975,7 +975,7 @@ protected function _auth_override_check()
         }
 
         // check for wildcard flag for rules for classes
-        if (!empty($this->overrides_array[$this->router->class]['*'])) // Check for class overrides
+        if (empty($this->overrides_array[$this->router->class]['*']) === FALSE) // Check for class overrides
         {
             // None auth override found, prepare nothing but send back a TRUE override flag
             if ($this->overrides_array[$this->router->class]['*'] == 'none')
@@ -1448,7 +1448,7 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
             return FALSE;
         }
 
-        if (ldap_count_entries($ldapconn, $res_id) != 1)
+        if (ldap_count_entries($ldapconn, $res_id) !== 1)
         {
             log_message('error', 'LDAP Auth: failure, username ' . $username . 'found more than once');
 
@@ -1521,7 +1521,7 @@ protected function _perform_library_auth($username = '', $password = NULL)
             return FALSE;
         }
 
-        if (!is_callable([$auth_library_class, $auth_library_function]))
+        if (is_callable([$auth_library_class, $auth_library_function]) === FALSE)
         {
             $this->load->library($auth_library_class);
         }
@@ -1580,7 +1580,7 @@ protected function _check_login($username = NULL, $password = FALSE)
             return FALSE;
         }
 
-        if ($valid_logins[$username] != $password)
+        if ($valid_logins[$username] !== $password)
         {
             return FALSE;
         }
@@ -1750,7 +1750,7 @@ protected function _check_whitelist_auth()
             $ip = trim($ip);
         }
 
-        if (!in_array($this->input->ip_address(), $whitelist))
+        if (in_array($this->input->ip_address(), $whitelist) === FALSE)
         {
             $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'IP not authorized'], 401);
         }

From e80b48e4aa21a94d71a820ece837faccff457107 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 2 Jul 2015 22:29:20 +0300
Subject: [PATCH 014/354] Fixed missing bracket during refactoring

---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 1c6bfa15..6f7952e2 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1135,7 +1135,7 @@ protected function _parse_put()
     protected function _parse_head()
     {
         // Parse the HEAD variables
-        parse_str(parse_url$this->input->server('REQUEST_URI'), PHP_URL_QUERY), $head);
+        parse_str(parse_url(http://github.com/$this-%3Einput-%3Eserver('REQUEST_URI'), PHP_URL_QUERY), $head);
 
         // Merge both the URI segments and HEAD params
         $this->_head_args = array_merge($this->_head_args, $head);

From dffbce315ae407062a37aca0fcd6ef41fe4ecf0c Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 2 Jul 2015 22:47:13 +0300
Subject: [PATCH 015/354] Fixed comparison

---
 application/libraries/Format.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 210e2f5b..165b6384 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -111,7 +111,7 @@ public function to_array($data = NULL)
         $array = [];
         foreach ((array) $data as $key => $value)
         {
-            if (is_object($value) || is_array($value))
+            if (is_object($value) === TRUE || is_array($value) === TRUE)
             {
                 $array[$key] = $this->to_array($value);
             }
@@ -153,7 +153,7 @@ public function to_xml($data = NULL, $structure = NULL, $basenode = 'xml')
         }
 
         // Force it to be something useful
-        if (!is_array($data) && !is_object($data))
+        if (is_array($data) === FALSE && is_object($data) === FALSE)
         {
             $data = (array) $data;
         }

From 6eb7e9d8fee29674609e0e268f24e6084e0ef5d4 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 6 Jul 2015 09:22:51 +0300
Subject: [PATCH 016/354] Removed empty line

---
 application/controllers/api/key.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/controllers/api/key.php b/application/controllers/api/key.php
index a708f52b..c89b64a5 100644
--- a/application/controllers/api/key.php
+++ b/application/controllers/api/key.php
@@ -253,7 +253,6 @@ private function _key_exists($key)
 
     private function _insert_key($key, $data)
     {
-
         $data[config_item('rest_key_column')] = $key;
         $data['date_created'] = function_exists('now') ? now() : time();
 

From e2543ecfbc5316765af44cef9023628b75968622 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 6 Jul 2015 09:43:48 +0300
Subject: [PATCH 017/354] Error on some systems with mcrypt_create_iv() not
 returning a string

Uses the native CI method get_random_bytes(), which is a simple wrapper
for mcrypt_create_iv() . Due to the changes made in 5e2cf85
---
 application/controllers/api/key.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/key.php b/application/controllers/api/key.php
index c89b64a5..4e9a3834 100644
--- a/application/controllers/api/key.php
+++ b/application/controllers/api/key.php
@@ -224,7 +224,13 @@ private function _generate_key()
         do
         {
             // Generate a random salt
-            $salt = mcrypt_create_iv(16, MCRYPT_DEV_URANDOM);
+            $salt = $this->security->get_random_bytes(64);
+            
+            // If an error occurred, then fall back to the previous method
+            if ($salt === FALSE)
+            {
+				$salt = hash('sha256', time() . mt_rand());
+            }
             $new_key = substr($salt, 0, config_item('rest_key_length'));
         }
         while (self::_key_exists($new_key));

From efef7ea7253b10c31bbe18f08da5f40dfcf111b9 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Wed, 8 Jul 2015 20:24:31 +0300
Subject: [PATCH 018/354] Temporary rename

Mentioned in #468, as CI3 has controllers as Ucfirst
---
 application/controllers/api/{example.php => Example_.php} | 0
 application/controllers/api/{key.php => Key_.php}         | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename application/controllers/api/{example.php => Example_.php} (100%)
 rename application/controllers/api/{key.php => Key_.php} (100%)

diff --git a/application/controllers/api/example.php b/application/controllers/api/Example_.php
similarity index 100%
rename from application/controllers/api/example.php
rename to application/controllers/api/Example_.php
diff --git a/application/controllers/api/key.php b/application/controllers/api/Key_.php
similarity index 100%
rename from application/controllers/api/key.php
rename to application/controllers/api/Key_.php

From 3c4559174aadb42e6b9b73e4615e300540c5f447 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Wed, 8 Jul 2015 20:25:24 +0300
Subject: [PATCH 019/354] Renamed controllers back to be ucfirst

Mentioned in #468
---
 application/controllers/api/{Example_.php => Example.php} | 0
 application/controllers/api/{Key_.php => Key.php}         | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename application/controllers/api/{Example_.php => Example.php} (100%)
 rename application/controllers/api/{Key_.php => Key.php} (100%)

diff --git a/application/controllers/api/Example_.php b/application/controllers/api/Example.php
similarity index 100%
rename from application/controllers/api/Example_.php
rename to application/controllers/api/Example.php
diff --git a/application/controllers/api/Key_.php b/application/controllers/api/Key.php
similarity index 100%
rename from application/controllers/api/Key_.php
rename to application/controllers/api/Key.php

From 0eec9b5f3cd9fff25a671c9ef57a90c9ebf02bec Mon Sep 17 00:00:00 2001
From: Kevin Lagaisse <kevin.lagaisse@gmail.com>
Date: Fri, 10 Jul 2015 22:02:29 +0200
Subject: [PATCH 020/354] api time limit

---
 application/libraries/REST_Controller.php | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 6f7952e2..f9314bb3 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -447,7 +447,7 @@ public function _remap($object_called, $arguments)
             // Check the limit
             if ($this->config->item('rest_enable_limits') && $this->_check_limit($controller_method) === FALSE)
             {
-                $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key has reached the hourly limit for this method.'];
+                $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key has reached the time limit for this method.'];
                 $this->response($response, 401);
             }
 
@@ -901,16 +901,24 @@ protected function _check_limit($controller_method)
             return TRUE;
         }
 
-        // How many times can you get to this method in an hour?
+        // How many times can you get to this method in a defined timelimit (default: 1hr)?
         $limit = $this->methods[$controller_method]['limit'];
 
+        $uri_noext = $this->uri->uri_string();
+        if (strpos(strrev($this->uri->uri_string()), strrev($this->response->format)) === 0) 
+        { 
+            $uri_noext = substr($this->uri->uri_string(),0, -strlen($this->response->format)-1);
+        }
+
         // Get data about a keys' usage and limit to one row
         $result = $this->rest->db
-            ->where('uri', $this->uri->uri_string())
+            ->where('uri', $uri_noext)
             ->where('api_key', $this->rest->key)
             ->get($this->config->item('rest_limits_table'))
             ->row();
 
+        $timelimit = (isset($this->methods[$controller_method]['time']) ? $this->methods[$controller_method]['time'] : 60 * 60);
+
         // No calls have been made for this key
         if ($result === NULL)
         {
@@ -923,12 +931,12 @@ protected function _check_limit($controller_method)
             ]);
         }
 
-        // Been an hour since they called
-        elseif ($result->hour_started < (time() - 3600))
+        // Been a time limit (or by default an hour) since they called
+        elseif ($result->hour_started < (time() - $timelimit))
         {
             // Reset the started period and count
             $this->rest->db
-                ->where('uri', $this->uri->uri_string())
+                ->where('uri', $uri_noext)
                 ->where('api_key', isset($this->rest->key) ? $this->rest->key : '')
                 ->set('hour_started', time())
                 ->set('count', 1)
@@ -946,7 +954,7 @@ protected function _check_limit($controller_method)
 
             // Increase the count by one
             $this->rest->db
-                ->where('uri', $this->uri->uri_string())
+                ->where('uri', $uri_noext)
                 ->where('api_key', $this->rest->key)
                 ->set('count', 'count + 1', FALSE)
                 ->update($this->config->item('rest_limits_table'));

From d52d82a724e1ce6629f55a1e97bdf18ae58dcb24 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 13 Jul 2015 18:21:19 +0300
Subject: [PATCH 021/354] Removed whitespace

---
 application/libraries/REST_Controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index f9314bb3..73ad657f 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -905,8 +905,8 @@ protected function _check_limit($controller_method)
         $limit = $this->methods[$controller_method]['limit'];
 
         $uri_noext = $this->uri->uri_string();
-        if (strpos(strrev($this->uri->uri_string()), strrev($this->response->format)) === 0) 
-        { 
+        if (strpos(strrev($this->uri->uri_string()), strrev($this->response->format)) === 0)
+        {
             $uri_noext = substr($this->uri->uri_string(),0, -strlen($this->response->format)-1);
         }
 

From 4f8c122ba81295dd8445569412948464ead120d2 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 13 Jul 2015 18:58:12 +0300
Subject: [PATCH 022/354] Using PHP_EOL

---
 application/libraries/Format.php          | 2 +-
 application/libraries/REST_Controller.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 165b6384..6efb03ea 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -408,7 +408,7 @@ protected function _from_csv($data)
         $array = [];
 
         // Splits
-        $rows = explode("\n", trim($data));
+        $rows = explode(PHP_EOL, trim($data));
         $headings = explode(',', array_shift($rows));
         foreach ($rows as $row)
         {
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 73ad657f..a16ea0df 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1379,7 +1379,7 @@ public function validation_errors()
     {
         $string = strip_tags($this->form_validation->error_string());
 
-        return explode("\n", trim($string, "\n"));
+        return explode(PHP_EOL, trim($string, PHP_EOL));
     }
 
     // SECURITY FUNCTIONS ---------------------------------------------------------

From 279039f27d364eaeeafcad46f79ca2cd4071578f Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 13 Jul 2015 19:12:04 +0300
Subject: [PATCH 023/354] Added additional methods

---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index a16ea0df..b1dca730 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -121,7 +121,7 @@ abstract class REST_Controller extends CI_Controller {
     protected $_options_args = [];
 
     /**
-     * The arguments from GET, POST, PUT, DELETE request methods combined.
+     * The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined
      *
      * @var array
      */

From 115923da2ba61becc4be7b5e31c72ad2dbfaf902 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 13 Jul 2015 19:48:45 +0300
Subject: [PATCH 024/354] Added $this->query() to parse query parameters

Regardless of whether it's a GET or POST request. Fixes #405
---
 README.md                                 |  6 ++
 application/libraries/REST_Controller.php | 97 ++++++++++++++++-------
 2 files changed, 74 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 0c1f3139..ecff303d 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,12 @@ public function index_delete($id)
 }
 ```
 
+If query parameters are passed via the URL, regardless of whether it's a GET request, can be obtainable by the query method:
+
+```php
+$this->query('blah'); // Query param
+```
+
 ## Content Types
 
 `REST_Controller` supports a bunch of different request/response formats, including XML, JSON and serialised PHP. By default, the class will check the URL and look for a format either as an extension or as a separate segment.
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index b1dca730..cff2617f 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -120,6 +120,13 @@ abstract class REST_Controller extends CI_Controller {
      */
     protected $_options_args = [];
 
+    /**
+     * The arguments for the query parameters
+     *
+     * @var array
+     */
+    protected $_query_args = [];
+
     /**
      * The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined
      *
@@ -269,6 +276,9 @@ public function __construct($config = 'rest')
             $this->{'_' . $this->request->method . '_args'} = [];
         }
 
+        // Set up the query parameters
+        $this->_parse_query();
+
         // Set up the GET variables
         $this->_get_args = array_merge($this->_get_args, $this->uri->ruri_to_assoc());
 
@@ -1065,35 +1075,8 @@ protected function _auth_override_check()
      */
     protected function _parse_get()
     {
-        // Declare a variable that will hold the REQUEST_URI
-        $request_uri = NULL;
-
-        // Fix for Issue #247
-        if (is_cli())
-        {
-            $args = $this->input->server('argv');
-            unset($args[0]);
-            // Combine the arguments using '/' as the delimiter
-            $request_uri = '/' . implode('/', $args) . '/';
-
-            // Set the following server variables
-            $_SERVER['REQUEST_URI'] = $request_uri;
-            $_SERVER['PATH_INFO'] = $request_uri;
-            $_SERVER['QUERY_STRING'] = $request_uri;
-        }
-        else
-        {
-            $request_uri = $this->input->server('REQUEST_URI');
-        }
-
-        // Declare a variable that will hold the parameters
-        $get = NULL;
-
-        // Grab the GET variables from the query string
-        parse_str(parse_url(http://github.com/$request_uri,%20PHP_URL_QUERY), $get);
-
-        // Merge both the URI segments and GET params
-        $this->_get_args = array_merge($this->_get_args, $get);
+        // Merge both the URI segments and query parameters
+        $this->_get_args = array_merge($this->_get_args, $this->_query_args);
     }
 
     /**
@@ -1202,6 +1185,41 @@ protected function _parse_delete()
         }
     }
 
+    /**
+     * Parse the query parameters
+     *
+     * @access protected
+     *
+     * @return void
+     */
+    public function _parse_query()
+    {
+        // Declare a variable that will hold the REQUEST_URI
+        $request_uri = NULL;
+
+        // If using the commandline version
+        if (is_cli())
+        {
+            $args = $this->input->server('argv');
+            unset($args[0]);
+
+            // Combine the arguments using '/' as the delimiter
+            $request_uri = '/' . implode('/', $args) . '/';
+
+            // Set the following server variables (perhaps not required anymore?)
+            $_SERVER['REQUEST_URI'] = $request_uri;
+            $_SERVER['PATH_INFO'] = $request_uri;
+            $_SERVER['QUERY_STRING'] = $request_uri;
+        }
+        else
+        {
+            $request_uri = $this->input->server('REQUEST_URI');
+        }
+
+        // Parse the query parameters from the query string
+        parse_str(parse_url(http://github.com/$request_uri,%20PHP_URL_QUERY), $this->_query_args);
+    }
+
     // INPUT FUNCTION --------------------------------------------------------------
 
     /**
@@ -1351,6 +1369,27 @@ public function patch($key = NULL, $xss_clean = NULL)
         return array_key_exists($key, $this->_patch_args) ? $this->_xss_clean($this->_patch_args[$key], $xss_clean) : FALSE;
     }
 
+    /**
+     * Retrieve a value from the query parameters
+     *
+     * @access public
+     *
+     * @param NULL $key Key to retrieve from the query parameters
+     * If NULL an array of arguments is returned
+     * @param NULL $xss_clean Whether to apply XSS filtering
+     *
+     * @return array|string|FALSE Value from the query parameters; otherwise, FALSE
+     */
+    public function query($key = NULL, $xss_clean = NULL)
+    {
+        if ($key === NULL)
+        {
+            return $this->_query_args;
+        }
+
+        return array_key_exists($key, $this->_query_args) ? $this->_xss_clean($this->_query_args[$key], $xss_clean) : FALSE;
+    }
+
     /**
      * Sanitizes data so that Cross Site Scripting Hacks can be
      * prevented.

From 75d7893295d9da875fbcb8011e04c1531f32450e Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 13 Jul 2015 19:49:20 +0300
Subject: [PATCH 025/354] Unified comments

---
 application/libraries/Format.php          | 13 ------
 application/libraries/REST_Controller.php | 50 +++++------------------
 2 files changed, 11 insertions(+), 52 deletions(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 6efb03ea..ddff3c69 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -37,7 +37,6 @@ class Format {
      *
      * @param NULL $data
      * @param NULL $from_type
-     *
      * @throws Exception
      */
 
@@ -90,7 +89,6 @@ public function factory($data, $from_type = NULL)
      *
      * @param mixed|NULL $data Optional data to pass, so as to override the data passed
      * to the constructor
-     *
      * @return array Data parsed as an array; otherwise, an empty array
      */
     public function to_array($data = NULL)
@@ -131,7 +129,6 @@ public function to_array($data = NULL)
      * to the constructor
      * @param NULL $structure
      * @param string $basenode
-     *
      * @return mixed
      */
     public function to_xml($data = NULL, $structure = NULL, $basenode = 'xml')
@@ -215,7 +212,6 @@ public function to_xml($data = NULL, $structure = NULL, $basenode = 'xml')
      *
      * @param mixed|NULL $data Optional data to pass, so as to override the data passed
      * to the constructor
-     *
      * @return mixed
      */
     public function to_html($data = NULL)
@@ -265,7 +261,6 @@ public function to_html($data = NULL)
      *
      * @param mixed|NULL $data Optional data to pass, so as to override the data passed
      * to the constructor
-     *
      * @return mixed
      */
     public function to_csv($data = NULL)
@@ -311,7 +306,6 @@ public function to_csv($data = NULL)
      *
      * @param mixed|NULL $data Optional data to pass, so as to override the data passed
      * to the constructor
-     *
      * @return string Json representation of a value
      */
     public function to_json($data = NULL)
@@ -350,7 +344,6 @@ public function to_json($data = NULL)
      *
      * @param mixed|NULL $data Optional data to pass, so as to override the data passed
      * to the constructor
-     *
      * @return string Serialized data
      */
     public function to_serialized($data = NULL)
@@ -370,7 +363,6 @@ public function to_serialized($data = NULL)
      *
      * @param mixed|NULL $data Optional data to pass, so as to override the data passed
      * to the constructor
-     *
      * @return mixed String representation of a variable
      */
     public function to_php($data = NULL)
@@ -389,7 +381,6 @@ public function to_php($data = NULL)
 
     /**
      * @param $data XML string
-     *
      * @return SimpleXMLElement XML element object; otherwise, empty array
      */
     protected function _from_xml($data)
@@ -399,7 +390,6 @@ protected function _from_xml($data)
 
     /**
      * @param string $data CSV string
-     *
      * @return array A multi-dimensional array with the outer array being the number of rows
      * and the inner arrays the individual fields
      */
@@ -426,7 +416,6 @@ protected function _from_csv($data)
 
     /**
      * @param $data Encoded json string
-     *
      * @return mixed Decoded json string with leading and trailing whitespace removed
      */
     protected function _from_json($data)
@@ -436,7 +425,6 @@ protected function _from_json($data)
 
     /**
      * @param string Data to unserialized
-     *
      * @return mixed Unserialized data
      */
     protected function _from_serialize($data)
@@ -446,7 +434,6 @@ protected function _from_serialize($data)
 
     /**
      * @param $data Data to trim leading and trailing whitespace
-     *
      * @return string Data with leading and trailing whitespace removed
      */
     protected function _from_php($data)
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index cff2617f..e4f61cc1 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -206,6 +206,7 @@ abstract class REST_Controller extends CI_Controller {
      * Extend this function to apply additional checking early on in the process
      *
      * @access protected
+     * @return void
      */
     protected function early_checks()
     {
@@ -215,9 +216,9 @@ protected function early_checks()
      * Constructor for the REST API
      *
      * @access public
-     *
      * @param string $config Configuration filename minus the file extension
      * e.g: my_rest.php is passed as 'my_rest'
+     * @return void
      */
     public function __construct($config = 'rest')
     {
@@ -381,6 +382,7 @@ public function __construct($config = 'rest')
      *
      * @author Chris Kacerguis
      * @access public
+     * @return void
      */
     public function __destruct()
     {
@@ -400,7 +402,6 @@ public function __destruct()
      * Controller method.
      *
      * @access public
-     *
      * @param  string $object_called
      * @param  array $arguments The arguments passed to the controller method.
      */
@@ -507,7 +508,6 @@ public function _remap($object_called, $arguments)
      * Takes mixed data and optionally a status code, then creates the response
      *
      * @access public
-     *
      * @param array|NULL $data Data to output to the user
      * @param int|NULL $http_code HTTP status code
      * @param bool $continue TRUE to flush the response to the client and continue
@@ -728,6 +728,7 @@ protected function _detect_output_format()
     /**
      * Get the HTTP request string e.g. get or post
      *
+     * @access protected
      * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
      */
     protected function _detect_method()
@@ -867,9 +868,7 @@ protected function _detect_lang()
      * Add the request to the log table
      *
      * @access protected
-     *
      * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
-     *
      * @return bool TRUE the data was inserted; otherwise, FALSE
      */
     protected function _log_request($authorized = FALSE)
@@ -897,9 +896,7 @@ protected function _log_request($authorized = FALSE)
      * Check if the requests to a controller method exceed a limit
      *
      * @access protected
-     *
      * @param  string $controller_method The method being called
-     *
      * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
      */
     protected function _check_limit($controller_method)
@@ -974,9 +971,7 @@ protected function _check_limit($controller_method)
     }
 
     /**
-     * Auth override check
-     * Check if there is a specific auth type set for the current class/method
-     * being called.
+     * Check if there is a specific auth type set for the current class/method being called
      *
      * @access protected
      * @return bool
@@ -1189,7 +1184,6 @@ protected function _parse_delete()
      * Parse the query parameters
      *
      * @access protected
-     *
      * @return void
      */
     public function _parse_query()
@@ -1226,11 +1220,9 @@ public function _parse_query()
      * Retrieve a value from a GET request
      *
      * @access public
-     *
      * @param NULL $key Key to retrieve from the GET request
      * If NULL an array of arguments is returned
      * @param NULL $xss_clean Whether to apply XSS filtering
-     *
      * @return array|string|FALSE Value from the GET request; otherwise, FALSE
      */
     public function get($key = NULL, $xss_clean = NULL)
@@ -1247,11 +1239,9 @@ public function get($key = NULL, $xss_clean = NULL)
      * Retrieve a value from a OPTIONS request
      *
      * @access public
-     *
      * @param NULL $key Key to retrieve from the OPTIONS request.
      * If NULL an array of arguments is returned
      * @param NULL $xss_clean Whether to apply XSS filtering
-     *
      * @return array|string|FALSE Value from the OPTIONS request; otherwise, FALSE
      */
     public function options($key = NULL, $xss_clean = NULL)
@@ -1268,11 +1258,9 @@ public function options($key = NULL, $xss_clean = NULL)
      * Retrieve a value from a HEAD request
      *
      * @access public
-     *
      * @param NULL $key Key to retrieve from the HEAD request
      * If NULL an array of arguments is returned
      * @param NULL $xss_clean Whether to apply XSS filtering
-     *
      * @return array|string|FALSE Value from the HEAD request; otherwise, FALSE
      */
     public function head($key = NULL, $xss_clean = NULL)
@@ -1289,11 +1277,9 @@ public function head($key = NULL, $xss_clean = NULL)
      * Retrieve a value from a POST request
      *
      * @access public
-     *
      * @param NULL $key Key to retrieve from the POST request
      * If NULL an array of arguments is returned
      * @param NULL $xss_clean Whether to apply XSS filtering
-     *
      * @return array|string|FALSE Value from the POST request; otherwise, FALSE
      */
     public function post($key = NULL, $xss_clean = NULL)
@@ -1310,11 +1296,9 @@ public function post($key = NULL, $xss_clean = NULL)
      * Retrieve a value from a PUT request
      *
      * @access public
-     *
      * @param NULL $key Key to retrieve from the PUT request
      * If NULL an array of arguments is returned
      * @param NULL $xss_clean Whether to apply XSS filtering
-     *
      * @return array|string|FALSE Value from the PUT request; otherwise, FALSE
      */
     public function put($key = NULL, $xss_clean = NULL)
@@ -1331,11 +1315,9 @@ public function put($key = NULL, $xss_clean = NULL)
      * Retrieve a value from a DELETE request
      *
      * @access public
-     *
      * @param NULL $key Key to retrieve from the DELETE request
      * If NULL an array of arguments is returned
      * @param NULL $xss_clean Whether to apply XSS filtering
-     *
      * @return array|string|FALSE Value from the DELETE request; otherwise, FALSE
      */
     public function delete($key = NULL, $xss_clean = NULL)
@@ -1352,11 +1334,9 @@ public function delete($key = NULL, $xss_clean = NULL)
      * Retrieve a value from a PATCH request
      *
      * @access public
-     *
      * @param NULL $key Key to retrieve from the PATCH request
      * If NULL an array of arguments is returned
      * @param NULL $xss_clean Whether to apply XSS filtering
-     *
      * @return array|string|FALSE Value from the PATCH request; otherwise, FALSE
      */
     public function patch($key = NULL, $xss_clean = NULL)
@@ -1373,11 +1353,9 @@ public function patch($key = NULL, $xss_clean = NULL)
      * Retrieve a value from the query parameters
      *
      * @access public
-     *
      * @param NULL $key Key to retrieve from the query parameters
      * If NULL an array of arguments is returned
      * @param NULL $xss_clean Whether to apply XSS filtering
-     *
      * @return array|string|FALSE Value from the query parameters; otherwise, FALSE
      */
     public function query($key = NULL, $xss_clean = NULL)
@@ -1395,10 +1373,8 @@ public function query($key = NULL, $xss_clean = NULL)
      * prevented.
      *
      * @access protected
-     *
      * @param  string $value Input data
      * @param  bool $xss_clean Whether to apply XSS filtering
-     *
      * @return string
      */
     protected function _xss_clean($value, $xss_clean)
@@ -1427,10 +1403,8 @@ public function validation_errors()
      * Perform LDAP Authentication
      *
      * @access protected
-     *
      * @param  string $username The username to validate
      * @param  string $password The password to validate
-     *
      * @return bool
      */
     protected function _perform_ldap_auth($username = '', $password = NULL)
@@ -1536,10 +1510,8 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
      * Perform Library Authentication - Override this function to change the way the library is called
      *
      * @access protected
-     *
      * @param  string $username The username to validate
      * @param  string $password The password to validate
-     *
      * @return bool
      */
     protected function _perform_library_auth($username = '', $password = NULL)
@@ -1580,10 +1552,8 @@ protected function _perform_library_auth($username = '', $password = NULL)
      * Check if the user is logged in
      *
      * @access protected
-     *
      * @param  string $username The user's name
      * @param  bool|string $password The user's password
-     *
      * @return bool
      */
     protected function _check_login($username = NULL, $password = FALSE)
@@ -1639,6 +1609,7 @@ protected function _check_login($username = NULL, $password = FALSE)
      * Check to see if the user is logged in with a PHP session key
      *
      * @access protected
+     * @return void
      */
     protected function _check_php_session()
     {
@@ -1661,6 +1632,7 @@ protected function _check_php_session()
      * Prepares for basic authentication
      *
      * @access protected
+     * @return void
      */
     protected function _prepare_basic_auth()
     {
@@ -1701,6 +1673,7 @@ protected function _prepare_basic_auth()
      * Prepares for digest authentication
      *
      * @access protected
+     * @return void
      */
     protected function _prepare_digest_auth()
     {
@@ -1762,6 +1735,7 @@ protected function _prepare_digest_auth()
      * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
      *
      * @access protected
+     * @return void
      */
     protected function _check_blacklist_auth()
     {
@@ -1785,6 +1759,7 @@ protected function _check_blacklist_auth()
      * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
      *
      * @access protected
+     * @return void
      */
     protected function _check_whitelist_auth()
     {
@@ -1807,9 +1782,9 @@ protected function _check_whitelist_auth()
      * Force logging in by setting the WWW-Authenticate header
      *
      * @access protected
-     *
      * @param string $nonce A server-specified data string which should be uniquely generated
      * each time
+     * @return void
      */
     protected function _force_login($nonce = '')
     {
@@ -1842,7 +1817,6 @@ protected function _force_login($nonce = '')
      *
      * @access protected
      * @author Chris Kacerguis
-     *
      * @return bool TRUE log table updated; otherwise, FALSE
      */
     protected function _log_access_time()
@@ -1861,9 +1835,7 @@ protected function _log_access_time()
      *
      * @access protected
      * @author Justin Chen
-     *
      * @param $http_code int HTTP status code
-     *
      * @return bool TRUE log table updated; otherwise, FALSE
      */
     protected function _log_response_code($http_code)

From 8dfee5647a83567dda57a743b52bf7741efe48e5 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 13 Jul 2015 19:49:54 +0300
Subject: [PATCH 026/354] Fixed typo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ecff303d..df0084fc 100644
--- a/README.md
+++ b/README.md
@@ -189,7 +189,7 @@ $ curl -X POST -H "X-API-KEY: some_key_here" http://example.com/books
 
 ## Contributions
 
-This project was originally written by Phil Sturgeon, however his involvment has shifted
+This project was originally written by Phil Sturgeon, however his involvement has shifted
 as he is no longer using it.  As of 11/20/2013 further developement and support will be done by Chris Kacerguis.
 
 Pull Requests are the best way to fix bugs or add features. I know loads of you use this, so please

From 3e74048521268b6d7d17f4df7683fd83c4c6d0b0 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 13 Jul 2015 19:50:42 +0300
Subject: [PATCH 027/354] Using ISO 8601 date format

We're developers after all
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index df0084fc..8df1e889 100644
--- a/README.md
+++ b/README.md
@@ -190,7 +190,7 @@ $ curl -X POST -H "X-API-KEY: some_key_here" http://example.com/books
 ## Contributions
 
 This project was originally written by Phil Sturgeon, however his involvement has shifted
-as he is no longer using it.  As of 11/20/2013 further developement and support will be done by Chris Kacerguis.
+as he is no longer using it.  As of 2013/11/20 further developement and support will be done by Chris Kacerguis.
 
 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.

From a954158486bb78745a1626f51502d993c7b20ce0 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 13 Jul 2015 19:53:58 +0300
Subject: [PATCH 028/354] Added the most comment HTTP status codes

---
 application/libraries/REST_Controller.php | 96 +++++++++++++++++++++++
 1 file changed, 96 insertions(+)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index e4f61cc1..129c92d6 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -202,6 +202,102 @@ abstract class REST_Controller extends CI_Controller {
      */
     protected $_enable_xss = FALSE;
 
+    // Success
+
+    /**
+     * The request has succeeded
+     */
+    const OK = 200;
+
+    /**
+     * The server successfully created a new resource
+     */
+    const CREATED = 201;
+
+    /**
+     * The server successfully processed the request, though no content is returned
+     */
+    const NO_CONTENT = 204;
+
+    // Redirection
+
+    /**
+     * The resource has not been modified since the last request
+     */
+    const NOT_MODIFIED = 304;
+
+    // Client Error
+
+    /**
+     * The request cannot be fulfilled due to multiple errors
+     */
+    const BAD_REQUEST = 400;
+
+    /**
+     * The user is unauthorized to access the requested resource
+     */
+    const UNAUTHORIZED = 401;
+
+    /**
+     * The requested resource is unavailable at this present time
+     */
+    const FORBIDDEN = 403;
+
+    /**
+     * The requested resource could not be found
+     *
+     * Note: This is sometimes used to mask if there was an UNAUTHORIZED (401) or
+     * FORBIDDEN (403) error, for security reasons
+     */
+    const NOT_FOUND = 404;
+
+    /**
+     * The request method is not supported by the following resource
+     */
+    const METHOD_NOT_ALLOWED = 405;
+
+    /**
+     * The request could not be completed due to a conflict with the current state
+     * of the resource
+     */
+    const CONFLICT = 409;
+
+    // Server Error
+
+    /**
+     * The server encountered an unexpected error
+     *
+     * Note: This is a generic error message when no specific message
+     * is suitable
+     */
+    const INTERNAL_SERVER_ERROR = 500;
+
+    /**
+     * The server does not recognised the request method
+     */
+    const NOT_IMPLEMENTED = 501;
+
+    /**
+     * HTTP status codes and their respective description
+     *
+     * @var array
+     * @link http://www.restapitutorial.com/httpstatuscodes.html
+     */
+    protected $http_status_codes = [
+        self::OK => 'OK',
+        self::CREATED => 'CREATED',
+        self::NO_CONTENT => 'NO CONTENT',
+        self::NOT_MODIFIED => 'NOT MODIFIED',
+        self::BAD_REQUEST => 'BAD REQUEST',
+        self::UNAUTHORIZED => 'UNAUTHORIZED',
+        self::FORBIDDEN => 'FORBIDDEN',
+        self::NOT_FOUND => 'NOT FOUND',
+        self::METHOD_NOT_ALLOWED => 'METHOD NOT ALLOWED',
+        self::CONFLICT => 'CONFLICT',
+        self::INTERNAL_SERVER_ERROR => 'INTERNAL SERVER ERROR',
+        self::NOT_IMPLEMENTED => 'NOT IMPLEMENTED'
+    ];
+
     /**
      * Extend this function to apply additional checking early on in the process
      *

From 26e2a772367f87935f55c9128f84d23249dec952 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 13 Jul 2015 19:55:37 +0300
Subject: [PATCH 029/354] Sentence correction

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8df1e889..ccd236d9 100644
--- a/README.md
+++ b/README.md
@@ -57,7 +57,7 @@ public function index_delete($id)
 }
 ```
 
-If query parameters are passed via the URL, regardless of whether it's a GET request, can be obtainable by the query method:
+If query parameters are passed via the URL, regardless of whether it's a GET request, can be obtained by the query method:
 
 ```php
 $this->query('blah'); // Query param

From e46d91f75d73a906d0761e37b36e9a9b85683f49 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 13 Jul 2015 20:48:42 +0300
Subject: [PATCH 030/354] Added format constants

---
 application/libraries/Format.php | 40 ++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index ddff3c69..2cd73cb4 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -11,6 +11,46 @@
  */
 class Format {
 
+    /**
+     * Array output format
+     */
+    const ARRAY_FORMAT = 'array';
+
+    /**
+     * Comma Separated Value (CSV) output format
+     */
+    const CSV_FORMAT = 'csv';
+
+    /**
+     * Json output format
+     */
+    const JSON_FORMAT = 'json';
+
+    /**
+     * HTML output format
+     */
+    const HTML_FORMAT = 'html';
+
+    /**
+     * PHP output format
+     */
+    const PHP_FORMAT = 'php';
+
+    /**
+     * Serialized output format
+     */
+    const SERIALIZED_FORMAT = 'serialized';
+
+    /**
+     * XML output format
+     */
+    const XML_FORMAT = 'xml';
+
+    /**
+     * Default format of this class
+     */
+    const DEFAULT_FORMAT = self::JSON; // Couldn't be DEFAULT, as this is a keyword
+
     /**
      * CodeIgniter instance
      *

From a9821930a4ff1267dfd276896998ef6e01a74a4f Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 13 Jul 2015 20:57:57 +0300
Subject: [PATCH 031/354] Using class constants

---
 application/libraries/REST_Controller.php | 52 +++++++++++------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 129c92d6..5dfef0a0 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -256,6 +256,11 @@ abstract class REST_Controller extends CI_Controller {
      */
     const METHOD_NOT_ALLOWED = 405;
 
+    /**
+     * The request was not acceptable
+     */
+    const NOT_ACCEPTABLE = 406;
+
     /**
      * The request could not be completed due to a conflict with the current state
      * of the resource
@@ -293,6 +298,7 @@ abstract class REST_Controller extends CI_Controller {
         self::FORBIDDEN => 'FORBIDDEN',
         self::NOT_FOUND => 'NOT FOUND',
         self::METHOD_NOT_ALLOWED => 'METHOD NOT ALLOWED',
+        self::NOT_ACCEPTABLE => 'NOT ACCEPTABLE',
         self::CONFLICT => 'CONFLICT',
         self::INTERNAL_SERVER_ERROR => 'INTERNAL SERVER ERROR',
         self::NOT_IMPLEMENTED => 'NOT IMPLEMENTED'
@@ -443,11 +449,10 @@ public function __construct($config = 'rest')
         if ($this->input->is_ajax_request() === FALSE && $this->config->item('rest_ajax_only'))
         {
             // Display an error response
-            $this->response(
-                [
+            $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
                     $this->config->item('rest_message_field_name') => 'Only AJAX requests are acceptable'
-                ], 406); // Set status to 406 NOT ACCEPTABLE
+                ], self::NOT_ACCEPTABLE);
         }
 
         // When there is no specific override for the current class/method, use the default auth value set in the config
@@ -506,7 +511,7 @@ public function _remap($object_called, $arguments)
         // Should we answer if not over SSL?
         if ($this->config->item('force_https') && $this->request->ssl === FALSE)
         {
-            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Unsupported protocol'], 403);
+            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Unsupported protocol'], self::FORBIDDEN);
         }
 
         // Remove the supported format from the function name e.g. index.json => index
@@ -528,7 +533,7 @@ public function _remap($object_called, $arguments)
                 $this->_log_request();
             }
 
-            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Invalid API Key ' . $this->rest->key], 403);
+            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Invalid API Key ' . $this->rest->key], self::FORBIDDEN);
         }
 
         // Check to see if this key has access to the requested controller.
@@ -539,13 +544,13 @@ public function _remap($object_called, $arguments)
                 $this->_log_request();
             }
 
-            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key does not have access to the requested controller.'], 401);
+            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key does not have access to the requested controller.'], self::UNAUTHORIZED);
         }
 
         // Sure it exists, but can they do anything with it?
         if (method_exists($this, $controller_method) === FALSE)
         {
-            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Unknown method.'], 404);
+            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Unknown method.'], self::NOT_FOUND);
         }
 
         // Doing key related stuff? Can only do it if they have a key right?
@@ -555,7 +560,7 @@ public function _remap($object_called, $arguments)
             if ($this->config->item('rest_enable_limits') && $this->_check_limit($controller_method) === FALSE)
             {
                 $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key has reached the time limit for this method.'];
-                $this->response($response, 401);
+                $this->response($response, self:UNAUTHORIZED);
             }
 
             // If no level is set use 0, they probably aren't using permissions
@@ -572,7 +577,7 @@ public function _remap($object_called, $arguments)
 
             // They don't have good enough perms
             $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key does not have enough permissions.'];
-            $authorized || $this->response($response, 401);
+            $authorized || $this->response($response, self:UNAUTHORIZED);
         }
 
         // No key stuff, but record that stuff is happening
@@ -589,14 +594,13 @@ public function _remap($object_called, $arguments)
         catch (Exception $ex)
         {
             // If the method doesn't exist, then the error will be caught and an error response shown
-            $this->response(
-                [
+            $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
                     $this->config->item('rest_message_field_name') => [
                         'classname' => get_class($ex),
                         'message' => $ex->getMessage()
                     ]
-                ], 500);
+                ], self:INTERNAL_SERVER_ERROR);
         }
     }
 
@@ -624,7 +628,7 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
         // If data is NULL and no HTTP status code provided, then display, error and exit
         if ($data === NULL && $http_code === NULL)
         {
-            $http_code = 404;
+            $http_code = self::NOT_FOUND;
         }
 
         // If data is not NULL and a HTTP status code provided, then continue
@@ -1716,11 +1720,10 @@ protected function _check_php_session()
         if (!$this->session->userdata($key))
         {
             // Display an error response
-            $this->response(
-                [
+            $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
                     $this->config->item('rest_message_field_name') => 'Not Authorized'
-                ], 401);
+                ], self::UNAUTHORIZED);
         }
     }
 
@@ -1819,11 +1822,10 @@ protected function _prepare_digest_auth()
         if (strcasecmp($digest['response'], $valid_response) !== 0)
         {
             // Display an error response
-            $this->response(
-                [
+            $this->response([
                     $this->config->item('rest_status_field_name') => 0,
                     $this->config->item('rest_message_field_name') => 'Invalid credentials'
-                ], 401);
+                ], self::UNAUTHORIZED);
         }
     }
 
@@ -1842,12 +1844,11 @@ protected function _check_blacklist_auth()
         if (preg_match($pattern, $this->config->item('rest_ip_blacklist')))
         {
             // Display an error response
-            $this->response(
-                [
+            $this->response([
                     'status' => FALSE,
                     'error' => 'IP Denied'
                 ],
-                401);
+                self::UNAUTHORIZED);
         }
     }
 
@@ -1870,7 +1871,7 @@ protected function _check_whitelist_auth()
 
         if (in_array($this->input->ip_address(), $whitelist) === FALSE)
         {
-            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'IP not authorized'], 401);
+            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'IP not authorized'], self::UNAUTHORIZED);
         }
     }
 
@@ -1901,11 +1902,10 @@ protected function _force_login($nonce = '')
         }
 
         // Display an error response
-        $this->response(
-            [
+        $this->response([
                 $this->config->item('rest_status_field_name') => FALSE,
                 $this->config->item('rest_message_field_name') => 'Not authorized'
-            ], 401);
+            ], self::UNAUTHORIZED);
     }
 
     /**

From 8659531ee89a812ec46ddf34e808c7ba9699b2f4 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 13 Jul 2015 21:15:02 +0300
Subject: [PATCH 032/354] Updated CSV formatting methods

This closes #484
---
 application/libraries/Format.php | 106 +++++++++++++++++++++++++++----
 1 file changed, 92 insertions(+), 14 deletions(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 2cd73cb4..4692cfb3 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -296,6 +296,84 @@ public function to_html($data = NULL)
         return $this->_ci->table->generate();
     }
 
+    /**
+     * @link http://www.metashock.de/2014/02/create-csv-file-in-memory-php/
+     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+     * to the constructor
+     * @param string $delimiter The optional delimiter parameter sets the field
+     * delimiter (one character only). NULL will use the default value (,)
+     * @param string $enclosure The optional enclosure parameter sets the field
+     * enclosure (one character only). NULL will use the default value (")
+     * @return string A csv string
+     */
+    public function to_csv($data = NULL, $delimiter = ',', $enclosure = '"')
+    {
+        // Use a threshold of 1 MB (1024 * 1024)
+        $handle = fopen('php://temp/maxmemory:1048576', 'w');
+        if ($handle === FALSE)
+        {
+            return NULL;
+        }
+
+        // If no data is passed as a parameter, then use the data passed
+        // via the constructor
+        if ($data === NULL && func_num_args() === 0)
+        {
+            $data = $this->_data;
+        }
+
+        // If NULL, then set as the default delimiter
+        if ($delimiter === NULL)
+        {
+            $delimiter = ',';
+        }
+
+        // If NULL, then set as the default enclosure
+        if ($enclosure === NULL)
+        {
+            $enclosure = '"';
+        }
+
+        // Cast as an array if not already
+        if (is_array($data) === FALSE)
+        {
+            $data = (array) $data;
+        }
+
+        // Check if it's a multi-dimensional array
+        if (isset($data[0]) && count($data) !== count($data, COUNT_RECURSIVE))
+        {
+            // Multi-dimensional array
+            $headings = array_keys($data[0]);
+        }
+        else
+        {
+            // Single array
+            $headings = array_keys($data);
+            $data = [$data];
+        }
+
+        // Apply the headings
+        fputcsv($handle, $headers, $delimiter, $enclosure);
+
+        foreach ($data as $record)
+        {
+            // Returns the length of the string written or FALSE
+            fputcsv($handle, $record, $delimiter, $enclosure);
+        }
+
+        // Reset the file pointer
+        rewind($handle);
+
+        // Retrieve the csv contents
+        $csv = stream_get_contents($handle);
+
+        // Close the handle
+        fclose($handle);
+
+        return $csv;
+    }
+
     /**
      * Format data as CSV
      *
@@ -430,28 +508,28 @@ protected function _from_xml($data)
 
     /**
      * @param string $data CSV string
+     * @param string $delimiter The optional delimiter parameter sets the field
+     * delimiter (one character only). NULL will use the default value (,)
+     * @param string $enclosure The optional enclosure parameter sets the field
+     * enclosure (one character only). NULL will use the default value (")
      * @return array A multi-dimensional array with the outer array being the number of rows
      * and the inner arrays the individual fields
      */
-    protected function _from_csv($data)
+    protected function _from_csv($data, $delimiter = ',', $enclosure = '"')
     {
-        $array = [];
-
-        // Splits
-        $rows = explode(PHP_EOL, trim($data));
-        $headings = explode(',', array_shift($rows));
-        foreach ($rows as $row)
+        // If NULL, then set as the default delimiter
+        if ($delimiter === NULL)
         {
-            // The substr removes " from start and end
-            $data_fields = explode('","', trim(substr($row, 1, -1)));
+            $delimiter = ',';
+        }
 
-            if (count($data_fields) === count($headings))
-            {
-                $array[] = array_combine($headings, $data_fields);
-            }
+        // If NULL, then set as the default enclosure
+        if ($enclosure === NULL)
+        {
+            $enclosure = '"';
         }
 
-        return $array;
+        return str_getcsv($data, $delimiter, $enclosure);
     }
 
     /**

From 8021fc4c389e1ea43adbd98526d2c1d82f0a1f06 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 13 Jul 2015 21:17:53 +0300
Subject: [PATCH 033/354] Fixed incorrect format

---
 application/libraries/Format.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 4692cfb3..a0d0857c 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -49,7 +49,7 @@ class Format {
     /**
      * Default format of this class
      */
-    const DEFAULT_FORMAT = self::JSON; // Couldn't be DEFAULT, as this is a keyword
+    const DEFAULT_FORMAT = self::JSON_FORMAT; // Couldn't be DEFAULT, as this is a keyword
 
     /**
      * CodeIgniter instance

From 45c135371cfdac94190734854c126412537abfbe Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 13 Jul 2015 21:28:46 +0300
Subject: [PATCH 034/354] Using constants in the REST_Controller

---
 application/controllers/api/Example.php | 14 ++++++-------
 application/controllers/api/Key.php     | 26 ++++++++++++-------------
 2 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 570a2a57..e9f58070 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -35,7 +35,7 @@ function user_get()
     {
         if (!$this->get('id'))
         {
-            $this->response(NULL, 400);
+            $this->response(NULL, REST_Controller::BAD_REQUEST);
         }
 
         // $user = $this->some_model->getSomething( $this->get('id') );
@@ -49,12 +49,12 @@ function user_get()
 
         if ($user)
         {
-            $this->response($user, 200); // 200 being the HTTP response code
+            $this->response($user, REST_Controller::OK); // OK (200) being the HTTP response code
         }
 
         else
         {
-            $this->response(['error' => 'User could not be found'], 404);
+            $this->response(['error' => 'User could not be found'], REST_Controller::NOT_FOUND);
         }
     }
 
@@ -68,7 +68,7 @@ function user_post()
             'message' => 'Added a resource'
         ];
 
-        $this->response($message, 201); // 201 being the HTTP response code
+        $this->response($message, REST_Controller::CREATED); // CREATED (201) being the HTTP response code
     }
 
     function user_delete()
@@ -79,7 +79,7 @@ function user_delete()
             'message' => 'Deleted the resource'
         ];
 
-        $this->response($message, 204); // 204 being the HTTP response code
+        $this->response($message, REST_Controller::NO_CONTENT); // NO_CONTENT (204) being the HTTP response code
     }
 
     function users_get()
@@ -93,12 +93,12 @@ function users_get()
 
         if ($users)
         {
-            $this->response($users, 200); // 200 being the HTTP response code
+            $this->response($users, REST_Controller::OK); // OK (200) being the HTTP response code
         }
 
         else
         {
-            $this->response(['error' => 'Couldn\'t find any users!'], 404);
+            $this->response(['error' => 'Couldn\'t find any users!'], REST_Controller::NOT_FOUND);
         }
     }
 
diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
index 4e9a3834..b303c9c7 100644
--- a/application/controllers/api/Key.php
+++ b/application/controllers/api/Key.php
@@ -47,14 +47,14 @@ public function index_put()
             $this->response([
                 'status' => 1,
                 'key' => $key
-            ], 201); // 201 = Created
+            ], REST_Controller::CREATED); // CREATED (201) being the HTTP response code
         }
         else
         {
             $this->response([
                 'status' => 0,
                 'error' => 'Could not save the key'
-            ], 500); // 500 = Internal Server Error
+            ], REST_Controller::INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
     }
 
@@ -77,7 +77,7 @@ public function index_delete()
             // It doesn't appear the key exists
             $this->response([
                 'error' => 'Invalid API Key'
-            ], 400); // 400 = Bad Request
+            ], REST_Controller::BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
         // Destroy it
@@ -87,7 +87,7 @@ public function index_delete()
         $this->response([
             'status' => 1,
             'success' => 'API Key was deleted'
-            ], 204); // 204 = Success, No Content
+            ], REST_Controller::NO_CONTENT); // NO_CONTENT (204) being the HTTP response code
     }
 
     // --------------------------------------------------------------------
@@ -110,7 +110,7 @@ public function level_post()
             // It doesn't appear the key exists
             $this->response([
                 'error' => 'Invalid API Key'
-            ], 400); // 400 = Bad Request
+            ], REST_Controller::BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
         // Update the key level
@@ -119,14 +119,14 @@ public function level_post()
             $this->response([
                 'status' => 1,
                 'success' => 'API Key was updated'
-            ], 200); // 200 = OK
+            ], REST_Controller::OK); // OK (200) being the HTTP response code
         }
         else
         {
             $this->response([
                 'status' => 0,
                 'error' => 'Could not update the key level'
-            ], 500); // 500 = Internal Server Error
+            ], REST_Controller::INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
     }
 
@@ -149,7 +149,7 @@ public function suspend_post()
             // It doesn't appear the key exists
             $this->response([
                 'error' => 'Invalid API Key'
-            ], 400); // 400 = Bad Request
+            ], REST_Controller::BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
         // Update the key level
@@ -158,14 +158,14 @@ public function suspend_post()
             $this->response([
                 'status' => 1,
                 'success' => 'Key was suspended'
-            ], 200); // 200 = OK
+            ], REST_Controller::OK); // OK (200) being the HTTP response code
         }
         else
         {
             $this->response([
                 'status' => 0,
                 'error' => 'Could not suspend the user'
-            ], 500); // 500 = Internal Server Error
+            ], REST_Controller::INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
     }
 
@@ -189,7 +189,7 @@ public function regenerate_post()
             // It doesn't appear the key exists
             $this->response([
                 'error' => 'Invalid API Key'
-            ], 400); // 400 = Bad Request
+            ], REST_Controller::BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
         // Build a new key
@@ -204,14 +204,14 @@ public function regenerate_post()
             $this->response([
                 'status' => 1,
                 'key' => $new_key
-            ], 201); // 201 = Created
+            ], REST_Controller::CREATED); // CREATED (201) being the HTTP response code
         }
         else
         {
             $this->response([
                 'status' => 0,
                 'error' => 'Could not save the key'
-            ], 500); // 500 = Internal Server Error
+            ], REST_Controller::INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
     }
 

From 7a42fafc6e3efa1d2963953f859f72d3554adae7 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 13 Jul 2015 21:30:15 +0300
Subject: [PATCH 035/354] Tidied database calls

---
 application/controllers/api/Key.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
index b303c9c7..7577c4d8 100644
--- a/application/controllers/api/Key.php
+++ b/application/controllers/api/Key.php
@@ -245,14 +245,19 @@ private function _generate_key()
 
     private function _get_key($key)
     {
-        return $this->db->where(config_item('rest_key_column'), $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(config_item('rest_key_column'), $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;
     }
 
     // --------------------------------------------------------------------

From cf824a6a7d7c9068269ac620b3ec190b127c0878 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 13 Jul 2015 21:36:25 +0300
Subject: [PATCH 036/354] Fixed missing colon for calling class-level constants

---
 application/libraries/REST_Controller.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 5dfef0a0..a456a05e 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -560,7 +560,7 @@ public function _remap($object_called, $arguments)
             if ($this->config->item('rest_enable_limits') && $this->_check_limit($controller_method) === FALSE)
             {
                 $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key has reached the time limit for this method.'];
-                $this->response($response, self:UNAUTHORIZED);
+                $this->response($response, self::UNAUTHORIZED);
             }
 
             // If no level is set use 0, they probably aren't using permissions
@@ -577,7 +577,7 @@ public function _remap($object_called, $arguments)
 
             // They don't have good enough perms
             $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key does not have enough permissions.'];
-            $authorized || $this->response($response, self:UNAUTHORIZED);
+            $authorized || $this->response($response, self::UNAUTHORIZED);
         }
 
         // No key stuff, but record that stuff is happening
@@ -600,7 +600,7 @@ public function _remap($object_called, $arguments)
                         'classname' => get_class($ex),
                         'message' => $ex->getMessage()
                     ]
-                ], self:INTERNAL_SERVER_ERROR);
+                ], self::INTERNAL_SERVER_ERROR);
         }
     }
 

From bd68661d16645847c2b78a17f0e41d2c8c02d7c3 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 13 Jul 2015 21:36:40 +0300
Subject: [PATCH 037/354] Removed redundant method

---
 application/libraries/Format.php | 45 --------------------------------
 1 file changed, 45 deletions(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index a0d0857c..6ec4a224 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -374,51 +374,6 @@ public function to_csv($data = NULL, $delimiter = ',', $enclosure = '"')
         return $csv;
     }
 
-    /**
-     * Format data as CSV
-     *
-     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-     * to the constructor
-     * @return mixed
-     */
-    public function to_csv($data = NULL)
-    {
-        // If no data is passed as a parameter, then use the data passed
-        // via the constructor
-        if ($data === NULL && func_num_args() === 0)
-        {
-            $data = $this->_data;
-        }
-
-        // Cast as an array if not already
-        if (is_array($data) === FALSE)
-        {
-            $data = (array) $data;
-        }
-
-        // Multi-dimensional array
-        if (isset($data[0]) && is_array($data[0]))
-        {
-            $headings = array_keys($data[0]);
-        }
-
-        // Single array
-        else
-        {
-            $headings = array_keys($data);
-            $data = [$data];
-        }
-
-        $output = '"' . implode('","', $headings) . '"' . PHP_EOL;
-        foreach ($data as &$row)
-        {
-            $row = str_replace('"', '""', $row); // Escape dbl quotes per RFC 4180
-            $output .= '"' . implode('","', $row) . '"' . PHP_EOL;
-        }
-
-        return $output;
-    }
-
     /**
      * Encode data as json
      *

From 13391e9df9e36ddb6c664538756f8b4f24b6977d Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Tue, 14 Jul 2015 09:07:15 +0300
Subject: [PATCH 038/354] Fixed incorrect access type

---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index a456a05e..bb9407e9 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1286,7 +1286,7 @@ protected function _parse_delete()
      * @access protected
      * @return void
      */
-    public function _parse_query()
+    protected function _parse_query()
     {
         // Declare a variable that will hold the REQUEST_URI
         $request_uri = NULL;

From eb627ee14259894094a19d2e4d7c0c4b04724ad1 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Tue, 14 Jul 2015 09:19:02 +0300
Subject: [PATCH 039/354] Changed access level of method

---
 application/libraries/REST_Controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index bb9407e9..c3f437db 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -712,10 +712,10 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
     /**
      * Get the input format e.g. json or xml
      *
-     * @access private
+     * @access protected
      * @return string|NULL Supported input format; otherwise, NULL
      */
-    private function _detect_input_format()
+    protected function _detect_input_format()
     {
         // Get the CONTENT-TYPE value from the SERVER variable
         $contentType = $this->input->server('CONTENT_TYPE');

From b94fa069c6a8a7fd43b91d1eddaa5982846661c2 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Tue, 14 Jul 2015 10:02:51 +0300
Subject: [PATCH 040/354] Slight efficency increase

---
 application/libraries/REST_Controller.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index c3f437db..0c7b2f58 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -774,9 +774,12 @@ protected function _detect_output_format()
 
             return $matches[1];
         }
+        
+        // Get the format and convert to lowercase
+        $format = strtolower($this->_get_args['format']);
 
         // A format has been passed as an argument in the URL and it is supported
-        if (isset($this->_get_args['format']) && array_key_exists($this->_get_args['format'], $this->_supported_formats))
+        if ($format !== FALSE && isset($this->_supported_formats[$format]))
         {
             return $this->_get_args['format'];
         }

From 1b4590e8e3f655f5bc25436aaa8f4676d34ccdda Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Tue, 14 Jul 2015 10:14:38 +0300
Subject: [PATCH 041/354] Fixed error from previous commit

---
 application/libraries/REST_Controller.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 0c7b2f58..f00e546d 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -774,14 +774,14 @@ protected function _detect_output_format()
 
             return $matches[1];
         }
-        
-        // Get the format and convert to lowercase
-        $format = strtolower($this->_get_args['format']);
+
+        // Get the format
+        $format = isset($this->_get_args['format']) ? strtolower($this->_get_args['format']) : NULL;
 
         // A format has been passed as an argument in the URL and it is supported
-        if ($format !== FALSE && isset($this->_supported_formats[$format]))
+        if ($format !== NULL && isset($this->_supported_formats[$format]))
         {
-            return $this->_get_args['format'];
+            return $format;
         }
 
         // Otherwise, check the HTTP_ACCEPT (if it exists and we are allowed)

From cb3b29af5ec4aa642d3edf927c36bd3add0a8f84 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Tue, 14 Jul 2015 10:16:22 +0300
Subject: [PATCH 042/354] Checking type and value

---
 application/libraries/REST_Controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index f00e546d..cf1f3f44 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -803,13 +803,13 @@ protected function _detect_output_format()
                     else
                     {
                         // If it is truly HTML, it wont want any XML
-                        if ($format == 'html' && strpos($this->input->server('HTTP_ACCEPT'), 'xml') === FALSE)
+                        if ($format === 'html' && strpos($this->input->server('HTTP_ACCEPT'), 'xml') === FALSE)
                         {
                             return $format;
                         }
 
                         // If it is truly XML, it wont want any HTML
-                        elseif ($format == 'xml' && strpos($this->input->server('HTTP_ACCEPT'), 'html') === FALSE)
+                        elseif ($format === 'xml' && strpos($this->input->server('HTTP_ACCEPT'), 'html') === FALSE)
                         {
                             return $format;
                         }

From fef68358d230e2be5f0f97a837b3f468b2149a39 Mon Sep 17 00:00:00 2001
From: Tjoosten <Tjoosten3@gmail.com>
Date: Wed, 15 Jul 2015 16:19:23 +0200
Subject: [PATCH 043/354] PR: #475 regenerate documentation

---
 documentation/404.html                        |   15 +-
 documentation/class-Example.html              |   57 +-
 documentation/class-Format.html               |  367 +-
 documentation/class-Key.html                  |   95 +-
 documentation/class-REST_Controller.html      |  676 ++--
 documentation/elementlist.js                  |    2 +-
 .../function-_perform_ldap_auth.html          |  135 -
 documentation/index.html                      |   26 +-
 .../package-CodeIgniter.Libraries.html        |   28 +-
 ...ree.html => package-CodeIgniter.Rest.html} |   59 +-
 documentation/package-CodeIgniter.html        |   18 +-
 documentation/package-None.html               |   29 +-
 documentation/source-class-Example.html       |  190 +-
 documentation/source-class-Format.html        |  760 ++--
 documentation/source-class-Key.html           |  527 +--
 .../source-class-REST_Controller.html         | 3308 +++++++++--------
 .../source-function-_perform_ldap_auth.html   |  205 -
 documentation/todo.html                       |  153 -
 18 files changed, 3378 insertions(+), 3272 deletions(-)
 delete mode 100644 documentation/function-_perform_ldap_auth.html
 rename documentation/{tree.html => package-CodeIgniter.Rest.html} (58%)
 delete mode 100644 documentation/source-function-_perform_ldap_auth.html
 delete mode 100644 documentation/todo.html

diff --git a/documentation/404.html b/documentation/404.html
index 762f8381..d40111fb 100644
--- a/documentation/404.html
+++ b/documentation/404.html
@@ -29,6 +29,11 @@ <h3>Packages</h3>
 					<a href="http://github.com/package-CodeIgniter.Libraries.html">
 						Libraries					</a>
 
+						</li>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
 						</li>
 							</ul></li>
 				<li>
@@ -45,8 +50,6 @@ <h3>Packages</h3>
 		<div id="elements">
 			<h3>Classes</h3>
 			<ul>
-				<li><a href="http://github.com/class-Example.html">Example</a></li>
-				<li><a href="http://github.com/class-Key.html">Key</a></li>
 				<li class="active"><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
 			</ul>
 
@@ -80,12 +83,6 @@ <h3>Classes</h3>
 			</li>
 		</ul>
 		<ul>
-			<li>
-				<a href="http://github.com/tree.html" title="Tree view of classes, interfaces, traits and exceptions"><span>Tree</span></a>
-			</li>
-			<li>
-				<a href="http://github.com/todo.html" title="Todo list"><span>Todo</span></a>
-			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -95,7 +92,7 @@ <h3>Classes</h3>
 	<h1>Page not found</h1>
 	<p>The requested page could not be found.</p>
 	<p>You have probably clicked on a link that is outdated and points to a page that does not exist any more or you have made an typing error in the address.</p>
-	<p>To continue please try to find requested page in the menu, take a look at <a href="http://github.com/tree.html">the tree view</a> of the whole project or use search field on the top.</p>
+	<p>To continue please try to find requested page in the menu, or use search field on the top.</p>
 </div>
 
 	<div id="footer">
diff --git a/documentation/class-Example.html b/documentation/class-Example.html
index 5d10d511..76e48ed4 100644
--- a/documentation/class-Example.html
+++ b/documentation/class-Example.html
@@ -28,6 +28,11 @@ <h3>Packages</h3>
 					<a href="http://github.com/package-CodeIgniter.Libraries.html">
 						Libraries					</a>
 
+						</li>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
 						</li>
 							</ul></li>
 				<li>
@@ -46,7 +51,6 @@ <h3>Classes</h3>
 			<ul>
 				<li class="active"><a href="http://github.com/class-Example.html">Example</a></li>
 				<li><a href="http://github.com/class-Key.html">Key</a></li>
-				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
 			</ul>
 
 
@@ -78,12 +82,6 @@ <h3>Classes</h3>
 <span>Class</span>			</li>
 		</ul>
 		<ul>
-			<li>
-				<a href="http://github.com/tree.html" title="Tree view of classes, interfaces, traits and exceptions"><span>Tree</span></a>
-			</li>
-			<li>
-				<a href="http://github.com/todo.html" title="Todo list"><span>Todo</span></a>
-			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -94,9 +92,8 @@ <h1>Class Example</h1>
 
 
 	<div class="description">
-	<p>CodeIgniter Rest Controller</p>
-
-<p>A fully RESTful server implementation for CodeIgniter using one library, one config file and one controller.</p>
+	<p>This is an example of a few basic user interaction methods you could use
+all done with a hardcoded array</p>
 	</div>
 
 	<dl class="tree">
@@ -131,19 +128,17 @@ <h1>Class Example</h1>
 		
 		
 		
-		<b>Package:</b> <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\<a href="http://github.com/package-CodeIgniter.Libraries.html">Libraries</a><br>
+		<b>Package:</b> <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\<a href="http://github.com/package-CodeIgniter.Rest.html">Rest</a><br>
 
 				<b>Category:</b>
-				Libraries<br>
+				Controller<br>
 				<b>License:</b>
 				<a href="http://github.com/MIT">MIT</a><br>
 				<b>Author:</b>
 				Phil Sturgeon, Chris Kacerguis<br>
-				<b>Version:</b>
-				3.0.0-pre<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-Example.html#19-108" title="Go to source code">application/controllers/api/example.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-Example.html#8-114" title="Go to source code">application/controllers/api/Example.php</a>
 		<br>
 	</div>
 
@@ -163,23 +158,25 @@ <h1>Class Example</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___construct">#</a>
-		<code><a href="http://github.com/source-class-Example.html#21-32" title="Go to source code">__construct</a>( )</code>
+		<code><a href="http://github.com/source-class-Example.html#21-32" title="Go to source code">__construct</a>( <span>string <var>$config</var>,…</span> )</code>
 
 		<div class="description short">
-			<p>Constructor function</p>
+			<p>Constructor for the REST API</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Constructor function</p>
+			<p>Constructor for the REST API</p>
 
 
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$config</var>,…</dt>
+					<dd><p>Configuration filename minus the file extension
+e.g: my_rest.php is passed as 'my_rest'</p></dd>
+				</dl></div>
 
 
 
-				<h4>Todo</h4>
-				<div class="list">
-						Document more please.<br>
-				</div>
 
 				<h4>Overrides</h4>
 				<div class="list"><code><a href="http://github.com/class-REST_Controller.html#___construct">REST_Controller::__construct()</a></code></div>
@@ -229,7 +226,7 @@ <h4>Overrides</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_user_post">#</a>
-		<code><a href="http://github.com/source-class-Example.html#61-67" title="Go to source code">user_post</a>( )</code>
+		<code><a href="http://github.com/source-class-Example.html#61-72" title="Go to source code">user_post</a>( )</code>
 
 		<div class="description short">
 			
@@ -259,7 +256,7 @@ <h4>Overrides</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_user_delete">#</a>
-		<code><a href="http://github.com/source-class-Example.html#69-75" title="Go to source code">user_delete</a>( )</code>
+		<code><a href="http://github.com/source-class-Example.html#74-83" title="Go to source code">user_delete</a>( )</code>
 
 		<div class="description short">
 			
@@ -289,7 +286,7 @@ <h4>Overrides</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_users_get">#</a>
-		<code><a href="http://github.com/source-class-Example.html#77-95" title="Go to source code">users_get</a>( )</code>
+		<code><a href="http://github.com/source-class-Example.html#85-103" title="Go to source code">users_get</a>( )</code>
 
 		<div class="description short">
 			
@@ -319,7 +316,7 @@ <h4>Overrides</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_send_post">#</a>
-		<code><a href="http://github.com/source-class-Example.html#98-101" title="Go to source code">send_post</a>( )</code>
+		<code><a href="http://github.com/source-class-Example.html#105-108" title="Go to source code">send_post</a>( )</code>
 
 		<div class="description short">
 			
@@ -349,7 +346,7 @@ <h4>Overrides</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_send_put">#</a>
-		<code><a href="http://github.com/source-class-Example.html#104-107" title="Go to source code">send_put</a>( )</code>
+		<code><a href="http://github.com/source-class-Example.html#110-113" title="Go to source code">send_put</a>( )</code>
 
 		<div class="description short">
 			
@@ -382,16 +379,13 @@ <h4>Overrides</h4>
 			<a href="http://github.com/class-REST_Controller.html#__check_php_session">_check_php_session()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__check_whitelist_auth">_check_whitelist_auth()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_api_key">_detect_api_key()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__detect_input_format">_detect_input_format()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_lang">_detect_lang()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_method">_detect_method()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_output_format">_detect_output_format()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__detect_ssl">_detect_ssl()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__fire_method">_fire_method()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__force_login">_force_login()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__force_loopable">_force_loopable()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__log_access_time">_log_access_time()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__log_request">_log_request()</a>, 
+			<a href="http://github.com/class-REST_Controller.html#__log_response_code">_log_response_code()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__parse_delete">_parse_delete()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__parse_get">_parse_get()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__parse_head">_parse_head()</a>, 
@@ -438,6 +432,7 @@ <h4>Overrides</h4>
 			<a href="http://github.com/class-REST_Controller.html#$_apiuser"><var>$_apiuser</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_args"><var>$_args</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_delete_args"><var>$_delete_args</var></a>, 
+			<a href="http://github.com/class-REST_Controller.html#$_enable_xss"><var>$_enable_xss</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_end_rtime"><var>$_end_rtime</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_get_args"><var>$_get_args</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_head_args"><var>$_head_args</var></a>, 
diff --git a/documentation/class-Format.html b/documentation/class-Format.html
index 762585cd..7e4e5323 100644
--- a/documentation/class-Format.html
+++ b/documentation/class-Format.html
@@ -28,6 +28,11 @@ <h3>Packages</h3>
 					<a href="http://github.com/package-CodeIgniter.Libraries.html">
 						Libraries					</a>
 
+						</li>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
 						</li>
 							</ul></li>
 				<li>
@@ -51,10 +56,6 @@ <h3>Classes</h3>
 
 
 
-			<h3>Functions</h3>
-			<ul>
-				<li><a href="http://github.com/function-_perform_ldap_auth.html">_perform_ldap_auth</a></li>
-			</ul>
 		</div>
 	</div>
 </div>
@@ -80,12 +81,6 @@ <h3>Functions</h3>
 <span>Class</span>			</li>
 		</ul>
 		<ul>
-			<li>
-				<a href="http://github.com/tree.html" title="Tree view of classes, interfaces, traits and exceptions"><span>Tree</span></a>
-			</li>
-			<li>
-				<a href="http://github.com/todo.html" title="Todo list"><span>Todo</span></a>
-			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -96,9 +91,8 @@ <h1>Class Format</h1>
 
 
 	<div class="description">
-	<p>Format class</p>
-
-<p>Help convert between various formats such as XML, JSON, CSV, etc.</p>
+	<p>Format class
+Help convert between various formats such as XML, JSON, CSV, etc.</p>
 	</div>
 
 
@@ -116,10 +110,10 @@ <h1>Class Format</h1>
 		
 
 				<b>License:</b>
-				<a href="http://philsturgeon.co.uk/code/dbad-license">http://philsturgeon.co.uk/code/dbad-license</a><br>
+				<a href="http://www.dbad-license.org/">http://www.dbad-license.org/</a><br>
 				<b>Author:</b>
-				Phil Sturgeon<br>
-			<b>Located at</b> <a href="http://github.com/source-class-Format.html#2-316" title="Go to source code">application/libraries/Format.php</a>
+				Phil Sturgeon, Chris Kacerguis<br>
+			<b>Located at</b> <a href="http://github.com/source-class-Format.html#5-457" title="Go to source code">application/libraries/Format.php</a>
 		<br>
 	</div>
 
@@ -127,72 +121,83 @@ <h1>Class Format</h1>
 
 	<table class="summary methods" id="methods">
 	<caption>Methods summary</caption>
-	<tr data-order="factory" id="_factory">
+	<tr data-order="__construct" id="___construct">
 
 		<td class="attributes"><code>
 			 public 
 
-			Factory
+			
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
-		<a class="anchor" href="#_factory">#</a>
-		<code><a href="http://github.com/source-class-Format.html#18-32" title="Go to source code">factory</a>( <span>mixed <var>$data</var></span>, <span>string <var>$from_type</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<a class="anchor" href="#___construct">#</a>
+		<code><a href="http://github.com/source-class-Format.html#36-67" title="Go to source code">__construct</a>( <span>null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$from_type</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
-			<p>Returns an instance of the Format object.</p>
+			<p>DO NOT CALL THIS DIRECTLY, USE factory()</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Returns an instance of the Format object.</p>
-
-<p>echo $this->format->factory(array('foo' => 'bar'))->to_xml();</p>
+			<p>DO NOT CALL THIS DIRECTLY, USE factory()</p>
 
 
 				<h4>Parameters</h4>
 				<div class="list"><dl>
 					<dt><var>$data</var></dt>
-					<dd>date to be converted</dd>
+					<dd></dd>
 					<dt><var>$from_type</var></dt>
-					<dd>format the file was provided in</dd>
+					<dd></dd>
 				</dl></div>
 
-				<h4>Returns</h4>
+
+				<h4>Throws</h4>
 				<div class="list">
-					Factory
+					Exception
 				</div>
 
 
 
-
 		</div>
 		</div></td>
 	</tr>
-	<tr data-order="__construct" id="___construct">
+	<tr data-order="factory" id="_factory">
 
 		<td class="attributes"><code>
 			 public 
 
-			
+			object
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
-		<a class="anchor" href="#___construct">#</a>
-		<code><a href="http://github.com/source-class-Format.html#34-56" title="Go to source code">__construct</a>( <span> <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span> <var>$from_type</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<a class="anchor" href="#_factory">#</a>
+		<code><a href="http://github.com/source-class-Format.html#69-84" title="Go to source code">factory</a>( <span>mixed <var>$data</var></span>, <span>string <var>$from_type</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
-			<p>Do not use this directly, call factory()</p>
+			<p>Create an instance of the format class
+e.g: echo $this->format->factory(['foo' => 'bar'])->to_csv();</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Do not use this directly, call factory()</p>
+			<p>Create an instance of the format class
+e.g: echo $this->format->factory(['foo' => 'bar'])->to_csv();</p>
 
 
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$data</var></dt>
+					<dd>Data to convert/parse</dd>
+					<dt><var>$from_type</var></dt>
+					<dd>Type to convert from e.g. json, csv, html</dd>
+				</dl></div>
 
+				<h4>Returns</h4>
+				<div class="list">
+					object<br>Instance of the format class
+				</div>
 
 
 
@@ -205,24 +210,34 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			
+			array
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_array">#</a>
-		<code><a href="http://github.com/source-class-Format.html#60-84" title="Go to source code">to_array</a>( <span> <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#88-125" title="Go to source code">to_array</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
-			
+			<p>Format data as an array</p>
 		</div>
 
 		<div class="description detailed hidden">
-			
+			<p>Format data as an array</p>
 
 
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$data</var></dt>
+					<dd><p>Optional data to pass, so as to override the data passed
+to the constructor</p></dd>
+				</dl></div>
 
+				<h4>Returns</h4>
+				<div class="list">
+					array<br>Data parsed as an array; otherwise, an empty array
+				</div>
 
 
 
@@ -235,24 +250,38 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			
+			mixed
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_xml">#</a>
-		<code><a href="http://github.com/source-class-Format.html#87-158" title="Go to source code">to_xml</a>( <span> <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span> <var>$structure</var> = <span class="php-keyword1">NULL</span></span>, <span> <var>$basenode</var> = <span class="php-quote">'xml'</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#127-211" title="Go to source code">to_xml</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$structure</var> = <span class="php-keyword1">NULL</span></span>, <span>string <var>$basenode</var> = <span class="php-quote">'xml'</span></span> )</code>
 
 		<div class="description short">
-			
+			<p>Format data as XML</p>
 		</div>
 
 		<div class="description detailed hidden">
-			
+			<p>Format data as XML</p>
 
 
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$data</var></dt>
+					<dd><p>Optional data to pass, so as to override the data passed
+to the constructor</p></dd>
+					<dt><var>$structure</var></dt>
+					<dd></dd>
+					<dt><var>$basenode</var></dt>
+					<dd></dd>
+				</dl></div>
 
+				<h4>Returns</h4>
+				<div class="list">
+					mixed
+				</div>
 
 
 
@@ -265,24 +294,34 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			
+			mixed
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_html">#</a>
-		<code><a href="http://github.com/source-class-Format.html#161-189" title="Go to source code">to_html</a>( )</code>
+		<code><a href="http://github.com/source-class-Format.html#213-261" title="Go to source code">to_html</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
-			
+			<p>Format data as HTML</p>
 		</div>
 
 		<div class="description detailed hidden">
-			
+			<p>Format data as HTML</p>
 
 
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$data</var></dt>
+					<dd><p>Optional data to pass, so as to override the data passed
+to the constructor</p></dd>
+				</dl></div>
 
+				<h4>Returns</h4>
+				<div class="list">
+					mixed
+				</div>
 
 
 
@@ -295,24 +334,34 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			
+			mixed
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_csv">#</a>
-		<code><a href="http://github.com/source-class-Format.html#192-217" title="Go to source code">to_csv</a>( )</code>
+		<code><a href="http://github.com/source-class-Format.html#263-307" title="Go to source code">to_csv</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
-			
+			<p>Format data as CSV</p>
 		</div>
 
 		<div class="description detailed hidden">
-			
+			<p>Format data as CSV</p>
 
 
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$data</var></dt>
+					<dd><p>Optional data to pass, so as to override the data passed
+to the constructor</p></dd>
+				</dl></div>
 
+				<h4>Returns</h4>
+				<div class="list">
+					mixed
+				</div>
 
 
 
@@ -325,24 +374,34 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			
+			string
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_json">#</a>
-		<code><a href="http://github.com/source-class-Format.html#220-254" title="Go to source code">to_json</a>( )</code>
+		<code><a href="http://github.com/source-class-Format.html#309-346" title="Go to source code">to_json</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
-			
+			<p>Encode data as json</p>
 		</div>
 
 		<div class="description detailed hidden">
-			
+			<p>Encode data as json</p>
 
 
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$data</var></dt>
+					<dd><p>Optional data to pass, so as to override the data passed
+to the constructor</p></dd>
+				</dl></div>
 
+				<h4>Returns</h4>
+				<div class="list">
+					string<br>Json representation of a value
+				</div>
 
 
 
@@ -355,24 +414,34 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			
+			string
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_serialized">#</a>
-		<code><a href="http://github.com/source-class-Format.html#257-260" title="Go to source code">to_serialized</a>( )</code>
+		<code><a href="http://github.com/source-class-Format.html#348-366" title="Go to source code">to_serialized</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
-			
+			<p>Encode data as a serialized array</p>
 		</div>
 
 		<div class="description detailed hidden">
-			
+			<p>Encode data as a serialized array</p>
 
 
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$data</var></dt>
+					<dd><p>Optional data to pass, so as to override the data passed
+to the constructor</p></dd>
+				</dl></div>
 
+				<h4>Returns</h4>
+				<div class="list">
+					string<br>Serialized data
+				</div>
 
 
 
@@ -385,24 +454,34 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			
+			mixed
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_php">#</a>
-		<code><a href="http://github.com/source-class-Format.html#263-266" title="Go to source code">to_php</a>( )</code>
+		<code><a href="http://github.com/source-class-Format.html#368-386" title="Go to source code">to_php</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
-			
+			<p>Format data using a PHP structure</p>
 		</div>
 
 		<div class="description detailed hidden">
-			
+			<p>Format data using a PHP structure</p>
 
 
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$data</var></dt>
+					<dd><p>Optional data to pass, so as to override the data passed
+to the constructor</p></dd>
+				</dl></div>
 
+				<h4>Returns</h4>
+				<div class="list">
+					mixed<br>String representation of a variable
+				</div>
 
 
 
@@ -415,14 +494,14 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 protected 
 
-			
+			SimpleXMLElement
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__from_xml">#</a>
-		<code><a href="http://github.com/source-class-Format.html#269-272" title="Go to source code">_from_xml</a>( <span> <var>$string</var></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#390-398" title="Go to source code">_from_xml</a>( <span> <var>$data</var></span> )</code>
 
 		<div class="description short">
 			
@@ -432,7 +511,16 @@ <h4>Returns</h4>
 			
 
 
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$data</var></dt>
+					<dd>string</dd>
+				</dl></div>
 
+				<h4>Returns</h4>
+				<div class="list">
+					SimpleXMLElement<br>XML element object; otherwise, empty array
+				</div>
 
 
 
@@ -445,14 +533,93 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 protected 
 
-			
+			array
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__from_csv">#</a>
-		<code><a href="http://github.com/source-class-Format.html#276-295" title="Go to source code">_from_csv</a>( <span> <var>$string</var></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#400-425" title="Go to source code">_from_csv</a>( <span>string <var>$data</var></span> )</code>
+
+		<div class="description short">
+			
+		</div>
+
+		<div class="description detailed hidden">
+			
+
+
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$data</var></dt>
+					<dd>CSV string</dd>
+				</dl></div>
+
+				<h4>Returns</h4>
+				<div class="list">
+					array<br><p>A multi-dimensional array with the outer array being the number of rows
+and the inner arrays the individual fields</p>
+				</div>
+
+
+
+
+		</div>
+		</div></td>
+	</tr>
+	<tr data-order="_from_json" id="__from_json">
+
+		<td class="attributes"><code>
+			 protected 
+
+			mixed
+			
+			</code>
+		</td>
+
+		<td class="name"><div>
+		<a class="anchor" href="#__from_json">#</a>
+		<code><a href="http://github.com/source-class-Format.html#427-435" title="Go to source code">_from_json</a>( <span> <var>$data</var></span> )</code>
+
+		<div class="description short">
+			
+		</div>
+
+		<div class="description detailed hidden">
+			
+
+
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$data</var></dt>
+					<dd>json string</dd>
+				</dl></div>
+
+				<h4>Returns</h4>
+				<div class="list">
+					mixed<br>Decoded json string with leading and trailing whitespace removed
+				</div>
+
+
+
+
+		</div>
+		</div></td>
+	</tr>
+	<tr data-order="_from_serialize" id="__from_serialize">
+
+		<td class="attributes"><code>
+			 protected 
+
+			mixed
+			
+			</code>
+		</td>
+
+		<td class="name"><div>
+		<a class="anchor" href="#__from_serialize">#</a>
+		<code><a href="http://github.com/source-class-Format.html#437-445" title="Go to source code">_from_serialize</a>( <span>string <var>$data</var></span> )</code>
 
 		<div class="description short">
 			
@@ -462,7 +629,55 @@ <h4>Returns</h4>
 			
 
 
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$data</var></dt>
+					<dd>to unserialized</dd>
+				</dl></div>
 
+				<h4>Returns</h4>
+				<div class="list">
+					mixed<br>Unserialized data
+				</div>
+
+
+
+
+		</div>
+		</div></td>
+	</tr>
+	<tr data-order="_from_php" id="__from_php">
+
+		<td class="attributes"><code>
+			 protected 
+
+			string
+			
+			</code>
+		</td>
+
+		<td class="name"><div>
+		<a class="anchor" href="#__from_php">#</a>
+		<code><a href="http://github.com/source-class-Format.html#447-455" title="Go to source code">_from_php</a>( <span> <var>$data</var></span> )</code>
+
+		<div class="description short">
+			
+		</div>
+
+		<div class="description detailed hidden">
+			
+
+
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$data</var></dt>
+					<dd>to trim leading and trailing whitespace</dd>
+				</dl></div>
+
+				<h4>Returns</h4>
+				<div class="list">
+					string<br>Data with leading and trailing whitespace removed
+				</div>
 
 
 
@@ -488,43 +703,43 @@ <h4>Returns</h4>
 	<tr data-order="_data" id="$_data">
 		<td class="attributes"><code>
 			protected  
-			array
+			mixed
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-Format.html#13" title="Go to source code"><var>$_data</var></a>
+				<a href="http://github.com/source-class-Format.html#21-26" title="Go to source code"><var>$_data</var></a>
 
 			<div class="description short">
-				
+				<p>Data to parse</p>
 			</div>
 
 			<div class="description detailed hidden">
-				
+				<p>Data to parse</p>
 
 			</div>
 		</td>
 		<td class="value">
 			<div>
 				<a href="#$_data" class="anchor">#</a>
-				<code><span class="php-keyword1">array</span>()</code>
+				<code>[]</code>
 			</div>
 		</td>
 	</tr>
 	<tr data-order="_from_type" id="$_from_type">
 		<td class="attributes"><code>
 			protected  
-			
+			string
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-Format.html#16" title="Go to source code"><var>$_from_type</var></a>
+				<a href="http://github.com/source-class-Format.html#28-33" title="Go to source code"><var>$_from_type</var></a>
 
 			<div class="description short">
-				
+				<p>Type to convert from</p>
 			</div>
 
 			<div class="description detailed hidden">
-				
+				<p>Type to convert from</p>
 
 			</div>
 		</td>
diff --git a/documentation/class-Key.html b/documentation/class-Key.html
index ae46fc61..b286a2d5 100644
--- a/documentation/class-Key.html
+++ b/documentation/class-Key.html
@@ -28,6 +28,11 @@ <h3>Packages</h3>
 					<a href="http://github.com/package-CodeIgniter.Libraries.html">
 						Libraries					</a>
 
+						</li>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
 						</li>
 							</ul></li>
 				<li>
@@ -46,7 +51,6 @@ <h3>Classes</h3>
 			<ul>
 				<li><a href="http://github.com/class-Example.html">Example</a></li>
 				<li class="active"><a href="http://github.com/class-Key.html">Key</a></li>
-				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
 			</ul>
 
 
@@ -78,12 +82,6 @@ <h3>Classes</h3>
 <span>Class</span>			</li>
 		</ul>
 		<ul>
-			<li>
-				<a href="http://github.com/tree.html" title="Tree view of classes, interfaces, traits and exceptions"><span>Tree</span></a>
-			</li>
-			<li>
-				<a href="http://github.com/todo.html" title="Todo list"><span>Todo</span></a>
-			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -94,9 +92,8 @@ <h1>Class Key</h1>
 
 
 	<div class="description">
-	<p>CodeIgniter Rest Controller</p>
-
-<p>A fully RESTful server implementation for CodeIgniter using one library, one config file and one controller.</p>
+	<p>Keys Controller
+This is a basic Key Management REST controller to make and delete keys</p>
 	</div>
 
 	<dl class="tree">
@@ -131,19 +128,17 @@ <h1>Class Key</h1>
 		
 		
 		
-		<b>Package:</b> <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\<a href="http://github.com/package-CodeIgniter.Libraries.html">Libraries</a><br>
+		<b>Package:</b> <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\<a href="http://github.com/package-CodeIgniter.Rest.html">Rest</a><br>
 
 				<b>Category:</b>
-				Libraries<br>
+				Controller<br>
 				<b>License:</b>
 				<a href="http://github.com/MIT">MIT</a><br>
 				<b>Author:</b>
 				Phil Sturgeon, Chris Kacerguis<br>
-				<b>Version:</b>
-				3.0.0-pre<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-Key.html#18-251" title="Go to source code">application/controllers/api/key.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-Key.html#8-287" title="Go to source code">application/controllers/api/Key.php</a>
 		<br>
 	</div>
 
@@ -163,16 +158,16 @@ <h1>Class Key</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_index_put">#</a>
-		<code><a href="http://github.com/source-class-Key.html#27-54" title="Go to source code">index_put</a>( )</code>
+		<code><a href="http://github.com/source-class-Key.html#28-59" title="Go to source code">index_put</a>( )</code>
 
 		<div class="description short">
-			<p>Key Create</p>
+			<p>Key Create
+Insert a key into the database</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Key Create</p>
-
-<p>Insert a key into the database.</p>
+			<p>Key Create
+Insert a key into the database</p>
 
 
 
@@ -195,16 +190,16 @@ <h1>Class Key</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_index_delete">#</a>
-		<code><a href="http://github.com/source-class-Key.html#58-82" title="Go to source code">index_delete</a>( )</code>
+		<code><a href="http://github.com/source-class-Key.html#63-91" title="Go to source code">index_delete</a>( )</code>
 
 		<div class="description short">
-			<p>Key Delete</p>
+			<p>Key Delete
+Remove a key from the database to stop it working</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Key Delete</p>
-
-<p>Remove a key from the database to stop it working.</p>
+			<p>Key Delete
+Remove a key from the database to stop it working</p>
 
 
 
@@ -227,16 +222,16 @@ <h1>Class Key</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_level_post">#</a>
-		<code><a href="http://github.com/source-class-Key.html#86-116" title="Go to source code">level_post</a>( )</code>
+		<code><a href="http://github.com/source-class-Key.html#95-131" title="Go to source code">level_post</a>( )</code>
 
 		<div class="description short">
-			<p>Update Key</p>
+			<p>Update Key
+Change the level</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Update Key</p>
-
-<p>Change the level</p>
+			<p>Update Key
+Change the level</p>
 
 
 
@@ -259,16 +254,16 @@ <h1>Class Key</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_suspend_post">#</a>
-		<code><a href="http://github.com/source-class-Key.html#120-149" title="Go to source code">suspend_post</a>( )</code>
+		<code><a href="http://github.com/source-class-Key.html#135-170" title="Go to source code">suspend_post</a>( )</code>
 
 		<div class="description short">
-			<p>Update Key</p>
+			<p>Update Key
+Change the level</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Update Key</p>
-
-<p>Change the level</p>
+			<p>Update Key
+Change the level</p>
 
 
 
@@ -291,16 +286,16 @@ <h1>Class Key</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_regenerate_post">#</a>
-		<code><a href="http://github.com/source-class-Key.html#153-189" title="Go to source code">regenerate_post</a>( )</code>
+		<code><a href="http://github.com/source-class-Key.html#174-216" title="Go to source code">regenerate_post</a>( )</code>
 
 		<div class="description short">
-			<p>Regenerate Key</p>
+			<p>Regenerate Key
+Remove a key from the database to stop it working</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Regenerate Key</p>
-
-<p>Remove a key from the database to stop it working.</p>
+			<p>Regenerate Key
+Remove a key from the database to stop it working</p>
 
 
 
@@ -327,16 +322,13 @@ <h1>Class Key</h1>
 			<a href="http://github.com/class-REST_Controller.html#__check_php_session">_check_php_session()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__check_whitelist_auth">_check_whitelist_auth()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_api_key">_detect_api_key()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__detect_input_format">_detect_input_format()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_lang">_detect_lang()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_method">_detect_method()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_output_format">_detect_output_format()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__detect_ssl">_detect_ssl()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__fire_method">_fire_method()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__force_login">_force_login()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__force_loopable">_force_loopable()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__log_access_time">_log_access_time()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__log_request">_log_request()</a>, 
+			<a href="http://github.com/class-REST_Controller.html#__log_response_code">_log_response_code()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__parse_delete">_parse_delete()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__parse_get">_parse_get()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__parse_head">_parse_head()</a>, 
@@ -383,7 +375,7 @@ <h1>Class Key</h1>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-Key.html#20-25" title="Go to source code"><var>$methods</var></a>
+				<a href="http://github.com/source-class-Key.html#21-26" title="Go to source code"><var>$methods</var></a>
 
 			<div class="description short">
 				<p>Defines the list of method properties such as limit, log and level</p>
@@ -397,12 +389,12 @@ <h1>Class Key</h1>
 		<td class="value">
 			<div>
 				<a href="#$methods" class="anchor">#</a>
-				<code><span class="php-keyword1">array</span>(
-    <span class="php-quote">'index_put'</span> =&gt; <span class="php-keyword1">array</span>(<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>, <span class="php-quote">'limit'</span> =&gt; <span class="php-num">10</span>),
-    <span class="php-quote">'index_delete'</span> =&gt; <span class="php-keyword1">array</span>(<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>),
-    <span class="php-quote">'level_post'</span> =&gt; <span class="php-keyword1">array</span>(<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>),
-    <span class="php-quote">'regenerate_post'</span> =&gt; <span class="php-keyword1">array</span>(<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>),
-)</code>
+				<code>[
+        <span class="php-quote">'index_put'</span> =&gt; [<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>, <span class="php-quote">'limit'</span> =&gt; <span class="php-num">10</span>],
+        <span class="php-quote">'index_delete'</span> =&gt; [<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>],
+        <span class="php-quote">'level_post'</span> =&gt; [<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>],
+        <span class="php-quote">'regenerate_post'</span> =&gt; [<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>],
+    ]</code>
 			</div>
 		</td>
 	</tr>
@@ -416,6 +408,7 @@ <h1>Class Key</h1>
 			<a href="http://github.com/class-REST_Controller.html#$_apiuser"><var>$_apiuser</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_args"><var>$_args</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_delete_args"><var>$_delete_args</var></a>, 
+			<a href="http://github.com/class-REST_Controller.html#$_enable_xss"><var>$_enable_xss</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_end_rtime"><var>$_end_rtime</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_get_args"><var>$_get_args</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_head_args"><var>$_head_args</var></a>, 
diff --git a/documentation/class-REST_Controller.html b/documentation/class-REST_Controller.html
index 74d8de5b..a12d2c52 100644
--- a/documentation/class-REST_Controller.html
+++ b/documentation/class-REST_Controller.html
@@ -28,6 +28,11 @@ <h3>Packages</h3>
 					<a href="http://github.com/package-CodeIgniter.Libraries.html">
 						Libraries					</a>
 
+						</li>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
 						</li>
 							</ul></li>
 				<li>
@@ -44,8 +49,6 @@ <h3>Packages</h3>
 		<div id="elements">
 			<h3>Classes</h3>
 			<ul>
-				<li><a href="http://github.com/class-Example.html">Example</a></li>
-				<li><a href="http://github.com/class-Key.html">Key</a></li>
 				<li class="active"><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
 			</ul>
 
@@ -78,12 +81,6 @@ <h3>Classes</h3>
 <span>Class</span>			</li>
 		</ul>
 		<ul>
-			<li>
-				<a href="http://github.com/tree.html" title="Tree view of classes, interfaces, traits and exceptions"><span>Tree</span></a>
-			</li>
-			<li>
-				<a href="http://github.com/todo.html" title="Todo list"><span>Todo</span></a>
-			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -94,9 +91,8 @@ <h1>Class REST_Controller</h1>
 
 
 	<div class="description">
-	<p>CodeIgniter Rest Controller</p>
-
-<p>A fully RESTful server implementation for CodeIgniter using one library, one config file and one controller.</p>
+	<p>CodeIgniter Rest Controller
+A fully RESTful server implementation for CodeIgniter using one library, one config file and one controller.</p>
 	</div>
 
 	<dl class="tree">
@@ -138,10 +134,10 @@ <h4>Direct known subclasses</h4>
 				<b>Author:</b>
 				Phil Sturgeon, Chris Kacerguis<br>
 				<b>Version:</b>
-				3.0.0-pre<br>
+				3.0.0<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#3-1541" title="Go to source code">application/libraries/REST_Controller.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-1872" title="Go to source code">application/libraries/REST_Controller.php</a>
 		<br>
 	</div>
 
@@ -161,14 +157,14 @@ <h4>Direct known subclasses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_early_checks">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#183-189" title="Go to source code">early_checks</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#198-205" title="Go to source code">early_checks</a>( )</code>
 
 		<div class="description short">
-			<p>Developers can extend this class and add a check in here.</p>
+			<p>Extend this function to apply additional checking early on in the process</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Developers can extend this class and add a check in here.</p>
+			<p>Extend this function to apply additional checking early on in the process</p>
 
 
 
@@ -191,23 +187,25 @@ <h4>Direct known subclasses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___construct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#191-318" title="Go to source code">__construct</a>( <span> <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#207-367" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
 
 		<div class="description short">
-			<p>Constructor function</p>
+			<p>Constructor for the REST API</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Constructor function</p>
+			<p>Constructor for the REST API</p>
 
 
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$config</var></dt>
+					<dd><p>Configuration filename minus the file extension
+e.g: my_rest.php is passed as 'my_rest'</p></dd>
+				</dl></div>
 
 
 
-				<h4>Todo</h4>
-				<div class="list">
-						Document more please.<br>
-				</div>
 
 
 		</div>
@@ -225,14 +223,14 @@ <h4>Todo</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___destruct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#320-333" title="Go to source code">__destruct</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#369-385" title="Go to source code">__destruct</a>( )</code>
 
 		<div class="description short">
-			<p>Destructor function</p>
+			<p>Deconstructor</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Destructor function</p>
+			<p>Deconstructor</p>
 
 
 
@@ -259,16 +257,16 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__remap">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#335-420" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#387-494" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var></span> )</code>
 
 		<div class="description short">
-			<p>Remap</p>
+			<p>Requests are not made to methods directly, the request will be for
+an "object". This simply maps the object and method to the correct
+Controller method.</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Remap</p>
-
-<p>Requests are not made to methods directly, the request will be for
+			<p>Requests are not made to methods directly, the request will be for
 an "object". This simply maps the object and method to the correct
 Controller method.</p>
 
@@ -285,45 +283,6 @@ <h4>Parameters</h4>
 
 
 
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_fire_method" id="__fire_method">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__fire_method">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#422-433" title="Go to source code">_fire_method</a>( <span>array <var>$method</var></span>, <span>array <var>$args</var></span> )</code>
-
-		<div class="description short">
-			<p>Fire Method</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Fire Method</p>
-
-<p>Fires the designated controller method with the given arguments.</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$method</var></dt>
-					<dd>The controller method to fire</dd>
-					<dt><var>$args</var></dt>
-					<dd>The arguments to pass to the controller method</dd>
-				</dl></div>
-
-
-
-
-
 		</div>
 		</div></td>
 	</tr>
@@ -339,93 +298,31 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#435-514" title="Go to source code">response</a>( <span>array <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>null|integer <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#496-600" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
-			<p>Response</p>
+			<p>Takes mixed data and optionally a status code, then creates the response</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Response</p>
-
-<p>Takes pure data and optionally a status code, then creates the response.
-Set $continue to TRUE to flush the response to the client and continue running the script.</p>
+			<p>Takes mixed data and optionally a status code, then creates the response</p>
 
 
 				<h4>Parameters</h4>
 				<div class="list"><dl>
 					<dt><var>$data</var></dt>
-					<dd></dd>
+					<dd>Data to output to the user</dd>
 					<dt><var>$http_code</var></dt>
-					<dd></dd>
+					<dd>HTTP status code</dd>
 					<dt><var>$continue</var></dt>
-					<dd></dd>
+					<dd><p>TRUE to flush the response to the client and continue
+running the script; otherwise, exit</p></dd>
 				</dl></div>
 
 
 
 
 
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_detect_ssl" id="__detect_ssl">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__detect_ssl">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#521-526" title="Go to source code">_detect_ssl</a>( )</code>
-
-		<div class="description short">
-			
-		</div>
-
-		<div class="description detailed hidden">
-			
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_detect_input_format" id="__detect_input_format">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__detect_input_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#534-550" title="Go to source code">_detect_input_format</a>( )</code>
-
-		<div class="description short">
-			
-		</div>
-
-		<div class="description detailed hidden">
-			
-
-
-
-
-
-
-
 		</div>
 		</div></td>
 	</tr>
@@ -434,29 +331,27 @@ <h4>Parameters</h4>
 		<td class="attributes"><code>
 			 protected 
 
-			string
+			mixed|null|string
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_output_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#552-621" title="Go to source code">_detect_output_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#636-716" title="Go to source code">_detect_output_format</a>( )</code>
 
 		<div class="description short">
-			<p>Detect format</p>
+			<p>Detect which format should be used to output the data</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Detect format</p>
-
-<p>Detect which format should be used to output the data.</p>
+			<p>Detect which format should be used to output the data</p>
 
 
 
 				<h4>Returns</h4>
 				<div class="list">
-					string<br>The output format.
+					mixed|null|string<br>Output format
 				</div>
 
 
@@ -470,29 +365,27 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 protected 
 
-			string
+			string|null
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_method">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#623-647" title="Go to source code">_detect_method</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#718-747" title="Go to source code">_detect_method</a>( )</code>
 
 		<div class="description short">
-			<p>Detect method</p>
+			<p>Get the HTTP request string e.g. get or post</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Detect method</p>
-
-<p>Detect which HTTP method is being used</p>
+			<p>Get the HTTP request string e.g. get or post</p>
 
 
 
 				<h4>Returns</h4>
 				<div class="list">
-					string
+					string|null<br>Supported request method as a lowercase string; otherwise, NULL if not supported
 				</div>
 
 
@@ -513,16 +406,14 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_api_key">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#649-714" title="Go to source code">_detect_api_key</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#749-821" title="Go to source code">_detect_api_key</a>( )</code>
 
 		<div class="description short">
-			<p>Detect API Key</p>
+			<p>See if the user has provided an API key</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Detect API Key</p>
-
-<p>See if the user has provided an API key</p>
+			<p>See if the user has provided an API key</p>
 
 
 
@@ -549,16 +440,14 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_lang">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#716-745" title="Go to source code">_detect_lang</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#823-854" title="Go to source code">_detect_lang</a>( )</code>
 
 		<div class="description short">
-			<p>Detect language(s)</p>
+			<p>What language do they want it in?</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Detect language(s)</p>
-
-<p>What language do they want it in?</p>
+			<p>What language do they want it in?</p>
 
 
 
@@ -578,34 +467,32 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 protected 
 
-			object
+			boolean
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_request">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#747-770" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#856-884" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
-			<p>Log request</p>
+			<p>Add the request to the log table</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Log request</p>
-
-<p>Record the entry for awesomeness purposes</p>
+			<p>Add the request to the log table</p>
 
 
 				<h4>Parameters</h4>
 				<div class="list"><dl>
 					<dt><var>$authorized</var></dt>
-					<dd></dd>
+					<dd>TRUE the user is authorized; otherwise, FALSE</dd>
 				</dl></div>
 
 				<h4>Returns</h4>
 				<div class="list">
-					object
+					boolean<br>TRUE the data was inserted; otherwise, FALSE
 				</div>
 
 
@@ -626,27 +513,25 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_limit">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#772-835" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#886-964" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
 
 		<div class="description short">
-			<p>Limiting requests</p>
+			<p>Check if the requests to a controller method exceed a limit</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Limiting requests</p>
-
-<p>Check if the requests are coming in a tad too fast.</p>
+			<p>Check if the requests to a controller method exceed a limit</p>
 
 
 				<h4>Parameters</h4>
 				<div class="list"><dl>
 					<dt><var>$controller_method</var></dt>
-					<dd>The method being called.</dd>
+					<dd>The method being called</dd>
 				</dl></div>
 
 				<h4>Returns</h4>
 				<div class="list">
-					boolean
+					boolean<br>TRUE the call limit is below the threshold; otherwise, FALSE
 				</div>
 
 
@@ -667,16 +552,17 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__auth_override_check">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#837-920" title="Go to source code">_auth_override_check</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#966-1058" title="Go to source code">_auth_override_check</a>( )</code>
 
 		<div class="description short">
-			<p>Auth override check</p>
+			<p>Auth override check
+Check if there is a specific auth type set for the current class/method
+being called.</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Auth override check</p>
-
-<p>Check if there is a specific auth type set for the current class/method
+			<p>Auth override check
+Check if there is a specific auth type set for the current class/method
 being called.</p>
 
 
@@ -704,14 +590,14 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#922-939" title="Go to source code">_parse_get</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1060-1097" title="Go to source code">_parse_get</a>( )</code>
 
 		<div class="description short">
-			<p>Parse GET</p>
+			<p>Parse the GET request arguments</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Parse GET</p>
+			<p>Parse the GET request arguments</p>
 
 
 
@@ -734,14 +620,14 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#941-949" title="Go to source code">_parse_post</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1099-1113" title="Go to source code">_parse_post</a>( )</code>
 
 		<div class="description short">
-			<p>Parse POST</p>
+			<p>Parse the POST request arguments</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Parse POST</p>
+			<p>Parse the POST request arguments</p>
 
 
 
@@ -764,14 +650,14 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#951-966" title="Go to source code">_parse_put</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1115-1135" title="Go to source code">_parse_put</a>( )</code>
 
 		<div class="description short">
-			<p>Parse PUT</p>
+			<p>Parse the PUT request arguments</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Parse PUT</p>
+			<p>Parse the PUT request arguments</p>
 
 
 
@@ -794,14 +680,14 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#968-978" title="Go to source code">_parse_head</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1137-1150" title="Go to source code">_parse_head</a>( )</code>
 
 		<div class="description short">
-			<p>Parse HEAD</p>
+			<p>Parse the HEAD request arguments</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Parse HEAD</p>
+			<p>Parse the HEAD request arguments</p>
 
 
 
@@ -824,14 +710,14 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#980-990" title="Go to source code">_parse_options</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1152-1165" title="Go to source code">_parse_options</a>( )</code>
 
 		<div class="description short">
-			<p>Parse OPTIONS</p>
+			<p>Parse the OPTIONS request arguments</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Parse OPTIONS</p>
+			<p>Parse the OPTIONS request arguments</p>
 
 
 
@@ -854,14 +740,14 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#992-1006" title="Go to source code">_parse_patch</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1167-1188" title="Go to source code">_parse_patch</a>( )</code>
 
 		<div class="description short">
-			<p>Parse PATCH</p>
+			<p>Parse the PATCH request arguments</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Parse PATCH</p>
+			<p>Parse the PATCH request arguments</p>
 
 
 
@@ -884,14 +770,14 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1008-1015" title="Go to source code">_parse_delete</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1190-1203" title="Go to source code">_parse_delete</a>( )</code>
 
 		<div class="description short">
-			<p>Parse DELETE</p>
+			<p>Parse the DELETE request arguments</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Parse DELETE</p>
+			<p>Parse the DELETE request arguments</p>
 
 
 
@@ -907,34 +793,35 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			string
+			array|string|false
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1019-1033" title="Go to source code">get</a>( <span>string <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$xss_clean</var> = <span class="php-keyword1">TRUE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1207-1226" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
-			<p>Retrieve a value from the GET request arguments.</p>
+			<p>Retrieve a value from a GET request</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Retrieve a value from the GET request arguments.</p>
+			<p>Retrieve a value from a GET request</p>
 
 
 				<h4>Parameters</h4>
 				<div class="list"><dl>
 					<dt><var>$key</var></dt>
-					<dd>The key for the GET request argument to retrieve</dd>
+					<dd><p>Key to retrieve from the GET request
+If NULL an array of arguments is returned</p></dd>
 					<dt><var>$xss_clean</var></dt>
-					<dd>Whether the value should be XSS cleaned or not.</dd>
+					<dd>Whether to apply XSS filtering</dd>
 				</dl></div>
 
 				<h4>Returns</h4>
 				<div class="list">
-					string<br>The GET argument value.
+					array|string|false<br>Value from the GET request; otherwise, FALSE
 				</div>
 
 
@@ -948,34 +835,35 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			string
+			array|string|false
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1035-1049" title="Go to source code">options</a>( <span>string <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$xss_clean</var> = <span class="php-keyword1">TRUE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1228-1247" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
-			<p>This function retrieves a values from the OPTIONS request arguments</p>
+			<p>Retrieve a value from a OPTIONS request</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>This function retrieves a values from the OPTIONS request arguments</p>
+			<p>Retrieve a value from a OPTIONS request</p>
 
 
 				<h4>Parameters</h4>
 				<div class="list"><dl>
 					<dt><var>$key</var></dt>
-					<dd>The OPTIONS/GET argument key</dd>
+					<dd><p>Key to retrieve from the OPTIONS request.
+If NULL an array of arguments is returned</p></dd>
 					<dt><var>$xss_clean</var></dt>
-					<dd>Whether the value should be XSS cleaned or not</dd>
+					<dd>Whether to apply XSS filtering</dd>
 				</dl></div>
 
 				<h4>Returns</h4>
 				<div class="list">
-					string<br>The OPTIONS/GET argument value
+					array|string|false<br>Value from the OPTIONS request; otherwise, FALSE
 				</div>
 
 
@@ -989,34 +877,35 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			string
+			array|string|false
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1051-1065" title="Go to source code">head</a>( <span>string <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$xss_clean</var> = <span class="php-keyword1">TRUE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1249-1268" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
-			<p>This function retrieves a values from the HEAD request arguments</p>
+			<p>Retrieve a value from a HEAD request</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>This function retrieves a values from the HEAD request arguments</p>
+			<p>Retrieve a value from a HEAD request</p>
 
 
 				<h4>Parameters</h4>
 				<div class="list"><dl>
 					<dt><var>$key</var></dt>
-					<dd>The HEAD/GET argument key</dd>
+					<dd><p>Key to retrieve from the HEAD request
+If NULL an array of arguments is returned</p></dd>
 					<dt><var>$xss_clean</var></dt>
-					<dd>Whether the value should be XSS cleaned or not</dd>
+					<dd>Whether to apply XSS filtering</dd>
 				</dl></div>
 
 				<h4>Returns</h4>
 				<div class="list">
-					string<br>The HEAD/GET argument value
+					array|string|false<br>Value from the HEAD request; otherwise, FALSE
 				</div>
 
 
@@ -1030,34 +919,35 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			string
+			array|string|false
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1067-1081" title="Go to source code">post</a>( <span>string <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$xss_clean</var> = <span class="php-keyword1">TRUE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1270-1289" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
-			<p>Retrieve a value from the POST request arguments.</p>
+			<p>Retrieve a value from a POST request</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Retrieve a value from the POST request arguments.</p>
+			<p>Retrieve a value from a POST request</p>
 
 
 				<h4>Parameters</h4>
 				<div class="list"><dl>
 					<dt><var>$key</var></dt>
-					<dd>The key for the POST request argument to retrieve</dd>
+					<dd><p>Key to retrieve from the POST request
+If NULL an array of arguments is returned</p></dd>
 					<dt><var>$xss_clean</var></dt>
-					<dd>Whether the value should be XSS cleaned or not.</dd>
+					<dd>Whether to apply XSS filtering</dd>
 				</dl></div>
 
 				<h4>Returns</h4>
 				<div class="list">
-					string<br>The POST argument value.
+					array|string|false<br>Value from the POST request; otherwise, FALSE
 				</div>
 
 
@@ -1071,34 +961,35 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			string
+			array|string|false
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1083-1097" title="Go to source code">put</a>( <span>string <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$xss_clean</var> = <span class="php-keyword1">TRUE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1291-1310" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
-			<p>Retrieve a value from the PUT request arguments.</p>
+			<p>Retrieve a value from a PUT request</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Retrieve a value from the PUT request arguments.</p>
+			<p>Retrieve a value from a PUT request</p>
 
 
 				<h4>Parameters</h4>
 				<div class="list"><dl>
 					<dt><var>$key</var></dt>
-					<dd>The key for the PUT request argument to retrieve</dd>
+					<dd><p>Key to retrieve from the PUT request
+If NULL an array of arguments is returned</p></dd>
 					<dt><var>$xss_clean</var></dt>
-					<dd>Whether the value should be XSS cleaned or not.</dd>
+					<dd>Whether to apply XSS filtering</dd>
 				</dl></div>
 
 				<h4>Returns</h4>
 				<div class="list">
-					string<br>The PUT argument value.
+					array|string|false<br>Value from the PUT request; otherwise, FALSE
 				</div>
 
 
@@ -1112,34 +1003,35 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			string
+			array|string|false
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1099-1113" title="Go to source code">delete</a>( <span>string <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$xss_clean</var> = <span class="php-keyword1">TRUE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1312-1331" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
-			<p>Retrieve a value from the DELETE request arguments.</p>
+			<p>Retrieve a value from a DELETE request</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Retrieve a value from the DELETE request arguments.</p>
+			<p>Retrieve a value from a DELETE request</p>
 
 
 				<h4>Parameters</h4>
 				<div class="list"><dl>
 					<dt><var>$key</var></dt>
-					<dd>The key for the DELETE request argument to retrieve</dd>
+					<dd><p>Key to retrieve from the DELETE request
+If NULL an array of arguments is returned</p></dd>
 					<dt><var>$xss_clean</var></dt>
-					<dd>Whether the value should be XSS cleaned or not.</dd>
+					<dd>Whether to apply XSS filtering</dd>
 				</dl></div>
 
 				<h4>Returns</h4>
 				<div class="list">
-					string<br>The DELETE argument value.
+					array|string|false<br>Value from the DELETE request; otherwise, FALSE
 				</div>
 
 
@@ -1153,34 +1045,35 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			string
+			array|string|false
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1115-1129" title="Go to source code">patch</a>( <span>string <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$xss_clean</var> = <span class="php-keyword1">TRUE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1333-1352" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
-			<p>Retrieve a value from the PATCH request arguments.</p>
+			<p>Retrieve a value from a PATCH request</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Retrieve a value from the PATCH request arguments.</p>
+			<p>Retrieve a value from a PATCH request</p>
 
 
 				<h4>Parameters</h4>
 				<div class="list"><dl>
 					<dt><var>$key</var></dt>
-					<dd>The key for the PATCH request argument to retrieve</dd>
+					<dd><p>Key to retrieve from the PATCH request
+If NULL an array of arguments is returned</p></dd>
 					<dt><var>$xss_clean</var></dt>
-					<dd>Whether the value should be XSS cleaned or not.</dd>
+					<dd>Whether to apply XSS filtering</dd>
 				</dl></div>
 
 				<h4>Returns</h4>
 				<div class="list">
-					string<br>The PATCH argument value.
+					array|string|false<br>Value from the PATCH request; otherwise, FALSE
 				</div>
 
 
@@ -1201,22 +1094,24 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__xss_clean">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1131-1145" title="Go to source code">_xss_clean</a>( <span>string <var>$val</var></span>, <span>boolean <var>$process</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1354-1370" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
 
 		<div class="description short">
-			<p>Process to protect from XSS attacks.</p>
+			<p>Sanitizes data so that Cross Site Scripting Hacks can be
+prevented.</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Process to protect from XSS attacks.</p>
+			<p>Sanitizes data so that Cross Site Scripting Hacks can be
+prevented.</p>
 
 
 				<h4>Parameters</h4>
 				<div class="list"><dl>
-					<dt><var>$val</var></dt>
-					<dd>The input.</dd>
-					<dt><var>$process</var></dt>
-					<dd>Do clean or note the input.</dd>
+					<dt><var>$value</var></dt>
+					<dd>Input data</dd>
+					<dt><var>$xss_clean</var></dt>
+					<dd>Whether to apply XSS filtering</dd>
 				</dl></div>
 
 				<h4>Returns</h4>
@@ -1242,14 +1137,14 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_validation_errors">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1147-1157" title="Go to source code">validation_errors</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1372-1383" title="Go to source code">validation_errors</a>( )</code>
 
 		<div class="description short">
-			<p>Retrieve the validation errors.</p>
+			<p>Retrieve the validation errors</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Retrieve the validation errors.</p>
+			<p>Retrieve the validation errors</p>
 
 
 
@@ -1276,7 +1171,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_ldap_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1161-1256" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1387-1494" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform LDAP Authentication</p>
@@ -1317,7 +1212,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_library_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1258-1290" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1496-1538" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform Library Authentication - Override this function to change the way the library is called</p>
@@ -1358,14 +1253,14 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1292-1338" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1540-1597" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
-			<p>Check if the user is logged in.</p>
+			<p>Check if the user is logged in</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Check if the user is logged in.</p>
+			<p>Check if the user is logged in</p>
 
 
 				<h4>Parameters</h4>
@@ -1399,14 +1294,14 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_php_session">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1340-1349" title="Go to source code">_check_php_session</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1599-1619" title="Go to source code">_check_php_session</a>( )</code>
 
 		<div class="description short">
-			<p>Check to see if the user is logged into the web app with a php session key.</p>
+			<p>Check to see if the user is logged in with a PHP session key</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Check to see if the user is logged into the web app with a php session key.</p>
+			<p>Check to see if the user is logged in with a PHP session key</p>
 
 
 
@@ -1429,23 +1324,19 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_basic_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1351-1380" title="Go to source code">_prepare_basic_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1621-1659" title="Go to source code">_prepare_basic_auth</a>( )</code>
 
 		<div class="description short">
-			
+			<p>Prepares for basic authentication</p>
 		</div>
 
 		<div class="description detailed hidden">
-			
+			<p>Prepares for basic authentication</p>
 
 
 
 
 
-				<h4>Todo</h4>
-				<div class="list">
-						document this.<br>
-				</div>
 
 
 		</div>
@@ -1463,23 +1354,19 @@ <h4>Todo</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_digest_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1382-1427" title="Go to source code">_prepare_digest_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1661-1720" title="Go to source code">_prepare_digest_auth</a>( )</code>
 
 		<div class="description short">
-			
+			<p>Prepares for digest authentication</p>
 		</div>
 
 		<div class="description detailed hidden">
-			
+			<p>Prepares for digest authentication</p>
 
 
 
 
 
-				<h4>Todo</h4>
-				<div class="list">
-						Document this.<br>
-				</div>
 
 
 		</div>
@@ -1497,14 +1384,14 @@ <h4>Todo</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_blacklist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1429-1443" title="Go to source code">_check_blacklist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1722-1743" title="Go to source code">_check_blacklist_auth</a>( )</code>
 
 		<div class="description short">
-			<p>Check if the client's ip is in the 'rest_ip_blacklist' config</p>
+			<p>Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Check if the client's ip is in the 'rest_ip_blacklist' config</p>
+			<p>Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response</p>
 
 
 
@@ -1527,14 +1414,14 @@ <h4>Todo</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_whitelist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1445-1461" title="Go to source code">_check_whitelist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1745-1765" title="Go to source code">_check_whitelist_auth</a>( )</code>
 
 		<div class="description short">
-			<p>Check if the client's ip is in the 'rest_ip_whitelist' config</p>
+			<p>Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Check if the client's ip is in the 'rest_ip_whitelist' config</p>
+			<p>Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response</p>
 
 
 
@@ -1557,73 +1444,69 @@ <h4>Todo</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__force_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1463-1477" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1767-1799" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
 
 		<div class="description short">
-			
+			<p>Force logging in by setting the WWW-Authenticate header</p>
 		</div>
 
 		<div class="description detailed hidden">
-			
+			<p>Force logging in by setting the WWW-Authenticate header</p>
 
 
 				<h4>Parameters</h4>
 				<div class="list"><dl>
 					<dt><var>$nonce</var></dt>
-					<dd></dd>
+					<dd><p>A server-specified data string which should be uniquely generated
+each time</p></dd>
 				</dl></div>
 
 
 
-				<h4>Todo</h4>
-				<div class="list">
-						Document this.<br>
-				</div>
 
 
 		</div>
 		</div></td>
 	</tr>
-	<tr data-order="_force_loopable" id="__force_loopable">
+	<tr data-order="_log_access_time" id="__log_access_time">
 
 		<td class="attributes"><code>
 			 protected 
 
-			array
+			boolean
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
-		<a class="anchor" href="#__force_loopable">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1479-1493" title="Go to source code">_force_loopable</a>( <span>object|array <var>$data</var></span> )</code>
+		<a class="anchor" href="#__log_access_time">#</a>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1801-1818" title="Go to source code">_log_access_time</a>( )</code>
 
 		<div class="description short">
-			<p>Force it into an array</p>
+			<p>Updates the log table with the total access time</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Force it into an array</p>
+			<p>Updates the log table with the total access time</p>
 
 
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$data</var></dt>
-					<dd></dd>
-				</dl></div>
 
 				<h4>Returns</h4>
 				<div class="list">
-					array
+					boolean<br>TRUE log table updated; otherwise, FALSE
 				</div>
 
 
+				<h4>Author</h4>
+				<div class="list">
+						Chris Kacerguis<br>
+				</div>
 
 
 		</div>
 		</div></td>
 	</tr>
-	<tr data-order="_log_access_time" id="__log_access_time">
+	<tr data-order="_log_response_code" id="__log_response_code">
 
 		<td class="attributes"><code>
 			 protected 
@@ -1634,27 +1517,32 @@ <h4>Returns</h4>
 		</td>
 
 		<td class="name"><div>
-		<a class="anchor" href="#__log_access_time">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1496-1507" title="Go to source code">_log_access_time</a>( )</code>
+		<a class="anchor" href="#__log_response_code">#</a>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1820-1838" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
 
 		<div class="description short">
-			<p>updates the log with the access time</p>
+			<p>Updates the log table with HTTP response code</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>updates the log with the access time</p>
+			<p>Updates the log table with HTTP response code</p>
 
 
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$http_code</var></dt>
+					<dd>HTTP status code</dd>
+				</dl></div>
 
 				<h4>Returns</h4>
 				<div class="list">
-					boolean
+					boolean<br>TRUE log table updated; otherwise, FALSE
 				</div>
 
 
 				<h4>Author</h4>
 				<div class="list">
-						Chris Kacerguis<br>
+						Justin Chen<br>
 				</div>
 
 
@@ -1673,7 +1561,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_access">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1509-1539" title="Go to source code">_check_access</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1840-1870" title="Go to source code">_check_access</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the API key has access to the controller and methods</p>
@@ -1686,7 +1574,7 @@ <h4>Author</h4>
 
 				<h4>Returns</h4>
 				<div class="list">
-					boolean
+					boolean<br>TRUE the API key has access; otherwise, FALSE
 				</div>
 
 
@@ -1717,16 +1605,16 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#18-25" title="Go to source code"><var>$rest_format</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#18-24" title="Go to source code"><var>$rest_format</var></a>
 
 			<div class="description short">
-				<p>This defines the rest format.</p>
+				<p>This defines the rest format.
+Must be overridden it in a controller so that it is set.</p>
 			</div>
 
 			<div class="description detailed hidden">
-				<p>This defines the rest format.</p>
-
-<p>Must be overridden it in a controller so that it is set.</p>
+				<p>This defines the rest format.
+Must be overridden it in a controller so that it is set.</p>
 
 			</div>
 		</td>
@@ -1744,7 +1632,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#27-32" title="Go to source code"><var>$methods</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#26-31" title="Go to source code"><var>$methods</var></a>
 
 			<div class="description short">
 				<p>Defines the list of method properties such as limit, log and level</p>
@@ -1758,7 +1646,7 @@ <h4>Returns</h4>
 		<td class="value">
 			<div>
 				<a href="#$methods" class="anchor">#</a>
-				<code><span class="php-keyword1">array</span>()</code>
+				<code>[]</code>
 			</div>
 		</td>
 	</tr>
@@ -1769,7 +1657,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#34-39" title="Go to source code"><var>$allowed_http_methods</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#33-38" title="Go to source code"><var>$allowed_http_methods</var></a>
 
 			<div class="description short">
 				<p>List of allowed HTTP methods</p>
@@ -1783,7 +1671,7 @@ <h4>Returns</h4>
 		<td class="value">
 			<div>
 				<a href="#$allowed_http_methods" class="anchor">#</a>
-				<code><span class="php-keyword1">array</span>(<span class="php-quote">'get'</span>, <span class="php-quote">'delete'</span>, <span class="php-quote">'post'</span>, <span class="php-quote">'put'</span>, <span class="php-quote">'options'</span>, <span class="php-quote">'patch'</span>, <span class="php-quote">'head'</span>)</code>
+				<code>[<span class="php-quote">'get'</span>, <span class="php-quote">'delete'</span>, <span class="php-quote">'post'</span>, <span class="php-quote">'put'</span>, <span class="php-quote">'options'</span>, <span class="php-quote">'patch'</span>, <span class="php-quote">'head'</span>]</code>
 			</div>
 		</td>
 	</tr>
@@ -1794,16 +1682,18 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#41-47" title="Go to source code"><var>$request</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#40-47" title="Go to source code"><var>$request</var></a>
 
 			<div class="description short">
-				<p>General request data and information.
-Stores accept, language, body, headers, etc.</p>
+				<p>Contains details about the request
+Fields: body, format, method, ssl
+Note: This is a dynamic object (stdClass)</p>
 			</div>
 
 			<div class="description detailed hidden">
-				<p>General request data and information.
-Stores accept, language, body, headers, etc.</p>
+				<p>Contains details about the request
+Fields: body, format, method, ssl
+Note: This is a dynamic object (stdClass)</p>
 
 			</div>
 		</td>
@@ -1821,14 +1711,18 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#49-54" title="Go to source code"><var>$response</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#49-56" title="Go to source code"><var>$response</var></a>
 
 			<div class="description short">
-				<p>What is gonna happen in output?</p>
+				<p>Contains details about the response
+Fields: format, lang
+Note: This is a dynamic object (stdClass)</p>
 			</div>
 
 			<div class="description detailed hidden">
-				<p>What is gonna happen in output?</p>
+				<p>Contains details about the response
+Fields: format, lang
+Note: This is a dynamic object (stdClass)</p>
 
 			</div>
 		</td>
@@ -1846,14 +1740,18 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#56-61" title="Go to source code"><var>$rest</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#58-65" title="Go to source code"><var>$rest</var></a>
 
 			<div class="description short">
-				<p>Stores DB, keys, key level, etc</p>
+				<p>Contains details about the REST API
+Fields: db, ignore_limits, key, level, user_id
+Note: This is a dynamic object (stdClass)</p>
 			</div>
 
 			<div class="description detailed hidden">
-				<p>Stores DB, keys, key level, etc</p>
+				<p>Contains details about the REST API
+Fields: db, ignore_limits, key, level, user_id
+Note: This is a dynamic object (stdClass)</p>
 
 			</div>
 		</td>
@@ -1871,7 +1769,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#63-68" title="Go to source code"><var>$_get_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#67-72" title="Go to source code"><var>$_get_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the GET request method</p>
@@ -1885,7 +1783,7 @@ <h4>Returns</h4>
 		<td class="value">
 			<div>
 				<a href="#$_get_args" class="anchor">#</a>
-				<code><span class="php-keyword1">array</span>()</code>
+				<code>[]</code>
 			</div>
 		</td>
 	</tr>
@@ -1896,7 +1794,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#70-75" title="Go to source code"><var>$_post_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#74-79" title="Go to source code"><var>$_post_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the POST request method</p>
@@ -1910,7 +1808,7 @@ <h4>Returns</h4>
 		<td class="value">
 			<div>
 				<a href="#$_post_args" class="anchor">#</a>
-				<code><span class="php-keyword1">array</span>()</code>
+				<code>[]</code>
 			</div>
 		</td>
 	</tr>
@@ -1921,7 +1819,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#77-82" title="Go to source code"><var>$_insert_id</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#81-86" title="Go to source code"><var>$_insert_id</var></a>
 
 			<div class="description short">
 				<p>The insert_id of the log entry (if we have one)</p>
@@ -1946,7 +1844,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#84-89" title="Go to source code"><var>$_put_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#88-93" title="Go to source code"><var>$_put_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the PUT request method</p>
@@ -1960,7 +1858,7 @@ <h4>Returns</h4>
 		<td class="value">
 			<div>
 				<a href="#$_put_args" class="anchor">#</a>
-				<code><span class="php-keyword1">array</span>()</code>
+				<code>[]</code>
 			</div>
 		</td>
 	</tr>
@@ -1971,7 +1869,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#91-96" title="Go to source code"><var>$_delete_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#95-100" title="Go to source code"><var>$_delete_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the DELETE request method</p>
@@ -1985,7 +1883,7 @@ <h4>Returns</h4>
 		<td class="value">
 			<div>
 				<a href="#$_delete_args" class="anchor">#</a>
-				<code><span class="php-keyword1">array</span>()</code>
+				<code>[]</code>
 			</div>
 		</td>
 	</tr>
@@ -1996,7 +1894,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#98-103" title="Go to source code"><var>$_patch_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#102-107" title="Go to source code"><var>$_patch_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the PATCH request method</p>
@@ -2010,7 +1908,7 @@ <h4>Returns</h4>
 		<td class="value">
 			<div>
 				<a href="#$_patch_args" class="anchor">#</a>
-				<code><span class="php-keyword1">array</span>()</code>
+				<code>[]</code>
 			</div>
 		</td>
 	</tr>
@@ -2021,7 +1919,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#105-110" title="Go to source code"><var>$_head_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#109-114" title="Go to source code"><var>$_head_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the HEAD request method</p>
@@ -2035,7 +1933,7 @@ <h4>Returns</h4>
 		<td class="value">
 			<div>
 				<a href="#$_head_args" class="anchor">#</a>
-				<code><span class="php-keyword1">array</span>()</code>
+				<code>[]</code>
 			</div>
 		</td>
 	</tr>
@@ -2046,7 +1944,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#112-117" title="Go to source code"><var>$_options_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#116-121" title="Go to source code"><var>$_options_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the OPTIONS request method</p>
@@ -2060,7 +1958,7 @@ <h4>Returns</h4>
 		<td class="value">
 			<div>
 				<a href="#$_options_args" class="anchor">#</a>
-				<code><span class="php-keyword1">array</span>()</code>
+				<code>[]</code>
 			</div>
 		</td>
 	</tr>
@@ -2071,7 +1969,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#119-124" title="Go to source code"><var>$_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#123-128" title="Go to source code"><var>$_args</var></a>
 
 			<div class="description short">
 				<p>The arguments from GET, POST, PUT, DELETE request methods combined.</p>
@@ -2085,7 +1983,7 @@ <h4>Returns</h4>
 		<td class="value">
 			<div>
 				<a href="#$_args" class="anchor">#</a>
-				<code><span class="php-keyword1">array</span>()</code>
+				<code>[]</code>
 			</div>
 		</td>
 	</tr>
@@ -2096,7 +1994,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#126-131" title="Go to source code"><var>$_allow</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#130-135" title="Go to source code"><var>$_allow</var></a>
 
 			<div class="description short">
 				<p>If the request is allowed based on the API key provided.</p>
@@ -2121,7 +2019,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#133-138" title="Go to source code"><var>$_zlib_oc</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#137-142" title="Go to source code"><var>$_zlib_oc</var></a>
 
 			<div class="description short">
 				<p>Determines if output compression is enabled</p>
@@ -2146,7 +2044,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#140-145" title="Go to source code"><var>$_user_ldap_dn</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#144-149" title="Go to source code"><var>$_user_ldap_dn</var></a>
 
 			<div class="description short">
 				<p>The LDAP Distinguished Name of the User post authentication</p>
@@ -2171,7 +2069,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#147-152" title="Go to source code"><var>$_start_rtime</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#151-156" title="Go to source code"><var>$_start_rtime</var></a>
 
 			<div class="description short">
 				<p>The start of the response time from the server</p>
@@ -2196,7 +2094,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#154-159" title="Go to source code"><var>$_end_rtime</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#158-163" title="Go to source code"><var>$_end_rtime</var></a>
 
 			<div class="description short">
 				<p>The end of the response time from the server</p>
@@ -2221,7 +2119,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#161-174" title="Go to source code"><var>$_supported_formats</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#165-179" title="Go to source code"><var>$_supported_formats</var></a>
 
 			<div class="description short">
 				<p>List all supported methods, the first will be the default format</p>
@@ -2235,15 +2133,16 @@ <h4>Returns</h4>
 		<td class="value">
 			<div>
 				<a href="#$_supported_formats" class="anchor">#</a>
-				<code><span class="php-keyword1">array</span>(
-    <span class="php-quote">'xml'</span>           =&gt; <span class="php-quote">'application/xml'</span>,
-    <span class="php-quote">'json'</span>          =&gt; <span class="php-quote">'application/json'</span>,
-    <span class="php-quote">'jsonp'</span>         =&gt; <span class="php-quote">'application/javascript'</span>,
-    <span class="php-quote">'serialized'</span>    =&gt; <span class="php-quote">'application/vnd.php.serialized'</span>,
-    <span class="php-quote">'php'</span>           =&gt; <span class="php-quote">'text/plain'</span>,
-    <span class="php-quote">'html'</span>          =&gt; <span class="php-quote">'text/html'</span>,
-    <span class="php-quote">'csv'</span>           =&gt; <span class="php-quote">'application/csv'</span>
-)</code>
+				<code>[
+        <span class="php-quote">'json'</span> =&gt; <span class="php-quote">'application/json'</span>,
+        <span class="php-quote">'array'</span> =&gt; <span class="php-quote">'application/json'</span>,
+        <span class="php-quote">'csv'</span> =&gt; <span class="php-quote">'application/csv'</span>,
+        <span class="php-quote">'html'</span> =&gt; <span class="php-quote">'text/html'</span>,
+        <span class="php-quote">'jsonp'</span> =&gt; <span class="php-quote">'application/javascript'</span>,
+        <span class="php-quote">'php'</span> =&gt; <span class="php-quote">'text/plain'</span>,
+        <span class="php-quote">'serialized'</span> =&gt; <span class="php-quote">'application/vnd.php.serialized'</span>,
+        <span class="php-quote">'xml'</span> =&gt; <span class="php-quote">'application/xml'</span>
+    ]</code>
 			</div>
 		</td>
 	</tr>
@@ -2254,7 +2153,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#176-181" title="Go to source code"><var>$_apiuser</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#181-186" title="Go to source code"><var>$_apiuser</var></a>
 
 			<div class="description short">
 				<p>Information about the current API user</p>
@@ -2272,6 +2171,37 @@ <h4>Returns</h4>
 			</div>
 		</td>
 	</tr>
+	<tr data-order="_enable_xss" id="$_enable_xss">
+		<td class="attributes"><code>
+			protected  
+			boolean
+		</code></td>
+
+		<td class="name">
+				<a href="http://github.com/source-class-REST_Controller.html#188-196" title="Go to source code"><var>$_enable_xss</var></a>
+
+			<div class="description short">
+				<p>Enable XSS flag
+Determines whether the XSS filter is always active when
+GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered.
+Set automatically based on config setting.</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>Enable XSS flag
+Determines whether the XSS filter is always active when
+GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered.
+Set automatically based on config setting.</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#$_enable_xss" class="anchor">#</a>
+				<code><span class="php-keyword1">FALSE</span></code>
+			</div>
+		</td>
+	</tr>
 	</table>
 
 
diff --git a/documentation/elementlist.js b/documentation/elementlist.js
index 7941e8a2..7fd9a1d3 100644
--- a/documentation/elementlist.js
+++ b/documentation/elementlist.js
@@ -1,3 +1,3 @@
 
 var ApiGen = ApiGen || {};
-ApiGen.elements = [["f","_perform_ldap_auth()"],["c","Example"],["c","Format"],["c","Key"],["c","REST_Controller"]];
+ApiGen.elements = [["c","Example"],["c","Format"],["c","Key"],["c","REST_Controller"]];
diff --git a/documentation/function-_perform_ldap_auth.html b/documentation/function-_perform_ldap_auth.html
deleted file mode 100644
index af6e32cc..00000000
--- a/documentation/function-_perform_ldap_auth.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-
-	<title>Function _perform_ldap_auth</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li><a href="http://github.com/class-Format.html">Format</a></li>
-			</ul>
-
-
-
-
-
-			<h3>Functions</h3>
-			<ul>
-				<li class="active"><a href="http://github.com/function-_perform_ldap_auth.html">_perform_ldap_auth</a></li>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li>
-<span>Package</span>			</li>
-			<li class="active">
-<span>Function</span>			</li>
-		</ul>
-		<ul>
-			<li>
-				<a href="http://github.com/tree.html" title="Tree view of classes, interfaces, traits and exceptions"><span>Tree</span></a>
-			</li>
-			<li>
-				<a href="http://github.com/todo.html" title="Todo list"><span>Todo</span></a>
-			</li>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<div id="content" class="function">
-	<h1>Function _perform_ldap_auth</h1>
-
-
-
-	<div class="info">
-		
-		
-		<b>Located at</b>
-		<a href="http://github.com/source-function-_perform_ldap_auth.html#10-98" title="Go to source code">
-			dummy.php
-		</a><br>
-	</div>
-
-
-	<table class="summary" id="parameters">
-	<caption>Parameters summary</caption>
-	<tr id="$username">
-		<td class="name"><code></code></td>
-		<td class="value"><code><var>$username</var> = <span class="php-quote">''</span></code></td>
-		<td></td>
-	</tr>
-	<tr id="$password">
-		<td class="name"><code></code></td>
-		<td class="value"><code><var>$password</var> = <span class="php-keyword1">NULL</span></code></td>
-		<td></td>
-	</tr>
-	</table>
-
-
-
-</div>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
-<script src="http://github.com/elementlist.js?a84266a83a9e4e19c2425432aca8ea8439364f92"></script>
-</body>
-</html>
diff --git a/documentation/index.html b/documentation/index.html
index 7790a6fe..434da845 100644
--- a/documentation/index.html
+++ b/documentation/index.html
@@ -27,6 +27,11 @@ <h3>Packages</h3>
 					<a href="http://github.com/package-CodeIgniter.Libraries.html">
 						Libraries					</a>
 
+						</li>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
 						</li>
 							</ul></li>
 				<li>
@@ -43,17 +48,13 @@ <h3>Packages</h3>
 		<div id="elements">
 			<h3>Classes</h3>
 			<ul>
-				<li><a href="http://github.com/class-Format.html">Format</a></li>
+				<li class="active"><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
 			</ul>
 
 
 
 
 
-			<h3>Functions</h3>
-			<ul>
-				<li class="active"><a href="http://github.com/function-_perform_ldap_auth.html">_perform_ldap_auth</a></li>
-			</ul>
 		</div>
 	</div>
 </div>
@@ -75,16 +76,10 @@ <h3>Functions</h3>
 			<li>
 <span>Package</span>			</li>
 			<li>
-				<a href="http://github.com/function-_perform_ldap_auth.html" title="Summary of _perform_ldap_auth"><span>Function</span></a>
+				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
 			</li>
 		</ul>
 		<ul>
-			<li>
-				<a href="http://github.com/tree.html" title="Tree view of classes, interfaces, traits and exceptions"><span>Tree</span></a>
-			</li>
-			<li>
-				<a href="http://github.com/todo.html" title="Todo list"><span>Todo</span></a>
-			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -107,6 +102,11 @@ <h1>Overview</h1>
 					<a href="http://github.com/package-CodeIgniter.Libraries.html">CodeIgniter\Libraries</a>
 				</td>
 			</tr>
+			<tr>
+				<td class="name">
+					<a href="http://github.com/package-CodeIgniter.Rest.html">CodeIgniter\Rest</a>
+				</td>
+			</tr>
 			<tr>
 				<td class="name">
 					<a href="http://github.com/package-None.html">None</a>
@@ -122,6 +122,6 @@ <h1>Overview</h1>
 </div>
 </div>
 <script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
-<script src="http://github.com/elementlist.js?a84266a83a9e4e19c2425432aca8ea8439364f92"></script>
+<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/package-CodeIgniter.Libraries.html b/documentation/package-CodeIgniter.Libraries.html
index c79d4217..8d7ec985 100644
--- a/documentation/package-CodeIgniter.Libraries.html
+++ b/documentation/package-CodeIgniter.Libraries.html
@@ -28,6 +28,11 @@ <h3>Packages</h3>
 					<a href="http://github.com/package-CodeIgniter.Libraries.html">
 						Libraries					</a>
 
+						</li>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
 						</li>
 							</ul></li>
 				<li>
@@ -44,8 +49,6 @@ <h3>Packages</h3>
 		<div id="elements">
 			<h3>Classes</h3>
 			<ul>
-				<li><a href="http://github.com/class-Example.html">Example</a></li>
-				<li><a href="http://github.com/class-Key.html">Key</a></li>
 				<li class="active"><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
 			</ul>
 
@@ -75,16 +78,10 @@ <h3>Classes</h3>
 			<li class="active">
 <span>Package</span>			</li>
 			<li>
-				<a href="http://github.com/function-_perform_ldap_auth.html" title="Summary of _perform_ldap_auth"><span>Function</span></a>
+				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
 			</li>
 		</ul>
 		<ul>
-			<li>
-				<a href="http://github.com/tree.html" title="Tree view of classes, interfaces, traits and exceptions"><span>Tree</span></a>
-			</li>
-			<li>
-				<a href="http://github.com/todo.html" title="Todo list"><span>Todo</span></a>
-			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -97,17 +94,10 @@ <h1>Package <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\Libraries</h1>
 
 <table class="summary" id="classes">
 <caption>Classes summary</caption>
-<tr>
-	<td class="name"><a href="http://github.com/class-Example.html">Example</a></td>
-	<td>CodeIgniter Rest Controller</td>
-</tr>
-<tr>
-	<td class="name"><a href="http://github.com/class-Key.html">Key</a></td>
-	<td>CodeIgniter Rest Controller</td>
-</tr>
 <tr>
 	<td class="name"><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></td>
-	<td>CodeIgniter Rest Controller</td>
+	<td><p>CodeIgniter Rest Controller
+A fully RESTful server implementation for CodeIgniter using one library, one config file and one controller.</p></td>
 </tr>
 </table>
 
@@ -123,6 +113,6 @@ <h1>Package <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\Libraries</h1>
 </div>
 </div>
 <script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
-<script src="http://github.com/elementlist.js?a84266a83a9e4e19c2425432aca8ea8439364f92"></script>
+<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/tree.html b/documentation/package-CodeIgniter.Rest.html
similarity index 58%
rename from documentation/tree.html
rename to documentation/package-CodeIgniter.Rest.html
index f6a5eadc..29afc146 100644
--- a/documentation/tree.html
+++ b/documentation/package-CodeIgniter.Rest.html
@@ -3,7 +3,7 @@
 <head>
 	<meta charset="utf-8">
 
-	<title>Tree</title>
+	<title>Package CodeIgniter\Rest</title>
 
 	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
 
@@ -18,7 +18,7 @@
 		<div id="groups">
 				<h3>Packages</h3>
 			<ul>
-				<li>
+				<li class="active">
 					<a href="http://github.com/package-CodeIgniter.html">
 						CodeIgniter<span></span>
 					</a>
@@ -28,6 +28,11 @@ <h3>Packages</h3>
 					<a href="http://github.com/package-CodeIgniter.Libraries.html">
 						Libraries					</a>
 
+						</li>
+				<li class="active">
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
 						</li>
 							</ul></li>
 				<li>
@@ -44,17 +49,14 @@ <h3>Packages</h3>
 		<div id="elements">
 			<h3>Classes</h3>
 			<ul>
-				<li><a href="http://github.com/class-Format.html">Format</a></li>
+				<li><a href="http://github.com/class-Example.html">Example</a></li>
+				<li><a href="http://github.com/class-Key.html">Key</a></li>
 			</ul>
 
 
 
 
 
-			<h3>Functions</h3>
-			<ul>
-				<li class="active"><a href="http://github.com/function-_perform_ldap_auth.html">_perform_ldap_auth</a></li>
-			</ul>
 		</div>
 	</div>
 </div>
@@ -74,45 +76,38 @@ <h3>Functions</h3>
 			<li>
 				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
 			</li>
-			<li>
+			<li class="active">
 <span>Package</span>			</li>
 			<li>
-				<a href="http://github.com/function-_perform_ldap_auth.html" title="Summary of _perform_ldap_auth"><span>Function</span></a>
+				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
 			</li>
 		</ul>
 		<ul>
-			<li class="active">
-<span>Tree</span>			</li>
-			<li>
-				<a href="http://github.com/todo.html" title="Todo list"><span>Todo</span></a>
-			</li>
 		</ul>
 		<ul>
 		</ul>
 	</div>
 
-<div id="content">
-	<h1>Tree</h1>
+<div id="content" class="package">
+	<h1>Package <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\Rest</h1>
 
-		<h3>Classes</h3>
-<div class="tree">
-	<ul>
 
-			<li><div class="notlast"><span>CI_Controller</span>			
-			
-			</div>
 
-				</li>
+<table class="summary" id="classes">
+<caption>Classes summary</caption>
+<tr>
+	<td class="name"><a href="http://github.com/class-Example.html">Example</a></td>
+	<td><p>This is an example of a few basic user interaction methods you could use
+all done with a hardcoded array</p></td>
+</tr>
+<tr>
+	<td class="name"><a href="http://github.com/class-Key.html">Key</a></td>
+	<td><p>Keys Controller
+This is a basic Key Management REST controller to make and delete keys</p></td>
+</tr>
+</table>
 
-			<li class="last"><div class="last"><a href="http://github.com/class-Format.html"><span>Format</span></a>
-			
-			
-			</div>
 
-		</li>
-		
-	</ul>
-</div>
 
 
 
@@ -124,6 +119,6 @@ <h3>Classes</h3>
 </div>
 </div>
 <script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
-<script src="http://github.com/elementlist.js?a84266a83a9e4e19c2425432aca8ea8439364f92"></script>
+<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/package-CodeIgniter.html b/documentation/package-CodeIgniter.html
index 0b48c862..1cb20267 100644
--- a/documentation/package-CodeIgniter.html
+++ b/documentation/package-CodeIgniter.html
@@ -28,6 +28,11 @@ <h3>Packages</h3>
 					<a href="http://github.com/package-CodeIgniter.Libraries.html">
 						Libraries					</a>
 
+						</li>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
 						</li>
 							</ul></li>
 				<li>
@@ -68,16 +73,10 @@ <h3>Packages</h3>
 			<li class="active">
 <span>Package</span>			</li>
 			<li>
-				<a href="http://github.com/function-_perform_ldap_auth.html" title="Summary of _perform_ldap_auth"><span>Function</span></a>
+				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
 			</li>
 		</ul>
 		<ul>
-			<li>
-				<a href="http://github.com/tree.html" title="Tree view of classes, interfaces, traits and exceptions"><span>Tree</span></a>
-			</li>
-			<li>
-				<a href="http://github.com/todo.html" title="Todo list"><span>Todo</span></a>
-			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -91,6 +90,9 @@ <h1>Package CodeIgniter</h1>
 	<tr>
 		<td class="name"><a href="http://github.com/package-CodeIgniter.Libraries.html">CodeIgniter\Libraries</a></td>
 	</tr>
+	<tr>
+		<td class="name"><a href="http://github.com/package-CodeIgniter.Rest.html">CodeIgniter\Rest</a></td>
+	</tr>
 	</table>
 
 
@@ -107,6 +109,6 @@ <h1>Package CodeIgniter</h1>
 </div>
 </div>
 <script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
-<script src="http://github.com/elementlist.js?a84266a83a9e4e19c2425432aca8ea8439364f92"></script>
+<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/package-None.html b/documentation/package-None.html
index 9909f104..4f19a520 100644
--- a/documentation/package-None.html
+++ b/documentation/package-None.html
@@ -28,6 +28,11 @@ <h3>Packages</h3>
 					<a href="http://github.com/package-CodeIgniter.Libraries.html">
 						Libraries					</a>
 
+						</li>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
 						</li>
 							</ul></li>
 				<li class="active">
@@ -51,10 +56,6 @@ <h3>Classes</h3>
 
 
 
-			<h3>Functions</h3>
-			<ul>
-				<li class="active"><a href="http://github.com/function-_perform_ldap_auth.html">_perform_ldap_auth</a></li>
-			</ul>
 		</div>
 	</div>
 </div>
@@ -77,16 +78,10 @@ <h3>Functions</h3>
 			<li class="active">
 <span>Package</span>			</li>
 			<li>
-				<a href="http://github.com/function-_perform_ldap_auth.html" title="Summary of _perform_ldap_auth"><span>Function</span></a>
+				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
 			</li>
 		</ul>
 		<ul>
-			<li>
-				<a href="http://github.com/tree.html" title="Tree view of classes, interfaces, traits and exceptions"><span>Tree</span></a>
-			</li>
-			<li>
-				<a href="http://github.com/todo.html" title="Todo list"><span>Todo</span></a>
-			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -101,7 +96,8 @@ <h1>No package</h1>
 <caption>Classes summary</caption>
 <tr>
 	<td class="name"><a href="http://github.com/class-Format.html">Format</a></td>
-	<td>Format class</td>
+	<td><p>Format class
+Help convert between various formats such as XML, JSON, CSV, etc.</p></td>
 </tr>
 </table>
 
@@ -109,13 +105,6 @@ <h1>No package</h1>
 
 
 
-<table class="summary" id="functions">
-<caption>Functions summary</caption>
-<tr>
-	<td class="name"><a href="http://github.com/function-_perform_ldap_auth.html">_perform_ldap_auth</a></td>
-	<td></td>
-</tr>
-</table>
 </div>
 
 	<div id="footer">
@@ -124,6 +113,6 @@ <h1>No package</h1>
 </div>
 </div>
 <script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
-<script src="http://github.com/elementlist.js?a84266a83a9e4e19c2425432aca8ea8439364f92"></script>
+<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Example.html b/documentation/source-class-Example.html
index bc0f03a7..cdeda9a8 100644
--- a/documentation/source-class-Example.html
+++ b/documentation/source-class-Example.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<meta name="robots" content="noindex">
 
-	<title>File application/controllers/api/example.php</title>
+	<title>File application/controllers/api/Example.php</title>
 
 	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
 
@@ -29,6 +29,11 @@ <h3>Packages</h3>
 					<a href="http://github.com/package-CodeIgniter.Libraries.html">
 						Libraries					</a>
 
+						</li>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
 						</li>
 							</ul></li>
 				<li class="active">
@@ -52,10 +57,6 @@ <h3>Classes</h3>
 
 
 
-			<h3>Functions</h3>
-			<ul>
-				<li class="active"><a href="http://github.com/function-_perform_ldap_auth.html">_perform_ldap_auth</a></li>
-			</ul>
 		</div>
 	</div>
 </div>
@@ -79,129 +80,130 @@ <h3>Functions</h3>
 				<a href="http://github.com/package-None.html" title="Summary of None"><span>Package</span></a>
 			</li>
 			<li>
-				<a href="http://github.com/function-_perform_ldap_auth.html" title="Summary of _perform_ldap_auth"><span>Function</span></a>
+				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
 			</li>
 		</ul>
 		<ul>
-			<li>
-				<a href="http://github.com/tree.html" title="Tree view of classes, interfaces, traits and exceptions"><span>Tree</span></a>
-			</li>
-			<li>
-				<a href="http://github.com/todo.html" title="Todo list"><span>Todo</span></a>
-			</li>
 		</ul>
 		<ul>
 		</ul>
 	</div>
 
-<pre><code><span id="1" class="l"><a href="#1">  1: </a><span class="xlang">&lt;?php</span> <span class="php-keyword2">defined</span>(<span class="php-quote">'BASEPATH'</span>) <span class="php-keyword1">OR</span> <span class="php-keyword1">exit</span>(<span class="php-quote">'No direct script access allowed'</span>);
+<pre><code><span id="1" class="l"><a href="#1">  1: </a><span class="xlang">&lt;?php</span>
 </span><span id="2" class="l"><a href="#2">  2: </a>
-</span><span id="3" class="l"><a href="#3">  3: </a><span class="php-comment">/**
-</span></span><span id="4" class="l"><a href="#4">  4: </a><span class="php-comment"> * Example
-</span></span><span id="5" class="l"><a href="#5">  5: </a><span class="php-comment"> *
-</span></span><span id="6" class="l"><a href="#6">  6: </a><span class="php-comment"> * This is an example of a few basic user interaction methods you could use
-</span></span><span id="7" class="l"><a href="#7">  7: </a><span class="php-comment"> * all done with a hardcoded array.
-</span></span><span id="8" class="l"><a href="#8">  8: </a><span class="php-comment"> *
-</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment"> * @package     CodeIgniter
-</span></span><span id="10" class="l"><a href="#10"> 10: </a><span class="php-comment"> * @subpackage  Rest Server
-</span></span><span id="11" class="l"><a href="#11"> 11: </a><span class="php-comment"> * @category    Controller
-</span></span><span id="12" class="l"><a href="#12"> 12: </a><span class="php-comment"> * @author      Phil Sturgeon
-</span></span><span id="13" class="l"><a href="#13"> 13: </a><span class="php-comment"> * @link        http://philsturgeon.co.uk/code/
-</span></span><span id="14" class="l"><a href="#14"> 14: </a><span class="php-comment">*/</span>
-</span><span id="15" class="l"><a href="#15"> 15: </a>
-</span><span id="16" class="l"><a href="#16"> 16: </a><span class="php-comment">// This can be removed if you use __autoload() in config.php OR use Modular Extensions</span>
-</span><span id="17" class="l"><a href="#17"> 17: </a><span class="php-keyword1">require</span> APPPATH.<span class="php-quote">'/libraries/REST_Controller.php'</span>;
-</span><span id="18" class="l"><a href="#18"> 18: </a>
-</span><span id="19" class="l"><a href="#19"> 19: </a><span class="php-keyword1">class</span> Example <span class="php-keyword1">extends</span> REST_Controller
-</span><span id="20" class="l"><a href="#20"> 20: </a>{
+</span><span id="3" class="l"><a href="#3">  3: </a><span class="php-keyword2">defined</span>(<span class="php-quote">'BASEPATH'</span>) <span class="php-keyword1">OR</span> <span class="php-keyword1">exit</span>(<span class="php-quote">'No direct script access allowed'</span>);
+</span><span id="4" class="l"><a href="#4">  4: </a>
+</span><span id="5" class="l"><a href="#5">  5: </a><span class="php-comment">// This can be removed if you use __autoload() in config.php OR use Modular Extensions</span>
+</span><span id="6" class="l"><a href="#6">  6: </a><span class="php-keyword1">require</span> APPPATH . <span class="php-quote">'/libraries/REST_Controller.php'</span>;
+</span><span id="7" class="l"><a href="#7">  7: </a>
+</span><span id="8" class="l"><a href="#8">  8: </a><span class="php-comment">/**
+</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment"> * This is an example of a few basic user interaction methods you could use
+</span></span><span id="10" class="l"><a href="#10"> 10: </a><span class="php-comment"> * all done with a hardcoded array
+</span></span><span id="11" class="l"><a href="#11"> 11: </a><span class="php-comment"> *
+</span></span><span id="12" class="l"><a href="#12"> 12: </a><span class="php-comment"> * @package         CodeIgniter
+</span></span><span id="13" class="l"><a href="#13"> 13: </a><span class="php-comment"> * @subpackage      Rest Server
+</span></span><span id="14" class="l"><a href="#14"> 14: </a><span class="php-comment"> * @category        Controller
+</span></span><span id="15" class="l"><a href="#15"> 15: </a><span class="php-comment"> * @author          Phil Sturgeon, Chris Kacerguis
+</span></span><span id="16" class="l"><a href="#16"> 16: </a><span class="php-comment"> * @license         MIT
+</span></span><span id="17" class="l"><a href="#17"> 17: </a><span class="php-comment"> * @link            https://github.com/chriskacerguis/codeigniter-restserver
+</span></span><span id="18" class="l"><a href="#18"> 18: </a><span class="php-comment"> */</span>
+</span><span id="19" class="l"><a href="#19"> 19: </a><span class="php-keyword1">class</span> Example <span class="php-keyword1">extends</span> REST_Controller {
+</span><span id="20" class="l"><a href="#20"> 20: </a>
 </span><span id="21" class="l"><a href="#21"> 21: </a>    <span class="php-keyword1">function</span> __construct()
 </span><span id="22" class="l"><a href="#22"> 22: </a>    {
-</span><span id="23" class="l"><a href="#23"> 23: </a>        <span class="php-comment">// Construct our parent class</span>
+</span><span id="23" class="l"><a href="#23"> 23: </a>        <span class="php-comment">// Construct the parent class</span>
 </span><span id="24" class="l"><a href="#24"> 24: </a>        parent::__construct();
-</span><span id="25" class="l"><a href="#25"> 25: </a>        
-</span><span id="26" class="l"><a href="#26"> 26: </a>        <span class="php-comment">// Configure limits on our controller methods. Ensure</span>
-</span><span id="27" class="l"><a href="#27"> 27: </a>        <span class="php-comment">// you have created the 'limits' table and enabled 'limits'</span>
+</span><span id="25" class="l"><a href="#25"> 25: </a>
+</span><span id="26" class="l"><a href="#26"> 26: </a>        <span class="php-comment">// Configure limits on our controller methods</span>
+</span><span id="27" class="l"><a href="#27"> 27: </a>        <span class="php-comment">// Ensure you have created the 'limits' table and enabled 'limits'</span>
 </span><span id="28" class="l"><a href="#28"> 28: </a>        <span class="php-comment">// within application/config/rest.php</span>
 </span><span id="29" class="l"><a href="#29"> 29: </a>        <span class="php-var">$this</span>-&gt;methods[<span class="php-quote">'user_get'</span>][<span class="php-quote">'limit'</span>] = <span class="php-num">500</span>; <span class="php-comment">//500 requests per hour per user/key</span>
 </span><span id="30" class="l"><a href="#30"> 30: </a>        <span class="php-var">$this</span>-&gt;methods[<span class="php-quote">'user_post'</span>][<span class="php-quote">'limit'</span>] = <span class="php-num">100</span>; <span class="php-comment">//100 requests per hour per user/key</span>
 </span><span id="31" class="l"><a href="#31"> 31: </a>        <span class="php-var">$this</span>-&gt;methods[<span class="php-quote">'user_delete'</span>][<span class="php-quote">'limit'</span>] = <span class="php-num">50</span>; <span class="php-comment">//50 requests per hour per user/key</span>
 </span><span id="32" class="l"><a href="#32"> 32: </a>    }
-</span><span id="33" class="l"><a href="#33"> 33: </a>    
+</span><span id="33" class="l"><a href="#33"> 33: </a>
 </span><span id="34" class="l"><a href="#34"> 34: </a>    <span class="php-keyword1">function</span> user_get()
 </span><span id="35" class="l"><a href="#35"> 35: </a>    {
-</span><span id="36" class="l"><a href="#36"> 36: </a>        <span class="php-keyword1">if</span>(!<span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>))
+</span><span id="36" class="l"><a href="#36"> 36: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>))
 </span><span id="37" class="l"><a href="#37"> 37: </a>        {
 </span><span id="38" class="l"><a href="#38"> 38: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">NULL</span>, <span class="php-num">400</span>);
 </span><span id="39" class="l"><a href="#39"> 39: </a>        }
 </span><span id="40" class="l"><a href="#40"> 40: </a>
 </span><span id="41" class="l"><a href="#41"> 41: </a>        <span class="php-comment">// $user = $this-&gt;some_model-&gt;getSomething( $this-&gt;get('id') );</span>
-</span><span id="42" class="l"><a href="#42"> 42: </a>        <span class="php-var">$users</span> = <span class="php-keyword1">array</span>(
-</span><span id="43" class="l"><a href="#43"> 43: </a>            <span class="php-num">1</span> =&gt; <span class="php-keyword1">array</span>(<span class="php-quote">'id'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Some Guy'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'example1@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Loves swimming'</span>),
-</span><span id="44" class="l"><a href="#44"> 44: </a>            <span class="php-num">2</span> =&gt; <span class="php-keyword1">array</span>(<span class="php-quote">'id'</span> =&gt; <span class="php-num">2</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Person Face'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'example2@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Has a huge face'</span>),
-</span><span id="45" class="l"><a href="#45"> 45: </a>            <span class="php-num">3</span> =&gt; <span class="php-keyword1">array</span>(<span class="php-quote">'id'</span> =&gt; <span class="php-num">3</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Scotty'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'example3@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Is a Scott!'</span>, <span class="php-keyword1">array</span>(<span class="php-quote">'hobbies'</span> =&gt; <span class="php-keyword1">array</span>(<span class="php-quote">'fartings'</span>, <span class="php-quote">'bikes'</span>))),
-</span><span id="46" class="l"><a href="#46"> 46: </a>        );
-</span><span id="47" class="l"><a href="#47"> 47: </a>        
+</span><span id="42" class="l"><a href="#42"> 42: </a>        <span class="php-var">$users</span> = [
+</span><span id="43" class="l"><a href="#43"> 43: </a>            <span class="php-num">1</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'John'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'john@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Loves coding'</span>],
+</span><span id="44" class="l"><a href="#44"> 44: </a>            <span class="php-num">2</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">2</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jim'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jim@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Developed on CodeIgniter'</span>],
+</span><span id="45" class="l"><a href="#45"> 45: </a>            <span class="php-num">3</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">3</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jane'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jane@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Lives in the USA'</span>, [<span class="php-quote">'hobbies'</span> =&gt; [<span class="php-quote">'guitar'</span>, <span class="php-quote">'cycling'</span>]]],
+</span><span id="46" class="l"><a href="#46"> 46: </a>        ];
+</span><span id="47" class="l"><a href="#47"> 47: </a>
 </span><span id="48" class="l"><a href="#48"> 48: </a>        <span class="php-var">$user</span> = @<span class="php-var">$users</span>[<span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>)];
-</span><span id="49" class="l"><a href="#49"> 49: </a>        
-</span><span id="50" class="l"><a href="#50"> 50: </a>        <span class="php-keyword1">if</span>(<span class="php-var">$user</span>)
+</span><span id="49" class="l"><a href="#49"> 49: </a>
+</span><span id="50" class="l"><a href="#50"> 50: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$user</span>)
 </span><span id="51" class="l"><a href="#51"> 51: </a>        {
 </span><span id="52" class="l"><a href="#52"> 52: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-var">$user</span>, <span class="php-num">200</span>); <span class="php-comment">// 200 being the HTTP response code</span>
 </span><span id="53" class="l"><a href="#53"> 53: </a>        }
 </span><span id="54" class="l"><a href="#54"> 54: </a>
 </span><span id="55" class="l"><a href="#55"> 55: </a>        <span class="php-keyword1">else</span>
 </span><span id="56" class="l"><a href="#56"> 56: </a>        {
-</span><span id="57" class="l"><a href="#57"> 57: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(<span class="php-quote">'error'</span> =&gt; <span class="php-quote">'User could not be found'</span>), <span class="php-num">404</span>);
+</span><span id="57" class="l"><a href="#57"> 57: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-quote">'error'</span> =&gt; <span class="php-quote">'User could not be found'</span>], <span class="php-num">404</span>);
 </span><span id="58" class="l"><a href="#58"> 58: </a>        }
 </span><span id="59" class="l"><a href="#59"> 59: </a>    }
-</span><span id="60" class="l"><a href="#60"> 60: </a>    
+</span><span id="60" class="l"><a href="#60"> 60: </a>
 </span><span id="61" class="l"><a href="#61"> 61: </a>    <span class="php-keyword1">function</span> user_post()
 </span><span id="62" class="l"><a href="#62"> 62: </a>    {
-</span><span id="63" class="l"><a href="#63"> 63: </a>        <span class="php-comment">//$this-&gt;some_model-&gt;updateUser( $this-&gt;get('id') );</span>
-</span><span id="64" class="l"><a href="#64"> 64: </a>        <span class="php-var">$message</span> = <span class="php-keyword1">array</span>(<span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>), <span class="php-quote">'name'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'name'</span>), <span class="php-quote">'email'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'email'</span>), <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'ADDED!'</span>);
-</span><span id="65" class="l"><a href="#65"> 65: </a>        
-</span><span id="66" class="l"><a href="#66"> 66: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$message</span>, <span class="php-num">200</span>); <span class="php-comment">// 200 being the HTTP response code</span>
-</span><span id="67" class="l"><a href="#67"> 67: </a>    }
-</span><span id="68" class="l"><a href="#68"> 68: </a>    
-</span><span id="69" class="l"><a href="#69"> 69: </a>    <span class="php-keyword1">function</span> user_delete()
-</span><span id="70" class="l"><a href="#70"> 70: </a>    {
-</span><span id="71" class="l"><a href="#71"> 71: </a>        <span class="php-comment">//$this-&gt;some_model-&gt;deletesomething( $this-&gt;get('id') );</span>
-</span><span id="72" class="l"><a href="#72"> 72: </a>        <span class="php-var">$message</span> = <span class="php-keyword1">array</span>(<span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>), <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'DELETED!'</span>);
-</span><span id="73" class="l"><a href="#73"> 73: </a>        
-</span><span id="74" class="l"><a href="#74"> 74: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$message</span>, <span class="php-num">200</span>); <span class="php-comment">// 200 being the HTTP response code</span>
-</span><span id="75" class="l"><a href="#75"> 75: </a>    }
-</span><span id="76" class="l"><a href="#76"> 76: </a>    
-</span><span id="77" class="l"><a href="#77"> 77: </a>    <span class="php-keyword1">function</span> users_get()
-</span><span id="78" class="l"><a href="#78"> 78: </a>    {
-</span><span id="79" class="l"><a href="#79"> 79: </a>        <span class="php-comment">//$users = $this-&gt;some_model-&gt;getSomething( $this-&gt;get('limit') );</span>
-</span><span id="80" class="l"><a href="#80"> 80: </a>        <span class="php-var">$users</span> = <span class="php-keyword1">array</span>(
-</span><span id="81" class="l"><a href="#81"> 81: </a>            <span class="php-keyword1">array</span>(<span class="php-quote">'id'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Some Guy'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'example1@example.com'</span>),
-</span><span id="82" class="l"><a href="#82"> 82: </a>            <span class="php-keyword1">array</span>(<span class="php-quote">'id'</span> =&gt; <span class="php-num">2</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Person Face'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'example2@example.com'</span>),
-</span><span id="83" class="l"><a href="#83"> 83: </a>            <span class="php-num">3</span> =&gt; <span class="php-keyword1">array</span>(<span class="php-quote">'id'</span> =&gt; <span class="php-num">3</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Scotty'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'example3@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-keyword1">array</span>(<span class="php-quote">'hobbies'</span> =&gt; <span class="php-keyword1">array</span>(<span class="php-quote">'fartings'</span>, <span class="php-quote">'bikes'</span>))),
-</span><span id="84" class="l"><a href="#84"> 84: </a>        );
-</span><span id="85" class="l"><a href="#85"> 85: </a>        
-</span><span id="86" class="l"><a href="#86"> 86: </a>        <span class="php-keyword1">if</span>(<span class="php-var">$users</span>)
-</span><span id="87" class="l"><a href="#87"> 87: </a>        {
-</span><span id="88" class="l"><a href="#88"> 88: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-var">$users</span>, <span class="php-num">200</span>); <span class="php-comment">// 200 being the HTTP response code</span>
-</span><span id="89" class="l"><a href="#89"> 89: </a>        }
-</span><span id="90" class="l"><a href="#90"> 90: </a>
-</span><span id="91" class="l"><a href="#91"> 91: </a>        <span class="php-keyword1">else</span>
-</span><span id="92" class="l"><a href="#92"> 92: </a>        {
-</span><span id="93" class="l"><a href="#93"> 93: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(<span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Couldn\'t find any users!'</span>), <span class="php-num">404</span>);
-</span><span id="94" class="l"><a href="#94"> 94: </a>        }
-</span><span id="95" class="l"><a href="#95"> 95: </a>    }
-</span><span id="96" class="l"><a href="#96"> 96: </a>
-</span><span id="97" class="l"><a href="#97"> 97: </a>
-</span><span id="98" class="l"><a href="#98"> 98: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> send_post()
-</span><span id="99" class="l"><a href="#99"> 99: </a>    {
-</span><span id="100" class="l"><a href="#100">100: </a>        <span class="php-keyword2">var_dump</span>(<span class="php-var">$this</span>-&gt;request-&gt;body);
-</span><span id="101" class="l"><a href="#101">101: </a>    }
-</span><span id="102" class="l"><a href="#102">102: </a>
-</span><span id="103" class="l"><a href="#103">103: </a>
-</span><span id="104" class="l"><a href="#104">104: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> send_put()
-</span><span id="105" class="l"><a href="#105">105: </a>    {
-</span><span id="106" class="l"><a href="#106">106: </a>        <span class="php-keyword2">var_dump</span>(<span class="php-var">$this</span>-&gt;put(<span class="php-quote">'foo'</span>));
-</span><span id="107" class="l"><a href="#107">107: </a>    }
-</span><span id="108" class="l"><a href="#108">108: </a>}</span></code></pre>
+</span><span id="63" class="l"><a href="#63"> 63: </a>        <span class="php-comment">// $this-&gt;some_model-&gt;update_user($this-&gt;get('id'));</span>
+</span><span id="64" class="l"><a href="#64"> 64: </a>        <span class="php-var">$message</span> = [
+</span><span id="65" class="l"><a href="#65"> 65: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>),
+</span><span id="66" class="l"><a href="#66"> 66: </a>            <span class="php-quote">'name'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'name'</span>),
+</span><span id="67" class="l"><a href="#67"> 67: </a>            <span class="php-quote">'email'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'email'</span>),
+</span><span id="68" class="l"><a href="#68"> 68: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Added a resource'</span>
+</span><span id="69" class="l"><a href="#69"> 69: </a>        ];
+</span><span id="70" class="l"><a href="#70"> 70: </a>
+</span><span id="71" class="l"><a href="#71"> 71: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$message</span>, <span class="php-num">201</span>); <span class="php-comment">// 201 being the HTTP response code</span>
+</span><span id="72" class="l"><a href="#72"> 72: </a>    }
+</span><span id="73" class="l"><a href="#73"> 73: </a>
+</span><span id="74" class="l"><a href="#74"> 74: </a>    <span class="php-keyword1">function</span> user_delete()
+</span><span id="75" class="l"><a href="#75"> 75: </a>    {
+</span><span id="76" class="l"><a href="#76"> 76: </a>        <span class="php-comment">// $this-&gt;some_model-&gt;delete_something($this-&gt;get();</span>
+</span><span id="77" class="l"><a href="#77"> 77: </a>        <span class="php-var">$message</span> = [
+</span><span id="78" class="l"><a href="#78"> 78: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>),
+</span><span id="79" class="l"><a href="#79"> 79: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Deleted the resource'</span>
+</span><span id="80" class="l"><a href="#80"> 80: </a>        ];
+</span><span id="81" class="l"><a href="#81"> 81: </a>
+</span><span id="82" class="l"><a href="#82"> 82: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$message</span>, <span class="php-num">204</span>); <span class="php-comment">// 204 being the HTTP response code</span>
+</span><span id="83" class="l"><a href="#83"> 83: </a>    }
+</span><span id="84" class="l"><a href="#84"> 84: </a>
+</span><span id="85" class="l"><a href="#85"> 85: </a>    <span class="php-keyword1">function</span> users_get()
+</span><span id="86" class="l"><a href="#86"> 86: </a>    {
+</span><span id="87" class="l"><a href="#87"> 87: </a>        <span class="php-comment">// $users = $this-&gt;some_model-&gt;get_something($this-&gt;get('limit'));</span>
+</span><span id="88" class="l"><a href="#88"> 88: </a>        <span class="php-var">$users</span> = [
+</span><span id="89" class="l"><a href="#89"> 89: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'John'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'john@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Loves coding'</span>],
+</span><span id="90" class="l"><a href="#90"> 90: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">2</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jim'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jim@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Developed on CodeIgniter'</span>],
+</span><span id="91" class="l"><a href="#91"> 91: </a>            <span class="php-num">3</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">3</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jane'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jane@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Lives in the USA'</span>, [<span class="php-quote">'hobbies'</span> =&gt; [<span class="php-quote">'guitar'</span>, <span class="php-quote">'cycling'</span>]]],
+</span><span id="92" class="l"><a href="#92"> 92: </a>        ];
+</span><span id="93" class="l"><a href="#93"> 93: </a>
+</span><span id="94" class="l"><a href="#94"> 94: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$users</span>)
+</span><span id="95" class="l"><a href="#95"> 95: </a>        {
+</span><span id="96" class="l"><a href="#96"> 96: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-var">$users</span>, <span class="php-num">200</span>); <span class="php-comment">// 200 being the HTTP response code</span>
+</span><span id="97" class="l"><a href="#97"> 97: </a>        }
+</span><span id="98" class="l"><a href="#98"> 98: </a>
+</span><span id="99" class="l"><a href="#99"> 99: </a>        <span class="php-keyword1">else</span>
+</span><span id="100" class="l"><a href="#100">100: </a>        {
+</span><span id="101" class="l"><a href="#101">101: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Couldn\'t find any users!'</span>], <span class="php-num">404</span>);
+</span><span id="102" class="l"><a href="#102">102: </a>        }
+</span><span id="103" class="l"><a href="#103">103: </a>    }
+</span><span id="104" class="l"><a href="#104">104: </a>
+</span><span id="105" class="l"><a href="#105">105: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> send_post()
+</span><span id="106" class="l"><a href="#106">106: </a>    {
+</span><span id="107" class="l"><a href="#107">107: </a>        <span class="php-keyword2">var_dump</span>(<span class="php-var">$this</span>-&gt;request-&gt;body);
+</span><span id="108" class="l"><a href="#108">108: </a>    }
+</span><span id="109" class="l"><a href="#109">109: </a>
+</span><span id="110" class="l"><a href="#110">110: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> send_put()
+</span><span id="111" class="l"><a href="#111">111: </a>    {
+</span><span id="112" class="l"><a href="#112">112: </a>        <span class="php-keyword2">var_dump</span>(<span class="php-var">$this</span>-&gt;put(<span class="php-quote">'foo'</span>));
+</span><span id="113" class="l"><a href="#113">113: </a>    }
+</span><span id="114" class="l"><a href="#114">114: </a>}
+</span><span id="115" class="l"><a href="#115">115: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
@@ -209,6 +211,6 @@ <h3>Functions</h3>
 </div>
 </div>
 <script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
-<script src="http://github.com/elementlist.js?a84266a83a9e4e19c2425432aca8ea8439364f92"></script>
+<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Format.html b/documentation/source-class-Format.html
index bca9fc38..e769e16d 100644
--- a/documentation/source-class-Format.html
+++ b/documentation/source-class-Format.html
@@ -29,6 +29,11 @@ <h3>Packages</h3>
 					<a href="http://github.com/package-CodeIgniter.Libraries.html">
 						Libraries					</a>
 
+						</li>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
 						</li>
 							</ul></li>
 				<li class="active">
@@ -52,10 +57,6 @@ <h3>Classes</h3>
 
 
 
-			<h3>Functions</h3>
-			<ul>
-				<li class="active"><a href="http://github.com/function-_perform_ldap_auth.html">_perform_ldap_auth</a></li>
-			</ul>
 		</div>
 	</div>
 </div>
@@ -79,340 +80,473 @@ <h3>Functions</h3>
 				<a href="http://github.com/package-None.html" title="Summary of None"><span>Package</span></a>
 			</li>
 			<li>
-				<a href="http://github.com/function-_perform_ldap_auth.html" title="Summary of _perform_ldap_auth"><span>Function</span></a>
+				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
 			</li>
 		</ul>
 		<ul>
-			<li>
-				<a href="http://github.com/tree.html" title="Tree view of classes, interfaces, traits and exceptions"><span>Tree</span></a>
-			</li>
-			<li>
-				<a href="http://github.com/todo.html" title="Todo list"><span>Todo</span></a>
-			</li>
 		</ul>
 		<ul>
 		</ul>
 	</div>
 
 <pre><code><span id="1" class="l"><a href="#1">  1: </a><span class="xlang">&lt;?php</span>
-</span><span id="2" class="l"><a href="#2">  2: </a><span class="php-comment">/**
-</span></span><span id="3" class="l"><a href="#3">  3: </a><span class="php-comment"> * Format class
-</span></span><span id="4" class="l"><a href="#4">  4: </a><span class="php-comment"> *
-</span></span><span id="5" class="l"><a href="#5">  5: </a><span class="php-comment"> * Help convert between various formats such as XML, JSON, CSV, etc.
-</span></span><span id="6" class="l"><a href="#6">  6: </a><span class="php-comment"> *
-</span></span><span id="7" class="l"><a href="#7">  7: </a><span class="php-comment"> * @author      Phil Sturgeon
-</span></span><span id="8" class="l"><a href="#8">  8: </a><span class="php-comment"> * @license     http://philsturgeon.co.uk/code/dbad-license
-</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment"> */</span>
-</span><span id="10" class="l"><a href="#10"> 10: </a><span class="php-keyword1">class</span> Format {
-</span><span id="11" class="l"><a href="#11"> 11: </a>
-</span><span id="12" class="l"><a href="#12"> 12: </a>    <span class="php-comment">// Array to convert</span>
-</span><span id="13" class="l"><a href="#13"> 13: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_data</span> = <span class="php-keyword1">array</span>();
-</span><span id="14" class="l"><a href="#14"> 14: </a>
-</span><span id="15" class="l"><a href="#15"> 15: </a>    <span class="php-comment">// View filename</span>
-</span><span id="16" class="l"><a href="#16"> 16: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_from_type</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="17" class="l"><a href="#17"> 17: </a>
-</span><span id="18" class="l"><a href="#18"> 18: </a>    <span class="php-comment">/**
-</span></span><span id="19" class="l"><a href="#19"> 19: </a><span class="php-comment">     * Returns an instance of the Format object.
-</span></span><span id="20" class="l"><a href="#20"> 20: </a><span class="php-comment">     *
-</span></span><span id="21" class="l"><a href="#21"> 21: </a><span class="php-comment">     *     echo $this-&gt;format-&gt;factory(array('foo' =&gt; 'bar'))-&gt;to_xml();
-</span></span><span id="22" class="l"><a href="#22"> 22: </a><span class="php-comment">     *
-</span></span><span id="23" class="l"><a href="#23"> 23: </a><span class="php-comment">     * @param   mixed  general date to be converted
-</span></span><span id="24" class="l"><a href="#24"> 24: </a><span class="php-comment">     * @param   string  data format the file was provided in
-</span></span><span id="25" class="l"><a href="#25"> 25: </a><span class="php-comment">     * @return  Factory
-</span></span><span id="26" class="l"><a href="#26"> 26: </a><span class="php-comment">     */</span>
-</span><span id="27" class="l"><a href="#27"> 27: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> factory(<span class="php-var">$data</span>, <span class="php-var">$from_type</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="28" class="l"><a href="#28"> 28: </a>    {
-</span><span id="29" class="l"><a href="#29"> 29: </a>        <span class="php-comment">// Stupid stuff to emulate the &quot;new static()&quot; stuff in this libraries PHP 5.3 equivalent</span>
-</span><span id="30" class="l"><a href="#30"> 30: </a>        <span class="php-var">$class</span> = __CLASS__;
-</span><span id="31" class="l"><a href="#31"> 31: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">new</span> <span class="php-var">$class</span>(<span class="php-var">$data</span>, <span class="php-var">$from_type</span>);
-</span><span id="32" class="l"><a href="#32"> 32: </a>    }
-</span><span id="33" class="l"><a href="#33"> 33: </a>
-</span><span id="34" class="l"><a href="#34"> 34: </a>    <span class="php-comment">/**
-</span></span><span id="35" class="l"><a href="#35"> 35: </a><span class="php-comment">     * Do not use this directly, call factory()
-</span></span><span id="36" class="l"><a href="#36"> 36: </a><span class="php-comment">     */</span>
-</span><span id="37" class="l"><a href="#37"> 37: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$from_type</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="38" class="l"><a href="#38"> 38: </a>    {
-</span><span id="39" class="l"><a href="#39"> 39: </a>        get_instance()-&gt;load-&gt;helper(<span class="php-quote">'inflector'</span>);
-</span><span id="40" class="l"><a href="#40"> 40: </a>
-</span><span id="41" class="l"><a href="#41"> 41: </a>        <span class="php-comment">// If the provided data is already formatted we should probably convert it to an array</span>
-</span><span id="42" class="l"><a href="#42"> 42: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$from_type</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="43" class="l"><a href="#43"> 43: </a>        {
-</span><span id="44" class="l"><a href="#44"> 44: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span> . <span class="php-var">$from_type</span>))
-</span><span id="45" class="l"><a href="#45"> 45: </a>            {
-</span><span id="46" class="l"><a href="#46"> 46: </a>                <span class="php-var">$data</span> = <span class="php-keyword2">call_user_func</span>(<span class="php-keyword1">array</span>(<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span> . <span class="php-var">$from_type</span>), <span class="php-var">$data</span>);
-</span><span id="47" class="l"><a href="#47"> 47: </a>            }
+</span><span id="2" class="l"><a href="#2">  2: </a>
+</span><span id="3" class="l"><a href="#3">  3: </a><span class="php-keyword2">defined</span>(<span class="php-quote">'BASEPATH'</span>) <span class="php-keyword1">OR</span> <span class="php-keyword1">exit</span>(<span class="php-quote">'No direct script access allowed'</span>);
+</span><span id="4" class="l"><a href="#4">  4: </a>
+</span><span id="5" class="l"><a href="#5">  5: </a><span class="php-comment">/**
+</span></span><span id="6" class="l"><a href="#6">  6: </a><span class="php-comment"> * Format class
+</span></span><span id="7" class="l"><a href="#7">  7: </a><span class="php-comment"> * Help convert between various formats such as XML, JSON, CSV, etc.
+</span></span><span id="8" class="l"><a href="#8">  8: </a><span class="php-comment"> *
+</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment"> * @author    Phil Sturgeon, Chris Kacerguis
+</span></span><span id="10" class="l"><a href="#10"> 10: </a><span class="php-comment"> * @license   http://www.dbad-license.org/
+</span></span><span id="11" class="l"><a href="#11"> 11: </a><span class="php-comment"> */</span>
+</span><span id="12" class="l"><a href="#12"> 12: </a><span class="php-keyword1">class</span> Format {
+</span><span id="13" class="l"><a href="#13"> 13: </a>
+</span><span id="14" class="l"><a href="#14"> 14: </a>    <span class="php-comment">/**
+</span></span><span id="15" class="l"><a href="#15"> 15: </a><span class="php-comment">     * CodeIgniter instance
+</span></span><span id="16" class="l"><a href="#16"> 16: </a><span class="php-comment">     *
+</span></span><span id="17" class="l"><a href="#17"> 17: </a><span class="php-comment">     * @var object
+</span></span><span id="18" class="l"><a href="#18"> 18: </a><span class="php-comment">     */</span>
+</span><span id="19" class="l"><a href="#19"> 19: </a>    <span class="php-keyword1">private</span> <span class="php-var">$_ci</span>;
+</span><span id="20" class="l"><a href="#20"> 20: </a>
+</span><span id="21" class="l"><a href="#21"> 21: </a>    <span class="php-comment">/**
+</span></span><span id="22" class="l"><a href="#22"> 22: </a><span class="php-comment">     * Data to parse
+</span></span><span id="23" class="l"><a href="#23"> 23: </a><span class="php-comment">     *
+</span></span><span id="24" class="l"><a href="#24"> 24: </a><span class="php-comment">     * @var mixed
+</span></span><span id="25" class="l"><a href="#25"> 25: </a><span class="php-comment">     */</span>
+</span><span id="26" class="l"><a href="#26"> 26: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_data</span> = [];
+</span><span id="27" class="l"><a href="#27"> 27: </a>
+</span><span id="28" class="l"><a href="#28"> 28: </a>    <span class="php-comment">/**
+</span></span><span id="29" class="l"><a href="#29"> 29: </a><span class="php-comment">     * Type to convert from
+</span></span><span id="30" class="l"><a href="#30"> 30: </a><span class="php-comment">     *
+</span></span><span id="31" class="l"><a href="#31"> 31: </a><span class="php-comment">     * @var string
+</span></span><span id="32" class="l"><a href="#32"> 32: </a><span class="php-comment">     */</span>
+</span><span id="33" class="l"><a href="#33"> 33: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_from_type</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="34" class="l"><a href="#34"> 34: </a>
+</span><span id="35" class="l"><a href="#35"> 35: </a>    <span class="php-comment">/**
+</span></span><span id="36" class="l"><a href="#36"> 36: </a><span class="php-comment">     * DO NOT CALL THIS DIRECTLY, USE factory()
+</span></span><span id="37" class="l"><a href="#37"> 37: </a><span class="php-comment">     *
+</span></span><span id="38" class="l"><a href="#38"> 38: </a><span class="php-comment">     * @param NULL $data
+</span></span><span id="39" class="l"><a href="#39"> 39: </a><span class="php-comment">     * @param NULL $from_type
+</span></span><span id="40" class="l"><a href="#40"> 40: </a><span class="php-comment">     *
+</span></span><span id="41" class="l"><a href="#41"> 41: </a><span class="php-comment">     * @throws Exception
+</span></span><span id="42" class="l"><a href="#42"> 42: </a><span class="php-comment">     */</span>
+</span><span id="43" class="l"><a href="#43"> 43: </a>
+</span><span id="44" class="l"><a href="#44"> 44: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$from_type</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="45" class="l"><a href="#45"> 45: </a>    {
+</span><span id="46" class="l"><a href="#46"> 46: </a>        <span class="php-comment">// Get the CodeIgniter reference</span>
+</span><span id="47" class="l"><a href="#47"> 47: </a>        <span class="php-var">$this</span>-&gt;_ci = &amp;get_instance();
 </span><span id="48" class="l"><a href="#48"> 48: </a>
-</span><span id="49" class="l"><a href="#49"> 49: </a>            <span class="php-keyword1">else</span>
-</span><span id="50" class="l"><a href="#50"> 50: </a>            {
-</span><span id="51" class="l"><a href="#51"> 51: </a>                <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'Format class does not support conversion from &quot;'</span> . <span class="php-var">$from_type</span> . <span class="php-quote">'&quot;.'</span>);
-</span><span id="52" class="l"><a href="#52"> 52: </a>            }
-</span><span id="53" class="l"><a href="#53"> 53: </a>        }
-</span><span id="54" class="l"><a href="#54"> 54: </a>
-</span><span id="55" class="l"><a href="#55"> 55: </a>        <span class="php-var">$this</span>-&gt;_data = <span class="php-var">$data</span>;
-</span><span id="56" class="l"><a href="#56"> 56: </a>    }
-</span><span id="57" class="l"><a href="#57"> 57: </a>
-</span><span id="58" class="l"><a href="#58"> 58: </a>    <span class="php-comment">// FORMATING OUTPUT ---------------------------------------------------------</span>
-</span><span id="59" class="l"><a href="#59"> 59: </a>
-</span><span id="60" class="l"><a href="#60"> 60: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_array(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="61" class="l"><a href="#61"> 61: </a>    {
-</span><span id="62" class="l"><a href="#62"> 62: </a>        <span class="php-comment">// If not just NULL, but nothing is provided</span>
-</span><span id="63" class="l"><a href="#63"> 63: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> <span class="php-keyword1">and</span> ! <span class="php-keyword2">func_num_args</span>())
-</span><span id="64" class="l"><a href="#64"> 64: </a>        {
-</span><span id="65" class="l"><a href="#65"> 65: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="66" class="l"><a href="#66"> 66: </a>        }
-</span><span id="67" class="l"><a href="#67"> 67: </a>
-</span><span id="68" class="l"><a href="#68"> 68: </a>        <span class="php-var">$array</span> = <span class="php-keyword1">array</span>();
-</span><span id="69" class="l"><a href="#69"> 69: </a>
-</span><span id="70" class="l"><a href="#70"> 70: </a>        <span class="php-keyword1">foreach</span> ((<span class="php-keyword1">array</span>) <span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
-</span><span id="71" class="l"><a href="#71"> 71: </a>        {
-</span><span id="72" class="l"><a href="#72"> 72: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>) <span class="php-keyword1">or</span> <span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>))
-</span><span id="73" class="l"><a href="#73"> 73: </a>            {
-</span><span id="74" class="l"><a href="#74"> 74: </a>                <span class="php-var">$array</span>[<span class="php-var">$key</span>] = <span class="php-var">$this</span>-&gt;to_array(<span class="php-var">$value</span>);
-</span><span id="75" class="l"><a href="#75"> 75: </a>            }
-</span><span id="76" class="l"><a href="#76"> 76: </a>
-</span><span id="77" class="l"><a href="#77"> 77: </a>            <span class="php-keyword1">else</span>
-</span><span id="78" class="l"><a href="#78"> 78: </a>            {
-</span><span id="79" class="l"><a href="#79"> 79: </a>                <span class="php-var">$array</span>[<span class="php-var">$key</span>] = <span class="php-var">$value</span>;
-</span><span id="80" class="l"><a href="#80"> 80: </a>            }
-</span><span id="81" class="l"><a href="#81"> 81: </a>        }
+</span><span id="49" class="l"><a href="#49"> 49: </a>        <span class="php-comment">// Load the inflector helper</span>
+</span><span id="50" class="l"><a href="#50"> 50: </a>        <span class="php-var">$this</span>-&gt;_ci-&gt;load-&gt;helper(<span class="php-quote">'inflector'</span>);
+</span><span id="51" class="l"><a href="#51"> 51: </a>
+</span><span id="52" class="l"><a href="#52"> 52: </a>        <span class="php-comment">// If the provided data is already formatted we should probably convert it to an array</span>
+</span><span id="53" class="l"><a href="#53"> 53: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$from_type</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="54" class="l"><a href="#54"> 54: </a>        {
+</span><span id="55" class="l"><a href="#55"> 55: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span> . <span class="php-var">$from_type</span>))
+</span><span id="56" class="l"><a href="#56"> 56: </a>            {
+</span><span id="57" class="l"><a href="#57"> 57: </a>                <span class="php-var">$data</span> = <span class="php-keyword2">call_user_func</span>([<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span> . <span class="php-var">$from_type</span>], <span class="php-var">$data</span>);
+</span><span id="58" class="l"><a href="#58"> 58: </a>            }
+</span><span id="59" class="l"><a href="#59"> 59: </a>            <span class="php-keyword1">else</span>
+</span><span id="60" class="l"><a href="#60"> 60: </a>            {
+</span><span id="61" class="l"><a href="#61"> 61: </a>                <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'Format class does not support conversion from &quot;'</span> . <span class="php-var">$from_type</span> . <span class="php-quote">'&quot;.'</span>);
+</span><span id="62" class="l"><a href="#62"> 62: </a>            }
+</span><span id="63" class="l"><a href="#63"> 63: </a>        }
+</span><span id="64" class="l"><a href="#64"> 64: </a>
+</span><span id="65" class="l"><a href="#65"> 65: </a>        <span class="php-comment">// Set the member variable to the data passed</span>
+</span><span id="66" class="l"><a href="#66"> 66: </a>        <span class="php-var">$this</span>-&gt;_data = <span class="php-var">$data</span>;
+</span><span id="67" class="l"><a href="#67"> 67: </a>    }
+</span><span id="68" class="l"><a href="#68"> 68: </a>
+</span><span id="69" class="l"><a href="#69"> 69: </a>    <span class="php-comment">/**
+</span></span><span id="70" class="l"><a href="#70"> 70: </a><span class="php-comment">     * Create an instance of the format class
+</span></span><span id="71" class="l"><a href="#71"> 71: </a><span class="php-comment">     * e.g: echo $this-&gt;format-&gt;factory(['foo' =&gt; 'bar'])-&gt;to_csv();
+</span></span><span id="72" class="l"><a href="#72"> 72: </a><span class="php-comment">     *
+</span></span><span id="73" class="l"><a href="#73"> 73: </a><span class="php-comment">     * @param mixed $data Data to convert/parse
+</span></span><span id="74" class="l"><a href="#74"> 74: </a><span class="php-comment">     * @param string $from_type Type to convert from e.g. json, csv, html
+</span></span><span id="75" class="l"><a href="#75"> 75: </a><span class="php-comment">     *
+</span></span><span id="76" class="l"><a href="#76"> 76: </a><span class="php-comment">     * @return object Instance of the format class
+</span></span><span id="77" class="l"><a href="#77"> 77: </a><span class="php-comment">     */</span>
+</span><span id="78" class="l"><a href="#78"> 78: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> factory(<span class="php-var">$data</span>, <span class="php-var">$from_type</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="79" class="l"><a href="#79"> 79: </a>    {
+</span><span id="80" class="l"><a href="#80"> 80: </a>        <span class="php-comment">// $class = __CLASS__;</span>
+</span><span id="81" class="l"><a href="#81"> 81: </a>        <span class="php-comment">// return new $class();</span>
 </span><span id="82" class="l"><a href="#82"> 82: </a>
-</span><span id="83" class="l"><a href="#83"> 83: </a>        <span class="php-keyword1">return</span> <span class="php-var">$array</span>;
+</span><span id="83" class="l"><a href="#83"> 83: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">new</span> <span class="php-keyword1">static</span>(<span class="php-var">$data</span>, <span class="php-var">$from_type</span>);
 </span><span id="84" class="l"><a href="#84"> 84: </a>    }
 </span><span id="85" class="l"><a href="#85"> 85: </a>
-</span><span id="86" class="l"><a href="#86"> 86: </a>    <span class="php-comment">// Format XML for output</span>
-</span><span id="87" class="l"><a href="#87"> 87: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_xml(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$structure</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$basenode</span> = <span class="php-quote">'xml'</span>)
-</span><span id="88" class="l"><a href="#88"> 88: </a>    {
-</span><span id="89" class="l"><a href="#89"> 89: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> <span class="php-keyword1">and</span> ! <span class="php-keyword2">func_num_args</span>())
-</span><span id="90" class="l"><a href="#90"> 90: </a>        {
-</span><span id="91" class="l"><a href="#91"> 91: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="92" class="l"><a href="#92"> 92: </a>        }
-</span><span id="93" class="l"><a href="#93"> 93: </a>
-</span><span id="94" class="l"><a href="#94"> 94: </a>        <span class="php-comment">// turn off compatibility mode as simple xml throws a wobbly if you don't.</span>
-</span><span id="95" class="l"><a href="#95"> 95: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ini_get</span>(<span class="php-quote">'zend.ze1_compatibility_mode'</span>) == <span class="php-num">1</span>)
-</span><span id="96" class="l"><a href="#96"> 96: </a>        {
-</span><span id="97" class="l"><a href="#97"> 97: </a>            <span class="php-keyword2">ini_set</span>(<span class="php-quote">'zend.ze1_compatibility_mode'</span>, <span class="php-num">0</span>);
-</span><span id="98" class="l"><a href="#98"> 98: </a>        }
-</span><span id="99" class="l"><a href="#99"> 99: </a>
-</span><span id="100" class="l"><a href="#100">100: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$structure</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="86" class="l"><a href="#86"> 86: </a>    <span class="php-comment">// FORMATTING OUTPUT ---------------------------------------------------------</span>
+</span><span id="87" class="l"><a href="#87"> 87: </a>
+</span><span id="88" class="l"><a href="#88"> 88: </a>    <span class="php-comment">/**
+</span></span><span id="89" class="l"><a href="#89"> 89: </a><span class="php-comment">     * Format data as an array
+</span></span><span id="90" class="l"><a href="#90"> 90: </a><span class="php-comment">     *
+</span></span><span id="91" class="l"><a href="#91"> 91: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="92" class="l"><a href="#92"> 92: </a><span class="php-comment">     * to the constructor
+</span></span><span id="93" class="l"><a href="#93"> 93: </a><span class="php-comment">     *
+</span></span><span id="94" class="l"><a href="#94"> 94: </a><span class="php-comment">     * @return array Data parsed as an array; otherwise, an empty array
+</span></span><span id="95" class="l"><a href="#95"> 95: </a><span class="php-comment">     */</span>
+</span><span id="96" class="l"><a href="#96"> 96: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_array(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="97" class="l"><a href="#97"> 97: </a>    {
+</span><span id="98" class="l"><a href="#98"> 98: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="99" class="l"><a href="#99"> 99: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="100" class="l"><a href="#100">100: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
 </span><span id="101" class="l"><a href="#101">101: </a>        {
-</span><span id="102" class="l"><a href="#102">102: </a>            <span class="php-var">$structure</span> = <span class="php-keyword2">simplexml_load_string</span>(<span class="php-quote">&quot;&lt;?xml version='1.0' encoding='utf-8'?&gt;&lt;</span><span class="php-var">$basenode</span><span class="php-quote"> /&gt;&quot;</span>);
+</span><span id="102" class="l"><a href="#102">102: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
 </span><span id="103" class="l"><a href="#103">103: </a>        }
 </span><span id="104" class="l"><a href="#104">104: </a>
-</span><span id="105" class="l"><a href="#105">105: </a>        <span class="php-comment">// Force it to be something useful</span>
-</span><span id="106" class="l"><a href="#106">106: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) <span class="php-keyword1">AND</span> ! <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
+</span><span id="105" class="l"><a href="#105">105: </a>        <span class="php-comment">// Cast as an array if not already</span>
+</span><span id="106" class="l"><a href="#106">106: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
 </span><span id="107" class="l"><a href="#107">107: </a>        {
 </span><span id="108" class="l"><a href="#108">108: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
 </span><span id="109" class="l"><a href="#109">109: </a>        }
 </span><span id="110" class="l"><a href="#110">110: </a>
-</span><span id="111" class="l"><a href="#111">111: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
-</span><span id="112" class="l"><a href="#112">112: </a>        {
-</span><span id="113" class="l"><a href="#113">113: </a>
-</span><span id="114" class="l"><a href="#114">114: </a>            <span class="php-comment">//change false/true to 0/1</span>
-</span><span id="115" class="l"><a href="#115">115: </a>            <span class="php-keyword1">if</span>(<span class="php-keyword2">is_bool</span>(<span class="php-var">$value</span>))
-</span><span id="116" class="l"><a href="#116">116: </a>            {
-</span><span id="117" class="l"><a href="#117">117: </a>                <span class="php-var">$value</span> = (int) <span class="php-var">$value</span>;
-</span><span id="118" class="l"><a href="#118">118: </a>            }
-</span><span id="119" class="l"><a href="#119">119: </a>
-</span><span id="120" class="l"><a href="#120">120: </a>            <span class="php-comment">// no numeric keys in our xml please!</span>
-</span><span id="121" class="l"><a href="#121">121: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">is_numeric</span>(<span class="php-var">$key</span>))
-</span><span id="122" class="l"><a href="#122">122: </a>            {
-</span><span id="123" class="l"><a href="#123">123: </a>                <span class="php-comment">// make string key...</span>
-</span><span id="124" class="l"><a href="#124">124: </a>                <span class="php-var">$key</span> = (singular(<span class="php-var">$basenode</span>) != <span class="php-var">$basenode</span>) ? singular(<span class="php-var">$basenode</span>) : <span class="php-quote">'item'</span>;
-</span><span id="125" class="l"><a href="#125">125: </a>            }
+</span><span id="111" class="l"><a href="#111">111: </a>        <span class="php-var">$array</span> = [];
+</span><span id="112" class="l"><a href="#112">112: </a>        <span class="php-keyword1">foreach</span> ((<span class="php-keyword1">array</span>) <span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
+</span><span id="113" class="l"><a href="#113">113: </a>        {
+</span><span id="114" class="l"><a href="#114">114: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>) === <span class="php-keyword1">TRUE</span> || <span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="115" class="l"><a href="#115">115: </a>            {
+</span><span id="116" class="l"><a href="#116">116: </a>                <span class="php-var">$array</span>[<span class="php-var">$key</span>] = <span class="php-var">$this</span>-&gt;to_array(<span class="php-var">$value</span>);
+</span><span id="117" class="l"><a href="#117">117: </a>            }
+</span><span id="118" class="l"><a href="#118">118: </a>            <span class="php-keyword1">else</span>
+</span><span id="119" class="l"><a href="#119">119: </a>            {
+</span><span id="120" class="l"><a href="#120">120: </a>                <span class="php-var">$array</span>[<span class="php-var">$key</span>] = <span class="php-var">$value</span>;
+</span><span id="121" class="l"><a href="#121">121: </a>            }
+</span><span id="122" class="l"><a href="#122">122: </a>        }
+</span><span id="123" class="l"><a href="#123">123: </a>
+</span><span id="124" class="l"><a href="#124">124: </a>        <span class="php-keyword1">return</span> <span class="php-var">$array</span>;
+</span><span id="125" class="l"><a href="#125">125: </a>    }
 </span><span id="126" class="l"><a href="#126">126: </a>
-</span><span id="127" class="l"><a href="#127">127: </a>            <span class="php-comment">// replace anything not alpha numeric</span>
-</span><span id="128" class="l"><a href="#128">128: </a>            <span class="php-var">$key</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/[^a-z_\-0-9]/i'</span>, <span class="php-quote">''</span>, <span class="php-var">$key</span>);
-</span><span id="129" class="l"><a href="#129">129: </a>
-</span><span id="130" class="l"><a href="#130">130: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-quote">'_attributes'</span> &amp;&amp; (<span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>)))
-</span><span id="131" class="l"><a href="#131">131: </a>            {
-</span><span id="132" class="l"><a href="#132">132: </a>                <span class="php-var">$attributes</span> = <span class="php-var">$value</span>;
-</span><span id="133" class="l"><a href="#133">133: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_object</span>(<span class="php-var">$attributes</span>)) <span class="php-var">$attributes</span> = <span class="php-keyword2">get_object_vars</span>(<span class="php-var">$attributes</span>);
-</span><span id="134" class="l"><a href="#134">134: </a>
-</span><span id="135" class="l"><a href="#135">135: </a>                <span class="php-keyword1">foreach</span> (<span class="php-var">$attributes</span> <span class="php-keyword1">as</span> <span class="php-var">$attributeName</span> =&gt; <span class="php-var">$attributeValue</span>)
-</span><span id="136" class="l"><a href="#136">136: </a>                {
-</span><span id="137" class="l"><a href="#137">137: </a>                    <span class="php-var">$structure</span>-&gt;addAttribute(<span class="php-var">$attributeName</span>, <span class="php-var">$attributeValue</span>);
-</span><span id="138" class="l"><a href="#138">138: </a>                }
-</span><span id="139" class="l"><a href="#139">139: </a>            }
-</span><span id="140" class="l"><a href="#140">140: </a>            <span class="php-comment">// if there is another array found recursively call this function</span>
-</span><span id="141" class="l"><a href="#141">141: </a>            <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>))
-</span><span id="142" class="l"><a href="#142">142: </a>            {
-</span><span id="143" class="l"><a href="#143">143: </a>                <span class="php-var">$node</span> = <span class="php-var">$structure</span>-&gt;addChild(<span class="php-var">$key</span>);
-</span><span id="144" class="l"><a href="#144">144: </a>
-</span><span id="145" class="l"><a href="#145">145: </a>                <span class="php-comment">// recursive call.</span>
-</span><span id="146" class="l"><a href="#146">146: </a>                <span class="php-var">$this</span>-&gt;to_xml(<span class="php-var">$value</span>, <span class="php-var">$node</span>, <span class="php-var">$key</span>);
-</span><span id="147" class="l"><a href="#147">147: </a>            }
-</span><span id="148" class="l"><a href="#148">148: </a>            <span class="php-keyword1">else</span>
-</span><span id="149" class="l"><a href="#149">149: </a>            {
-</span><span id="150" class="l"><a href="#150">150: </a>                <span class="php-comment">// add single node.</span>
-</span><span id="151" class="l"><a href="#151">151: </a>                <span class="php-var">$value</span> = <span class="php-keyword2">htmlspecialchars</span>(<span class="php-keyword2">html_entity_decode</span>(<span class="php-var">$value</span>, ENT_QUOTES, <span class="php-quote">'UTF-8'</span>), ENT_QUOTES, <span class="php-quote">&quot;UTF-8&quot;</span>);
-</span><span id="152" class="l"><a href="#152">152: </a>
-</span><span id="153" class="l"><a href="#153">153: </a>                <span class="php-var">$structure</span>-&gt;addChild(<span class="php-var">$key</span>, <span class="php-var">$value</span>);
-</span><span id="154" class="l"><a href="#154">154: </a>            }
-</span><span id="155" class="l"><a href="#155">155: </a>        }
-</span><span id="156" class="l"><a href="#156">156: </a>
-</span><span id="157" class="l"><a href="#157">157: </a>        <span class="php-keyword1">return</span> <span class="php-var">$structure</span>-&gt;asXML();
-</span><span id="158" class="l"><a href="#158">158: </a>    }
-</span><span id="159" class="l"><a href="#159">159: </a>
-</span><span id="160" class="l"><a href="#160">160: </a>    <span class="php-comment">// Format HTML for output</span>
-</span><span id="161" class="l"><a href="#161">161: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_html()
-</span><span id="162" class="l"><a href="#162">162: </a>    {
-</span><span id="163" class="l"><a href="#163">163: </a>        <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>)<span class="php-var">$this</span>-&gt;_data;
-</span><span id="164" class="l"><a href="#164">164: </a>
-</span><span id="165" class="l"><a href="#165">165: </a>        <span class="php-comment">// Multi-dimensional array</span>
-</span><span id="166" class="l"><a href="#166">166: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]) &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]))
-</span><span id="167" class="l"><a href="#167">167: </a>        {
-</span><span id="168" class="l"><a href="#168">168: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]);
-</span><span id="169" class="l"><a href="#169">169: </a>        }
-</span><span id="170" class="l"><a href="#170">170: </a>
-</span><span id="171" class="l"><a href="#171">171: </a>        <span class="php-comment">// Single array</span>
-</span><span id="172" class="l"><a href="#172">172: </a>        <span class="php-keyword1">else</span>
-</span><span id="173" class="l"><a href="#173">173: </a>        {
-</span><span id="174" class="l"><a href="#174">174: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>);
-</span><span id="175" class="l"><a href="#175">175: </a>            <span class="php-var">$data</span> = <span class="php-keyword1">array</span>(<span class="php-var">$data</span>);
-</span><span id="176" class="l"><a href="#176">176: </a>        }
-</span><span id="177" class="l"><a href="#177">177: </a>
-</span><span id="178" class="l"><a href="#178">178: </a>        <span class="php-var">$ci</span> = get_instance();
-</span><span id="179" class="l"><a href="#179">179: </a>        <span class="php-var">$ci</span>-&gt;load-&gt;library(<span class="php-quote">'table'</span>);
-</span><span id="180" class="l"><a href="#180">180: </a>
-</span><span id="181" class="l"><a href="#181">181: </a>        <span class="php-var">$ci</span>-&gt;table-&gt;set_heading(<span class="php-var">$headings</span>);
-</span><span id="182" class="l"><a href="#182">182: </a>
-</span><span id="183" class="l"><a href="#183">183: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$row</span>)
-</span><span id="184" class="l"><a href="#184">184: </a>        {
-</span><span id="185" class="l"><a href="#185">185: </a>            <span class="php-var">$ci</span>-&gt;table-&gt;add_row(<span class="php-var">$row</span>);
-</span><span id="186" class="l"><a href="#186">186: </a>        }
+</span><span id="127" class="l"><a href="#127">127: </a>    <span class="php-comment">/**
+</span></span><span id="128" class="l"><a href="#128">128: </a><span class="php-comment">     * Format data as XML
+</span></span><span id="129" class="l"><a href="#129">129: </a><span class="php-comment">     *
+</span></span><span id="130" class="l"><a href="#130">130: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="131" class="l"><a href="#131">131: </a><span class="php-comment">     * to the constructor
+</span></span><span id="132" class="l"><a href="#132">132: </a><span class="php-comment">     * @param NULL $structure
+</span></span><span id="133" class="l"><a href="#133">133: </a><span class="php-comment">     * @param string $basenode
+</span></span><span id="134" class="l"><a href="#134">134: </a><span class="php-comment">     *
+</span></span><span id="135" class="l"><a href="#135">135: </a><span class="php-comment">     * @return mixed
+</span></span><span id="136" class="l"><a href="#136">136: </a><span class="php-comment">     */</span>
+</span><span id="137" class="l"><a href="#137">137: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_xml(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$structure</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$basenode</span> = <span class="php-quote">'xml'</span>)
+</span><span id="138" class="l"><a href="#138">138: </a>    {
+</span><span id="139" class="l"><a href="#139">139: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="140" class="l"><a href="#140">140: </a>        {
+</span><span id="141" class="l"><a href="#141">141: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="142" class="l"><a href="#142">142: </a>        }
+</span><span id="143" class="l"><a href="#143">143: </a>
+</span><span id="144" class="l"><a href="#144">144: </a>        <span class="php-comment">// turn off compatibility mode as simple xml throws a wobbly if you don't.</span>
+</span><span id="145" class="l"><a href="#145">145: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ini_get</span>(<span class="php-quote">'zend.ze1_compatibility_mode'</span>) == <span class="php-num">1</span>)
+</span><span id="146" class="l"><a href="#146">146: </a>        {
+</span><span id="147" class="l"><a href="#147">147: </a>            <span class="php-keyword2">ini_set</span>(<span class="php-quote">'zend.ze1_compatibility_mode'</span>, <span class="php-num">0</span>);
+</span><span id="148" class="l"><a href="#148">148: </a>        }
+</span><span id="149" class="l"><a href="#149">149: </a>
+</span><span id="150" class="l"><a href="#150">150: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$structure</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="151" class="l"><a href="#151">151: </a>        {
+</span><span id="152" class="l"><a href="#152">152: </a>            <span class="php-var">$structure</span> = <span class="php-keyword2">simplexml_load_string</span>(<span class="php-quote">&quot;&lt;?xml version='1.0' encoding='utf-8'?&gt;&lt;</span><span class="php-var">$basenode</span><span class="php-quote"> /&gt;&quot;</span>);
+</span><span id="153" class="l"><a href="#153">153: </a>        }
+</span><span id="154" class="l"><a href="#154">154: </a>
+</span><span id="155" class="l"><a href="#155">155: </a>        <span class="php-comment">// Force it to be something useful</span>
+</span><span id="156" class="l"><a href="#156">156: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="157" class="l"><a href="#157">157: </a>        {
+</span><span id="158" class="l"><a href="#158">158: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
+</span><span id="159" class="l"><a href="#159">159: </a>        }
+</span><span id="160" class="l"><a href="#160">160: </a>
+</span><span id="161" class="l"><a href="#161">161: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
+</span><span id="162" class="l"><a href="#162">162: </a>        {
+</span><span id="163" class="l"><a href="#163">163: </a>
+</span><span id="164" class="l"><a href="#164">164: </a>            <span class="php-comment">//change false/true to 0/1</span>
+</span><span id="165" class="l"><a href="#165">165: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">is_bool</span>(<span class="php-var">$value</span>))
+</span><span id="166" class="l"><a href="#166">166: </a>            {
+</span><span id="167" class="l"><a href="#167">167: </a>                <span class="php-var">$value</span> = (int) <span class="php-var">$value</span>;
+</span><span id="168" class="l"><a href="#168">168: </a>            }
+</span><span id="169" class="l"><a href="#169">169: </a>
+</span><span id="170" class="l"><a href="#170">170: </a>            <span class="php-comment">// no numeric keys in our xml please!</span>
+</span><span id="171" class="l"><a href="#171">171: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">is_numeric</span>(<span class="php-var">$key</span>))
+</span><span id="172" class="l"><a href="#172">172: </a>            {
+</span><span id="173" class="l"><a href="#173">173: </a>                <span class="php-comment">// make string key...</span>
+</span><span id="174" class="l"><a href="#174">174: </a>                <span class="php-var">$key</span> = (singular(<span class="php-var">$basenode</span>) != <span class="php-var">$basenode</span>) ? singular(<span class="php-var">$basenode</span>) : <span class="php-quote">'item'</span>;
+</span><span id="175" class="l"><a href="#175">175: </a>            }
+</span><span id="176" class="l"><a href="#176">176: </a>
+</span><span id="177" class="l"><a href="#177">177: </a>            <span class="php-comment">// replace anything not alpha numeric</span>
+</span><span id="178" class="l"><a href="#178">178: </a>            <span class="php-var">$key</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/[^a-z_\-0-9]/i'</span>, <span class="php-quote">''</span>, <span class="php-var">$key</span>);
+</span><span id="179" class="l"><a href="#179">179: </a>
+</span><span id="180" class="l"><a href="#180">180: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-quote">'_attributes'</span> &amp;&amp; (<span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>)))
+</span><span id="181" class="l"><a href="#181">181: </a>            {
+</span><span id="182" class="l"><a href="#182">182: </a>                <span class="php-var">$attributes</span> = <span class="php-var">$value</span>;
+</span><span id="183" class="l"><a href="#183">183: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_object</span>(<span class="php-var">$attributes</span>))
+</span><span id="184" class="l"><a href="#184">184: </a>                {
+</span><span id="185" class="l"><a href="#185">185: </a>                    <span class="php-var">$attributes</span> = <span class="php-keyword2">get_object_vars</span>(<span class="php-var">$attributes</span>);
+</span><span id="186" class="l"><a href="#186">186: </a>                }
 </span><span id="187" class="l"><a href="#187">187: </a>
-</span><span id="188" class="l"><a href="#188">188: </a>        <span class="php-keyword1">return</span> <span class="php-var">$ci</span>-&gt;table-&gt;generate();
-</span><span id="189" class="l"><a href="#189">189: </a>    }
-</span><span id="190" class="l"><a href="#190">190: </a>
-</span><span id="191" class="l"><a href="#191">191: </a>    <span class="php-comment">// Format CSV for output</span>
-</span><span id="192" class="l"><a href="#192">192: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_csv()
-</span><span id="193" class="l"><a href="#193">193: </a>    {
-</span><span id="194" class="l"><a href="#194">194: </a>        <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>)<span class="php-var">$this</span>-&gt;_data;
-</span><span id="195" class="l"><a href="#195">195: </a>
-</span><span id="196" class="l"><a href="#196">196: </a>        <span class="php-comment">// Multi-dimensional array</span>
-</span><span id="197" class="l"><a href="#197">197: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]) &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]))
-</span><span id="198" class="l"><a href="#198">198: </a>        {
-</span><span id="199" class="l"><a href="#199">199: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]);
-</span><span id="200" class="l"><a href="#200">200: </a>        }
-</span><span id="201" class="l"><a href="#201">201: </a>
-</span><span id="202" class="l"><a href="#202">202: </a>        <span class="php-comment">// Single array</span>
-</span><span id="203" class="l"><a href="#203">203: </a>        <span class="php-keyword1">else</span>
-</span><span id="204" class="l"><a href="#204">204: </a>        {
-</span><span id="205" class="l"><a href="#205">205: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>);
-</span><span id="206" class="l"><a href="#206">206: </a>            <span class="php-var">$data</span> = <span class="php-keyword1">array</span>(<span class="php-var">$data</span>);
-</span><span id="207" class="l"><a href="#207">207: </a>        }
-</span><span id="208" class="l"><a href="#208">208: </a>
-</span><span id="209" class="l"><a href="#209">209: </a>        <span class="php-var">$output</span> = <span class="php-quote">'&quot;'</span>.<span class="php-keyword2">implode</span>(<span class="php-quote">'&quot;,&quot;'</span>, <span class="php-var">$headings</span>).<span class="php-quote">'&quot;'</span>.PHP_EOL;
-</span><span id="210" class="l"><a href="#210">210: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$row</span>)
-</span><span id="211" class="l"><a href="#211">211: </a>        {
-</span><span id="212" class="l"><a href="#212">212: </a>                    <span class="php-var">$row</span>    = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'&quot;'</span>, <span class="php-quote">'&quot;&quot;'</span>, <span class="php-var">$row</span>); <span class="php-comment">// Escape dbl quotes per RFC 4180</span>
-</span><span id="213" class="l"><a href="#213">213: </a>                    <span class="php-var">$output</span> .= <span class="php-quote">'&quot;'</span>.<span class="php-keyword2">implode</span>(<span class="php-quote">'&quot;,&quot;'</span>, <span class="php-var">$row</span>).<span class="php-quote">'&quot;'</span>.PHP_EOL;
-</span><span id="214" class="l"><a href="#214">214: </a>        }
-</span><span id="215" class="l"><a href="#215">215: </a>
-</span><span id="216" class="l"><a href="#216">216: </a>        <span class="php-keyword1">return</span> <span class="php-var">$output</span>;
-</span><span id="217" class="l"><a href="#217">217: </a>    }
-</span><span id="218" class="l"><a href="#218">218: </a>
-</span><span id="219" class="l"><a href="#219">219: </a>    <span class="php-comment">// Encode as JSON</span>
-</span><span id="220" class="l"><a href="#220">220: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_json()
-</span><span id="221" class="l"><a href="#221">221: </a>    {
-</span><span id="222" class="l"><a href="#222">222: </a>        <span class="php-var">$callback</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$_GET</span>[<span class="php-quote">'callback'</span>]) ? <span class="php-var">$_GET</span>[<span class="php-quote">'callback'</span>] : <span class="php-quote">''</span>;
-</span><span id="223" class="l"><a href="#223">223: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$callback</span> === <span class="php-quote">''</span>)
-</span><span id="224" class="l"><a href="#224">224: </a>        {
-</span><span id="225" class="l"><a href="#225">225: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_data);
-</span><span id="226" class="l"><a href="#226">226: </a>
-</span><span id="227" class="l"><a href="#227">227: </a>            <span class="php-comment">/* Had to take out this code, it doesn't work on Objects.
-</span></span><span id="228" class="l"><a href="#228">228: </a><span class="php-comment">            $str = $this-&gt;_data;
-</span></span><span id="229" class="l"><a href="#229">229: </a><span class="php-comment">            array_walk_recursive($str, function(&amp;$item, $key)
-</span></span><span id="230" class="l"><a href="#230">230: </a><span class="php-comment">            {
-</span></span><span id="231" class="l"><a href="#231">231: </a><span class="php-comment">                if(!mb_detect_encoding($item, 'utf-8', true))
-</span></span><span id="232" class="l"><a href="#232">232: </a><span class="php-comment">                {
-</span></span><span id="233" class="l"><a href="#233">233: </a><span class="php-comment">                    $item = utf8_encode($item);
-</span></span><span id="234" class="l"><a href="#234">234: </a><span class="php-comment">                }
-</span></span><span id="235" class="l"><a href="#235">235: </a><span class="php-comment">            });
-</span></span><span id="236" class="l"><a href="#236">236: </a><span class="php-comment">
-</span></span><span id="237" class="l"><a href="#237">237: </a><span class="php-comment">            return json_encode($str);
-</span></span><span id="238" class="l"><a href="#238">238: </a><span class="php-comment">            */</span>
-</span><span id="239" class="l"><a href="#239">239: </a>        }
-</span><span id="240" class="l"><a href="#240">240: </a>
-</span><span id="241" class="l"><a href="#241">241: </a>        <span class="php-comment">// we only honour jsonp callback which are valid javascript identifiers</span>
-</span><span id="242" class="l"><a href="#242">242: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-quote">'/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i'</span>, <span class="php-var">$callback</span>))
-</span><span id="243" class="l"><a href="#243">243: </a>        {
-</span><span id="244" class="l"><a href="#244">244: </a>            <span class="php-comment">// this is a jsonp request, the content-type must be updated to be text/javascript</span>
-</span><span id="245" class="l"><a href="#245">245: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">&quot;Content-Type: application/javascript&quot;</span>);
-</span><span id="246" class="l"><a href="#246">246: </a>            <span class="php-keyword1">return</span> <span class="php-var">$callback</span> . <span class="php-quote">&quot;(&quot;</span> . <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_data) . <span class="php-quote">&quot;);&quot;</span>;
+</span><span id="188" class="l"><a href="#188">188: </a>                <span class="php-keyword1">foreach</span> (<span class="php-var">$attributes</span> <span class="php-keyword1">as</span> <span class="php-var">$attributeName</span> =&gt; <span class="php-var">$attributeValue</span>)
+</span><span id="189" class="l"><a href="#189">189: </a>                {
+</span><span id="190" class="l"><a href="#190">190: </a>                    <span class="php-var">$structure</span>-&gt;addAttribute(<span class="php-var">$attributeName</span>, <span class="php-var">$attributeValue</span>);
+</span><span id="191" class="l"><a href="#191">191: </a>                }
+</span><span id="192" class="l"><a href="#192">192: </a>            }
+</span><span id="193" class="l"><a href="#193">193: </a>            <span class="php-comment">// if there is another array found recursively call this function</span>
+</span><span id="194" class="l"><a href="#194">194: </a>            <span class="php-keyword1">elseif</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>))
+</span><span id="195" class="l"><a href="#195">195: </a>            {
+</span><span id="196" class="l"><a href="#196">196: </a>                <span class="php-var">$node</span> = <span class="php-var">$structure</span>-&gt;addChild(<span class="php-var">$key</span>);
+</span><span id="197" class="l"><a href="#197">197: </a>
+</span><span id="198" class="l"><a href="#198">198: </a>                <span class="php-comment">// recursive call.</span>
+</span><span id="199" class="l"><a href="#199">199: </a>                <span class="php-var">$this</span>-&gt;to_xml(<span class="php-var">$value</span>, <span class="php-var">$node</span>, <span class="php-var">$key</span>);
+</span><span id="200" class="l"><a href="#200">200: </a>            }
+</span><span id="201" class="l"><a href="#201">201: </a>            <span class="php-keyword1">else</span>
+</span><span id="202" class="l"><a href="#202">202: </a>            {
+</span><span id="203" class="l"><a href="#203">203: </a>                <span class="php-comment">// add single node.</span>
+</span><span id="204" class="l"><a href="#204">204: </a>                <span class="php-var">$value</span> = <span class="php-keyword2">htmlspecialchars</span>(<span class="php-keyword2">html_entity_decode</span>(<span class="php-var">$value</span>, ENT_QUOTES, <span class="php-quote">'UTF-8'</span>), ENT_QUOTES, <span class="php-quote">'UTF-8'</span>);
+</span><span id="205" class="l"><a href="#205">205: </a>
+</span><span id="206" class="l"><a href="#206">206: </a>                <span class="php-var">$structure</span>-&gt;addChild(<span class="php-var">$key</span>, <span class="php-var">$value</span>);
+</span><span id="207" class="l"><a href="#207">207: </a>            }
+</span><span id="208" class="l"><a href="#208">208: </a>        }
+</span><span id="209" class="l"><a href="#209">209: </a>
+</span><span id="210" class="l"><a href="#210">210: </a>        <span class="php-keyword1">return</span> <span class="php-var">$structure</span>-&gt;asXML();
+</span><span id="211" class="l"><a href="#211">211: </a>    }
+</span><span id="212" class="l"><a href="#212">212: </a>
+</span><span id="213" class="l"><a href="#213">213: </a>    <span class="php-comment">/**
+</span></span><span id="214" class="l"><a href="#214">214: </a><span class="php-comment">     * Format data as HTML
+</span></span><span id="215" class="l"><a href="#215">215: </a><span class="php-comment">     *
+</span></span><span id="216" class="l"><a href="#216">216: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="217" class="l"><a href="#217">217: </a><span class="php-comment">     * to the constructor
+</span></span><span id="218" class="l"><a href="#218">218: </a><span class="php-comment">     *
+</span></span><span id="219" class="l"><a href="#219">219: </a><span class="php-comment">     * @return mixed
+</span></span><span id="220" class="l"><a href="#220">220: </a><span class="php-comment">     */</span>
+</span><span id="221" class="l"><a href="#221">221: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_html(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="222" class="l"><a href="#222">222: </a>    {
+</span><span id="223" class="l"><a href="#223">223: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="224" class="l"><a href="#224">224: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="225" class="l"><a href="#225">225: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="226" class="l"><a href="#226">226: </a>        {
+</span><span id="227" class="l"><a href="#227">227: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="228" class="l"><a href="#228">228: </a>        }
+</span><span id="229" class="l"><a href="#229">229: </a>
+</span><span id="230" class="l"><a href="#230">230: </a>        <span class="php-comment">// Cast as an array if not already</span>
+</span><span id="231" class="l"><a href="#231">231: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="232" class="l"><a href="#232">232: </a>        {
+</span><span id="233" class="l"><a href="#233">233: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
+</span><span id="234" class="l"><a href="#234">234: </a>        }
+</span><span id="235" class="l"><a href="#235">235: </a>
+</span><span id="236" class="l"><a href="#236">236: </a>        <span class="php-comment">// Multi-dimensional array</span>
+</span><span id="237" class="l"><a href="#237">237: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]) &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]))
+</span><span id="238" class="l"><a href="#238">238: </a>        {
+</span><span id="239" class="l"><a href="#239">239: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]);
+</span><span id="240" class="l"><a href="#240">240: </a>        }
+</span><span id="241" class="l"><a href="#241">241: </a>
+</span><span id="242" class="l"><a href="#242">242: </a>        <span class="php-comment">// Single array</span>
+</span><span id="243" class="l"><a href="#243">243: </a>        <span class="php-keyword1">else</span>
+</span><span id="244" class="l"><a href="#244">244: </a>        {
+</span><span id="245" class="l"><a href="#245">245: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>);
+</span><span id="246" class="l"><a href="#246">246: </a>            <span class="php-var">$data</span> = [<span class="php-var">$data</span>];
 </span><span id="247" class="l"><a href="#247">247: </a>        }
-</span><span id="248" class="l"><a href="#248">248: </a>        <span class="php-keyword1">else</span>
-</span><span id="249" class="l"><a href="#249">249: </a>        {
-</span><span id="250" class="l"><a href="#250">250: </a>            <span class="php-comment">// we have an invalid jsonp callback identifier, we'll return plain json with a warning field</span>
-</span><span id="251" class="l"><a href="#251">251: </a>            <span class="php-var">$this</span>-&gt;_data[<span class="php-quote">'warning'</span>] = <span class="php-quote">&quot;invalid jsonp callback provided: &quot;</span>.<span class="php-var">$callback</span>;
-</span><span id="252" class="l"><a href="#252">252: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_data);
-</span><span id="253" class="l"><a href="#253">253: </a>        }
-</span><span id="254" class="l"><a href="#254">254: </a>    }
-</span><span id="255" class="l"><a href="#255">255: </a>
-</span><span id="256" class="l"><a href="#256">256: </a>    <span class="php-comment">// Encode as Serialized array</span>
-</span><span id="257" class="l"><a href="#257">257: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_serialized()
-</span><span id="258" class="l"><a href="#258">258: </a>    {
-</span><span id="259" class="l"><a href="#259">259: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_data);
-</span><span id="260" class="l"><a href="#260">260: </a>    }
-</span><span id="261" class="l"><a href="#261">261: </a>
-</span><span id="262" class="l"><a href="#262">262: </a>    <span class="php-comment">// Output as a string representing the PHP structure</span>
-</span><span id="263" class="l"><a href="#263">263: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_php()
-</span><span id="264" class="l"><a href="#264">264: </a>    {
-</span><span id="265" class="l"><a href="#265">265: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">var_export</span>(<span class="php-var">$this</span>-&gt;_data, <span class="php-keyword1">TRUE</span>);
-</span><span id="266" class="l"><a href="#266">266: </a>    }
-</span><span id="267" class="l"><a href="#267">267: </a>
-</span><span id="268" class="l"><a href="#268">268: </a>    <span class="php-comment">// Format XML for output</span>
-</span><span id="269" class="l"><a href="#269">269: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_xml(<span class="php-var">$string</span>)
-</span><span id="270" class="l"><a href="#270">270: </a>    {
-</span><span id="271" class="l"><a href="#271">271: </a>        <span class="php-keyword1">return</span> <span class="php-var">$string</span> ? (<span class="php-keyword1">array</span>) <span class="php-keyword2">simplexml_load_string</span>(<span class="php-var">$string</span>, <span class="php-quote">'SimpleXMLElement'</span>, LIBXML_NOCDATA) : <span class="php-keyword1">array</span>();
-</span><span id="272" class="l"><a href="#272">272: </a>    }
-</span><span id="273" class="l"><a href="#273">273: </a>
-</span><span id="274" class="l"><a href="#274">274: </a>    <span class="php-comment">// Format CSV for output</span>
-</span><span id="275" class="l"><a href="#275">275: </a>    <span class="php-comment">// This function is DODGY! Not perfect CSV support but works with my REST_Controller</span>
-</span><span id="276" class="l"><a href="#276">276: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_csv(<span class="php-var">$string</span>)
-</span><span id="277" class="l"><a href="#277">277: </a>    {
-</span><span id="278" class="l"><a href="#278">278: </a>        <span class="php-var">$data</span> = <span class="php-keyword1">array</span>();
+</span><span id="248" class="l"><a href="#248">248: </a>
+</span><span id="249" class="l"><a href="#249">249: </a>        <span class="php-comment">// Load the table library</span>
+</span><span id="250" class="l"><a href="#250">250: </a>        <span class="php-var">$this</span>-&gt;_ci-&gt;load-&gt;library(<span class="php-quote">'table'</span>);
+</span><span id="251" class="l"><a href="#251">251: </a>
+</span><span id="252" class="l"><a href="#252">252: </a>        <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;set_heading(<span class="php-var">$headings</span>);
+</span><span id="253" class="l"><a href="#253">253: </a>
+</span><span id="254" class="l"><a href="#254">254: </a>        <span class="php-comment">// Should row used as a reference?</span>
+</span><span id="255" class="l"><a href="#255">255: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$row</span>)
+</span><span id="256" class="l"><a href="#256">256: </a>        {
+</span><span id="257" class="l"><a href="#257">257: </a>            <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;add_row(<span class="php-var">$row</span>);
+</span><span id="258" class="l"><a href="#258">258: </a>        }
+</span><span id="259" class="l"><a href="#259">259: </a>
+</span><span id="260" class="l"><a href="#260">260: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;generate();
+</span><span id="261" class="l"><a href="#261">261: </a>    }
+</span><span id="262" class="l"><a href="#262">262: </a>
+</span><span id="263" class="l"><a href="#263">263: </a>    <span class="php-comment">/**
+</span></span><span id="264" class="l"><a href="#264">264: </a><span class="php-comment">     * Format data as CSV
+</span></span><span id="265" class="l"><a href="#265">265: </a><span class="php-comment">     *
+</span></span><span id="266" class="l"><a href="#266">266: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="267" class="l"><a href="#267">267: </a><span class="php-comment">     * to the constructor
+</span></span><span id="268" class="l"><a href="#268">268: </a><span class="php-comment">     *
+</span></span><span id="269" class="l"><a href="#269">269: </a><span class="php-comment">     * @return mixed
+</span></span><span id="270" class="l"><a href="#270">270: </a><span class="php-comment">     */</span>
+</span><span id="271" class="l"><a href="#271">271: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_csv(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="272" class="l"><a href="#272">272: </a>    {
+</span><span id="273" class="l"><a href="#273">273: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="274" class="l"><a href="#274">274: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="275" class="l"><a href="#275">275: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="276" class="l"><a href="#276">276: </a>        {
+</span><span id="277" class="l"><a href="#277">277: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="278" class="l"><a href="#278">278: </a>        }
 </span><span id="279" class="l"><a href="#279">279: </a>
-</span><span id="280" class="l"><a href="#280">280: </a>        <span class="php-comment">// Splits</span>
-</span><span id="281" class="l"><a href="#281">281: </a>        <span class="php-var">$rows</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">&quot;\n&quot;</span>, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>));
-</span><span id="282" class="l"><a href="#282">282: </a>        <span class="php-var">$headings</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-keyword2">array_shift</span>(<span class="php-var">$rows</span>));
-</span><span id="283" class="l"><a href="#283">283: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$rows</span> <span class="php-keyword1">as</span> <span class="php-var">$row</span>)
-</span><span id="284" class="l"><a href="#284">284: </a>        {
-</span><span id="285" class="l"><a href="#285">285: </a>            <span class="php-comment">// The substr removes &quot; from start and end</span>
-</span><span id="286" class="l"><a href="#286">286: </a>            <span class="php-var">$data_fields</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">'&quot;,&quot;'</span>, <span class="php-keyword2">trim</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$row</span>, <span class="php-num">1</span>, -<span class="php-num">1</span>)));
-</span><span id="287" class="l"><a href="#287">287: </a>
-</span><span id="288" class="l"><a href="#288">288: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">count</span>(<span class="php-var">$data_fields</span>) == <span class="php-keyword2">count</span>(<span class="php-var">$headings</span>))
-</span><span id="289" class="l"><a href="#289">289: </a>            {
-</span><span id="290" class="l"><a href="#290">290: </a>                <span class="php-var">$data</span>[] = <span class="php-keyword2">array_combine</span>(<span class="php-var">$headings</span>, <span class="php-var">$data_fields</span>);
-</span><span id="291" class="l"><a href="#291">291: </a>            }
-</span><span id="292" class="l"><a href="#292">292: </a>        }
-</span><span id="293" class="l"><a href="#293">293: </a>
-</span><span id="294" class="l"><a href="#294">294: </a>        <span class="php-keyword1">return</span> <span class="php-var">$data</span>;
-</span><span id="295" class="l"><a href="#295">295: </a>    }
-</span><span id="296" class="l"><a href="#296">296: </a>
-</span><span id="297" class="l"><a href="#297">297: </a>    <span class="php-comment">// Encode as JSON</span>
-</span><span id="298" class="l"><a href="#298">298: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _from_json(<span class="php-var">$string</span>)
-</span><span id="299" class="l"><a href="#299">299: </a>    {
-</span><span id="300" class="l"><a href="#300">300: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_decode</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$string</span>));
-</span><span id="301" class="l"><a href="#301">301: </a>    }
-</span><span id="302" class="l"><a href="#302">302: </a>
-</span><span id="303" class="l"><a href="#303">303: </a>    <span class="php-comment">// Encode as Serialized array</span>
-</span><span id="304" class="l"><a href="#304">304: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _from_serialize(<span class="php-var">$string</span>)
-</span><span id="305" class="l"><a href="#305">305: </a>    {
-</span><span id="306" class="l"><a href="#306">306: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">unserialize</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$string</span>));
+</span><span id="280" class="l"><a href="#280">280: </a>        <span class="php-comment">// Cast as an array if not already</span>
+</span><span id="281" class="l"><a href="#281">281: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="282" class="l"><a href="#282">282: </a>        {
+</span><span id="283" class="l"><a href="#283">283: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
+</span><span id="284" class="l"><a href="#284">284: </a>        }
+</span><span id="285" class="l"><a href="#285">285: </a>
+</span><span id="286" class="l"><a href="#286">286: </a>        <span class="php-comment">// Multi-dimensional array</span>
+</span><span id="287" class="l"><a href="#287">287: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]) &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]))
+</span><span id="288" class="l"><a href="#288">288: </a>        {
+</span><span id="289" class="l"><a href="#289">289: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]);
+</span><span id="290" class="l"><a href="#290">290: </a>        }
+</span><span id="291" class="l"><a href="#291">291: </a>
+</span><span id="292" class="l"><a href="#292">292: </a>        <span class="php-comment">// Single array</span>
+</span><span id="293" class="l"><a href="#293">293: </a>        <span class="php-keyword1">else</span>
+</span><span id="294" class="l"><a href="#294">294: </a>        {
+</span><span id="295" class="l"><a href="#295">295: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>);
+</span><span id="296" class="l"><a href="#296">296: </a>            <span class="php-var">$data</span> = [<span class="php-var">$data</span>];
+</span><span id="297" class="l"><a href="#297">297: </a>        }
+</span><span id="298" class="l"><a href="#298">298: </a>
+</span><span id="299" class="l"><a href="#299">299: </a>        <span class="php-var">$output</span> = <span class="php-quote">'&quot;'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'&quot;,&quot;'</span>, <span class="php-var">$headings</span>) . <span class="php-quote">'&quot;'</span> . PHP_EOL;
+</span><span id="300" class="l"><a href="#300">300: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$row</span>)
+</span><span id="301" class="l"><a href="#301">301: </a>        {
+</span><span id="302" class="l"><a href="#302">302: </a>            <span class="php-var">$row</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'&quot;'</span>, <span class="php-quote">'&quot;&quot;'</span>, <span class="php-var">$row</span>); <span class="php-comment">// Escape dbl quotes per RFC 4180</span>
+</span><span id="303" class="l"><a href="#303">303: </a>            <span class="php-var">$output</span> .= <span class="php-quote">'&quot;'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'&quot;,&quot;'</span>, <span class="php-var">$row</span>) . <span class="php-quote">'&quot;'</span> . PHP_EOL;
+</span><span id="304" class="l"><a href="#304">304: </a>        }
+</span><span id="305" class="l"><a href="#305">305: </a>
+</span><span id="306" class="l"><a href="#306">306: </a>        <span class="php-keyword1">return</span> <span class="php-var">$output</span>;
 </span><span id="307" class="l"><a href="#307">307: </a>    }
 </span><span id="308" class="l"><a href="#308">308: </a>
-</span><span id="309" class="l"><a href="#309">309: </a>    <span class="php-comment">// If you provide text/plain value on the Content-type header on a request</span>
-</span><span id="310" class="l"><a href="#310">310: </a>    <span class="php-comment">// just return the string</span>
-</span><span id="311" class="l"><a href="#311">311: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _from_php(<span class="php-var">$string</span>)
-</span><span id="312" class="l"><a href="#312">312: </a>    {
-</span><span id="313" class="l"><a href="#313">313: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>);
-</span><span id="314" class="l"><a href="#314">314: </a>    }
-</span><span id="315" class="l"><a href="#315">315: </a>
-</span><span id="316" class="l"><a href="#316">316: </a>}
-</span><span id="317" class="l"><a href="#317">317: </a>
-</span><span id="318" class="l"><a href="#318">318: </a><span class="php-comment">/* End of file format.php */</span>
-</span><span id="319" class="l"><a href="#319">319: </a></span></code></pre>
+</span><span id="309" class="l"><a href="#309">309: </a>    <span class="php-comment">/**
+</span></span><span id="310" class="l"><a href="#310">310: </a><span class="php-comment">     * Encode data as json
+</span></span><span id="311" class="l"><a href="#311">311: </a><span class="php-comment">     *
+</span></span><span id="312" class="l"><a href="#312">312: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="313" class="l"><a href="#313">313: </a><span class="php-comment">     * to the constructor
+</span></span><span id="314" class="l"><a href="#314">314: </a><span class="php-comment">     *
+</span></span><span id="315" class="l"><a href="#315">315: </a><span class="php-comment">     * @return string Json representation of a value
+</span></span><span id="316" class="l"><a href="#316">316: </a><span class="php-comment">     */</span>
+</span><span id="317" class="l"><a href="#317">317: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_json(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="318" class="l"><a href="#318">318: </a>    {
+</span><span id="319" class="l"><a href="#319">319: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="320" class="l"><a href="#320">320: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="321" class="l"><a href="#321">321: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="322" class="l"><a href="#322">322: </a>        {
+</span><span id="323" class="l"><a href="#323">323: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="324" class="l"><a href="#324">324: </a>        }
+</span><span id="325" class="l"><a href="#325">325: </a>
+</span><span id="326" class="l"><a href="#326">326: </a>        <span class="php-comment">// Get the callback parameter (if set)</span>
+</span><span id="327" class="l"><a href="#327">327: </a>        <span class="php-var">$callback</span> = <span class="php-var">$this</span>-&gt;_ci-&gt;input-&gt;get(<span class="php-quote">'callback'</span>);
+</span><span id="328" class="l"><a href="#328">328: </a>
+</span><span id="329" class="l"><a href="#329">329: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$callback</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="330" class="l"><a href="#330">330: </a>        {
+</span><span id="331" class="l"><a href="#331">331: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
+</span><span id="332" class="l"><a href="#332">332: </a>        }
+</span><span id="333" class="l"><a href="#333">333: </a>
+</span><span id="334" class="l"><a href="#334">334: </a>        <span class="php-comment">// We only honour a jsonp callback which are valid javascript identifiers</span>
+</span><span id="335" class="l"><a href="#335">335: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">preg_match</span>(<span class="php-quote">'/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i'</span>, <span class="php-var">$callback</span>))
+</span><span id="336" class="l"><a href="#336">336: </a>        {
+</span><span id="337" class="l"><a href="#337">337: </a>            <span class="php-comment">// Return the data as encoded json with a callback</span>
+</span><span id="338" class="l"><a href="#338">338: </a>            <span class="php-keyword1">return</span> <span class="php-var">$callback</span> . <span class="php-quote">'('</span> . <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>) . <span class="php-quote">');'</span>;
+</span><span id="339" class="l"><a href="#339">339: </a>        }
+</span><span id="340" class="l"><a href="#340">340: </a>
+</span><span id="341" class="l"><a href="#341">341: </a>        <span class="php-comment">// An invalid jsonp callback function provided.</span>
+</span><span id="342" class="l"><a href="#342">342: </a>        <span class="php-comment">// Though I don't believe this should be hardcoded here</span>
+</span><span id="343" class="l"><a href="#343">343: </a>        <span class="php-var">$data</span>[<span class="php-quote">'warning'</span>] = <span class="php-quote">'INVALID JSONP CALLBACK: '</span> . <span class="php-var">$callback</span>;
+</span><span id="344" class="l"><a href="#344">344: </a>
+</span><span id="345" class="l"><a href="#345">345: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
+</span><span id="346" class="l"><a href="#346">346: </a>    }
+</span><span id="347" class="l"><a href="#347">347: </a>
+</span><span id="348" class="l"><a href="#348">348: </a>    <span class="php-comment">/**
+</span></span><span id="349" class="l"><a href="#349">349: </a><span class="php-comment">     * Encode data as a serialized array
+</span></span><span id="350" class="l"><a href="#350">350: </a><span class="php-comment">     *
+</span></span><span id="351" class="l"><a href="#351">351: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="352" class="l"><a href="#352">352: </a><span class="php-comment">     * to the constructor
+</span></span><span id="353" class="l"><a href="#353">353: </a><span class="php-comment">     *
+</span></span><span id="354" class="l"><a href="#354">354: </a><span class="php-comment">     * @return string Serialized data
+</span></span><span id="355" class="l"><a href="#355">355: </a><span class="php-comment">     */</span>
+</span><span id="356" class="l"><a href="#356">356: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_serialized(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="357" class="l"><a href="#357">357: </a>    {
+</span><span id="358" class="l"><a href="#358">358: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="359" class="l"><a href="#359">359: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="360" class="l"><a href="#360">360: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="361" class="l"><a href="#361">361: </a>        {
+</span><span id="362" class="l"><a href="#362">362: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="363" class="l"><a href="#363">363: </a>        }
+</span><span id="364" class="l"><a href="#364">364: </a>
+</span><span id="365" class="l"><a href="#365">365: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">serialize</span>(<span class="php-var">$data</span>);
+</span><span id="366" class="l"><a href="#366">366: </a>    }
+</span><span id="367" class="l"><a href="#367">367: </a>
+</span><span id="368" class="l"><a href="#368">368: </a>    <span class="php-comment">/**
+</span></span><span id="369" class="l"><a href="#369">369: </a><span class="php-comment">     * Format data using a PHP structure
+</span></span><span id="370" class="l"><a href="#370">370: </a><span class="php-comment">     *
+</span></span><span id="371" class="l"><a href="#371">371: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="372" class="l"><a href="#372">372: </a><span class="php-comment">     * to the constructor
+</span></span><span id="373" class="l"><a href="#373">373: </a><span class="php-comment">     *
+</span></span><span id="374" class="l"><a href="#374">374: </a><span class="php-comment">     * @return mixed String representation of a variable
+</span></span><span id="375" class="l"><a href="#375">375: </a><span class="php-comment">     */</span>
+</span><span id="376" class="l"><a href="#376">376: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_php(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="377" class="l"><a href="#377">377: </a>    {
+</span><span id="378" class="l"><a href="#378">378: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="379" class="l"><a href="#379">379: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="380" class="l"><a href="#380">380: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="381" class="l"><a href="#381">381: </a>        {
+</span><span id="382" class="l"><a href="#382">382: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="383" class="l"><a href="#383">383: </a>        }
+</span><span id="384" class="l"><a href="#384">384: </a>
+</span><span id="385" class="l"><a href="#385">385: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">var_export</span>(<span class="php-var">$data</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="386" class="l"><a href="#386">386: </a>    }
+</span><span id="387" class="l"><a href="#387">387: </a>
+</span><span id="388" class="l"><a href="#388">388: </a>    <span class="php-comment">// INTERNAL FUNCTIONS</span>
+</span><span id="389" class="l"><a href="#389">389: </a>
+</span><span id="390" class="l"><a href="#390">390: </a>    <span class="php-comment">/**
+</span></span><span id="391" class="l"><a href="#391">391: </a><span class="php-comment">     * @param $data XML string
+</span></span><span id="392" class="l"><a href="#392">392: </a><span class="php-comment">     *
+</span></span><span id="393" class="l"><a href="#393">393: </a><span class="php-comment">     * @return SimpleXMLElement XML element object; otherwise, empty array
+</span></span><span id="394" class="l"><a href="#394">394: </a><span class="php-comment">     */</span>
+</span><span id="395" class="l"><a href="#395">395: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_xml(<span class="php-var">$data</span>)
+</span><span id="396" class="l"><a href="#396">396: </a>    {
+</span><span id="397" class="l"><a href="#397">397: </a>        <span class="php-keyword1">return</span> <span class="php-var">$data</span> ? (<span class="php-keyword1">array</span>) <span class="php-keyword2">simplexml_load_string</span>(<span class="php-var">$data</span>, <span class="php-quote">'SimpleXMLElement'</span>, LIBXML_NOCDATA) : [];
+</span><span id="398" class="l"><a href="#398">398: </a>    }
+</span><span id="399" class="l"><a href="#399">399: </a>
+</span><span id="400" class="l"><a href="#400">400: </a>    <span class="php-comment">/**
+</span></span><span id="401" class="l"><a href="#401">401: </a><span class="php-comment">     * @param string $data CSV string
+</span></span><span id="402" class="l"><a href="#402">402: </a><span class="php-comment">     *
+</span></span><span id="403" class="l"><a href="#403">403: </a><span class="php-comment">     * @return array A multi-dimensional array with the outer array being the number of rows
+</span></span><span id="404" class="l"><a href="#404">404: </a><span class="php-comment">     * and the inner arrays the individual fields
+</span></span><span id="405" class="l"><a href="#405">405: </a><span class="php-comment">     */</span>
+</span><span id="406" class="l"><a href="#406">406: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_csv(<span class="php-var">$data</span>)
+</span><span id="407" class="l"><a href="#407">407: </a>    {
+</span><span id="408" class="l"><a href="#408">408: </a>        <span class="php-var">$array</span> = [];
+</span><span id="409" class="l"><a href="#409">409: </a>
+</span><span id="410" class="l"><a href="#410">410: </a>        <span class="php-comment">// Splits</span>
+</span><span id="411" class="l"><a href="#411">411: </a>        <span class="php-var">$rows</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">&quot;\n&quot;</span>, <span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
+</span><span id="412" class="l"><a href="#412">412: </a>        <span class="php-var">$headings</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-keyword2">array_shift</span>(<span class="php-var">$rows</span>));
+</span><span id="413" class="l"><a href="#413">413: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$rows</span> <span class="php-keyword1">as</span> <span class="php-var">$row</span>)
+</span><span id="414" class="l"><a href="#414">414: </a>        {
+</span><span id="415" class="l"><a href="#415">415: </a>            <span class="php-comment">// The substr removes &quot; from start and end</span>
+</span><span id="416" class="l"><a href="#416">416: </a>            <span class="php-var">$data_fields</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">'&quot;,&quot;'</span>, <span class="php-keyword2">trim</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$row</span>, <span class="php-num">1</span>, -<span class="php-num">1</span>)));
+</span><span id="417" class="l"><a href="#417">417: </a>
+</span><span id="418" class="l"><a href="#418">418: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">count</span>(<span class="php-var">$data_fields</span>) === <span class="php-keyword2">count</span>(<span class="php-var">$headings</span>))
+</span><span id="419" class="l"><a href="#419">419: </a>            {
+</span><span id="420" class="l"><a href="#420">420: </a>                <span class="php-var">$array</span>[] = <span class="php-keyword2">array_combine</span>(<span class="php-var">$headings</span>, <span class="php-var">$data_fields</span>);
+</span><span id="421" class="l"><a href="#421">421: </a>            }
+</span><span id="422" class="l"><a href="#422">422: </a>        }
+</span><span id="423" class="l"><a href="#423">423: </a>
+</span><span id="424" class="l"><a href="#424">424: </a>        <span class="php-keyword1">return</span> <span class="php-var">$array</span>;
+</span><span id="425" class="l"><a href="#425">425: </a>    }
+</span><span id="426" class="l"><a href="#426">426: </a>
+</span><span id="427" class="l"><a href="#427">427: </a>    <span class="php-comment">/**
+</span></span><span id="428" class="l"><a href="#428">428: </a><span class="php-comment">     * @param $data Encoded json string
+</span></span><span id="429" class="l"><a href="#429">429: </a><span class="php-comment">     *
+</span></span><span id="430" class="l"><a href="#430">430: </a><span class="php-comment">     * @return mixed Decoded json string with leading and trailing whitespace removed
+</span></span><span id="431" class="l"><a href="#431">431: </a><span class="php-comment">     */</span>
+</span><span id="432" class="l"><a href="#432">432: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_json(<span class="php-var">$data</span>)
+</span><span id="433" class="l"><a href="#433">433: </a>    {
+</span><span id="434" class="l"><a href="#434">434: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_decode</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
+</span><span id="435" class="l"><a href="#435">435: </a>    }
+</span><span id="436" class="l"><a href="#436">436: </a>
+</span><span id="437" class="l"><a href="#437">437: </a>    <span class="php-comment">/**
+</span></span><span id="438" class="l"><a href="#438">438: </a><span class="php-comment">     * @param string Data to unserialized
+</span></span><span id="439" class="l"><a href="#439">439: </a><span class="php-comment">     *
+</span></span><span id="440" class="l"><a href="#440">440: </a><span class="php-comment">     * @return mixed Unserialized data
+</span></span><span id="441" class="l"><a href="#441">441: </a><span class="php-comment">     */</span>
+</span><span id="442" class="l"><a href="#442">442: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_serialize(<span class="php-var">$data</span>)
+</span><span id="443" class="l"><a href="#443">443: </a>    {
+</span><span id="444" class="l"><a href="#444">444: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">unserialize</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
+</span><span id="445" class="l"><a href="#445">445: </a>    }
+</span><span id="446" class="l"><a href="#446">446: </a>
+</span><span id="447" class="l"><a href="#447">447: </a>    <span class="php-comment">/**
+</span></span><span id="448" class="l"><a href="#448">448: </a><span class="php-comment">     * @param $data Data to trim leading and trailing whitespace
+</span></span><span id="449" class="l"><a href="#449">449: </a><span class="php-comment">     *
+</span></span><span id="450" class="l"><a href="#450">450: </a><span class="php-comment">     * @return string Data with leading and trailing whitespace removed
+</span></span><span id="451" class="l"><a href="#451">451: </a><span class="php-comment">     */</span>
+</span><span id="452" class="l"><a href="#452">452: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_php(<span class="php-var">$data</span>)
+</span><span id="453" class="l"><a href="#453">453: </a>    {
+</span><span id="454" class="l"><a href="#454">454: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">trim</span>(<span class="php-var">$data</span>);
+</span><span id="455" class="l"><a href="#455">455: </a>    }
+</span><span id="456" class="l"><a href="#456">456: </a>
+</span><span id="457" class="l"><a href="#457">457: </a>}
+</span><span id="458" class="l"><a href="#458">458: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
@@ -420,6 +554,6 @@ <h3>Functions</h3>
 </div>
 </div>
 <script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
-<script src="http://github.com/elementlist.js?a84266a83a9e4e19c2425432aca8ea8439364f92"></script>
+<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Key.html b/documentation/source-class-Key.html
index f8223e28..d47c058c 100644
--- a/documentation/source-class-Key.html
+++ b/documentation/source-class-Key.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<meta name="robots" content="noindex">
 
-	<title>File application/controllers/api/key.php</title>
+	<title>File application/controllers/api/Key.php</title>
 
 	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
 
@@ -29,6 +29,11 @@ <h3>Packages</h3>
 					<a href="http://github.com/package-CodeIgniter.Libraries.html">
 						Libraries					</a>
 
+						</li>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
 						</li>
 							</ul></li>
 				<li class="active">
@@ -52,10 +57,6 @@ <h3>Classes</h3>
 
 
 
-			<h3>Functions</h3>
-			<ul>
-				<li class="active"><a href="http://github.com/function-_perform_ldap_auth.html">_perform_ldap_auth</a></li>
-			</ul>
 		</div>
 	</div>
 </div>
@@ -79,273 +80,303 @@ <h3>Functions</h3>
 				<a href="http://github.com/package-None.html" title="Summary of None"><span>Package</span></a>
 			</li>
 			<li>
-				<a href="http://github.com/function-_perform_ldap_auth.html" title="Summary of _perform_ldap_auth"><span>Function</span></a>
+				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
 			</li>
 		</ul>
 		<ul>
-			<li>
-				<a href="http://github.com/tree.html" title="Tree view of classes, interfaces, traits and exceptions"><span>Tree</span></a>
-			</li>
-			<li>
-				<a href="http://github.com/todo.html" title="Todo list"><span>Todo</span></a>
-			</li>
 		</ul>
 		<ul>
 		</ul>
 	</div>
 
-<pre><code><span id="1" class="l"><a href="#1">  1: </a><span class="xlang">&lt;?php</span> <span class="php-keyword2">defined</span>(<span class="php-quote">'BASEPATH'</span>) <span class="php-keyword1">OR</span> <span class="php-keyword1">exit</span>(<span class="php-quote">'No direct script access allowed'</span>);
+<pre><code><span id="1" class="l"><a href="#1">  1: </a><span class="xlang">&lt;?php</span>
 </span><span id="2" class="l"><a href="#2">  2: </a>
-</span><span id="3" class="l"><a href="#3">  3: </a><span class="php-comment">/**
-</span></span><span id="4" class="l"><a href="#4">  4: </a><span class="php-comment"> * Keys Controller
-</span></span><span id="5" class="l"><a href="#5">  5: </a><span class="php-comment"> *
-</span></span><span id="6" class="l"><a href="#6">  6: </a><span class="php-comment"> * This is a basic Key Management REST controller to make and delete keys.
-</span></span><span id="7" class="l"><a href="#7">  7: </a><span class="php-comment"> *
-</span></span><span id="8" class="l"><a href="#8">  8: </a><span class="php-comment"> * @package     CodeIgniter
-</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment"> * @subpackage  Rest Server
-</span></span><span id="10" class="l"><a href="#10"> 10: </a><span class="php-comment"> * @category    Controller
-</span></span><span id="11" class="l"><a href="#11"> 11: </a><span class="php-comment"> * @author      Phil Sturgeon
-</span></span><span id="12" class="l"><a href="#12"> 12: </a><span class="php-comment"> * @link        http://philsturgeon.co.uk/code/
-</span></span><span id="13" class="l"><a href="#13"> 13: </a><span class="php-comment">*/</span>
-</span><span id="14" class="l"><a href="#14"> 14: </a>
-</span><span id="15" class="l"><a href="#15"> 15: </a><span class="php-comment">// This can be removed if you use __autoload() in config.php</span>
-</span><span id="16" class="l"><a href="#16"> 16: </a><span class="php-keyword1">require</span>(APPPATH.<span class="php-quote">'/libraries/REST_Controller.php'</span>);
-</span><span id="17" class="l"><a href="#17"> 17: </a>
-</span><span id="18" class="l"><a href="#18"> 18: </a><span class="php-keyword1">class</span> <span class="php-keyword2">Key</span> <span class="php-keyword1">extends</span> REST_Controller
-</span><span id="19" class="l"><a href="#19"> 19: </a>{
-</span><span id="20" class="l"><a href="#20"> 20: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$methods</span> = <span class="php-keyword1">array</span>(
-</span><span id="21" class="l"><a href="#21"> 21: </a>        <span class="php-quote">'index_put'</span> =&gt; <span class="php-keyword1">array</span>(<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>, <span class="php-quote">'limit'</span> =&gt; <span class="php-num">10</span>),
-</span><span id="22" class="l"><a href="#22"> 22: </a>        <span class="php-quote">'index_delete'</span> =&gt; <span class="php-keyword1">array</span>(<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>),
-</span><span id="23" class="l"><a href="#23"> 23: </a>        <span class="php-quote">'level_post'</span> =&gt; <span class="php-keyword1">array</span>(<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>),
-</span><span id="24" class="l"><a href="#24"> 24: </a>        <span class="php-quote">'regenerate_post'</span> =&gt; <span class="php-keyword1">array</span>(<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>),
-</span><span id="25" class="l"><a href="#25"> 25: </a>    );
-</span><span id="26" class="l"><a href="#26"> 26: </a>
-</span><span id="27" class="l"><a href="#27"> 27: </a>    <span class="php-comment">/**
-</span></span><span id="28" class="l"><a href="#28"> 28: </a><span class="php-comment">     * Key Create
-</span></span><span id="29" class="l"><a href="#29"> 29: </a><span class="php-comment">     *
-</span></span><span id="30" class="l"><a href="#30"> 30: </a><span class="php-comment">     * Insert a key into the database.
+</span><span id="3" class="l"><a href="#3">  3: </a><span class="php-keyword2">defined</span>(<span class="php-quote">'BASEPATH'</span>) <span class="php-keyword1">OR</span> <span class="php-keyword1">exit</span>(<span class="php-quote">'No direct script access allowed'</span>);
+</span><span id="4" class="l"><a href="#4">  4: </a>
+</span><span id="5" class="l"><a href="#5">  5: </a><span class="php-comment">// This can be removed if you use __autoload() in config.php OR use Modular Extensions</span>
+</span><span id="6" class="l"><a href="#6">  6: </a><span class="php-keyword1">require</span> APPPATH . <span class="php-quote">'/libraries/REST_Controller.php'</span>;
+</span><span id="7" class="l"><a href="#7">  7: </a>
+</span><span id="8" class="l"><a href="#8">  8: </a><span class="php-comment">/**
+</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment"> * Keys Controller
+</span></span><span id="10" class="l"><a href="#10"> 10: </a><span class="php-comment"> * This is a basic Key Management REST controller to make and delete keys
+</span></span><span id="11" class="l"><a href="#11"> 11: </a><span class="php-comment"> *
+</span></span><span id="12" class="l"><a href="#12"> 12: </a><span class="php-comment"> * @package         CodeIgniter
+</span></span><span id="13" class="l"><a href="#13"> 13: </a><span class="php-comment"> * @subpackage      Rest Server
+</span></span><span id="14" class="l"><a href="#14"> 14: </a><span class="php-comment"> * @category        Controller
+</span></span><span id="15" class="l"><a href="#15"> 15: </a><span class="php-comment"> * @author          Phil Sturgeon, Chris Kacerguis
+</span></span><span id="16" class="l"><a href="#16"> 16: </a><span class="php-comment"> * @license         MIT
+</span></span><span id="17" class="l"><a href="#17"> 17: </a><span class="php-comment"> * @link            https://github.com/chriskacerguis/codeigniter-restserver
+</span></span><span id="18" class="l"><a href="#18"> 18: </a><span class="php-comment"> */</span>
+</span><span id="19" class="l"><a href="#19"> 19: </a><span class="php-keyword1">class</span> <span class="php-keyword2">Key</span> <span class="php-keyword1">extends</span> REST_Controller {
+</span><span id="20" class="l"><a href="#20"> 20: </a>
+</span><span id="21" class="l"><a href="#21"> 21: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$methods</span> = [
+</span><span id="22" class="l"><a href="#22"> 22: </a>            <span class="php-quote">'index_put'</span> =&gt; [<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>, <span class="php-quote">'limit'</span> =&gt; <span class="php-num">10</span>],
+</span><span id="23" class="l"><a href="#23"> 23: </a>            <span class="php-quote">'index_delete'</span> =&gt; [<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>],
+</span><span id="24" class="l"><a href="#24"> 24: </a>            <span class="php-quote">'level_post'</span> =&gt; [<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>],
+</span><span id="25" class="l"><a href="#25"> 25: </a>            <span class="php-quote">'regenerate_post'</span> =&gt; [<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>],
+</span><span id="26" class="l"><a href="#26"> 26: </a>        ];
+</span><span id="27" class="l"><a href="#27"> 27: </a>
+</span><span id="28" class="l"><a href="#28"> 28: </a>    <span class="php-comment">/**
+</span></span><span id="29" class="l"><a href="#29"> 29: </a><span class="php-comment">     * Key Create
+</span></span><span id="30" class="l"><a href="#30"> 30: </a><span class="php-comment">     * Insert a key into the database
 </span></span><span id="31" class="l"><a href="#31"> 31: </a><span class="php-comment">     *
-</span></span><span id="32" class="l"><a href="#32"> 32: </a><span class="php-comment">     * @access  public
-</span></span><span id="33" class="l"><a href="#33"> 33: </a><span class="php-comment">     * @return  void
+</span></span><span id="32" class="l"><a href="#32"> 32: </a><span class="php-comment">     * @access    public
+</span></span><span id="33" class="l"><a href="#33"> 33: </a><span class="php-comment">     * @return    void
 </span></span><span id="34" class="l"><a href="#34"> 34: </a><span class="php-comment">     */</span>
 </span><span id="35" class="l"><a href="#35"> 35: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> index_put()
 </span><span id="36" class="l"><a href="#36"> 36: </a>    {
 </span><span id="37" class="l"><a href="#37"> 37: </a>        <span class="php-comment">// Build a new key</span>
 </span><span id="38" class="l"><a href="#38"> 38: </a>        <span class="php-var">$key</span> = self::_generate_key();
 </span><span id="39" class="l"><a href="#39"> 39: </a>
-</span><span id="40" class="l"><a href="#40"> 40: </a>        <span class="php-comment">// If no key level provided, give them a rubbish one</span>
+</span><span id="40" class="l"><a href="#40"> 40: </a>        <span class="php-comment">// If no key level provided, provide a generic key</span>
 </span><span id="41" class="l"><a href="#41"> 41: </a>        <span class="php-var">$level</span> = <span class="php-var">$this</span>-&gt;put(<span class="php-quote">'level'</span>) ? <span class="php-var">$this</span>-&gt;put(<span class="php-quote">'level'</span>) : <span class="php-num">1</span>;
-</span><span id="42" class="l"><a href="#42"> 42: </a>        <span class="php-var">$ignore_limits</span> = <span class="php-var">$this</span>-&gt;put(<span class="php-quote">'ignore_limits'</span>) ? <span class="php-var">$this</span>-&gt;put(<span class="php-quote">'ignore_limits'</span>) : <span class="php-num">1</span>;
+</span><span id="42" class="l"><a href="#42"> 42: </a>        <span class="php-var">$ignore_limits</span> = <span class="php-keyword2">ctype_digit</span>(<span class="php-var">$this</span>-&gt;put(<span class="php-quote">'ignore_limits'</span>)) ? (int) <span class="php-var">$this</span>-&gt;put(<span class="php-quote">'ignore_limits'</span>) : <span class="php-num">1</span>;
 </span><span id="43" class="l"><a href="#43"> 43: </a>
 </span><span id="44" class="l"><a href="#44"> 44: </a>        <span class="php-comment">// Insert the new key</span>
-</span><span id="45" class="l"><a href="#45"> 45: </a>        <span class="php-keyword1">if</span> (self::_insert_key(<span class="php-var">$key</span>, <span class="php-keyword1">array</span>(<span class="php-quote">'level'</span> =&gt; <span class="php-var">$level</span>, <span class="php-quote">'ignore_limits'</span> =&gt; <span class="php-var">$ignore_limits</span>)))
+</span><span id="45" class="l"><a href="#45"> 45: </a>        <span class="php-keyword1">if</span> (self::_insert_key(<span class="php-var">$key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-var">$level</span>, <span class="php-quote">'ignore_limits'</span> =&gt; <span class="php-var">$ignore_limits</span>]))
 </span><span id="46" class="l"><a href="#46"> 46: </a>        {
-</span><span id="47" class="l"><a href="#47"> 47: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(<span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'key'</span> =&gt; <span class="php-var">$key</span>), <span class="php-num">201</span>); <span class="php-comment">// 201 = Created</span>
-</span><span id="48" class="l"><a href="#48"> 48: </a>        }
-</span><span id="49" class="l"><a href="#49"> 49: </a>
-</span><span id="50" class="l"><a href="#50"> 50: </a>        <span class="php-keyword1">else</span>
-</span><span id="51" class="l"><a href="#51"> 51: </a>        {
-</span><span id="52" class="l"><a href="#52"> 52: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(<span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>, <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not save the key.'</span>), <span class="php-num">500</span>); <span class="php-comment">// 500 = Internal Server Error</span>
-</span><span id="53" class="l"><a href="#53"> 53: </a>        }
-</span><span id="54" class="l"><a href="#54"> 54: </a>    }
-</span><span id="55" class="l"><a href="#55"> 55: </a>
-</span><span id="56" class="l"><a href="#56"> 56: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="57" class="l"><a href="#57"> 57: </a>
-</span><span id="58" class="l"><a href="#58"> 58: </a>    <span class="php-comment">/**
-</span></span><span id="59" class="l"><a href="#59"> 59: </a><span class="php-comment">     * Key Delete
-</span></span><span id="60" class="l"><a href="#60"> 60: </a><span class="php-comment">     *
-</span></span><span id="61" class="l"><a href="#61"> 61: </a><span class="php-comment">     * Remove a key from the database to stop it working.
-</span></span><span id="62" class="l"><a href="#62"> 62: </a><span class="php-comment">     *
-</span></span><span id="63" class="l"><a href="#63"> 63: </a><span class="php-comment">     * @access  public
-</span></span><span id="64" class="l"><a href="#64"> 64: </a><span class="php-comment">     * @return  void
-</span></span><span id="65" class="l"><a href="#65"> 65: </a><span class="php-comment">     */</span>
-</span><span id="66" class="l"><a href="#66"> 66: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> index_delete()
-</span><span id="67" class="l"><a href="#67"> 67: </a>    {
-</span><span id="68" class="l"><a href="#68"> 68: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;<span class="php-keyword2">delete</span>(<span class="php-quote">'key'</span>);
-</span><span id="69" class="l"><a href="#69"> 69: </a>
-</span><span id="70" class="l"><a href="#70"> 70: </a>        <span class="php-comment">// Does this key even exist?</span>
-</span><span id="71" class="l"><a href="#71"> 71: </a>        <span class="php-keyword1">if</span> ( ! self::_key_exists(<span class="php-var">$key</span>))
-</span><span id="72" class="l"><a href="#72"> 72: </a>        {
-</span><span id="73" class="l"><a href="#73"> 73: </a>            <span class="php-comment">// NOOOOOOOOO!</span>
-</span><span id="74" class="l"><a href="#74"> 74: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(<span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>, <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key.'</span>), <span class="php-num">400</span>);
-</span><span id="75" class="l"><a href="#75"> 75: </a>        }
-</span><span id="76" class="l"><a href="#76"> 76: </a>
-</span><span id="77" class="l"><a href="#77"> 77: </a>        <span class="php-comment">// Kill it</span>
-</span><span id="78" class="l"><a href="#78"> 78: </a>        self::_delete_key(<span class="php-var">$key</span>);
-</span><span id="79" class="l"><a href="#79"> 79: </a>
-</span><span id="80" class="l"><a href="#80"> 80: </a>        <span class="php-comment">// Tell em we killed it</span>
-</span><span id="81" class="l"><a href="#81"> 81: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(<span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API Key was deleted.'</span>), <span class="php-num">200</span>);
-</span><span id="82" class="l"><a href="#82"> 82: </a>    }
-</span><span id="83" class="l"><a href="#83"> 83: </a>
-</span><span id="84" class="l"><a href="#84"> 84: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="47" class="l"><a href="#47"> 47: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="48" class="l"><a href="#48"> 48: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
+</span><span id="49" class="l"><a href="#49"> 49: </a>                <span class="php-quote">'key'</span> =&gt; <span class="php-var">$key</span>
+</span><span id="50" class="l"><a href="#50"> 50: </a>            ], <span class="php-num">201</span>); <span class="php-comment">// 201 = Created</span>
+</span><span id="51" class="l"><a href="#51"> 51: </a>        }
+</span><span id="52" class="l"><a href="#52"> 52: </a>        <span class="php-keyword1">else</span>
+</span><span id="53" class="l"><a href="#53"> 53: </a>        {
+</span><span id="54" class="l"><a href="#54"> 54: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="55" class="l"><a href="#55"> 55: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>,
+</span><span id="56" class="l"><a href="#56"> 56: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
+</span><span id="57" class="l"><a href="#57"> 57: </a>            ], <span class="php-num">500</span>); <span class="php-comment">// 500 = Internal Server Error</span>
+</span><span id="58" class="l"><a href="#58"> 58: </a>        }
+</span><span id="59" class="l"><a href="#59"> 59: </a>    }
+</span><span id="60" class="l"><a href="#60"> 60: </a>
+</span><span id="61" class="l"><a href="#61"> 61: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="62" class="l"><a href="#62"> 62: </a>
+</span><span id="63" class="l"><a href="#63"> 63: </a>    <span class="php-comment">/**
+</span></span><span id="64" class="l"><a href="#64"> 64: </a><span class="php-comment">     * Key Delete
+</span></span><span id="65" class="l"><a href="#65"> 65: </a><span class="php-comment">     * Remove a key from the database to stop it working
+</span></span><span id="66" class="l"><a href="#66"> 66: </a><span class="php-comment">     *
+</span></span><span id="67" class="l"><a href="#67"> 67: </a><span class="php-comment">     * @access    public
+</span></span><span id="68" class="l"><a href="#68"> 68: </a><span class="php-comment">     * @return    void
+</span></span><span id="69" class="l"><a href="#69"> 69: </a><span class="php-comment">     */</span>
+</span><span id="70" class="l"><a href="#70"> 70: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> index_delete()
+</span><span id="71" class="l"><a href="#71"> 71: </a>    {
+</span><span id="72" class="l"><a href="#72"> 72: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;<span class="php-keyword2">delete</span>(<span class="php-quote">'key'</span>);
+</span><span id="73" class="l"><a href="#73"> 73: </a>
+</span><span id="74" class="l"><a href="#74"> 74: </a>        <span class="php-comment">// Does this key exist?</span>
+</span><span id="75" class="l"><a href="#75"> 75: </a>        <span class="php-keyword1">if</span> (!self::_key_exists(<span class="php-var">$key</span>))
+</span><span id="76" class="l"><a href="#76"> 76: </a>        {
+</span><span id="77" class="l"><a href="#77"> 77: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
+</span><span id="78" class="l"><a href="#78"> 78: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="79" class="l"><a href="#79"> 79: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key'</span>
+</span><span id="80" class="l"><a href="#80"> 80: </a>            ], <span class="php-num">400</span>); <span class="php-comment">// 400 = Bad Request</span>
+</span><span id="81" class="l"><a href="#81"> 81: </a>        }
+</span><span id="82" class="l"><a href="#82"> 82: </a>
+</span><span id="83" class="l"><a href="#83"> 83: </a>        <span class="php-comment">// Destroy it</span>
+</span><span id="84" class="l"><a href="#84"> 84: </a>        self::_delete_key(<span class="php-var">$key</span>);
 </span><span id="85" class="l"><a href="#85"> 85: </a>
-</span><span id="86" class="l"><a href="#86"> 86: </a>    <span class="php-comment">/**
-</span></span><span id="87" class="l"><a href="#87"> 87: </a><span class="php-comment">     * Update Key
-</span></span><span id="88" class="l"><a href="#88"> 88: </a><span class="php-comment">     *
-</span></span><span id="89" class="l"><a href="#89"> 89: </a><span class="php-comment">     * Change the level
-</span></span><span id="90" class="l"><a href="#90"> 90: </a><span class="php-comment">     *
-</span></span><span id="91" class="l"><a href="#91"> 91: </a><span class="php-comment">     * @access  public
-</span></span><span id="92" class="l"><a href="#92"> 92: </a><span class="php-comment">     * @return  void
-</span></span><span id="93" class="l"><a href="#93"> 93: </a><span class="php-comment">     */</span>
-</span><span id="94" class="l"><a href="#94"> 94: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> level_post()
-</span><span id="95" class="l"><a href="#95"> 95: </a>    {
-</span><span id="96" class="l"><a href="#96"> 96: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
-</span><span id="97" class="l"><a href="#97"> 97: </a>        <span class="php-var">$new_level</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'level'</span>);
-</span><span id="98" class="l"><a href="#98"> 98: </a>
-</span><span id="99" class="l"><a href="#99"> 99: </a>        <span class="php-comment">// Does this key even exist?</span>
-</span><span id="100" class="l"><a href="#100">100: </a>        <span class="php-keyword1">if</span> ( ! self::_key_exists(<span class="php-var">$key</span>))
-</span><span id="101" class="l"><a href="#101">101: </a>        {
-</span><span id="102" class="l"><a href="#102">102: </a>            <span class="php-comment">// NOOOOOOOOO!</span>
-</span><span id="103" class="l"><a href="#103">103: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(<span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key.'</span>), <span class="php-num">400</span>);
-</span><span id="104" class="l"><a href="#104">104: </a>        }
-</span><span id="105" class="l"><a href="#105">105: </a>
-</span><span id="106" class="l"><a href="#106">106: </a>        <span class="php-comment">// Update the key level</span>
-</span><span id="107" class="l"><a href="#107">107: </a>        <span class="php-keyword1">if</span> (self::_update_key(<span class="php-var">$key</span>, <span class="php-keyword1">array</span>(<span class="php-quote">'level'</span> =&gt; <span class="php-var">$new_level</span>)))
-</span><span id="108" class="l"><a href="#108">108: </a>        {
-</span><span id="109" class="l"><a href="#109">109: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(<span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API Key was updated.'</span>), <span class="php-num">200</span>); <span class="php-comment">// 200 = OK</span>
-</span><span id="110" class="l"><a href="#110">110: </a>        }
-</span><span id="111" class="l"><a href="#111">111: </a>
-</span><span id="112" class="l"><a href="#112">112: </a>        <span class="php-keyword1">else</span>
-</span><span id="113" class="l"><a href="#113">113: </a>        {
-</span><span id="114" class="l"><a href="#114">114: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(<span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>, <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not update the key level.'</span>), <span class="php-num">500</span>); <span class="php-comment">// 500 = Internal Server Error</span>
-</span><span id="115" class="l"><a href="#115">115: </a>        }
-</span><span id="116" class="l"><a href="#116">116: </a>    }
-</span><span id="117" class="l"><a href="#117">117: </a>
-</span><span id="118" class="l"><a href="#118">118: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="119" class="l"><a href="#119">119: </a>
-</span><span id="120" class="l"><a href="#120">120: </a>    <span class="php-comment">/**
-</span></span><span id="121" class="l"><a href="#121">121: </a><span class="php-comment">     * Update Key
-</span></span><span id="122" class="l"><a href="#122">122: </a><span class="php-comment">     *
-</span></span><span id="123" class="l"><a href="#123">123: </a><span class="php-comment">     * Change the level
-</span></span><span id="124" class="l"><a href="#124">124: </a><span class="php-comment">     *
-</span></span><span id="125" class="l"><a href="#125">125: </a><span class="php-comment">     * @access  public
-</span></span><span id="126" class="l"><a href="#126">126: </a><span class="php-comment">     * @return  void
-</span></span><span id="127" class="l"><a href="#127">127: </a><span class="php-comment">     */</span>
-</span><span id="128" class="l"><a href="#128">128: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> suspend_post()
-</span><span id="129" class="l"><a href="#129">129: </a>    {
-</span><span id="130" class="l"><a href="#130">130: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
-</span><span id="131" class="l"><a href="#131">131: </a>
-</span><span id="132" class="l"><a href="#132">132: </a>        <span class="php-comment">// Does this key even exist?</span>
-</span><span id="133" class="l"><a href="#133">133: </a>        <span class="php-keyword1">if</span> ( ! self::_key_exists(<span class="php-var">$key</span>))
-</span><span id="134" class="l"><a href="#134">134: </a>        {
-</span><span id="135" class="l"><a href="#135">135: </a>            <span class="php-comment">// NOOOOOOOOO!</span>
-</span><span id="136" class="l"><a href="#136">136: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(<span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key.'</span>), <span class="php-num">400</span>);
-</span><span id="137" class="l"><a href="#137">137: </a>        }
-</span><span id="138" class="l"><a href="#138">138: </a>
-</span><span id="139" class="l"><a href="#139">139: </a>        <span class="php-comment">// Update the key level</span>
-</span><span id="140" class="l"><a href="#140">140: </a>        <span class="php-keyword1">if</span> (self::_update_key(<span class="php-var">$key</span>, <span class="php-keyword1">array</span>(<span class="php-quote">'level'</span> =&gt; <span class="php-num">0</span>)))
-</span><span id="141" class="l"><a href="#141">141: </a>        {
-</span><span id="142" class="l"><a href="#142">142: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(<span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'Key was suspended.'</span>), <span class="php-num">200</span>); <span class="php-comment">// 200 = OK</span>
-</span><span id="143" class="l"><a href="#143">143: </a>        }
-</span><span id="144" class="l"><a href="#144">144: </a>
-</span><span id="145" class="l"><a href="#145">145: </a>        <span class="php-keyword1">else</span>
-</span><span id="146" class="l"><a href="#146">146: </a>        {
-</span><span id="147" class="l"><a href="#147">147: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(<span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>, <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not suspend the user.'</span>), <span class="php-num">500</span>); <span class="php-comment">// 500 = Internal Server Error</span>
-</span><span id="148" class="l"><a href="#148">148: </a>        }
-</span><span id="149" class="l"><a href="#149">149: </a>    }
-</span><span id="150" class="l"><a href="#150">150: </a>
-</span><span id="151" class="l"><a href="#151">151: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="152" class="l"><a href="#152">152: </a>
-</span><span id="153" class="l"><a href="#153">153: </a>    <span class="php-comment">/**
-</span></span><span id="154" class="l"><a href="#154">154: </a><span class="php-comment">     * Regenerate Key
-</span></span><span id="155" class="l"><a href="#155">155: </a><span class="php-comment">     *
-</span></span><span id="156" class="l"><a href="#156">156: </a><span class="php-comment">     * Remove a key from the database to stop it working.
-</span></span><span id="157" class="l"><a href="#157">157: </a><span class="php-comment">     *
-</span></span><span id="158" class="l"><a href="#158">158: </a><span class="php-comment">     * @access  public
-</span></span><span id="159" class="l"><a href="#159">159: </a><span class="php-comment">     * @return  void
-</span></span><span id="160" class="l"><a href="#160">160: </a><span class="php-comment">     */</span>
-</span><span id="161" class="l"><a href="#161">161: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> regenerate_post()
-</span><span id="162" class="l"><a href="#162">162: </a>    {
-</span><span id="163" class="l"><a href="#163">163: </a>        <span class="php-var">$old_key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
-</span><span id="164" class="l"><a href="#164">164: </a>        <span class="php-var">$key_details</span> = self::_get_key(<span class="php-var">$old_key</span>);
-</span><span id="165" class="l"><a href="#165">165: </a>
-</span><span id="166" class="l"><a href="#166">166: </a>        <span class="php-comment">// The key wasnt found</span>
-</span><span id="167" class="l"><a href="#167">167: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-var">$key_details</span>)
-</span><span id="168" class="l"><a href="#168">168: </a>        {
-</span><span id="169" class="l"><a href="#169">169: </a>            <span class="php-comment">// NOOOOOOOOO!</span>
-</span><span id="170" class="l"><a href="#170">170: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(<span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>, <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key.'</span>), <span class="php-num">400</span>);
-</span><span id="171" class="l"><a href="#171">171: </a>        }
-</span><span id="172" class="l"><a href="#172">172: </a>
-</span><span id="173" class="l"><a href="#173">173: </a>        <span class="php-comment">// Build a new key</span>
-</span><span id="174" class="l"><a href="#174">174: </a>        <span class="php-var">$new_key</span> = self::_generate_key();
-</span><span id="175" class="l"><a href="#175">175: </a>
-</span><span id="176" class="l"><a href="#176">176: </a>        <span class="php-comment">// Insert the new key</span>
-</span><span id="177" class="l"><a href="#177">177: </a>        <span class="php-keyword1">if</span> (self::_insert_key(<span class="php-var">$new_key</span>, <span class="php-keyword1">array</span>(<span class="php-quote">'level'</span> =&gt; <span class="php-var">$key_details</span>-&gt;level, <span class="php-quote">'ignore_limits'</span> =&gt; <span class="php-var">$key_details</span>-&gt;ignore_limits)))
-</span><span id="178" class="l"><a href="#178">178: </a>        {
-</span><span id="179" class="l"><a href="#179">179: </a>            <span class="php-comment">// Suspend old key</span>
-</span><span id="180" class="l"><a href="#180">180: </a>            self::_update_key(<span class="php-var">$old_key</span>, <span class="php-keyword1">array</span>(<span class="php-quote">'level'</span> =&gt; <span class="php-num">0</span>));
-</span><span id="181" class="l"><a href="#181">181: </a>
-</span><span id="182" class="l"><a href="#182">182: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(<span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'key'</span> =&gt; <span class="php-var">$new_key</span>), <span class="php-num">201</span>); <span class="php-comment">// 201 = Created</span>
-</span><span id="183" class="l"><a href="#183">183: </a>        }
-</span><span id="184" class="l"><a href="#184">184: </a>
-</span><span id="185" class="l"><a href="#185">185: </a>        <span class="php-keyword1">else</span>
-</span><span id="186" class="l"><a href="#186">186: </a>        {
-</span><span id="187" class="l"><a href="#187">187: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(<span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>, <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not save the key.'</span>), <span class="php-num">500</span>); <span class="php-comment">// 500 = Internal Server Error</span>
-</span><span id="188" class="l"><a href="#188">188: </a>        }
-</span><span id="189" class="l"><a href="#189">189: </a>    }
-</span><span id="190" class="l"><a href="#190">190: </a>
-</span><span id="191" class="l"><a href="#191">191: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="192" class="l"><a href="#192">192: </a>
-</span><span id="193" class="l"><a href="#193">193: </a>    <span class="php-comment">/* Helper Methods */</span>
-</span><span id="194" class="l"><a href="#194">194: </a>    
-</span><span id="195" class="l"><a href="#195">195: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _generate_key()
-</span><span id="196" class="l"><a href="#196">196: </a>    {
-</span><span id="197" class="l"><a href="#197">197: </a>        <span class="php-comment">//$this-&gt;load-&gt;helper('security');</span>
-</span><span id="198" class="l"><a href="#198">198: </a>        
-</span><span id="199" class="l"><a href="#199">199: </a>        <span class="php-keyword1">do</span>
+</span><span id="86" class="l"><a href="#86"> 86: </a>        <span class="php-comment">// Respond that the key was destroyed</span>
+</span><span id="87" class="l"><a href="#87"> 87: </a>        <span class="php-var">$this</span>-&gt;response([
+</span><span id="88" class="l"><a href="#88"> 88: </a>            <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
+</span><span id="89" class="l"><a href="#89"> 89: </a>            <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API Key was deleted'</span>
+</span><span id="90" class="l"><a href="#90"> 90: </a>            ], <span class="php-num">204</span>); <span class="php-comment">// 204 = Success, No Content</span>
+</span><span id="91" class="l"><a href="#91"> 91: </a>    }
+</span><span id="92" class="l"><a href="#92"> 92: </a>
+</span><span id="93" class="l"><a href="#93"> 93: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="94" class="l"><a href="#94"> 94: </a>
+</span><span id="95" class="l"><a href="#95"> 95: </a>    <span class="php-comment">/**
+</span></span><span id="96" class="l"><a href="#96"> 96: </a><span class="php-comment">     * Update Key
+</span></span><span id="97" class="l"><a href="#97"> 97: </a><span class="php-comment">     * Change the level
+</span></span><span id="98" class="l"><a href="#98"> 98: </a><span class="php-comment">     *
+</span></span><span id="99" class="l"><a href="#99"> 99: </a><span class="php-comment">     * @access    public
+</span></span><span id="100" class="l"><a href="#100">100: </a><span class="php-comment">     * @return    void
+</span></span><span id="101" class="l"><a href="#101">101: </a><span class="php-comment">     */</span>
+</span><span id="102" class="l"><a href="#102">102: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> level_post()
+</span><span id="103" class="l"><a href="#103">103: </a>    {
+</span><span id="104" class="l"><a href="#104">104: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
+</span><span id="105" class="l"><a href="#105">105: </a>        <span class="php-var">$new_level</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'level'</span>);
+</span><span id="106" class="l"><a href="#106">106: </a>
+</span><span id="107" class="l"><a href="#107">107: </a>        <span class="php-comment">// Does this key exist?</span>
+</span><span id="108" class="l"><a href="#108">108: </a>        <span class="php-keyword1">if</span> (!self::_key_exists(<span class="php-var">$key</span>))
+</span><span id="109" class="l"><a href="#109">109: </a>        {
+</span><span id="110" class="l"><a href="#110">110: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
+</span><span id="111" class="l"><a href="#111">111: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="112" class="l"><a href="#112">112: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key'</span>
+</span><span id="113" class="l"><a href="#113">113: </a>            ], <span class="php-num">400</span>); <span class="php-comment">// 400 = Bad Request</span>
+</span><span id="114" class="l"><a href="#114">114: </a>        }
+</span><span id="115" class="l"><a href="#115">115: </a>
+</span><span id="116" class="l"><a href="#116">116: </a>        <span class="php-comment">// Update the key level</span>
+</span><span id="117" class="l"><a href="#117">117: </a>        <span class="php-keyword1">if</span> (self::_update_key(<span class="php-var">$key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-var">$new_level</span>]))
+</span><span id="118" class="l"><a href="#118">118: </a>        {
+</span><span id="119" class="l"><a href="#119">119: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="120" class="l"><a href="#120">120: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
+</span><span id="121" class="l"><a href="#121">121: </a>                <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API Key was updated'</span>
+</span><span id="122" class="l"><a href="#122">122: </a>            ], <span class="php-num">200</span>); <span class="php-comment">// 200 = OK</span>
+</span><span id="123" class="l"><a href="#123">123: </a>        }
+</span><span id="124" class="l"><a href="#124">124: </a>        <span class="php-keyword1">else</span>
+</span><span id="125" class="l"><a href="#125">125: </a>        {
+</span><span id="126" class="l"><a href="#126">126: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="127" class="l"><a href="#127">127: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>,
+</span><span id="128" class="l"><a href="#128">128: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not update the key level'</span>
+</span><span id="129" class="l"><a href="#129">129: </a>            ], <span class="php-num">500</span>); <span class="php-comment">// 500 = Internal Server Error</span>
+</span><span id="130" class="l"><a href="#130">130: </a>        }
+</span><span id="131" class="l"><a href="#131">131: </a>    }
+</span><span id="132" class="l"><a href="#132">132: </a>
+</span><span id="133" class="l"><a href="#133">133: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="134" class="l"><a href="#134">134: </a>
+</span><span id="135" class="l"><a href="#135">135: </a>    <span class="php-comment">/**
+</span></span><span id="136" class="l"><a href="#136">136: </a><span class="php-comment">     * Update Key
+</span></span><span id="137" class="l"><a href="#137">137: </a><span class="php-comment">     * Change the level
+</span></span><span id="138" class="l"><a href="#138">138: </a><span class="php-comment">     *
+</span></span><span id="139" class="l"><a href="#139">139: </a><span class="php-comment">     * @access    public
+</span></span><span id="140" class="l"><a href="#140">140: </a><span class="php-comment">     * @return    void
+</span></span><span id="141" class="l"><a href="#141">141: </a><span class="php-comment">     */</span>
+</span><span id="142" class="l"><a href="#142">142: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> suspend_post()
+</span><span id="143" class="l"><a href="#143">143: </a>    {
+</span><span id="144" class="l"><a href="#144">144: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
+</span><span id="145" class="l"><a href="#145">145: </a>
+</span><span id="146" class="l"><a href="#146">146: </a>        <span class="php-comment">// Does this key exist?</span>
+</span><span id="147" class="l"><a href="#147">147: </a>        <span class="php-keyword1">if</span> (!self::_key_exists(<span class="php-var">$key</span>))
+</span><span id="148" class="l"><a href="#148">148: </a>        {
+</span><span id="149" class="l"><a href="#149">149: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
+</span><span id="150" class="l"><a href="#150">150: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="151" class="l"><a href="#151">151: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key'</span>
+</span><span id="152" class="l"><a href="#152">152: </a>            ], <span class="php-num">400</span>); <span class="php-comment">// 400 = Bad Request</span>
+</span><span id="153" class="l"><a href="#153">153: </a>        }
+</span><span id="154" class="l"><a href="#154">154: </a>
+</span><span id="155" class="l"><a href="#155">155: </a>        <span class="php-comment">// Update the key level</span>
+</span><span id="156" class="l"><a href="#156">156: </a>        <span class="php-keyword1">if</span> (self::_update_key(<span class="php-var">$key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-num">0</span>]))
+</span><span id="157" class="l"><a href="#157">157: </a>        {
+</span><span id="158" class="l"><a href="#158">158: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="159" class="l"><a href="#159">159: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
+</span><span id="160" class="l"><a href="#160">160: </a>                <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'Key was suspended'</span>
+</span><span id="161" class="l"><a href="#161">161: </a>            ], <span class="php-num">200</span>); <span class="php-comment">// 200 = OK</span>
+</span><span id="162" class="l"><a href="#162">162: </a>        }
+</span><span id="163" class="l"><a href="#163">163: </a>        <span class="php-keyword1">else</span>
+</span><span id="164" class="l"><a href="#164">164: </a>        {
+</span><span id="165" class="l"><a href="#165">165: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="166" class="l"><a href="#166">166: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>,
+</span><span id="167" class="l"><a href="#167">167: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not suspend the user'</span>
+</span><span id="168" class="l"><a href="#168">168: </a>            ], <span class="php-num">500</span>); <span class="php-comment">// 500 = Internal Server Error</span>
+</span><span id="169" class="l"><a href="#169">169: </a>        }
+</span><span id="170" class="l"><a href="#170">170: </a>    }
+</span><span id="171" class="l"><a href="#171">171: </a>
+</span><span id="172" class="l"><a href="#172">172: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="173" class="l"><a href="#173">173: </a>
+</span><span id="174" class="l"><a href="#174">174: </a>    <span class="php-comment">/**
+</span></span><span id="175" class="l"><a href="#175">175: </a><span class="php-comment">     * Regenerate Key
+</span></span><span id="176" class="l"><a href="#176">176: </a><span class="php-comment">     * Remove a key from the database to stop it working
+</span></span><span id="177" class="l"><a href="#177">177: </a><span class="php-comment">     *
+</span></span><span id="178" class="l"><a href="#178">178: </a><span class="php-comment">     * @access    public
+</span></span><span id="179" class="l"><a href="#179">179: </a><span class="php-comment">     * @return    void
+</span></span><span id="180" class="l"><a href="#180">180: </a><span class="php-comment">     */</span>
+</span><span id="181" class="l"><a href="#181">181: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> regenerate_post()
+</span><span id="182" class="l"><a href="#182">182: </a>    {
+</span><span id="183" class="l"><a href="#183">183: </a>        <span class="php-var">$old_key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
+</span><span id="184" class="l"><a href="#184">184: </a>        <span class="php-var">$key_details</span> = self::_get_key(<span class="php-var">$old_key</span>);
+</span><span id="185" class="l"><a href="#185">185: </a>
+</span><span id="186" class="l"><a href="#186">186: </a>        <span class="php-comment">// Does this key exist?</span>
+</span><span id="187" class="l"><a href="#187">187: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$key_details</span>)
+</span><span id="188" class="l"><a href="#188">188: </a>        {
+</span><span id="189" class="l"><a href="#189">189: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
+</span><span id="190" class="l"><a href="#190">190: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="191" class="l"><a href="#191">191: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key'</span>
+</span><span id="192" class="l"><a href="#192">192: </a>            ], <span class="php-num">400</span>); <span class="php-comment">// 400 = Bad Request</span>
+</span><span id="193" class="l"><a href="#193">193: </a>        }
+</span><span id="194" class="l"><a href="#194">194: </a>
+</span><span id="195" class="l"><a href="#195">195: </a>        <span class="php-comment">// Build a new key</span>
+</span><span id="196" class="l"><a href="#196">196: </a>        <span class="php-var">$new_key</span> = self::_generate_key();
+</span><span id="197" class="l"><a href="#197">197: </a>
+</span><span id="198" class="l"><a href="#198">198: </a>        <span class="php-comment">// Insert the new key</span>
+</span><span id="199" class="l"><a href="#199">199: </a>        <span class="php-keyword1">if</span> (self::_insert_key(<span class="php-var">$new_key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-var">$key_details</span>-&gt;level, <span class="php-quote">'ignore_limits'</span> =&gt; <span class="php-var">$key_details</span>-&gt;ignore_limits]))
 </span><span id="200" class="l"><a href="#200">200: </a>        {
-</span><span id="201" class="l"><a href="#201">201: </a>            <span class="php-var">$salt</span> = do_hash(<span class="php-keyword2">time</span>().<span class="php-keyword2">mt_rand</span>());
-</span><span id="202" class="l"><a href="#202">202: </a>            <span class="php-var">$new_key</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$salt</span>, <span class="php-num">0</span>, config_item(<span class="php-quote">'rest_key_length'</span>));
-</span><span id="203" class="l"><a href="#203">203: </a>        }
-</span><span id="204" class="l"><a href="#204">204: </a>
-</span><span id="205" class="l"><a href="#205">205: </a>        <span class="php-comment">// Already in the DB? Fail. Try again</span>
-</span><span id="206" class="l"><a href="#206">206: </a>        <span class="php-keyword1">while</span> (self::_key_exists(<span class="php-var">$new_key</span>));
-</span><span id="207" class="l"><a href="#207">207: </a>
-</span><span id="208" class="l"><a href="#208">208: </a>        <span class="php-keyword1">return</span> <span class="php-var">$new_key</span>;
-</span><span id="209" class="l"><a href="#209">209: </a>    }
-</span><span id="210" class="l"><a href="#210">210: </a>
-</span><span id="211" class="l"><a href="#211">211: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="212" class="l"><a href="#212">212: </a>
-</span><span id="213" class="l"><a href="#213">213: </a>    <span class="php-comment">/* Private Data Methods */</span>
-</span><span id="214" class="l"><a href="#214">214: </a>
-</span><span id="215" class="l"><a href="#215">215: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _get_key(<span class="php-var">$key</span>)
-</span><span id="216" class="l"><a href="#216">216: </a>    {
-</span><span id="217" class="l"><a href="#217">217: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db-&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(config_item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row();
-</span><span id="218" class="l"><a href="#218">218: </a>    }
+</span><span id="201" class="l"><a href="#201">201: </a>            <span class="php-comment">// Suspend old key</span>
+</span><span id="202" class="l"><a href="#202">202: </a>            self::_update_key(<span class="php-var">$old_key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-num">0</span>]);
+</span><span id="203" class="l"><a href="#203">203: </a>
+</span><span id="204" class="l"><a href="#204">204: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="205" class="l"><a href="#205">205: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
+</span><span id="206" class="l"><a href="#206">206: </a>                <span class="php-quote">'key'</span> =&gt; <span class="php-var">$new_key</span>
+</span><span id="207" class="l"><a href="#207">207: </a>            ], <span class="php-num">201</span>); <span class="php-comment">// 201 = Created</span>
+</span><span id="208" class="l"><a href="#208">208: </a>        }
+</span><span id="209" class="l"><a href="#209">209: </a>        <span class="php-keyword1">else</span>
+</span><span id="210" class="l"><a href="#210">210: </a>        {
+</span><span id="211" class="l"><a href="#211">211: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="212" class="l"><a href="#212">212: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>,
+</span><span id="213" class="l"><a href="#213">213: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
+</span><span id="214" class="l"><a href="#214">214: </a>            ], <span class="php-num">500</span>); <span class="php-comment">// 500 = Internal Server Error</span>
+</span><span id="215" class="l"><a href="#215">215: </a>        }
+</span><span id="216" class="l"><a href="#216">216: </a>    }
+</span><span id="217" class="l"><a href="#217">217: </a>
+</span><span id="218" class="l"><a href="#218">218: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
 </span><span id="219" class="l"><a href="#219">219: </a>
-</span><span id="220" class="l"><a href="#220">220: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="220" class="l"><a href="#220">220: </a>    <span class="php-comment">/* Helper Methods */</span>
 </span><span id="221" class="l"><a href="#221">221: </a>
-</span><span id="222" class="l"><a href="#222">222: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _key_exists(<span class="php-var">$key</span>)
+</span><span id="222" class="l"><a href="#222">222: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _generate_key()
 </span><span id="223" class="l"><a href="#223">223: </a>    {
-</span><span id="224" class="l"><a href="#224">224: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db-&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;count_all_results(config_item(<span class="php-quote">'rest_keys_table'</span>)) &gt; <span class="php-num">0</span>;
-</span><span id="225" class="l"><a href="#225">225: </a>    }
-</span><span id="226" class="l"><a href="#226">226: </a>
-</span><span id="227" class="l"><a href="#227">227: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="228" class="l"><a href="#228">228: </a>
-</span><span id="229" class="l"><a href="#229">229: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _insert_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
-</span><span id="230" class="l"><a href="#230">230: </a>    {
-</span><span id="231" class="l"><a href="#231">231: </a>        
-</span><span id="232" class="l"><a href="#232">232: </a>        <span class="php-var">$data</span>[config_item(<span class="php-quote">'rest_key_column'</span>)] = <span class="php-var">$key</span>;
-</span><span id="233" class="l"><a href="#233">233: </a>        <span class="php-var">$data</span>[<span class="php-quote">'date_created'</span>] = <span class="php-keyword2">function_exists</span>(<span class="php-quote">'now'</span>) ? now() : <span class="php-keyword2">time</span>();
-</span><span id="234" class="l"><a href="#234">234: </a>
-</span><span id="235" class="l"><a href="#235">235: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db-&gt;set(<span class="php-var">$data</span>)-&gt;insert(config_item(<span class="php-quote">'rest_keys_table'</span>));
-</span><span id="236" class="l"><a href="#236">236: </a>    }
-</span><span id="237" class="l"><a href="#237">237: </a>
-</span><span id="238" class="l"><a href="#238">238: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="239" class="l"><a href="#239">239: </a>
-</span><span id="240" class="l"><a href="#240">240: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _update_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
-</span><span id="241" class="l"><a href="#241">241: </a>    {
-</span><span id="242" class="l"><a href="#242">242: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db-&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;update(config_item(<span class="php-quote">'rest_keys_table'</span>), <span class="php-var">$data</span>);
-</span><span id="243" class="l"><a href="#243">243: </a>    }
-</span><span id="244" class="l"><a href="#244">244: </a>
-</span><span id="245" class="l"><a href="#245">245: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="246" class="l"><a href="#246">246: </a>
-</span><span id="247" class="l"><a href="#247">247: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _delete_key(<span class="php-var">$key</span>)
-</span><span id="248" class="l"><a href="#248">248: </a>    {
-</span><span id="249" class="l"><a href="#249">249: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db-&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;<span class="php-keyword2">delete</span>(config_item(<span class="php-quote">'rest_keys_table'</span>));
-</span><span id="250" class="l"><a href="#250">250: </a>    }
-</span><span id="251" class="l"><a href="#251">251: </a>}
-</span><span id="252" class="l"><a href="#252">252: </a></span></code></pre>
+</span><span id="224" class="l"><a href="#224">224: </a>        <span class="php-keyword1">do</span>
+</span><span id="225" class="l"><a href="#225">225: </a>        {
+</span><span id="226" class="l"><a href="#226">226: </a>            <span class="php-comment">// Generate a random salt</span>
+</span><span id="227" class="l"><a href="#227">227: </a>            <span class="php-var">$salt</span> = <span class="php-var">$this</span>-&gt;security-&gt;get_random_bytes(<span class="php-num">64</span>);
+</span><span id="228" class="l"><a href="#228">228: </a>            
+</span><span id="229" class="l"><a href="#229">229: </a>            <span class="php-comment">// If an error occurred, then fall back to the previous method</span>
+</span><span id="230" class="l"><a href="#230">230: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$salt</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="231" class="l"><a href="#231">231: </a>            {
+</span><span id="232" class="l"><a href="#232">232: </a>                <span class="php-var">$salt</span> = <span class="php-keyword2">hash</span>(<span class="php-quote">'sha256'</span>, <span class="php-keyword2">time</span>() . <span class="php-keyword2">mt_rand</span>());
+</span><span id="233" class="l"><a href="#233">233: </a>            }
+</span><span id="234" class="l"><a href="#234">234: </a>            <span class="php-var">$new_key</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$salt</span>, <span class="php-num">0</span>, config_item(<span class="php-quote">'rest_key_length'</span>));
+</span><span id="235" class="l"><a href="#235">235: </a>        }
+</span><span id="236" class="l"><a href="#236">236: </a>        <span class="php-keyword1">while</span> (self::_key_exists(<span class="php-var">$new_key</span>));
+</span><span id="237" class="l"><a href="#237">237: </a>        <span class="php-comment">// Already in the DB? Fail. Try again</span>
+</span><span id="238" class="l"><a href="#238">238: </a>
+</span><span id="239" class="l"><a href="#239">239: </a>        <span class="php-keyword1">return</span> <span class="php-var">$new_key</span>;
+</span><span id="240" class="l"><a href="#240">240: </a>    }
+</span><span id="241" class="l"><a href="#241">241: </a>
+</span><span id="242" class="l"><a href="#242">242: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="243" class="l"><a href="#243">243: </a>
+</span><span id="244" class="l"><a href="#244">244: </a>    <span class="php-comment">/* Private Data Methods */</span>
+</span><span id="245" class="l"><a href="#245">245: </a>
+</span><span id="246" class="l"><a href="#246">246: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _get_key(<span class="php-var">$key</span>)
+</span><span id="247" class="l"><a href="#247">247: </a>    {
+</span><span id="248" class="l"><a href="#248">248: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db-&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(config_item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row();
+</span><span id="249" class="l"><a href="#249">249: </a>    }
+</span><span id="250" class="l"><a href="#250">250: </a>
+</span><span id="251" class="l"><a href="#251">251: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="252" class="l"><a href="#252">252: </a>
+</span><span id="253" class="l"><a href="#253">253: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _key_exists(<span class="php-var">$key</span>)
+</span><span id="254" class="l"><a href="#254">254: </a>    {
+</span><span id="255" class="l"><a href="#255">255: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db-&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;count_all_results(config_item(<span class="php-quote">'rest_keys_table'</span>)) &gt; <span class="php-num">0</span>;
+</span><span id="256" class="l"><a href="#256">256: </a>    }
+</span><span id="257" class="l"><a href="#257">257: </a>
+</span><span id="258" class="l"><a href="#258">258: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="259" class="l"><a href="#259">259: </a>
+</span><span id="260" class="l"><a href="#260">260: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _insert_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
+</span><span id="261" class="l"><a href="#261">261: </a>    {
+</span><span id="262" class="l"><a href="#262">262: </a>        <span class="php-var">$data</span>[config_item(<span class="php-quote">'rest_key_column'</span>)] = <span class="php-var">$key</span>;
+</span><span id="263" class="l"><a href="#263">263: </a>        <span class="php-var">$data</span>[<span class="php-quote">'date_created'</span>] = <span class="php-keyword2">function_exists</span>(<span class="php-quote">'now'</span>) ? now() : <span class="php-keyword2">time</span>();
+</span><span id="264" class="l"><a href="#264">264: </a>
+</span><span id="265" class="l"><a href="#265">265: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="266" class="l"><a href="#266">266: </a>            -&gt;set(<span class="php-var">$data</span>)
+</span><span id="267" class="l"><a href="#267">267: </a>            -&gt;insert(config_item(<span class="php-quote">'rest_keys_table'</span>));
+</span><span id="268" class="l"><a href="#268">268: </a>    }
+</span><span id="269" class="l"><a href="#269">269: </a>
+</span><span id="270" class="l"><a href="#270">270: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="271" class="l"><a href="#271">271: </a>
+</span><span id="272" class="l"><a href="#272">272: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _update_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
+</span><span id="273" class="l"><a href="#273">273: </a>    {
+</span><span id="274" class="l"><a href="#274">274: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="275" class="l"><a href="#275">275: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
+</span><span id="276" class="l"><a href="#276">276: </a>            -&gt;update(config_item(<span class="php-quote">'rest_keys_table'</span>), <span class="php-var">$data</span>);
+</span><span id="277" class="l"><a href="#277">277: </a>    }
+</span><span id="278" class="l"><a href="#278">278: </a>
+</span><span id="279" class="l"><a href="#279">279: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="280" class="l"><a href="#280">280: </a>
+</span><span id="281" class="l"><a href="#281">281: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _delete_key(<span class="php-var">$key</span>)
+</span><span id="282" class="l"><a href="#282">282: </a>    {
+</span><span id="283" class="l"><a href="#283">283: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="284" class="l"><a href="#284">284: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
+</span><span id="285" class="l"><a href="#285">285: </a>            -&gt;<span class="php-keyword2">delete</span>(config_item(<span class="php-quote">'rest_keys_table'</span>));
+</span><span id="286" class="l"><a href="#286">286: </a>    }
+</span><span id="287" class="l"><a href="#287">287: </a>}
+</span><span id="288" class="l"><a href="#288">288: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
@@ -353,6 +384,6 @@ <h3>Functions</h3>
 </div>
 </div>
 <script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
-<script src="http://github.com/elementlist.js?a84266a83a9e4e19c2425432aca8ea8439364f92"></script>
+<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/source-class-REST_Controller.html b/documentation/source-class-REST_Controller.html
index 1242de05..122dd871 100644
--- a/documentation/source-class-REST_Controller.html
+++ b/documentation/source-class-REST_Controller.html
@@ -29,6 +29,11 @@ <h3>Packages</h3>
 					<a href="http://github.com/package-CodeIgniter.Libraries.html">
 						Libraries					</a>
 
+						</li>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
 						</li>
 							</ul></li>
 				<li class="active">
@@ -52,10 +57,6 @@ <h3>Classes</h3>
 
 
 
-			<h3>Functions</h3>
-			<ul>
-				<li class="active"><a href="http://github.com/function-_perform_ldap_auth.html">_perform_ldap_auth</a></li>
-			</ul>
 		</div>
 	</div>
 </div>
@@ -79,1563 +80,1888 @@ <h3>Functions</h3>
 				<a href="http://github.com/package-None.html" title="Summary of None"><span>Package</span></a>
 			</li>
 			<li>
-				<a href="http://github.com/function-_perform_ldap_auth.html" title="Summary of _perform_ldap_auth"><span>Function</span></a>
+				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
 			</li>
 		</ul>
 		<ul>
-			<li>
-				<a href="http://github.com/tree.html" title="Tree view of classes, interfaces, traits and exceptions"><span>Tree</span></a>
-			</li>
-			<li>
-				<a href="http://github.com/todo.html" title="Todo list"><span>Todo</span></a>
-			</li>
 		</ul>
 		<ul>
 		</ul>
 	</div>
 
-<pre><code><span id="1" class="l"><a href="#1">   1: </a><span class="xlang">&lt;?php</span> <span class="php-keyword2">defined</span>(<span class="php-quote">'BASEPATH'</span>) <span class="php-keyword1">or</span> <span class="php-keyword1">exit</span>(<span class="php-quote">'No direct script access allowed'</span>);
+<pre><code><span id="1" class="l"><a href="#1">   1: </a><span class="xlang">&lt;?php</span>
 </span><span id="2" class="l"><a href="#2">   2: </a>
-</span><span id="3" class="l"><a href="#3">   3: </a><span class="php-comment">/**
-</span></span><span id="4" class="l"><a href="#4">   4: </a><span class="php-comment"> * CodeIgniter Rest Controller
-</span></span><span id="5" class="l"><a href="#5">   5: </a><span class="php-comment"> *
-</span></span><span id="6" class="l"><a href="#6">   6: </a><span class="php-comment"> * A fully RESTful server implementation for CodeIgniter using one library, one config file and one controller.
-</span></span><span id="7" class="l"><a href="#7">   7: </a><span class="php-comment"> *
-</span></span><span id="8" class="l"><a href="#8">   8: </a><span class="php-comment"> * @package         CodeIgniter
-</span></span><span id="9" class="l"><a href="#9">   9: </a><span class="php-comment"> * @subpackage      Libraries
-</span></span><span id="10" class="l"><a href="#10">  10: </a><span class="php-comment"> * @category        Libraries
-</span></span><span id="11" class="l"><a href="#11">  11: </a><span class="php-comment"> * @author          Phil Sturgeon, Chris Kacerguis
-</span></span><span id="12" class="l"><a href="#12">  12: </a><span class="php-comment"> * @license         MIT
-</span></span><span id="13" class="l"><a href="#13">  13: </a><span class="php-comment"> * @link            https://github.com/chriskacerguis/codeigniter-restserver
-</span></span><span id="14" class="l"><a href="#14">  14: </a><span class="php-comment"> * @version         3.0.0-pre
-</span></span><span id="15" class="l"><a href="#15">  15: </a><span class="php-comment"> */</span>
-</span><span id="16" class="l"><a href="#16">  16: </a><span class="php-keyword1">abstract</span> <span class="php-keyword1">class</span> REST_Controller <span class="php-keyword1">extends</span> CI_Controller
-</span><span id="17" class="l"><a href="#17">  17: </a>{
+</span><span id="3" class="l"><a href="#3">   3: </a><span class="php-keyword2">defined</span>(<span class="php-quote">'BASEPATH'</span>) <span class="php-keyword1">OR</span> <span class="php-keyword1">exit</span>(<span class="php-quote">'No direct script access allowed'</span>);
+</span><span id="4" class="l"><a href="#4">   4: </a>
+</span><span id="5" class="l"><a href="#5">   5: </a><span class="php-comment">/**
+</span></span><span id="6" class="l"><a href="#6">   6: </a><span class="php-comment"> * CodeIgniter Rest Controller
+</span></span><span id="7" class="l"><a href="#7">   7: </a><span class="php-comment"> * A fully RESTful server implementation for CodeIgniter using one library, one config file and one controller.
+</span></span><span id="8" class="l"><a href="#8">   8: </a><span class="php-comment"> *
+</span></span><span id="9" class="l"><a href="#9">   9: </a><span class="php-comment"> * @package         CodeIgniter
+</span></span><span id="10" class="l"><a href="#10">  10: </a><span class="php-comment"> * @subpackage      Libraries
+</span></span><span id="11" class="l"><a href="#11">  11: </a><span class="php-comment"> * @category        Libraries
+</span></span><span id="12" class="l"><a href="#12">  12: </a><span class="php-comment"> * @author          Phil Sturgeon, Chris Kacerguis
+</span></span><span id="13" class="l"><a href="#13">  13: </a><span class="php-comment"> * @license         MIT
+</span></span><span id="14" class="l"><a href="#14">  14: </a><span class="php-comment"> * @link            https://github.com/chriskacerguis/codeigniter-restserver
+</span></span><span id="15" class="l"><a href="#15">  15: </a><span class="php-comment"> * @version         3.0.0
+</span></span><span id="16" class="l"><a href="#16">  16: </a><span class="php-comment"> */</span>
+</span><span id="17" class="l"><a href="#17">  17: </a><span class="php-keyword1">abstract</span> <span class="php-keyword1">class</span> REST_Controller <span class="php-keyword1">extends</span> CI_Controller {
 </span><span id="18" class="l"><a href="#18">  18: </a>    <span class="php-comment">/**
 </span></span><span id="19" class="l"><a href="#19">  19: </a><span class="php-comment">     * This defines the rest format.
-</span></span><span id="20" class="l"><a href="#20">  20: </a><span class="php-comment">     *
-</span></span><span id="21" class="l"><a href="#21">  21: </a><span class="php-comment">     * Must be overridden it in a controller so that it is set.
-</span></span><span id="22" class="l"><a href="#22">  22: </a><span class="php-comment">     *
-</span></span><span id="23" class="l"><a href="#23">  23: </a><span class="php-comment">     * @var string|NULL
-</span></span><span id="24" class="l"><a href="#24">  24: </a><span class="php-comment">     */</span>
-</span><span id="25" class="l"><a href="#25">  25: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$rest_format</span>          = <span class="php-keyword1">NULL</span>;
-</span><span id="26" class="l"><a href="#26">  26: </a>
-</span><span id="27" class="l"><a href="#27">  27: </a>    <span class="php-comment">/**
-</span></span><span id="28" class="l"><a href="#28">  28: </a><span class="php-comment">     * Defines the list of method properties such as limit, log and level
-</span></span><span id="29" class="l"><a href="#29">  29: </a><span class="php-comment">     *
-</span></span><span id="30" class="l"><a href="#30">  30: </a><span class="php-comment">     * @var array
-</span></span><span id="31" class="l"><a href="#31">  31: </a><span class="php-comment">     */</span>
-</span><span id="32" class="l"><a href="#32">  32: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$methods</span>              = <span class="php-keyword1">array</span>();
-</span><span id="33" class="l"><a href="#33">  33: </a>
-</span><span id="34" class="l"><a href="#34">  34: </a>    <span class="php-comment">/**
-</span></span><span id="35" class="l"><a href="#35">  35: </a><span class="php-comment">     * List of allowed HTTP methods
-</span></span><span id="36" class="l"><a href="#36">  36: </a><span class="php-comment">     *
-</span></span><span id="37" class="l"><a href="#37">  37: </a><span class="php-comment">     * @var array
-</span></span><span id="38" class="l"><a href="#38">  38: </a><span class="php-comment">     */</span>
-</span><span id="39" class="l"><a href="#39">  39: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$allowed_http_methods</span> = <span class="php-keyword1">array</span>(<span class="php-quote">'get'</span>, <span class="php-quote">'delete'</span>, <span class="php-quote">'post'</span>, <span class="php-quote">'put'</span>, <span class="php-quote">'options'</span>, <span class="php-quote">'patch'</span>, <span class="php-quote">'head'</span>);
-</span><span id="40" class="l"><a href="#40">  40: </a>
-</span><span id="41" class="l"><a href="#41">  41: </a>    <span class="php-comment">/**
-</span></span><span id="42" class="l"><a href="#42">  42: </a><span class="php-comment">     * General request data and information.
-</span></span><span id="43" class="l"><a href="#43">  43: </a><span class="php-comment">     * Stores accept, language, body, headers, etc.
+</span></span><span id="20" class="l"><a href="#20">  20: </a><span class="php-comment">     * Must be overridden it in a controller so that it is set.
+</span></span><span id="21" class="l"><a href="#21">  21: </a><span class="php-comment">     *
+</span></span><span id="22" class="l"><a href="#22">  22: </a><span class="php-comment">     * @var string|NULL
+</span></span><span id="23" class="l"><a href="#23">  23: </a><span class="php-comment">     */</span>
+</span><span id="24" class="l"><a href="#24">  24: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$rest_format</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="25" class="l"><a href="#25">  25: </a>
+</span><span id="26" class="l"><a href="#26">  26: </a>    <span class="php-comment">/**
+</span></span><span id="27" class="l"><a href="#27">  27: </a><span class="php-comment">     * Defines the list of method properties such as limit, log and level
+</span></span><span id="28" class="l"><a href="#28">  28: </a><span class="php-comment">     *
+</span></span><span id="29" class="l"><a href="#29">  29: </a><span class="php-comment">     * @var array
+</span></span><span id="30" class="l"><a href="#30">  30: </a><span class="php-comment">     */</span>
+</span><span id="31" class="l"><a href="#31">  31: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$methods</span> = [];
+</span><span id="32" class="l"><a href="#32">  32: </a>
+</span><span id="33" class="l"><a href="#33">  33: </a>    <span class="php-comment">/**
+</span></span><span id="34" class="l"><a href="#34">  34: </a><span class="php-comment">     * List of allowed HTTP methods
+</span></span><span id="35" class="l"><a href="#35">  35: </a><span class="php-comment">     *
+</span></span><span id="36" class="l"><a href="#36">  36: </a><span class="php-comment">     * @var array
+</span></span><span id="37" class="l"><a href="#37">  37: </a><span class="php-comment">     */</span>
+</span><span id="38" class="l"><a href="#38">  38: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$allowed_http_methods</span> = [<span class="php-quote">'get'</span>, <span class="php-quote">'delete'</span>, <span class="php-quote">'post'</span>, <span class="php-quote">'put'</span>, <span class="php-quote">'options'</span>, <span class="php-quote">'patch'</span>, <span class="php-quote">'head'</span>];
+</span><span id="39" class="l"><a href="#39">  39: </a>
+</span><span id="40" class="l"><a href="#40">  40: </a>    <span class="php-comment">/**
+</span></span><span id="41" class="l"><a href="#41">  41: </a><span class="php-comment">     * Contains details about the request
+</span></span><span id="42" class="l"><a href="#42">  42: </a><span class="php-comment">     * Fields: body, format, method, ssl
+</span></span><span id="43" class="l"><a href="#43">  43: </a><span class="php-comment">     * Note: This is a dynamic object (stdClass)
 </span></span><span id="44" class="l"><a href="#44">  44: </a><span class="php-comment">     *
 </span></span><span id="45" class="l"><a href="#45">  45: </a><span class="php-comment">     * @var object
 </span></span><span id="46" class="l"><a href="#46">  46: </a><span class="php-comment">     */</span>
-</span><span id="47" class="l"><a href="#47">  47: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$request</span>              = <span class="php-keyword1">NULL</span>;
+</span><span id="47" class="l"><a href="#47">  47: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$request</span> = <span class="php-keyword1">NULL</span>;
 </span><span id="48" class="l"><a href="#48">  48: </a>
-</span><span id="49" class="l"><a href="#49">  49: </a>    <span class="php-comment">/**
-</span></span><span id="50" class="l"><a href="#50">  50: </a><span class="php-comment">     * What is gonna happen in output?
-</span></span><span id="51" class="l"><a href="#51">  51: </a><span class="php-comment">     *
-</span></span><span id="52" class="l"><a href="#52">  52: </a><span class="php-comment">     * @var object
-</span></span><span id="53" class="l"><a href="#53">  53: </a><span class="php-comment">     */</span>
-</span><span id="54" class="l"><a href="#54">  54: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$response</span>             = <span class="php-keyword1">NULL</span>;
-</span><span id="55" class="l"><a href="#55">  55: </a>
-</span><span id="56" class="l"><a href="#56">  56: </a>    <span class="php-comment">/**
-</span></span><span id="57" class="l"><a href="#57">  57: </a><span class="php-comment">     * Stores DB, keys, key level, etc
-</span></span><span id="58" class="l"><a href="#58">  58: </a><span class="php-comment">     *
-</span></span><span id="59" class="l"><a href="#59">  59: </a><span class="php-comment">     * @var object
-</span></span><span id="60" class="l"><a href="#60">  60: </a><span class="php-comment">     */</span>
-</span><span id="61" class="l"><a href="#61">  61: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$rest</span>                 = <span class="php-keyword1">NULL</span>;
-</span><span id="62" class="l"><a href="#62">  62: </a>
-</span><span id="63" class="l"><a href="#63">  63: </a>    <span class="php-comment">/**
-</span></span><span id="64" class="l"><a href="#64">  64: </a><span class="php-comment">     * The arguments for the GET request method
-</span></span><span id="65" class="l"><a href="#65">  65: </a><span class="php-comment">     *
-</span></span><span id="66" class="l"><a href="#66">  66: </a><span class="php-comment">     * @var array
-</span></span><span id="67" class="l"><a href="#67">  67: </a><span class="php-comment">     */</span>
-</span><span id="68" class="l"><a href="#68">  68: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_get_args</span>            = <span class="php-keyword1">array</span>();
-</span><span id="69" class="l"><a href="#69">  69: </a>
-</span><span id="70" class="l"><a href="#70">  70: </a>    <span class="php-comment">/**
-</span></span><span id="71" class="l"><a href="#71">  71: </a><span class="php-comment">     * The arguments for the POST request method
-</span></span><span id="72" class="l"><a href="#72">  72: </a><span class="php-comment">     *
-</span></span><span id="73" class="l"><a href="#73">  73: </a><span class="php-comment">     * @var array
-</span></span><span id="74" class="l"><a href="#74">  74: </a><span class="php-comment">     */</span>
-</span><span id="75" class="l"><a href="#75">  75: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_post_args</span>           = <span class="php-keyword1">array</span>();
-</span><span id="76" class="l"><a href="#76">  76: </a>
-</span><span id="77" class="l"><a href="#77">  77: </a>    <span class="php-comment">/**
-</span></span><span id="78" class="l"><a href="#78">  78: </a><span class="php-comment">     * The insert_id of the log entry (if we have one)
-</span></span><span id="79" class="l"><a href="#79">  79: </a><span class="php-comment">     *
-</span></span><span id="80" class="l"><a href="#80">  80: </a><span class="php-comment">     * @var string
-</span></span><span id="81" class="l"><a href="#81">  81: </a><span class="php-comment">    */</span>
-</span><span id="82" class="l"><a href="#82">  82: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_insert_id</span>           = <span class="php-quote">''</span>;
-</span><span id="83" class="l"><a href="#83">  83: </a>
-</span><span id="84" class="l"><a href="#84">  84: </a>    <span class="php-comment">/**
-</span></span><span id="85" class="l"><a href="#85">  85: </a><span class="php-comment">     * The arguments for the PUT request method
-</span></span><span id="86" class="l"><a href="#86">  86: </a><span class="php-comment">     *
-</span></span><span id="87" class="l"><a href="#87">  87: </a><span class="php-comment">     * @var array
-</span></span><span id="88" class="l"><a href="#88">  88: </a><span class="php-comment">     */</span>
-</span><span id="89" class="l"><a href="#89">  89: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_put_args</span>            = <span class="php-keyword1">array</span>();
-</span><span id="90" class="l"><a href="#90">  90: </a>
-</span><span id="91" class="l"><a href="#91">  91: </a>    <span class="php-comment">/**
-</span></span><span id="92" class="l"><a href="#92">  92: </a><span class="php-comment">     * The arguments for the DELETE request method
-</span></span><span id="93" class="l"><a href="#93">  93: </a><span class="php-comment">     *
-</span></span><span id="94" class="l"><a href="#94">  94: </a><span class="php-comment">     * @var array
-</span></span><span id="95" class="l"><a href="#95">  95: </a><span class="php-comment">     */</span>
-</span><span id="96" class="l"><a href="#96">  96: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_delete_args</span>         = <span class="php-keyword1">array</span>();
-</span><span id="97" class="l"><a href="#97">  97: </a>
-</span><span id="98" class="l"><a href="#98">  98: </a>    <span class="php-comment">/**
-</span></span><span id="99" class="l"><a href="#99">  99: </a><span class="php-comment">     * The arguments for the PATCH request method
-</span></span><span id="100" class="l"><a href="#100"> 100: </a><span class="php-comment">     *
-</span></span><span id="101" class="l"><a href="#101"> 101: </a><span class="php-comment">     * @var array
-</span></span><span id="102" class="l"><a href="#102"> 102: </a><span class="php-comment">     */</span>
-</span><span id="103" class="l"><a href="#103"> 103: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_patch_args</span>          = <span class="php-keyword1">array</span>();
-</span><span id="104" class="l"><a href="#104"> 104: </a>
-</span><span id="105" class="l"><a href="#105"> 105: </a>    <span class="php-comment">/**
-</span></span><span id="106" class="l"><a href="#106"> 106: </a><span class="php-comment">     * The arguments for the HEAD request method
-</span></span><span id="107" class="l"><a href="#107"> 107: </a><span class="php-comment">     *
-</span></span><span id="108" class="l"><a href="#108"> 108: </a><span class="php-comment">     * @var array
-</span></span><span id="109" class="l"><a href="#109"> 109: </a><span class="php-comment">     */</span>
-</span><span id="110" class="l"><a href="#110"> 110: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_head_args</span>           = <span class="php-keyword1">array</span>();
-</span><span id="111" class="l"><a href="#111"> 111: </a>
-</span><span id="112" class="l"><a href="#112"> 112: </a>    <span class="php-comment">/**
-</span></span><span id="113" class="l"><a href="#113"> 113: </a><span class="php-comment">     * The arguments for the OPTIONS request method
-</span></span><span id="114" class="l"><a href="#114"> 114: </a><span class="php-comment">     *
-</span></span><span id="115" class="l"><a href="#115"> 115: </a><span class="php-comment">     * @var array
-</span></span><span id="116" class="l"><a href="#116"> 116: </a><span class="php-comment">     */</span>
-</span><span id="117" class="l"><a href="#117"> 117: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_options_args</span>        = <span class="php-keyword1">array</span>();
-</span><span id="118" class="l"><a href="#118"> 118: </a>
-</span><span id="119" class="l"><a href="#119"> 119: </a>    <span class="php-comment">/**
-</span></span><span id="120" class="l"><a href="#120"> 120: </a><span class="php-comment">     * The arguments from GET, POST, PUT, DELETE request methods combined.
-</span></span><span id="121" class="l"><a href="#121"> 121: </a><span class="php-comment">     *
-</span></span><span id="122" class="l"><a href="#122"> 122: </a><span class="php-comment">     * @var array
-</span></span><span id="123" class="l"><a href="#123"> 123: </a><span class="php-comment">     */</span>
-</span><span id="124" class="l"><a href="#124"> 124: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_args</span>                = <span class="php-keyword1">array</span>();
-</span><span id="125" class="l"><a href="#125"> 125: </a>
-</span><span id="126" class="l"><a href="#126"> 126: </a>    <span class="php-comment">/**
-</span></span><span id="127" class="l"><a href="#127"> 127: </a><span class="php-comment">     * If the request is allowed based on the API key provided.
-</span></span><span id="128" class="l"><a href="#128"> 128: </a><span class="php-comment">     *
-</span></span><span id="129" class="l"><a href="#129"> 129: </a><span class="php-comment">     * @var boolean
-</span></span><span id="130" class="l"><a href="#130"> 130: </a><span class="php-comment">     */</span>
-</span><span id="131" class="l"><a href="#131"> 131: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_allow</span>               = <span class="php-keyword1">TRUE</span>;
-</span><span id="132" class="l"><a href="#132"> 132: </a>
-</span><span id="133" class="l"><a href="#133"> 133: </a>    <span class="php-comment">/**
-</span></span><span id="134" class="l"><a href="#134"> 134: </a><span class="php-comment">     * Determines if output compression is enabled
-</span></span><span id="135" class="l"><a href="#135"> 135: </a><span class="php-comment">     *
-</span></span><span id="136" class="l"><a href="#136"> 136: </a><span class="php-comment">     * @var boolean
-</span></span><span id="137" class="l"><a href="#137"> 137: </a><span class="php-comment">     */</span>
-</span><span id="138" class="l"><a href="#138"> 138: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_zlib_oc</span>             = <span class="php-keyword1">FALSE</span>;
-</span><span id="139" class="l"><a href="#139"> 139: </a>
-</span><span id="140" class="l"><a href="#140"> 140: </a>    <span class="php-comment">/**
-</span></span><span id="141" class="l"><a href="#141"> 141: </a><span class="php-comment">     * The LDAP Distinguished Name of the User post authentication
-</span></span><span id="142" class="l"><a href="#142"> 142: </a><span class="php-comment">     *
-</span></span><span id="143" class="l"><a href="#143"> 143: </a><span class="php-comment">     * @var string
-</span></span><span id="144" class="l"><a href="#144"> 144: </a><span class="php-comment">    */</span>
-</span><span id="145" class="l"><a href="#145"> 145: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_user_ldap_dn</span>        = <span class="php-quote">''</span>;
-</span><span id="146" class="l"><a href="#146"> 146: </a>
-</span><span id="147" class="l"><a href="#147"> 147: </a>    <span class="php-comment">/**
-</span></span><span id="148" class="l"><a href="#148"> 148: </a><span class="php-comment">     * The start of the response time from the server
-</span></span><span id="149" class="l"><a href="#149"> 149: </a><span class="php-comment">     *
-</span></span><span id="150" class="l"><a href="#150"> 150: </a><span class="php-comment">     * @var string
-</span></span><span id="151" class="l"><a href="#151"> 151: </a><span class="php-comment">    */</span>
-</span><span id="152" class="l"><a href="#152"> 152: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_start_rtime</span>         = <span class="php-quote">''</span>;
-</span><span id="153" class="l"><a href="#153"> 153: </a>
-</span><span id="154" class="l"><a href="#154"> 154: </a>    <span class="php-comment">/**
-</span></span><span id="155" class="l"><a href="#155"> 155: </a><span class="php-comment">     * The end of the response time from the server
-</span></span><span id="156" class="l"><a href="#156"> 156: </a><span class="php-comment">     *
-</span></span><span id="157" class="l"><a href="#157"> 157: </a><span class="php-comment">     * @var string
-</span></span><span id="158" class="l"><a href="#158"> 158: </a><span class="php-comment">    */</span>
-</span><span id="159" class="l"><a href="#159"> 159: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_end_rtime</span>           = <span class="php-quote">''</span>;
-</span><span id="160" class="l"><a href="#160"> 160: </a>
-</span><span id="161" class="l"><a href="#161"> 161: </a>    <span class="php-comment">/**
-</span></span><span id="162" class="l"><a href="#162"> 162: </a><span class="php-comment">     * List all supported methods, the first will be the default format
-</span></span><span id="163" class="l"><a href="#163"> 163: </a><span class="php-comment">     *
-</span></span><span id="164" class="l"><a href="#164"> 164: </a><span class="php-comment">     * @var array
-</span></span><span id="165" class="l"><a href="#165"> 165: </a><span class="php-comment">     */</span>
-</span><span id="166" class="l"><a href="#166"> 166: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_supported_formats</span>   = <span class="php-keyword1">array</span>(
-</span><span id="167" class="l"><a href="#167"> 167: </a>        <span class="php-quote">'xml'</span>           =&gt; <span class="php-quote">'application/xml'</span>,
-</span><span id="168" class="l"><a href="#168"> 168: </a>        <span class="php-quote">'json'</span>          =&gt; <span class="php-quote">'application/json'</span>,
-</span><span id="169" class="l"><a href="#169"> 169: </a>        <span class="php-quote">'jsonp'</span>         =&gt; <span class="php-quote">'application/javascript'</span>,
-</span><span id="170" class="l"><a href="#170"> 170: </a>        <span class="php-quote">'serialized'</span>    =&gt; <span class="php-quote">'application/vnd.php.serialized'</span>,
-</span><span id="171" class="l"><a href="#171"> 171: </a>        <span class="php-quote">'php'</span>           =&gt; <span class="php-quote">'text/plain'</span>,
-</span><span id="172" class="l"><a href="#172"> 172: </a>        <span class="php-quote">'html'</span>          =&gt; <span class="php-quote">'text/html'</span>,
-</span><span id="173" class="l"><a href="#173"> 173: </a>        <span class="php-quote">'csv'</span>           =&gt; <span class="php-quote">'application/csv'</span>
-</span><span id="174" class="l"><a href="#174"> 174: </a>    );
-</span><span id="175" class="l"><a href="#175"> 175: </a>
-</span><span id="176" class="l"><a href="#176"> 176: </a>    <span class="php-comment">/**
-</span></span><span id="177" class="l"><a href="#177"> 177: </a><span class="php-comment">     * Information about the current API user
-</span></span><span id="178" class="l"><a href="#178"> 178: </a><span class="php-comment">     *
-</span></span><span id="179" class="l"><a href="#179"> 179: </a><span class="php-comment">     * @var object
-</span></span><span id="180" class="l"><a href="#180"> 180: </a><span class="php-comment">     */</span>
-</span><span id="181" class="l"><a href="#181"> 181: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_apiuser</span>;
-</span><span id="182" class="l"><a href="#182"> 182: </a>
-</span><span id="183" class="l"><a href="#183"> 183: </a>    <span class="php-comment">/**
-</span></span><span id="184" class="l"><a href="#184"> 184: </a><span class="php-comment">     * Developers can extend this class and add a check in here.
+</span><span id="49" class="l"><a href="#49">  49: </a>        <span class="php-comment">/**
+</span></span><span id="50" class="l"><a href="#50">  50: </a><span class="php-comment">     * Contains details about the response
+</span></span><span id="51" class="l"><a href="#51">  51: </a><span class="php-comment">     * Fields: format, lang
+</span></span><span id="52" class="l"><a href="#52">  52: </a><span class="php-comment">     * Note: This is a dynamic object (stdClass)
+</span></span><span id="53" class="l"><a href="#53">  53: </a><span class="php-comment">     *
+</span></span><span id="54" class="l"><a href="#54">  54: </a><span class="php-comment">     * @var object
+</span></span><span id="55" class="l"><a href="#55">  55: </a><span class="php-comment">     */</span>
+</span><span id="56" class="l"><a href="#56">  56: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$response</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="57" class="l"><a href="#57">  57: </a>
+</span><span id="58" class="l"><a href="#58">  58: </a>    <span class="php-comment">/**
+</span></span><span id="59" class="l"><a href="#59">  59: </a><span class="php-comment">     * Contains details about the REST API
+</span></span><span id="60" class="l"><a href="#60">  60: </a><span class="php-comment">     * Fields: db, ignore_limits, key, level, user_id
+</span></span><span id="61" class="l"><a href="#61">  61: </a><span class="php-comment">     * Note: This is a dynamic object (stdClass)
+</span></span><span id="62" class="l"><a href="#62">  62: </a><span class="php-comment">     *
+</span></span><span id="63" class="l"><a href="#63">  63: </a><span class="php-comment">     * @var object
+</span></span><span id="64" class="l"><a href="#64">  64: </a><span class="php-comment">     */</span>
+</span><span id="65" class="l"><a href="#65">  65: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$rest</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="66" class="l"><a href="#66">  66: </a>
+</span><span id="67" class="l"><a href="#67">  67: </a>    <span class="php-comment">/**
+</span></span><span id="68" class="l"><a href="#68">  68: </a><span class="php-comment">     * The arguments for the GET request method
+</span></span><span id="69" class="l"><a href="#69">  69: </a><span class="php-comment">     *
+</span></span><span id="70" class="l"><a href="#70">  70: </a><span class="php-comment">     * @var array
+</span></span><span id="71" class="l"><a href="#71">  71: </a><span class="php-comment">     */</span>
+</span><span id="72" class="l"><a href="#72">  72: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_get_args</span> = [];
+</span><span id="73" class="l"><a href="#73">  73: </a>
+</span><span id="74" class="l"><a href="#74">  74: </a>    <span class="php-comment">/**
+</span></span><span id="75" class="l"><a href="#75">  75: </a><span class="php-comment">     * The arguments for the POST request method
+</span></span><span id="76" class="l"><a href="#76">  76: </a><span class="php-comment">     *
+</span></span><span id="77" class="l"><a href="#77">  77: </a><span class="php-comment">     * @var array
+</span></span><span id="78" class="l"><a href="#78">  78: </a><span class="php-comment">     */</span>
+</span><span id="79" class="l"><a href="#79">  79: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_post_args</span> = [];
+</span><span id="80" class="l"><a href="#80">  80: </a>
+</span><span id="81" class="l"><a href="#81">  81: </a>    <span class="php-comment">/**
+</span></span><span id="82" class="l"><a href="#82">  82: </a><span class="php-comment">     * The insert_id of the log entry (if we have one)
+</span></span><span id="83" class="l"><a href="#83">  83: </a><span class="php-comment">     *
+</span></span><span id="84" class="l"><a href="#84">  84: </a><span class="php-comment">     * @var string
+</span></span><span id="85" class="l"><a href="#85">  85: </a><span class="php-comment">     */</span>
+</span><span id="86" class="l"><a href="#86">  86: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_insert_id</span> = <span class="php-quote">''</span>;
+</span><span id="87" class="l"><a href="#87">  87: </a>
+</span><span id="88" class="l"><a href="#88">  88: </a>    <span class="php-comment">/**
+</span></span><span id="89" class="l"><a href="#89">  89: </a><span class="php-comment">     * The arguments for the PUT request method
+</span></span><span id="90" class="l"><a href="#90">  90: </a><span class="php-comment">     *
+</span></span><span id="91" class="l"><a href="#91">  91: </a><span class="php-comment">     * @var array
+</span></span><span id="92" class="l"><a href="#92">  92: </a><span class="php-comment">     */</span>
+</span><span id="93" class="l"><a href="#93">  93: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_put_args</span> = [];
+</span><span id="94" class="l"><a href="#94">  94: </a>
+</span><span id="95" class="l"><a href="#95">  95: </a>    <span class="php-comment">/**
+</span></span><span id="96" class="l"><a href="#96">  96: </a><span class="php-comment">     * The arguments for the DELETE request method
+</span></span><span id="97" class="l"><a href="#97">  97: </a><span class="php-comment">     *
+</span></span><span id="98" class="l"><a href="#98">  98: </a><span class="php-comment">     * @var array
+</span></span><span id="99" class="l"><a href="#99">  99: </a><span class="php-comment">     */</span>
+</span><span id="100" class="l"><a href="#100"> 100: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_delete_args</span> = [];
+</span><span id="101" class="l"><a href="#101"> 101: </a>
+</span><span id="102" class="l"><a href="#102"> 102: </a>    <span class="php-comment">/**
+</span></span><span id="103" class="l"><a href="#103"> 103: </a><span class="php-comment">     * The arguments for the PATCH request method
+</span></span><span id="104" class="l"><a href="#104"> 104: </a><span class="php-comment">     *
+</span></span><span id="105" class="l"><a href="#105"> 105: </a><span class="php-comment">     * @var array
+</span></span><span id="106" class="l"><a href="#106"> 106: </a><span class="php-comment">     */</span>
+</span><span id="107" class="l"><a href="#107"> 107: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_patch_args</span> = [];
+</span><span id="108" class="l"><a href="#108"> 108: </a>
+</span><span id="109" class="l"><a href="#109"> 109: </a>    <span class="php-comment">/**
+</span></span><span id="110" class="l"><a href="#110"> 110: </a><span class="php-comment">     * The arguments for the HEAD request method
+</span></span><span id="111" class="l"><a href="#111"> 111: </a><span class="php-comment">     *
+</span></span><span id="112" class="l"><a href="#112"> 112: </a><span class="php-comment">     * @var array
+</span></span><span id="113" class="l"><a href="#113"> 113: </a><span class="php-comment">     */</span>
+</span><span id="114" class="l"><a href="#114"> 114: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_head_args</span> = [];
+</span><span id="115" class="l"><a href="#115"> 115: </a>
+</span><span id="116" class="l"><a href="#116"> 116: </a>    <span class="php-comment">/**
+</span></span><span id="117" class="l"><a href="#117"> 117: </a><span class="php-comment">     * The arguments for the OPTIONS request method
+</span></span><span id="118" class="l"><a href="#118"> 118: </a><span class="php-comment">     *
+</span></span><span id="119" class="l"><a href="#119"> 119: </a><span class="php-comment">     * @var array
+</span></span><span id="120" class="l"><a href="#120"> 120: </a><span class="php-comment">     */</span>
+</span><span id="121" class="l"><a href="#121"> 121: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_options_args</span> = [];
+</span><span id="122" class="l"><a href="#122"> 122: </a>
+</span><span id="123" class="l"><a href="#123"> 123: </a>    <span class="php-comment">/**
+</span></span><span id="124" class="l"><a href="#124"> 124: </a><span class="php-comment">     * The arguments from GET, POST, PUT, DELETE request methods combined.
+</span></span><span id="125" class="l"><a href="#125"> 125: </a><span class="php-comment">     *
+</span></span><span id="126" class="l"><a href="#126"> 126: </a><span class="php-comment">     * @var array
+</span></span><span id="127" class="l"><a href="#127"> 127: </a><span class="php-comment">     */</span>
+</span><span id="128" class="l"><a href="#128"> 128: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_args</span> = [];
+</span><span id="129" class="l"><a href="#129"> 129: </a>
+</span><span id="130" class="l"><a href="#130"> 130: </a>    <span class="php-comment">/**
+</span></span><span id="131" class="l"><a href="#131"> 131: </a><span class="php-comment">     * If the request is allowed based on the API key provided.
+</span></span><span id="132" class="l"><a href="#132"> 132: </a><span class="php-comment">     *
+</span></span><span id="133" class="l"><a href="#133"> 133: </a><span class="php-comment">     * @var bool
+</span></span><span id="134" class="l"><a href="#134"> 134: </a><span class="php-comment">     */</span>
+</span><span id="135" class="l"><a href="#135"> 135: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_allow</span> = <span class="php-keyword1">TRUE</span>;
+</span><span id="136" class="l"><a href="#136"> 136: </a>
+</span><span id="137" class="l"><a href="#137"> 137: </a>    <span class="php-comment">/**
+</span></span><span id="138" class="l"><a href="#138"> 138: </a><span class="php-comment">     * Determines if output compression is enabled
+</span></span><span id="139" class="l"><a href="#139"> 139: </a><span class="php-comment">     *
+</span></span><span id="140" class="l"><a href="#140"> 140: </a><span class="php-comment">     * @var bool
+</span></span><span id="141" class="l"><a href="#141"> 141: </a><span class="php-comment">     */</span>
+</span><span id="142" class="l"><a href="#142"> 142: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_zlib_oc</span> = <span class="php-keyword1">FALSE</span>;
+</span><span id="143" class="l"><a href="#143"> 143: </a>
+</span><span id="144" class="l"><a href="#144"> 144: </a>    <span class="php-comment">/**
+</span></span><span id="145" class="l"><a href="#145"> 145: </a><span class="php-comment">     * The LDAP Distinguished Name of the User post authentication
+</span></span><span id="146" class="l"><a href="#146"> 146: </a><span class="php-comment">     *
+</span></span><span id="147" class="l"><a href="#147"> 147: </a><span class="php-comment">     * @var string
+</span></span><span id="148" class="l"><a href="#148"> 148: </a><span class="php-comment">     */</span>
+</span><span id="149" class="l"><a href="#149"> 149: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_user_ldap_dn</span> = <span class="php-quote">''</span>;
+</span><span id="150" class="l"><a href="#150"> 150: </a>
+</span><span id="151" class="l"><a href="#151"> 151: </a>    <span class="php-comment">/**
+</span></span><span id="152" class="l"><a href="#152"> 152: </a><span class="php-comment">     * The start of the response time from the server
+</span></span><span id="153" class="l"><a href="#153"> 153: </a><span class="php-comment">     *
+</span></span><span id="154" class="l"><a href="#154"> 154: </a><span class="php-comment">     * @var string
+</span></span><span id="155" class="l"><a href="#155"> 155: </a><span class="php-comment">     */</span>
+</span><span id="156" class="l"><a href="#156"> 156: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_start_rtime</span> = <span class="php-quote">''</span>;
+</span><span id="157" class="l"><a href="#157"> 157: </a>
+</span><span id="158" class="l"><a href="#158"> 158: </a>    <span class="php-comment">/**
+</span></span><span id="159" class="l"><a href="#159"> 159: </a><span class="php-comment">     * The end of the response time from the server
+</span></span><span id="160" class="l"><a href="#160"> 160: </a><span class="php-comment">     *
+</span></span><span id="161" class="l"><a href="#161"> 161: </a><span class="php-comment">     * @var string
+</span></span><span id="162" class="l"><a href="#162"> 162: </a><span class="php-comment">     */</span>
+</span><span id="163" class="l"><a href="#163"> 163: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_end_rtime</span> = <span class="php-quote">''</span>;
+</span><span id="164" class="l"><a href="#164"> 164: </a>
+</span><span id="165" class="l"><a href="#165"> 165: </a>    <span class="php-comment">/**
+</span></span><span id="166" class="l"><a href="#166"> 166: </a><span class="php-comment">     * List all supported methods, the first will be the default format
+</span></span><span id="167" class="l"><a href="#167"> 167: </a><span class="php-comment">     *
+</span></span><span id="168" class="l"><a href="#168"> 168: </a><span class="php-comment">     * @var array
+</span></span><span id="169" class="l"><a href="#169"> 169: </a><span class="php-comment">     */</span>
+</span><span id="170" class="l"><a href="#170"> 170: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_supported_formats</span> = [
+</span><span id="171" class="l"><a href="#171"> 171: </a>            <span class="php-quote">'json'</span> =&gt; <span class="php-quote">'application/json'</span>,
+</span><span id="172" class="l"><a href="#172"> 172: </a>            <span class="php-quote">'array'</span> =&gt; <span class="php-quote">'application/json'</span>,
+</span><span id="173" class="l"><a href="#173"> 173: </a>            <span class="php-quote">'csv'</span> =&gt; <span class="php-quote">'application/csv'</span>,
+</span><span id="174" class="l"><a href="#174"> 174: </a>            <span class="php-quote">'html'</span> =&gt; <span class="php-quote">'text/html'</span>,
+</span><span id="175" class="l"><a href="#175"> 175: </a>            <span class="php-quote">'jsonp'</span> =&gt; <span class="php-quote">'application/javascript'</span>,
+</span><span id="176" class="l"><a href="#176"> 176: </a>            <span class="php-quote">'php'</span> =&gt; <span class="php-quote">'text/plain'</span>,
+</span><span id="177" class="l"><a href="#177"> 177: </a>            <span class="php-quote">'serialized'</span> =&gt; <span class="php-quote">'application/vnd.php.serialized'</span>,
+</span><span id="178" class="l"><a href="#178"> 178: </a>            <span class="php-quote">'xml'</span> =&gt; <span class="php-quote">'application/xml'</span>
+</span><span id="179" class="l"><a href="#179"> 179: </a>        ];
+</span><span id="180" class="l"><a href="#180"> 180: </a>
+</span><span id="181" class="l"><a href="#181"> 181: </a>    <span class="php-comment">/**
+</span></span><span id="182" class="l"><a href="#182"> 182: </a><span class="php-comment">     * Information about the current API user
+</span></span><span id="183" class="l"><a href="#183"> 183: </a><span class="php-comment">     *
+</span></span><span id="184" class="l"><a href="#184"> 184: </a><span class="php-comment">     * @var object
 </span></span><span id="185" class="l"><a href="#185"> 185: </a><span class="php-comment">     */</span>
-</span><span id="186" class="l"><a href="#186"> 186: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> early_checks()
-</span><span id="187" class="l"><a href="#187"> 187: </a>    {
-</span><span id="188" class="l"><a href="#188"> 188: </a>
-</span><span id="189" class="l"><a href="#189"> 189: </a>    }
-</span><span id="190" class="l"><a href="#190"> 190: </a>
-</span><span id="191" class="l"><a href="#191"> 191: </a>    <span class="php-comment">/**
-</span></span><span id="192" class="l"><a href="#192"> 192: </a><span class="php-comment">     * Constructor function
-</span></span><span id="193" class="l"><a href="#193"> 193: </a><span class="php-comment">     * @todo Document more please.
-</span></span><span id="194" class="l"><a href="#194"> 194: </a><span class="php-comment">     */</span>
-</span><span id="195" class="l"><a href="#195"> 195: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$config</span> = <span class="php-quote">'rest'</span>)
-</span><span id="196" class="l"><a href="#196"> 196: </a>    {
-</span><span id="197" class="l"><a href="#197"> 197: </a>        parent::__construct();
-</span><span id="198" class="l"><a href="#198"> 198: </a>
-</span><span id="199" class="l"><a href="#199"> 199: </a>        <span class="php-comment">// Start the timer for how long the request takes</span>
-</span><span id="200" class="l"><a href="#200"> 200: </a>        <span class="php-var">$this</span>-&gt;_start_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="201" class="l"><a href="#201"> 201: </a>
-</span><span id="202" class="l"><a href="#202"> 202: </a>        <span class="php-comment">// Lets grab the config and get ready to party</span>
-</span><span id="203" class="l"><a href="#203"> 203: </a>        <span class="php-var">$this</span>-&gt;load-&gt;config(<span class="php-var">$config</span>);
-</span><span id="204" class="l"><a href="#204"> 204: </a>
-</span><span id="205" class="l"><a href="#205"> 205: </a>        <span class="php-comment">// This library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter itself</span>
-</span><span id="206" class="l"><a href="#206"> 206: </a>        <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-quote">'format'</span>);
-</span><span id="207" class="l"><a href="#207"> 207: </a>
-</span><span id="208" class="l"><a href="#208"> 208: </a>        <span class="php-comment">// init objects</span>
-</span><span id="209" class="l"><a href="#209"> 209: </a>        <span class="php-var">$this</span>-&gt;response     = <span class="php-keyword1">new</span> stdClass();
-</span><span id="210" class="l"><a href="#210"> 210: </a>        <span class="php-var">$this</span>-&gt;rest         = <span class="php-keyword1">new</span> stdClass();
-</span><span id="211" class="l"><a href="#211"> 211: </a>
-</span><span id="212" class="l"><a href="#212"> 212: </a>        <span class="php-var">$this</span>-&gt;_zlib_oc     = @<span class="php-keyword2">ini_get</span>(<span class="php-quote">'zlib.output_compression'</span>);
-</span><span id="213" class="l"><a href="#213"> 213: </a>
-</span><span id="214" class="l"><a href="#214"> 214: </a>        <span class="php-comment">// let's learn about the request</span>
-</span><span id="215" class="l"><a href="#215"> 215: </a>        <span class="php-var">$this</span>-&gt;request      = <span class="php-keyword1">new</span> stdClass();
-</span><span id="216" class="l"><a href="#216"> 216: </a>
-</span><span id="217" class="l"><a href="#217"> 217: </a>        <span class="php-comment">// Check to see if this IP is Blacklisted</span>
-</span><span id="218" class="l"><a href="#218"> 218: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>)) {
-</span><span id="219" class="l"><a href="#219"> 219: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
-</span><span id="220" class="l"><a href="#220"> 220: </a>        }
+</span><span id="186" class="l"><a href="#186"> 186: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_apiuser</span>;
+</span><span id="187" class="l"><a href="#187"> 187: </a>
+</span><span id="188" class="l"><a href="#188"> 188: </a>    <span class="php-comment">/**
+</span></span><span id="189" class="l"><a href="#189"> 189: </a><span class="php-comment">     * Enable XSS flag
+</span></span><span id="190" class="l"><a href="#190"> 190: </a><span class="php-comment">     * Determines whether the XSS filter is always active when
+</span></span><span id="191" class="l"><a href="#191"> 191: </a><span class="php-comment">     * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered.
+</span></span><span id="192" class="l"><a href="#192"> 192: </a><span class="php-comment">     * Set automatically based on config setting.
+</span></span><span id="193" class="l"><a href="#193"> 193: </a><span class="php-comment">     *
+</span></span><span id="194" class="l"><a href="#194"> 194: </a><span class="php-comment">     * @var bool
+</span></span><span id="195" class="l"><a href="#195"> 195: </a><span class="php-comment">     */</span>
+</span><span id="196" class="l"><a href="#196"> 196: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_enable_xss</span> = <span class="php-keyword1">FALSE</span>;
+</span><span id="197" class="l"><a href="#197"> 197: </a>
+</span><span id="198" class="l"><a href="#198"> 198: </a>    <span class="php-comment">/**
+</span></span><span id="199" class="l"><a href="#199"> 199: </a><span class="php-comment">     * Extend this function to apply additional checking early on in the process
+</span></span><span id="200" class="l"><a href="#200"> 200: </a><span class="php-comment">     *
+</span></span><span id="201" class="l"><a href="#201"> 201: </a><span class="php-comment">     * @access protected
+</span></span><span id="202" class="l"><a href="#202"> 202: </a><span class="php-comment">     */</span>
+</span><span id="203" class="l"><a href="#203"> 203: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> early_checks()
+</span><span id="204" class="l"><a href="#204"> 204: </a>    {
+</span><span id="205" class="l"><a href="#205"> 205: </a>    }
+</span><span id="206" class="l"><a href="#206"> 206: </a>
+</span><span id="207" class="l"><a href="#207"> 207: </a>    <span class="php-comment">/**
+</span></span><span id="208" class="l"><a href="#208"> 208: </a><span class="php-comment">     * Constructor for the REST API
+</span></span><span id="209" class="l"><a href="#209"> 209: </a><span class="php-comment">     *
+</span></span><span id="210" class="l"><a href="#210"> 210: </a><span class="php-comment">     * @access public
+</span></span><span id="211" class="l"><a href="#211"> 211: </a><span class="php-comment">     *
+</span></span><span id="212" class="l"><a href="#212"> 212: </a><span class="php-comment">     * @param string $config Configuration filename minus the file extension
+</span></span><span id="213" class="l"><a href="#213"> 213: </a><span class="php-comment">     * e.g: my_rest.php is passed as 'my_rest'
+</span></span><span id="214" class="l"><a href="#214"> 214: </a><span class="php-comment">     */</span>
+</span><span id="215" class="l"><a href="#215"> 215: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$config</span> = <span class="php-quote">'rest'</span>)
+</span><span id="216" class="l"><a href="#216"> 216: </a>    {
+</span><span id="217" class="l"><a href="#217"> 217: </a>        parent::__construct();
+</span><span id="218" class="l"><a href="#218"> 218: </a>
+</span><span id="219" class="l"><a href="#219"> 219: </a>        <span class="php-comment">// Disable XML Entity (security vulnerability)</span>
+</span><span id="220" class="l"><a href="#220"> 220: </a>        <span class="php-keyword2">libxml_disable_entity_loader</span>(<span class="php-keyword1">TRUE</span>);
 </span><span id="221" class="l"><a href="#221"> 221: </a>
-</span><span id="222" class="l"><a href="#222"> 222: </a>        <span class="php-comment">// Is it over SSL?</span>
-</span><span id="223" class="l"><a href="#223"> 223: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl     = <span class="php-var">$this</span>-&gt;_detect_ssl();
-</span><span id="224" class="l"><a href="#224"> 224: </a>
-</span><span id="225" class="l"><a href="#225"> 225: </a>        <span class="php-comment">// How is this request being made? POST, DELETE, GET, PUT?</span>
-</span><span id="226" class="l"><a href="#226"> 226: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method  = <span class="php-var">$this</span>-&gt;_detect_method();
-</span><span id="227" class="l"><a href="#227"> 227: </a>
-</span><span id="228" class="l"><a href="#228"> 228: </a>        <span class="php-comment">// Create argument container, if nonexistent</span>
-</span><span id="229" class="l"><a href="#229"> 229: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>})) {
-</span><span id="230" class="l"><a href="#230"> 230: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>} = <span class="php-keyword1">array</span>();
-</span><span id="231" class="l"><a href="#231"> 231: </a>        }
-</span><span id="232" class="l"><a href="#232"> 232: </a>
-</span><span id="233" class="l"><a href="#233"> 233: </a>        <span class="php-comment">// Set up our GET variables</span>
-</span><span id="234" class="l"><a href="#234"> 234: </a>        <span class="php-var">$this</span>-&gt;_get_args        = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
-</span><span id="235" class="l"><a href="#235"> 235: </a>
-</span><span id="236" class="l"><a href="#236"> 236: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
-</span><span id="237" class="l"><a href="#237"> 237: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format  = <span class="php-var">$this</span>-&gt;_detect_input_format();
-</span><span id="238" class="l"><a href="#238"> 238: </a>
-</span><span id="239" class="l"><a href="#239"> 239: </a>        <span class="php-comment">// Some Methods cant have a body</span>
-</span><span id="240" class="l"><a href="#240"> 240: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body    = <span class="php-keyword1">NULL</span>;
-</span><span id="241" class="l"><a href="#241"> 241: </a>
-</span><span id="242" class="l"><a href="#242"> 242: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
+</span><span id="222" class="l"><a href="#222"> 222: </a>        <span class="php-comment">// Check to see if PHP is equal to or greater than 5.4.x</span>
+</span><span id="223" class="l"><a href="#223"> 223: </a>        <span class="php-keyword1">if</span> (is_php(<span class="php-quote">'5.4'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="224" class="l"><a href="#224"> 224: </a>        {
+</span><span id="225" class="l"><a href="#225"> 225: </a>            <span class="php-comment">// CodeIgniter 3 is recommended for v5.4 or above</span>
+</span><span id="226" class="l"><a href="#226"> 226: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'Using PHP v'</span> . PHP_VERSION . <span class="php-quote">', though PHP v5.4 or greater is required'</span>);
+</span><span id="227" class="l"><a href="#227"> 227: </a>        }
+</span><span id="228" class="l"><a href="#228"> 228: </a>
+</span><span id="229" class="l"><a href="#229"> 229: </a>        <span class="php-comment">// Check to see if this is CI 3.x</span>
+</span><span id="230" class="l"><a href="#230"> 230: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">explode</span>(<span class="php-quote">'.'</span>, CI_VERSION, <span class="php-num">2</span>)[<span class="php-num">0</span>] &lt; <span class="php-num">3</span>)
+</span><span id="231" class="l"><a href="#231"> 231: </a>        {
+</span><span id="232" class="l"><a href="#232"> 232: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
+</span><span id="233" class="l"><a href="#233"> 233: </a>        }
+</span><span id="234" class="l"><a href="#234"> 234: </a>
+</span><span id="235" class="l"><a href="#235"> 235: </a>        <span class="php-comment">// Set the default value of global xss filtering. Same approach as CodeIgniter 3</span>
+</span><span id="236" class="l"><a href="#236"> 236: </a>        <span class="php-var">$this</span>-&gt;_enable_xss = (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'global_xss_filtering'</span>) === <span class="php-keyword1">TRUE</span>);
+</span><span id="237" class="l"><a href="#237"> 237: </a>
+</span><span id="238" class="l"><a href="#238"> 238: </a>        <span class="php-comment">// Start the timer for how long the request takes</span>
+</span><span id="239" class="l"><a href="#239"> 239: </a>        <span class="php-var">$this</span>-&gt;_start_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="240" class="l"><a href="#240"> 240: </a>
+</span><span id="241" class="l"><a href="#241"> 241: </a>        <span class="php-comment">// Load the rest.php configuration file</span>
+</span><span id="242" class="l"><a href="#242"> 242: </a>        <span class="php-var">$this</span>-&gt;load-&gt;config(<span class="php-var">$config</span>);
 </span><span id="243" class="l"><a href="#243"> 243: </a>
-</span><span id="244" class="l"><a href="#244"> 244: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
-</span><span id="245" class="l"><a href="#245"> 245: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format <span class="php-keyword1">and</span> <span class="php-var">$this</span>-&gt;request-&gt;body) {
-</span><span id="246" class="l"><a href="#246"> 246: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
-</span><span id="247" class="l"><a href="#247"> 247: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
-</span><span id="248" class="l"><a href="#248"> 248: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
-</span><span id="249" class="l"><a href="#249"> 249: </a>        }
-</span><span id="250" class="l"><a href="#250"> 250: </a>
-</span><span id="251" class="l"><a href="#251"> 251: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
-</span><span id="252" class="l"><a href="#252"> 252: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args,
-</span><span id="253" class="l"><a href="#253"> 253: </a>            <span class="php-var">$this</span>-&gt;_options_args,
-</span><span id="254" class="l"><a href="#254"> 254: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
-</span><span id="255" class="l"><a href="#255"> 255: </a>            <span class="php-var">$this</span>-&gt;_head_args ,
-</span><span id="256" class="l"><a href="#256"> 256: </a>            <span class="php-var">$this</span>-&gt;_put_args,
-</span><span id="257" class="l"><a href="#257"> 257: </a>            <span class="php-var">$this</span>-&gt;_post_args,
-</span><span id="258" class="l"><a href="#258"> 258: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
-</span><span id="259" class="l"><a href="#259"> 259: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>}
-</span><span id="260" class="l"><a href="#260"> 260: </a>        );
-</span><span id="261" class="l"><a href="#261"> 261: </a>
-</span><span id="262" class="l"><a href="#262"> 262: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
-</span><span id="263" class="l"><a href="#263"> 263: </a>        <span class="php-var">$this</span>-&gt;response         = <span class="php-keyword1">new</span> stdClass();
-</span><span id="264" class="l"><a href="#264"> 264: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
+</span><span id="244" class="l"><a href="#244"> 244: </a>        <span class="php-comment">// At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)</span>
+</span><span id="245" class="l"><a href="#245"> 245: </a>        <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-quote">'format'</span>);
+</span><span id="246" class="l"><a href="#246"> 246: </a>
+</span><span id="247" class="l"><a href="#247"> 247: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
+</span><span id="248" class="l"><a href="#248"> 248: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
+</span><span id="249" class="l"><a href="#249"> 249: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
+</span><span id="250" class="l"><a href="#250"> 250: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
+</span><span id="251" class="l"><a href="#251"> 251: </a>
+</span><span id="252" class="l"><a href="#252"> 252: </a>        <span class="php-var">$this</span>-&gt;_zlib_oc = @<span class="php-keyword2">ini_get</span>(<span class="php-quote">'zlib.output_compression'</span>);
+</span><span id="253" class="l"><a href="#253"> 253: </a>
+</span><span id="254" class="l"><a href="#254"> 254: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
+</span><span id="255" class="l"><a href="#255"> 255: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="256" class="l"><a href="#256"> 256: </a>        {
+</span><span id="257" class="l"><a href="#257"> 257: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
+</span><span id="258" class="l"><a href="#258"> 258: </a>        }
+</span><span id="259" class="l"><a href="#259"> 259: </a>
+</span><span id="260" class="l"><a href="#260"> 260: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
+</span><span id="261" class="l"><a href="#261"> 261: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
+</span><span id="262" class="l"><a href="#262"> 262: </a>
+</span><span id="263" class="l"><a href="#263"> 263: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
+</span><span id="264" class="l"><a href="#264"> 264: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
 </span><span id="265" class="l"><a href="#265"> 265: </a>
-</span><span id="266" class="l"><a href="#266"> 266: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
-</span><span id="267" class="l"><a href="#267"> 267: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang   = <span class="php-var">$this</span>-&gt;_detect_lang();
-</span><span id="268" class="l"><a href="#268"> 268: </a>
-</span><span id="269" class="l"><a href="#269"> 269: </a>        <span class="php-comment">// Developers can extend this class and add a check in here</span>
-</span><span id="270" class="l"><a href="#270"> 270: </a>        <span class="php-var">$this</span>-&gt;early_checks();
+</span><span id="266" class="l"><a href="#266"> 266: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
+</span><span id="267" class="l"><a href="#267"> 267: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
+</span><span id="268" class="l"><a href="#268"> 268: </a>        {
+</span><span id="269" class="l"><a href="#269"> 269: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = [];
+</span><span id="270" class="l"><a href="#270"> 270: </a>        }
 </span><span id="271" class="l"><a href="#271"> 271: </a>
-</span><span id="272" class="l"><a href="#272"> 272: </a>        <span class="php-var">$this</span>-&gt;rest             = <span class="php-keyword1">new</span> StdClass();
-</span><span id="273" class="l"><a href="#273"> 273: </a>
-</span><span id="274" class="l"><a href="#274"> 274: </a>        <span class="php-comment">// Load DB if its enabled</span>
-</span><span id="275" class="l"><a href="#275"> 275: </a>        <span class="php-keyword1">if</span> (config_item(<span class="php-quote">'rest_database_group'</span>) <span class="php-keyword1">and</span> (config_item(<span class="php-quote">'rest_enable_keys'</span>) <span class="php-keyword1">or</span> config_item(<span class="php-quote">'rest_enable_logging'</span>))) {
-</span><span id="276" class="l"><a href="#276"> 276: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db     = <span class="php-var">$this</span>-&gt;load-&gt;database(config_item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
-</span><span id="277" class="l"><a href="#277"> 277: </a>        }
-</span><span id="278" class="l"><a href="#278"> 278: </a>
-</span><span id="279" class="l"><a href="#279"> 279: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
-</span><span id="280" class="l"><a href="#280"> 280: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">&quot;db&quot;</span>)) {
-</span><span id="281" class="l"><a href="#281"> 281: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db     = <span class="php-var">$this</span>-&gt;db;
-</span><span id="282" class="l"><a href="#282"> 282: </a>        }
-</span><span id="283" class="l"><a href="#283"> 283: </a>
-</span><span id="284" class="l"><a href="#284"> 284: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
-</span><span id="285" class="l"><a href="#285"> 285: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
-</span><span id="286" class="l"><a href="#286"> 286: </a>        <span class="php-var">$this</span>-&gt;auth_override    = <span class="php-var">$this</span>-&gt;_auth_override_check();
-</span><span id="287" class="l"><a href="#287"> 287: </a>
-</span><span id="288" class="l"><a href="#288"> 288: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
-</span><span id="289" class="l"><a href="#289"> 289: </a>          <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
-</span><span id="290" class="l"><a href="#290"> 290: </a>        <span class="php-keyword1">if</span> (config_item(<span class="php-quote">'rest_enable_keys'</span>) <span class="php-keyword1">and</span> <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>) {
-</span><span id="291" class="l"><a href="#291"> 291: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
-</span><span id="292" class="l"><a href="#292"> 292: </a>        }
-</span><span id="293" class="l"><a href="#293"> 293: </a>
-</span><span id="294" class="l"><a href="#294"> 294: </a>        <span class="php-comment">// only allow ajax requests</span>
-</span><span id="295" class="l"><a href="#295"> 295: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() <span class="php-keyword1">and</span> config_item(<span class="php-quote">'rest_ajax_only'</span>)) {
-</span><span id="296" class="l"><a href="#296"> 296: </a>            <span class="php-var">$response</span> = <span class="php-keyword1">array</span>(config_item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, config_item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Only AJAX requests are accepted.'</span>);
-</span><span id="297" class="l"><a href="#297"> 297: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, <span class="php-num">406</span>); <span class="php-comment">// Set status to 406 NOT ACCEPTABLE</span>
-</span><span id="298" class="l"><a href="#298"> 298: </a>        }
-</span><span id="299" class="l"><a href="#299"> 299: </a>
-</span><span id="300" class="l"><a href="#300"> 300: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
-</span><span id="301" class="l"><a href="#301"> 301: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span> &amp;&amp; !(config_item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>)) {
-</span><span id="302" class="l"><a href="#302"> 302: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="303" class="l"><a href="#303"> 303: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>) {
-</span><span id="304" class="l"><a href="#304"> 304: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
-</span><span id="305" class="l"><a href="#305"> 305: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="306" class="l"><a href="#306"> 306: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="307" class="l"><a href="#307"> 307: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
-</span><span id="308" class="l"><a href="#308"> 308: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="309" class="l"><a href="#309"> 309: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="310" class="l"><a href="#310"> 310: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
-</span><span id="311" class="l"><a href="#311"> 311: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="312" class="l"><a href="#312"> 312: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="313" class="l"><a href="#313"> 313: </a>            }
-</span><span id="314" class="l"><a href="#314"> 314: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>)) {
-</span><span id="315" class="l"><a href="#315"> 315: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="316" class="l"><a href="#316"> 316: </a>            }
-</span><span id="317" class="l"><a href="#317"> 317: </a>        }
-</span><span id="318" class="l"><a href="#318"> 318: </a>    }
-</span><span id="319" class="l"><a href="#319"> 319: </a>
-</span><span id="320" class="l"><a href="#320"> 320: </a>    <span class="php-comment">/**
-</span></span><span id="321" class="l"><a href="#321"> 321: </a><span class="php-comment">     * Destructor function
-</span></span><span id="322" class="l"><a href="#322"> 322: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="323" class="l"><a href="#323"> 323: </a><span class="php-comment">     */</span>
-</span><span id="324" class="l"><a href="#324"> 324: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
-</span><span id="325" class="l"><a href="#325"> 325: </a>    {
-</span><span id="326" class="l"><a href="#326"> 326: </a>        <span class="php-comment">// Record the &quot;stop&quot; time of the request</span>
-</span><span id="327" class="l"><a href="#327"> 327: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="328" class="l"><a href="#328"> 328: </a>        <span class="php-comment">// CK: if, we are logging, log the access time here, as we are done!</span>
-</span><span id="329" class="l"><a href="#329"> 329: </a>        <span class="php-keyword1">if</span> (config_item(<span class="php-quote">'rest_enable_logging'</span>)) {
-</span><span id="330" class="l"><a href="#330"> 330: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
-</span><span id="331" class="l"><a href="#331"> 331: </a>        }
-</span><span id="332" class="l"><a href="#332"> 332: </a>
-</span><span id="333" class="l"><a href="#333"> 333: </a>    }
+</span><span id="272" class="l"><a href="#272"> 272: </a>        <span class="php-comment">// Set up the GET variables</span>
+</span><span id="273" class="l"><a href="#273"> 273: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
+</span><span id="274" class="l"><a href="#274"> 274: </a>
+</span><span id="275" class="l"><a href="#275"> 275: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
+</span><span id="276" class="l"><a href="#276"> 276: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
+</span><span id="277" class="l"><a href="#277"> 277: </a>
+</span><span id="278" class="l"><a href="#278"> 278: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
+</span><span id="279" class="l"><a href="#279"> 279: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
+</span><span id="280" class="l"><a href="#280"> 280: </a>
+</span><span id="281" class="l"><a href="#281"> 281: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
+</span><span id="282" class="l"><a href="#282"> 282: </a>
+</span><span id="283" class="l"><a href="#283"> 283: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
+</span><span id="284" class="l"><a href="#284"> 284: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
+</span><span id="285" class="l"><a href="#285"> 285: </a>        {
+</span><span id="286" class="l"><a href="#286"> 286: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
+</span><span id="287" class="l"><a href="#287"> 287: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
+</span><span id="288" class="l"><a href="#288"> 288: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
+</span><span id="289" class="l"><a href="#289"> 289: </a>        }
+</span><span id="290" class="l"><a href="#290"> 290: </a>
+</span><span id="291" class="l"><a href="#291"> 291: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
+</span><span id="292" class="l"><a href="#292"> 292: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
+</span><span id="293" class="l"><a href="#293"> 293: </a>            <span class="php-var">$this</span>-&gt;_get_args,
+</span><span id="294" class="l"><a href="#294"> 294: </a>            <span class="php-var">$this</span>-&gt;_options_args,
+</span><span id="295" class="l"><a href="#295"> 295: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
+</span><span id="296" class="l"><a href="#296"> 296: </a>            <span class="php-var">$this</span>-&gt;_head_args,
+</span><span id="297" class="l"><a href="#297"> 297: </a>            <span class="php-var">$this</span>-&gt;_put_args,
+</span><span id="298" class="l"><a href="#298"> 298: </a>            <span class="php-var">$this</span>-&gt;_post_args,
+</span><span id="299" class="l"><a href="#299"> 299: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
+</span><span id="300" class="l"><a href="#300"> 300: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}
+</span><span id="301" class="l"><a href="#301"> 301: </a>        );
+</span><span id="302" class="l"><a href="#302"> 302: </a>
+</span><span id="303" class="l"><a href="#303"> 303: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
+</span><span id="304" class="l"><a href="#304"> 304: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
+</span><span id="305" class="l"><a href="#305"> 305: </a>
+</span><span id="306" class="l"><a href="#306"> 306: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
+</span><span id="307" class="l"><a href="#307"> 307: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
+</span><span id="308" class="l"><a href="#308"> 308: </a>
+</span><span id="309" class="l"><a href="#309"> 309: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
+</span><span id="310" class="l"><a href="#310"> 310: </a>        <span class="php-var">$this</span>-&gt;early_checks();
+</span><span id="311" class="l"><a href="#311"> 311: </a>
+</span><span id="312" class="l"><a href="#312"> 312: </a>        <span class="php-comment">// Load DB if its enabled</span>
+</span><span id="313" class="l"><a href="#313"> 313: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
+</span><span id="314" class="l"><a href="#314"> 314: </a>        {
+</span><span id="315" class="l"><a href="#315"> 315: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
+</span><span id="316" class="l"><a href="#316"> 316: </a>        }
+</span><span id="317" class="l"><a href="#317"> 317: </a>
+</span><span id="318" class="l"><a href="#318"> 318: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
+</span><span id="319" class="l"><a href="#319"> 319: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
+</span><span id="320" class="l"><a href="#320"> 320: </a>        {
+</span><span id="321" class="l"><a href="#321"> 321: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
+</span><span id="322" class="l"><a href="#322"> 322: </a>        }
+</span><span id="323" class="l"><a href="#323"> 323: </a>
+</span><span id="324" class="l"><a href="#324"> 324: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
+</span><span id="325" class="l"><a href="#325"> 325: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
+</span><span id="326" class="l"><a href="#326"> 326: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
+</span><span id="327" class="l"><a href="#327"> 327: </a>
+</span><span id="328" class="l"><a href="#328"> 328: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
+</span><span id="329" class="l"><a href="#329"> 329: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
+</span><span id="330" class="l"><a href="#330"> 330: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
+</span><span id="331" class="l"><a href="#331"> 331: </a>        {
+</span><span id="332" class="l"><a href="#332"> 332: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
+</span><span id="333" class="l"><a href="#333"> 333: </a>        }
 </span><span id="334" class="l"><a href="#334"> 334: </a>
-</span><span id="335" class="l"><a href="#335"> 335: </a>    <span class="php-comment">/**
-</span></span><span id="336" class="l"><a href="#336"> 336: </a><span class="php-comment">     * Remap
-</span></span><span id="337" class="l"><a href="#337"> 337: </a><span class="php-comment">     *
-</span></span><span id="338" class="l"><a href="#338"> 338: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
-</span></span><span id="339" class="l"><a href="#339"> 339: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
-</span></span><span id="340" class="l"><a href="#340"> 340: </a><span class="php-comment">     * Controller method.
-</span></span><span id="341" class="l"><a href="#341"> 341: </a><span class="php-comment">     *
-</span></span><span id="342" class="l"><a href="#342"> 342: </a><span class="php-comment">     * @param string $object_called
-</span></span><span id="343" class="l"><a href="#343"> 343: </a><span class="php-comment">     * @param array  $arguments     The arguments passed to the controller method.
-</span></span><span id="344" class="l"><a href="#344"> 344: </a><span class="php-comment">     */</span>
-</span><span id="345" class="l"><a href="#345"> 345: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span>)
-</span><span id="346" class="l"><a href="#346"> 346: </a>    {
-</span><span id="347" class="l"><a href="#347"> 347: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
-</span><span id="348" class="l"><a href="#348"> 348: </a>        <span class="php-keyword1">if</span> (config_item(<span class="php-quote">'force_https'</span>) <span class="php-keyword1">and</span> !<span class="php-var">$this</span>-&gt;_detect_ssl()) {
-</span><span id="349" class="l"><a href="#349"> 349: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(config_item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, config_item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unsupported protocol'</span>), <span class="php-num">403</span>);
-</span><span id="350" class="l"><a href="#350"> 350: </a>        }
-</span><span id="351" class="l"><a href="#351"> 351: </a>
-</span><span id="352" class="l"><a href="#352"> 352: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/^(.*)\.('</span>.<span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)).<span class="php-quote">')$/'</span>;
-</span><span id="353" class="l"><a href="#353"> 353: </a>        <span class="php-var">$matches</span> = <span class="php-keyword1">array</span>();
-</span><span id="354" class="l"><a href="#354"> 354: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$object_called</span>, <span class="php-var">$matches</span>)) {
-</span><span id="355" class="l"><a href="#355"> 355: </a>            <span class="php-var">$object_called</span> = <span class="php-var">$matches</span>[<span class="php-num">1</span>];
-</span><span id="356" class="l"><a href="#356"> 356: </a>        }
-</span><span id="357" class="l"><a href="#357"> 357: </a>
-</span><span id="358" class="l"><a href="#358"> 358: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span>.<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method;
-</span><span id="359" class="l"><a href="#359"> 359: </a>
-</span><span id="360" class="l"><a href="#360"> 360: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
-</span><span id="361" class="l"><a href="#361"> 361: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) <span class="php-keyword1">and</span> <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] == <span class="php-keyword1">FALSE</span>);
-</span><span id="362" class="l"><a href="#362"> 362: </a>
-</span><span id="363" class="l"><a href="#363"> 363: </a>        <span class="php-comment">// Use keys for this method?</span>
-</span><span id="364" class="l"><a href="#364"> 364: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) <span class="php-keyword1">and</span> <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] == <span class="php-keyword1">FALSE</span>);
-</span><span id="365" class="l"><a href="#365"> 365: </a>
-</span><span id="366" class="l"><a href="#366"> 366: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here.</span>
-</span><span id="367" class="l"><a href="#367"> 367: </a>        <span class="php-keyword1">if</span> (config_item(<span class="php-quote">'rest_enable_keys'</span>) <span class="php-keyword1">and</span> <span class="php-var">$use_key</span> <span class="php-keyword1">and</span> <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>) {
-</span><span id="368" class="l"><a href="#368"> 368: </a>            <span class="php-keyword1">if</span> (config_item(<span class="php-quote">'rest_enable_logging'</span>) <span class="php-keyword1">and</span> <span class="php-var">$log_method</span>) {
-</span><span id="369" class="l"><a href="#369"> 369: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="370" class="l"><a href="#370"> 370: </a>            }
-</span><span id="371" class="l"><a href="#371"> 371: </a>
-</span><span id="372" class="l"><a href="#372"> 372: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(config_item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, config_item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid API Key '</span>.<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>), <span class="php-num">403</span>);
-</span><span id="373" class="l"><a href="#373"> 373: </a>        }
-</span><span id="374" class="l"><a href="#374"> 374: </a>
-</span><span id="375" class="l"><a href="#375"> 375: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller.</span>
-</span><span id="376" class="l"><a href="#376"> 376: </a>        <span class="php-keyword1">if</span> (config_item(<span class="php-quote">'rest_enable_keys'</span>) <span class="php-keyword1">and</span> <span class="php-var">$use_key</span> <span class="php-keyword1">and</span> !<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) <span class="php-keyword1">and</span> !<span class="php-var">$this</span>-&gt;_check_access()) {
-</span><span id="377" class="l"><a href="#377"> 377: </a>            <span class="php-keyword1">if</span> (config_item(<span class="php-quote">'rest_enable_logging'</span>) <span class="php-keyword1">and</span> <span class="php-var">$log_method</span>) {
-</span><span id="378" class="l"><a href="#378"> 378: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="379" class="l"><a href="#379"> 379: </a>            }
-</span><span id="380" class="l"><a href="#380"> 380: </a>
-</span><span id="381" class="l"><a href="#381"> 381: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(config_item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, config_item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have access to the requested controller.'</span>), <span class="php-num">401</span>);
-</span><span id="382" class="l"><a href="#382"> 382: </a>        }
-</span><span id="383" class="l"><a href="#383"> 383: </a>
-</span><span id="384" class="l"><a href="#384"> 384: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
-</span><span id="385" class="l"><a href="#385"> 385: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>)) {
-</span><span id="386" class="l"><a href="#386"> 386: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(config_item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, config_item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unknown method.'</span>), <span class="php-num">404</span>);
-</span><span id="387" class="l"><a href="#387"> 387: </a>        }
-</span><span id="388" class="l"><a href="#388"> 388: </a>
-</span><span id="389" class="l"><a href="#389"> 389: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
-</span><span id="390" class="l"><a href="#390"> 390: </a>        <span class="php-keyword1">if</span> (config_item(<span class="php-quote">'rest_enable_keys'</span>) <span class="php-keyword1">and</span> !<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)) {
-</span><span id="391" class="l"><a href="#391"> 391: </a>            <span class="php-comment">// Check the limit</span>
-</span><span id="392" class="l"><a href="#392"> 392: </a>            <span class="php-keyword1">if</span> (config_item(<span class="php-quote">'rest_enable_limits'</span>) <span class="php-keyword1">and</span> !<span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>)) {
-</span><span id="393" class="l"><a href="#393"> 393: </a>                <span class="php-var">$response</span> = <span class="php-keyword1">array</span>(config_item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, config_item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key has reached the hourly limit for this method.'</span>);
-</span><span id="394" class="l"><a href="#394"> 394: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, <span class="php-num">401</span>);
-</span><span id="395" class="l"><a href="#395"> 395: </a>            }
-</span><span id="396" class="l"><a href="#396"> 396: </a>
-</span><span id="397" class="l"><a href="#397"> 397: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
-</span><span id="398" class="l"><a href="#398"> 398: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
-</span><span id="399" class="l"><a href="#399"> 399: </a>
-</span><span id="400" class="l"><a href="#400"> 400: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
-</span><span id="401" class="l"><a href="#401"> 401: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
-</span><span id="402" class="l"><a href="#402"> 402: </a>
-</span><span id="403" class="l"><a href="#403"> 403: </a>            <span class="php-comment">// IM TELLIN!</span>
-</span><span id="404" class="l"><a href="#404"> 404: </a>            <span class="php-keyword1">if</span> (config_item(<span class="php-quote">'rest_enable_logging'</span>) <span class="php-keyword1">and</span> <span class="php-var">$log_method</span>) {
-</span><span id="405" class="l"><a href="#405"> 405: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
-</span><span id="406" class="l"><a href="#406"> 406: </a>            }
+</span><span id="335" class="l"><a href="#335"> 335: </a>        <span class="php-comment">// Only allow ajax requests</span>
+</span><span id="336" class="l"><a href="#336"> 336: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
+</span><span id="337" class="l"><a href="#337"> 337: </a>        {
+</span><span id="338" class="l"><a href="#338"> 338: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="339" class="l"><a href="#339"> 339: </a>            <span class="php-var">$this</span>-&gt;response(
+</span><span id="340" class="l"><a href="#340"> 340: </a>                [
+</span><span id="341" class="l"><a href="#341"> 341: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="342" class="l"><a href="#342"> 342: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Only AJAX requests are acceptable'</span>
+</span><span id="343" class="l"><a href="#343"> 343: </a>                ], <span class="php-num">406</span>); <span class="php-comment">// Set status to 406 NOT ACCEPTABLE</span>
+</span><span id="344" class="l"><a href="#344"> 344: </a>        }
+</span><span id="345" class="l"><a href="#345"> 345: </a>
+</span><span id="346" class="l"><a href="#346"> 346: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
+</span><span id="347" class="l"><a href="#347"> 347: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; !(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
+</span><span id="348" class="l"><a href="#348"> 348: </a>        {
+</span><span id="349" class="l"><a href="#349"> 349: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="350" class="l"><a href="#350"> 350: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
+</span><span id="351" class="l"><a href="#351"> 351: </a>            {
+</span><span id="352" class="l"><a href="#352"> 352: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
+</span><span id="353" class="l"><a href="#353"> 353: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="354" class="l"><a href="#354"> 354: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="355" class="l"><a href="#355"> 355: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
+</span><span id="356" class="l"><a href="#356"> 356: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="357" class="l"><a href="#357"> 357: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="358" class="l"><a href="#358"> 358: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
+</span><span id="359" class="l"><a href="#359"> 359: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="360" class="l"><a href="#360"> 360: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="361" class="l"><a href="#361"> 361: </a>            }
+</span><span id="362" class="l"><a href="#362"> 362: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="363" class="l"><a href="#363"> 363: </a>            {
+</span><span id="364" class="l"><a href="#364"> 364: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="365" class="l"><a href="#365"> 365: </a>            }
+</span><span id="366" class="l"><a href="#366"> 366: </a>        }
+</span><span id="367" class="l"><a href="#367"> 367: </a>    }
+</span><span id="368" class="l"><a href="#368"> 368: </a>
+</span><span id="369" class="l"><a href="#369"> 369: </a>    <span class="php-comment">/**
+</span></span><span id="370" class="l"><a href="#370"> 370: </a><span class="php-comment">     * Deconstructor
+</span></span><span id="371" class="l"><a href="#371"> 371: </a><span class="php-comment">     *
+</span></span><span id="372" class="l"><a href="#372"> 372: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="373" class="l"><a href="#373"> 373: </a><span class="php-comment">     * @access public
+</span></span><span id="374" class="l"><a href="#374"> 374: </a><span class="php-comment">     */</span>
+</span><span id="375" class="l"><a href="#375"> 375: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
+</span><span id="376" class="l"><a href="#376"> 376: </a>    {
+</span><span id="377" class="l"><a href="#377"> 377: </a>        <span class="php-comment">// Get the current timestamp</span>
+</span><span id="378" class="l"><a href="#378"> 378: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="379" class="l"><a href="#379"> 379: </a>
+</span><span id="380" class="l"><a href="#380"> 380: </a>        <span class="php-comment">// Log the loading time to the log table</span>
+</span><span id="381" class="l"><a href="#381"> 381: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="382" class="l"><a href="#382"> 382: </a>        {
+</span><span id="383" class="l"><a href="#383"> 383: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
+</span><span id="384" class="l"><a href="#384"> 384: </a>        }
+</span><span id="385" class="l"><a href="#385"> 385: </a>    }
+</span><span id="386" class="l"><a href="#386"> 386: </a>
+</span><span id="387" class="l"><a href="#387"> 387: </a>    <span class="php-comment">/**
+</span></span><span id="388" class="l"><a href="#388"> 388: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
+</span></span><span id="389" class="l"><a href="#389"> 389: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
+</span></span><span id="390" class="l"><a href="#390"> 390: </a><span class="php-comment">     * Controller method.
+</span></span><span id="391" class="l"><a href="#391"> 391: </a><span class="php-comment">     *
+</span></span><span id="392" class="l"><a href="#392"> 392: </a><span class="php-comment">     * @access public
+</span></span><span id="393" class="l"><a href="#393"> 393: </a><span class="php-comment">     *
+</span></span><span id="394" class="l"><a href="#394"> 394: </a><span class="php-comment">     * @param  string $object_called
+</span></span><span id="395" class="l"><a href="#395"> 395: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method.
+</span></span><span id="396" class="l"><a href="#396"> 396: </a><span class="php-comment">     */</span>
+</span><span id="397" class="l"><a href="#397"> 397: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span>)
+</span><span id="398" class="l"><a href="#398"> 398: </a>    {
+</span><span id="399" class="l"><a href="#399"> 399: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
+</span><span id="400" class="l"><a href="#400"> 400: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
+</span><span id="401" class="l"><a href="#401"> 401: </a>        {
+</span><span id="402" class="l"><a href="#402"> 402: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unsupported protocol'</span>], <span class="php-num">403</span>);
+</span><span id="403" class="l"><a href="#403"> 403: </a>        }
+</span><span id="404" class="l"><a href="#404"> 404: </a>
+</span><span id="405" class="l"><a href="#405"> 405: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
+</span><span id="406" class="l"><a href="#406"> 406: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
 </span><span id="407" class="l"><a href="#407"> 407: </a>
-</span><span id="408" class="l"><a href="#408"> 408: </a>            <span class="php-comment">// They don't have good enough perms</span>
-</span><span id="409" class="l"><a href="#409"> 409: </a>            <span class="php-var">$response</span> = <span class="php-keyword1">array</span>(config_item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, config_item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have enough permissions.'</span>);
-</span><span id="410" class="l"><a href="#410"> 410: </a>            <span class="php-var">$authorized</span> <span class="php-keyword1">or</span> <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, <span class="php-num">401</span>);
-</span><span id="411" class="l"><a href="#411"> 411: </a>        }
+</span><span id="408" class="l"><a href="#408"> 408: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span> . <span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method;
+</span><span id="409" class="l"><a href="#409"> 409: </a>
+</span><span id="410" class="l"><a href="#410"> 410: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
+</span><span id="411" class="l"><a href="#411"> 411: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] == <span class="php-keyword1">FALSE</span>);
 </span><span id="412" class="l"><a href="#412"> 412: </a>
-</span><span id="413" class="l"><a href="#413"> 413: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
-</span><span id="414" class="l"><a href="#414"> 414: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (config_item(<span class="php-quote">'rest_enable_logging'</span>) <span class="php-keyword1">and</span> <span class="php-var">$log_method</span>) {
-</span><span id="415" class="l"><a href="#415"> 415: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
-</span><span id="416" class="l"><a href="#416"> 416: </a>        }
-</span><span id="417" class="l"><a href="#417"> 417: </a>
-</span><span id="418" class="l"><a href="#418"> 418: </a>        <span class="php-comment">// and...... GO!</span>
-</span><span id="419" class="l"><a href="#419"> 419: </a>        <span class="php-var">$this</span>-&gt;_fire_method(<span class="php-keyword1">array</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>), <span class="php-var">$arguments</span>);
-</span><span id="420" class="l"><a href="#420"> 420: </a>    }
-</span><span id="421" class="l"><a href="#421"> 421: </a>
-</span><span id="422" class="l"><a href="#422"> 422: </a>    <span class="php-comment">/**
-</span></span><span id="423" class="l"><a href="#423"> 423: </a><span class="php-comment">     * Fire Method
-</span></span><span id="424" class="l"><a href="#424"> 424: </a><span class="php-comment">     *
-</span></span><span id="425" class="l"><a href="#425"> 425: </a><span class="php-comment">     * Fires the designated controller method with the given arguments.
-</span></span><span id="426" class="l"><a href="#426"> 426: </a><span class="php-comment">     *
-</span></span><span id="427" class="l"><a href="#427"> 427: </a><span class="php-comment">     * @param array $method The controller method to fire
-</span></span><span id="428" class="l"><a href="#428"> 428: </a><span class="php-comment">     * @param array $args   The arguments to pass to the controller method
-</span></span><span id="429" class="l"><a href="#429"> 429: </a><span class="php-comment">     */</span>
-</span><span id="430" class="l"><a href="#430"> 430: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _fire_method(<span class="php-var">$method</span>, <span class="php-var">$args</span>)
-</span><span id="431" class="l"><a href="#431"> 431: </a>    {
-</span><span id="432" class="l"><a href="#432"> 432: </a>        <span class="php-keyword2">call_user_func_array</span>(<span class="php-var">$method</span>, <span class="php-var">$args</span>);
-</span><span id="433" class="l"><a href="#433"> 433: </a>    }
+</span><span id="413" class="l"><a href="#413"> 413: </a>        <span class="php-comment">// Use keys for this method?</span>
+</span><span id="414" class="l"><a href="#414"> 414: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] == <span class="php-keyword1">FALSE</span>);
+</span><span id="415" class="l"><a href="#415"> 415: </a>
+</span><span id="416" class="l"><a href="#416"> 416: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here.</span>
+</span><span id="417" class="l"><a href="#417"> 417: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
+</span><span id="418" class="l"><a href="#418"> 418: </a>        {
+</span><span id="419" class="l"><a href="#419"> 419: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="420" class="l"><a href="#420"> 420: </a>            {
+</span><span id="421" class="l"><a href="#421"> 421: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="422" class="l"><a href="#422"> 422: </a>            }
+</span><span id="423" class="l"><a href="#423"> 423: </a>
+</span><span id="424" class="l"><a href="#424"> 424: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid API Key '</span> . <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>], <span class="php-num">403</span>);
+</span><span id="425" class="l"><a href="#425"> 425: </a>        }
+</span><span id="426" class="l"><a href="#426"> 426: </a>
+</span><span id="427" class="l"><a href="#427"> 427: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller.</span>
+</span><span id="428" class="l"><a href="#428"> 428: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
+</span><span id="429" class="l"><a href="#429"> 429: </a>        {
+</span><span id="430" class="l"><a href="#430"> 430: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="431" class="l"><a href="#431"> 431: </a>            {
+</span><span id="432" class="l"><a href="#432"> 432: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="433" class="l"><a href="#433"> 433: </a>            }
 </span><span id="434" class="l"><a href="#434"> 434: </a>
-</span><span id="435" class="l"><a href="#435"> 435: </a>    <span class="php-comment">/**
-</span></span><span id="436" class="l"><a href="#436"> 436: </a><span class="php-comment">     * Response
-</span></span><span id="437" class="l"><a href="#437"> 437: </a><span class="php-comment">     *
-</span></span><span id="438" class="l"><a href="#438"> 438: </a><span class="php-comment">     * Takes pure data and optionally a status code, then creates the response.
-</span></span><span id="439" class="l"><a href="#439"> 439: </a><span class="php-comment">     * Set $continue to TRUE to flush the response to the client and continue running the script.
-</span></span><span id="440" class="l"><a href="#440"> 440: </a><span class="php-comment">     *
-</span></span><span id="441" class="l"><a href="#441"> 441: </a><span class="php-comment">     * @param array    $data
-</span></span><span id="442" class="l"><a href="#442"> 442: </a><span class="php-comment">     * @param NULL|int $http_code
-</span></span><span id="443" class="l"><a href="#443"> 443: </a><span class="php-comment">     * @param bool $continue
-</span></span><span id="444" class="l"><a href="#444"> 444: </a><span class="php-comment">     */</span>
-</span><span id="445" class="l"><a href="#445"> 445: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="446" class="l"><a href="#446"> 446: </a>    {
-</span><span id="447" class="l"><a href="#447"> 447: </a>        <span class="php-comment">// If data is NULL and not code provide, error and bail</span>
-</span><span id="448" class="l"><a href="#448"> 448: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>) {
-</span><span id="449" class="l"><a href="#449"> 449: </a>            <span class="php-var">$http_code</span> = <span class="php-num">404</span>;
-</span><span id="450" class="l"><a href="#450"> 450: </a>
-</span><span id="451" class="l"><a href="#451"> 451: </a>            <span class="php-comment">// create the output variable here in the case of $this-&gt;response(array());</span>
-</span><span id="452" class="l"><a href="#452"> 452: </a>            <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="453" class="l"><a href="#453"> 453: </a>        }
-</span><span id="454" class="l"><a href="#454"> 454: </a>
-</span><span id="455" class="l"><a href="#455"> 455: </a>        <span class="php-comment">// If data is NULL but http code provided, keep the output empty</span>
-</span><span id="456" class="l"><a href="#456"> 456: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">is_numeric</span>(<span class="php-var">$http_code</span>)) {
-</span><span id="457" class="l"><a href="#457"> 457: </a>            <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="458" class="l"><a href="#458"> 458: </a>        }
+</span><span id="435" class="l"><a href="#435"> 435: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have access to the requested controller.'</span>], <span class="php-num">401</span>);
+</span><span id="436" class="l"><a href="#436"> 436: </a>        }
+</span><span id="437" class="l"><a href="#437"> 437: </a>
+</span><span id="438" class="l"><a href="#438"> 438: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
+</span><span id="439" class="l"><a href="#439"> 439: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="440" class="l"><a href="#440"> 440: </a>        {
+</span><span id="441" class="l"><a href="#441"> 441: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unknown method.'</span>], <span class="php-num">404</span>);
+</span><span id="442" class="l"><a href="#442"> 442: </a>        }
+</span><span id="443" class="l"><a href="#443"> 443: </a>
+</span><span id="444" class="l"><a href="#444"> 444: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
+</span><span id="445" class="l"><a href="#445"> 445: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="446" class="l"><a href="#446"> 446: </a>        {
+</span><span id="447" class="l"><a href="#447"> 447: </a>            <span class="php-comment">// Check the limit</span>
+</span><span id="448" class="l"><a href="#448"> 448: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="449" class="l"><a href="#449"> 449: </a>            {
+</span><span id="450" class="l"><a href="#450"> 450: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key has reached the time limit for this method.'</span>];
+</span><span id="451" class="l"><a href="#451"> 451: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, <span class="php-num">401</span>);
+</span><span id="452" class="l"><a href="#452"> 452: </a>            }
+</span><span id="453" class="l"><a href="#453"> 453: </a>
+</span><span id="454" class="l"><a href="#454"> 454: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
+</span><span id="455" class="l"><a href="#455"> 455: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
+</span><span id="456" class="l"><a href="#456"> 456: </a>
+</span><span id="457" class="l"><a href="#457"> 457: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
+</span><span id="458" class="l"><a href="#458"> 458: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
 </span><span id="459" class="l"><a href="#459"> 459: </a>
-</span><span id="460" class="l"><a href="#460"> 460: </a>        <span class="php-comment">// Otherwise (if no data but 200 provided) or some data, carry on camping!</span>
-</span><span id="461" class="l"><a href="#461"> 461: </a>        <span class="php-keyword1">else</span> {
-</span><span id="462" class="l"><a href="#462"> 462: </a>            <span class="php-comment">// Is compression requested?</span>
-</span><span id="463" class="l"><a href="#463"> 463: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'compress_output'</span>) === <span class="php-keyword1">TRUE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_zlib_oc == <span class="php-keyword1">FALSE</span>) {
-</span><span id="464" class="l"><a href="#464"> 464: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">extension_loaded</span>(<span class="php-quote">'zlib'</span>)) {
-</span><span id="465" class="l"><a href="#465"> 465: </a>                    <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$_SERVER</span>[<span class="php-quote">'HTTP_ACCEPT_ENCODING'</span>]) <span class="php-keyword1">and</span> <span class="php-keyword2">strpos</span>(<span class="php-var">$_SERVER</span>[<span class="php-quote">'HTTP_ACCEPT_ENCODING'</span>], <span class="php-quote">'gzip'</span>) !== <span class="php-keyword1">FALSE</span>) {
-</span><span id="466" class="l"><a href="#466"> 466: </a>                        <span class="php-keyword2">ob_start</span>(<span class="php-quote">'ob_gzhandler'</span>);
-</span><span id="467" class="l"><a href="#467"> 467: </a>                    }
-</span><span id="468" class="l"><a href="#468"> 468: </a>                }
-</span><span id="469" class="l"><a href="#469"> 469: </a>            }
+</span><span id="460" class="l"><a href="#460"> 460: </a>            <span class="php-comment">// IM TELLIN!</span>
+</span><span id="461" class="l"><a href="#461"> 461: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="462" class="l"><a href="#462"> 462: </a>            {
+</span><span id="463" class="l"><a href="#463"> 463: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
+</span><span id="464" class="l"><a href="#464"> 464: </a>            }
+</span><span id="465" class="l"><a href="#465"> 465: </a>
+</span><span id="466" class="l"><a href="#466"> 466: </a>            <span class="php-comment">// They don't have good enough perms</span>
+</span><span id="467" class="l"><a href="#467"> 467: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have enough permissions.'</span>];
+</span><span id="468" class="l"><a href="#468"> 468: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, <span class="php-num">401</span>);
+</span><span id="469" class="l"><a href="#469"> 469: </a>        }
 </span><span id="470" class="l"><a href="#470"> 470: </a>
-</span><span id="471" class="l"><a href="#471"> 471: </a>            <span class="php-keyword2">is_numeric</span>(<span class="php-var">$http_code</span>) <span class="php-keyword1">or</span> <span class="php-var">$http_code</span> = <span class="php-num">200</span>;
-</span><span id="472" class="l"><a href="#472"> 472: </a>
-</span><span id="473" class="l"><a href="#473"> 473: </a>            <span class="php-comment">// @deprecated the following statement can be deleted.</span>
-</span><span id="474" class="l"><a href="#474"> 474: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
-</span><span id="475" class="l"><a href="#475"> 475: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_format_'</span>.<span class="php-var">$this</span>-&gt;response-&gt;format)) {
-</span><span id="476" class="l"><a href="#476"> 476: </a>                <span class="php-comment">// Set the correct format header</span>
-</span><span id="477" class="l"><a href="#477"> 477: </a>                <span class="php-keyword2">header</span>(<span class="php-quote">'Content-Type: '</span>.<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format] . <span class="php-quote">'; charset='</span> . <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
-</span><span id="478" class="l"><a href="#478"> 478: </a>
-</span><span id="479" class="l"><a href="#479"> 479: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_format_'</span>.<span class="php-var">$this</span>-&gt;response-&gt;format}(<span class="php-var">$data</span>);
-</span><span id="480" class="l"><a href="#480"> 480: </a>            }
-</span><span id="481" class="l"><a href="#481"> 481: </a>
-</span><span id="482" class="l"><a href="#482"> 482: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
-</span><span id="483" class="l"><a href="#483"> 483: </a>            <span class="php-keyword1">elseif</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span>.<span class="php-var">$this</span>-&gt;response-&gt;format)) {
-</span><span id="484" class="l"><a href="#484"> 484: </a>                <span class="php-comment">// Set the correct format header</span>
-</span><span id="485" class="l"><a href="#485"> 485: </a>                <span class="php-keyword2">header</span>(<span class="php-quote">'Content-Type: '</span>.<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format] . <span class="php-quote">'; charset='</span> . <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
-</span><span id="486" class="l"><a href="#486"> 486: </a>
-</span><span id="487" class="l"><a href="#487"> 487: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span>.<span class="php-var">$this</span>-&gt;response-&gt;format}();
-</span><span id="488" class="l"><a href="#488"> 488: </a>            }
-</span><span id="489" class="l"><a href="#489"> 489: </a>
-</span><span id="490" class="l"><a href="#490"> 490: </a>            <span class="php-comment">// Format not supported, output directly</span>
-</span><span id="491" class="l"><a href="#491"> 491: </a>            <span class="php-keyword1">else</span> {
-</span><span id="492" class="l"><a href="#492"> 492: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
-</span><span id="493" class="l"><a href="#493"> 493: </a>            }
-</span><span id="494" class="l"><a href="#494"> 494: </a>        }
+</span><span id="471" class="l"><a href="#471"> 471: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
+</span><span id="472" class="l"><a href="#472"> 472: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="473" class="l"><a href="#473"> 473: </a>        {
+</span><span id="474" class="l"><a href="#474"> 474: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
+</span><span id="475" class="l"><a href="#475"> 475: </a>        }
+</span><span id="476" class="l"><a href="#476"> 476: </a>
+</span><span id="477" class="l"><a href="#477"> 477: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
+</span><span id="478" class="l"><a href="#478"> 478: </a>        <span class="php-keyword1">try</span>
+</span><span id="479" class="l"><a href="#479"> 479: </a>        {
+</span><span id="480" class="l"><a href="#480"> 480: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
+</span><span id="481" class="l"><a href="#481"> 481: </a>        }
+</span><span id="482" class="l"><a href="#482"> 482: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
+</span><span id="483" class="l"><a href="#483"> 483: </a>        {
+</span><span id="484" class="l"><a href="#484"> 484: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
+</span><span id="485" class="l"><a href="#485"> 485: </a>            <span class="php-var">$this</span>-&gt;response(
+</span><span id="486" class="l"><a href="#486"> 486: </a>                [
+</span><span id="487" class="l"><a href="#487"> 487: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="488" class="l"><a href="#488"> 488: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
+</span><span id="489" class="l"><a href="#489"> 489: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
+</span><span id="490" class="l"><a href="#490"> 490: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
+</span><span id="491" class="l"><a href="#491"> 491: </a>                    ]
+</span><span id="492" class="l"><a href="#492"> 492: </a>                ], <span class="php-num">500</span>);
+</span><span id="493" class="l"><a href="#493"> 493: </a>        }
+</span><span id="494" class="l"><a href="#494"> 494: </a>    }
 </span><span id="495" class="l"><a href="#495"> 495: </a>
-</span><span id="496" class="l"><a href="#496"> 496: </a>        set_status_header(<span class="php-var">$http_code</span>);
-</span><span id="497" class="l"><a href="#497"> 497: </a>
-</span><span id="498" class="l"><a href="#498"> 498: </a>        <span class="php-comment">// If zlib.output_compression is enabled it will compress the output,</span>
-</span><span id="499" class="l"><a href="#499"> 499: </a>        <span class="php-comment">// but it will not modify the content-length header to compensate for</span>
-</span><span id="500" class="l"><a href="#500"> 500: </a>        <span class="php-comment">// the reduction, causing the browser to hang waiting for more data.</span>
-</span><span id="501" class="l"><a href="#501"> 501: </a>        <span class="php-comment">// We'll just skip content-length in those cases.</span>
-</span><span id="502" class="l"><a href="#502"> 502: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-var">$this</span>-&gt;_zlib_oc &amp;&amp; ! <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'compress_output'</span>)) {
-</span><span id="503" class="l"><a href="#503"> 503: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'Content-Length: '</span> . <span class="php-keyword2">strlen</span>(<span class="php-var">$output</span>));
-</span><span id="504" class="l"><a href="#504"> 504: </a>        }
-</span><span id="505" class="l"><a href="#505"> 505: </a>
-</span><span id="506" class="l"><a href="#506"> 506: </a>        <span class="php-keyword1">if</span>(<span class="php-var">$continue</span>){
-</span><span id="507" class="l"><a href="#507"> 507: </a>            <span class="php-keyword1">echo</span>(<span class="php-var">$output</span>);
-</span><span id="508" class="l"><a href="#508"> 508: </a>            <span class="php-keyword2">ob_end_flush</span>();
-</span><span id="509" class="l"><a href="#509"> 509: </a>            <span class="php-keyword2">ob_flush</span>();
-</span><span id="510" class="l"><a href="#510"> 510: </a>            <span class="php-keyword2">flush</span>();
-</span><span id="511" class="l"><a href="#511"> 511: </a>        }<span class="php-keyword1">else</span>{
-</span><span id="512" class="l"><a href="#512"> 512: </a>            <span class="php-keyword1">exit</span>(<span class="php-var">$output</span>);
+</span><span id="496" class="l"><a href="#496"> 496: </a>    <span class="php-comment">/**
+</span></span><span id="497" class="l"><a href="#497"> 497: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
+</span></span><span id="498" class="l"><a href="#498"> 498: </a><span class="php-comment">     *
+</span></span><span id="499" class="l"><a href="#499"> 499: </a><span class="php-comment">     * @access public
+</span></span><span id="500" class="l"><a href="#500"> 500: </a><span class="php-comment">     *
+</span></span><span id="501" class="l"><a href="#501"> 501: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
+</span></span><span id="502" class="l"><a href="#502"> 502: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
+</span></span><span id="503" class="l"><a href="#503"> 503: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
+</span></span><span id="504" class="l"><a href="#504"> 504: </a><span class="php-comment">     * running the script; otherwise, exit
+</span></span><span id="505" class="l"><a href="#505"> 505: </a><span class="php-comment">     */</span>
+</span><span id="506" class="l"><a href="#506"> 506: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="507" class="l"><a href="#507"> 507: </a>    {
+</span><span id="508" class="l"><a href="#508"> 508: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
+</span><span id="509" class="l"><a href="#509"> 509: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="510" class="l"><a href="#510"> 510: </a>        {
+</span><span id="511" class="l"><a href="#511"> 511: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
+</span><span id="512" class="l"><a href="#512"> 512: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
 </span><span id="513" class="l"><a href="#513"> 513: </a>        }
-</span><span id="514" class="l"><a href="#514"> 514: </a>    }
-</span><span id="515" class="l"><a href="#515"> 515: </a>
-</span><span id="516" class="l"><a href="#516"> 516: </a>    <span class="php-comment">/*
-</span></span><span id="517" class="l"><a href="#517"> 517: </a><span class="php-comment">     * Detect SSL use
-</span></span><span id="518" class="l"><a href="#518"> 518: </a><span class="php-comment">     *
-</span></span><span id="519" class="l"><a href="#519"> 519: </a><span class="php-comment">     * Detect whether SSL is being used or not
-</span></span><span id="520" class="l"><a href="#520"> 520: </a><span class="php-comment">     */</span>
-</span><span id="521" class="l"><a href="#521"> 521: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_ssl()
-</span><span id="522" class="l"><a href="#522"> 522: </a>    {
-</span><span id="523" class="l"><a href="#523"> 523: </a>            <span class="php-comment">// $_SERVER['HTTPS'] (http://php.net/manual/en/reserved.variables.server.php)</span>
-</span><span id="524" class="l"><a href="#524"> 524: </a>            <span class="php-comment">// Set to a non-empty value if the script was queried through the HTTPS protocol</span>
-</span><span id="525" class="l"><a href="#525"> 525: </a>            <span class="php-keyword1">return</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$_SERVER</span>[<span class="php-quote">'HTTPS'</span>]) &amp;&amp; !<span class="php-keyword1">empty</span>(<span class="php-var">$_SERVER</span>[<span class="php-quote">'HTTPS'</span>]));
-</span><span id="526" class="l"><a href="#526"> 526: </a>    }
-</span><span id="527" class="l"><a href="#527"> 527: </a>
-</span><span id="528" class="l"><a href="#528"> 528: </a>
-</span><span id="529" class="l"><a href="#529"> 529: </a>    <span class="php-comment">/*
-</span></span><span id="530" class="l"><a href="#530"> 530: </a><span class="php-comment">     * Detect input format
-</span></span><span id="531" class="l"><a href="#531"> 531: </a><span class="php-comment">     *
-</span></span><span id="532" class="l"><a href="#532"> 532: </a><span class="php-comment">     * Detect which format the HTTP Body is provided in
-</span></span><span id="533" class="l"><a href="#533"> 533: </a><span class="php-comment">     */</span>
-</span><span id="534" class="l"><a href="#534"> 534: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
-</span><span id="535" class="l"><a href="#535"> 535: </a>    {
-</span><span id="536" class="l"><a href="#536"> 536: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>)) {
-</span><span id="537" class="l"><a href="#537"> 537: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="538" class="l"><a href="#538"> 538: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$format</span> =&gt; <span class="php-var">$mime</span>) {
-</span><span id="539" class="l"><a href="#539"> 539: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$match</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>), <span class="php-quote">';'</span>)) {
-</span><span id="540" class="l"><a href="#540"> 540: </a>                    <span class="php-var">$match</span> = <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$match</span>));
-</span><span id="541" class="l"><a href="#541"> 541: </a>                }
-</span><span id="542" class="l"><a href="#542"> 542: </a>
-</span><span id="543" class="l"><a href="#543"> 543: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$match</span> == <span class="php-var">$mime</span>) {
-</span><span id="544" class="l"><a href="#544"> 544: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="545" class="l"><a href="#545"> 545: </a>                }
-</span><span id="546" class="l"><a href="#546"> 546: </a>            }
-</span><span id="547" class="l"><a href="#547"> 547: </a>        }
+</span><span id="514" class="l"><a href="#514"> 514: </a>
+</span><span id="515" class="l"><a href="#515"> 515: </a>        <span class="php-comment">// Set the output as NULL by default</span>
+</span><span id="516" class="l"><a href="#516"> 516: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="517" class="l"><a href="#517"> 517: </a>
+</span><span id="518" class="l"><a href="#518"> 518: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
+</span><span id="519" class="l"><a href="#519"> 519: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="520" class="l"><a href="#520"> 520: </a>        {
+</span><span id="521" class="l"><a href="#521"> 521: </a>            <span class="php-var">$http_code</span> = <span class="php-num">404</span>;
+</span><span id="522" class="l"><a href="#522"> 522: </a>        }
+</span><span id="523" class="l"><a href="#523"> 523: </a>
+</span><span id="524" class="l"><a href="#524"> 524: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
+</span><span id="525" class="l"><a href="#525"> 525: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="526" class="l"><a href="#526"> 526: </a>        {
+</span><span id="527" class="l"><a href="#527"> 527: </a>            <span class="php-comment">// Is compression enabled and available?</span>
+</span><span id="528" class="l"><a href="#528"> 528: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'compress_output'</span>) === <span class="php-keyword1">TRUE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_zlib_oc == <span class="php-keyword1">FALSE</span>)
+</span><span id="529" class="l"><a href="#529"> 529: </a>            {
+</span><span id="530" class="l"><a href="#530"> 530: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">extension_loaded</span>(<span class="php-quote">'zlib'</span>))
+</span><span id="531" class="l"><a href="#531"> 531: </a>                {
+</span><span id="532" class="l"><a href="#532"> 532: </a>                    <span class="php-var">$http_encoding</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_ENCODING'</span>);
+</span><span id="533" class="l"><a href="#533"> 533: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$http_encoding</span> !== <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_encoding</span>, <span class="php-quote">'gzip'</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="534" class="l"><a href="#534"> 534: </a>                    {
+</span><span id="535" class="l"><a href="#535"> 535: </a>                        <span class="php-keyword2">ob_start</span>(<span class="php-quote">'ob_gzhandler'</span>);
+</span><span id="536" class="l"><a href="#536"> 536: </a>                    }
+</span><span id="537" class="l"><a href="#537"> 537: </a>                }
+</span><span id="538" class="l"><a href="#538"> 538: </a>            }
+</span><span id="539" class="l"><a href="#539"> 539: </a>
+</span><span id="540" class="l"><a href="#540"> 540: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
+</span><span id="541" class="l"><a href="#541"> 541: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
+</span><span id="542" class="l"><a href="#542"> 542: </a>            {
+</span><span id="543" class="l"><a href="#543"> 543: </a>                <span class="php-comment">// Set the format header</span>
+</span><span id="544" class="l"><a href="#544"> 544: </a>                <span class="php-keyword2">header</span>(<span class="php-quote">'Content-Type: '</span> . <span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format]
+</span><span id="545" class="l"><a href="#545"> 545: </a>                       . <span class="php-quote">'; charset='</span> . <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
+</span><span id="546" class="l"><a href="#546"> 546: </a>
+</span><span id="547" class="l"><a href="#547"> 547: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
 </span><span id="548" class="l"><a href="#548"> 548: </a>
-</span><span id="549" class="l"><a href="#549"> 549: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="550" class="l"><a href="#550"> 550: </a>    }
-</span><span id="551" class="l"><a href="#551"> 551: </a>
-</span><span id="552" class="l"><a href="#552"> 552: </a>    <span class="php-comment">/**
-</span></span><span id="553" class="l"><a href="#553"> 553: </a><span class="php-comment">     * Detect format
-</span></span><span id="554" class="l"><a href="#554"> 554: </a><span class="php-comment">     *
-</span></span><span id="555" class="l"><a href="#555"> 555: </a><span class="php-comment">     * Detect which format should be used to output the data.
-</span></span><span id="556" class="l"><a href="#556"> 556: </a><span class="php-comment">     *
-</span></span><span id="557" class="l"><a href="#557"> 557: </a><span class="php-comment">     * @return string The output format.
-</span></span><span id="558" class="l"><a href="#558"> 558: </a><span class="php-comment">     */</span>
-</span><span id="559" class="l"><a href="#559"> 559: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
-</span><span id="560" class="l"><a href="#560"> 560: </a>    {
-</span><span id="561" class="l"><a href="#561"> 561: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span>.<span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)).<span class="php-quote">')$/'</span>;
-</span><span id="562" class="l"><a href="#562"> 562: </a>
-</span><span id="563" class="l"><a href="#563"> 563: </a>        <span class="php-comment">// Check if a file extension is used when no get arguments provided</span>
-</span><span id="564" class="l"><a href="#564"> 564: </a>        <span class="php-var">$matches</span> = <span class="php-keyword1">array</span>();
-</span><span id="565" class="l"><a href="#565"> 565: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_get_args <span class="php-keyword1">and</span> <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>)) {
-</span><span id="566" class="l"><a href="#566"> 566: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
+</span><span id="549" class="l"><a href="#549"> 549: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error.</span>
+</span><span id="550" class="l"><a href="#550"> 550: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
+</span><span id="551" class="l"><a href="#551"> 551: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
+</span><span id="552" class="l"><a href="#552"> 552: </a>                {
+</span><span id="553" class="l"><a href="#553"> 553: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="554" class="l"><a href="#554"> 554: </a>                }
+</span><span id="555" class="l"><a href="#555"> 555: </a>            }
+</span><span id="556" class="l"><a href="#556"> 556: </a>            <span class="php-keyword1">else</span>
+</span><span id="557" class="l"><a href="#557"> 557: </a>            {
+</span><span id="558" class="l"><a href="#558"> 558: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
+</span><span id="559" class="l"><a href="#559"> 559: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
+</span><span id="560" class="l"><a href="#560"> 560: </a>                {
+</span><span id="561" class="l"><a href="#561"> 561: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="562" class="l"><a href="#562"> 562: </a>                }
+</span><span id="563" class="l"><a href="#563"> 563: </a>
+</span><span id="564" class="l"><a href="#564"> 564: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
+</span><span id="565" class="l"><a href="#565"> 565: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
+</span><span id="566" class="l"><a href="#566"> 566: </a>            }
 </span><span id="567" class="l"><a href="#567"> 567: </a>        }
 </span><span id="568" class="l"><a href="#568"> 568: </a>
-</span><span id="569" class="l"><a href="#569"> 569: </a>        <span class="php-comment">// Check if a file extension is used</span>
-</span><span id="570" class="l"><a href="#570"> 570: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;_get_args <span class="php-keyword1">and</span> !<span class="php-keyword2">is_array</span>(<span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args)) <span class="php-keyword1">and</span> <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args), <span class="php-var">$matches</span>)) {
-</span><span id="571" class="l"><a href="#571"> 571: </a>        <span class="php-comment">//elseif ($this-&gt;_get_args and !is_array(end($this-&gt;_get_args)) and preg_match($pattern, end(array_keys($this-&gt;_get_args)), $matches)) {</span>
-</span><span id="572" class="l"><a href="#572"> 572: </a>            <span class="php-comment">// The key of the last argument</span>
-</span><span id="573" class="l"><a href="#573"> 573: </a>            <span class="php-var">$last_key</span> = <span class="php-keyword2">end</span>(<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_get_args));
-</span><span id="574" class="l"><a href="#574"> 574: </a>
-</span><span id="575" class="l"><a href="#575"> 575: </a>            <span class="php-comment">// Remove the extension from arguments too</span>
-</span><span id="576" class="l"><a href="#576"> 576: </a>            <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>] = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>]);
-</span><span id="577" class="l"><a href="#577"> 577: </a>            <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>]     = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>]);
-</span><span id="578" class="l"><a href="#578"> 578: </a>
-</span><span id="579" class="l"><a href="#579"> 579: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
+</span><span id="569" class="l"><a href="#569"> 569: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
+</span><span id="570" class="l"><a href="#570"> 570: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
+</span><span id="571" class="l"><a href="#571"> 571: </a>        <span class="php-comment">// correct HTTP status code</span>
+</span><span id="572" class="l"><a href="#572"> 572: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = <span class="php-num">200</span>;
+</span><span id="573" class="l"><a href="#573"> 573: </a>
+</span><span id="574" class="l"><a href="#574"> 574: </a>        set_status_header(<span class="php-var">$http_code</span>);
+</span><span id="575" class="l"><a href="#575"> 575: </a>
+</span><span id="576" class="l"><a href="#576"> 576: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
+</span><span id="577" class="l"><a href="#577"> 577: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="578" class="l"><a href="#578"> 578: </a>        {
+</span><span id="579" class="l"><a href="#579"> 579: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
 </span><span id="580" class="l"><a href="#580"> 580: </a>        }
 </span><span id="581" class="l"><a href="#581"> 581: </a>
-</span><span id="582" class="l"><a href="#582"> 582: </a>        <span class="php-comment">// A format has been passed as an argument in the URL and it is supported</span>
-</span><span id="583" class="l"><a href="#583"> 583: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]) <span class="php-keyword1">and</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>], <span class="php-var">$this</span>-&gt;_supported_formats)) {
-</span><span id="584" class="l"><a href="#584"> 584: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>];
-</span><span id="585" class="l"><a href="#585"> 585: </a>        }
-</span><span id="586" class="l"><a href="#586"> 586: </a>
-</span><span id="587" class="l"><a href="#587"> 587: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT (if it exists and we are allowed)</span>
-</span><span id="588" class="l"><a href="#588"> 588: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> <span class="php-keyword1">and</span> <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>)) {
-</span><span id="589" class="l"><a href="#589"> 589: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="590" class="l"><a href="#590"> 590: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>) {
-</span><span id="591" class="l"><a href="#591"> 591: </a>                <span class="php-comment">// Has this format been requested?</span>
-</span><span id="592" class="l"><a href="#592"> 592: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>) {
-</span><span id="593" class="l"><a href="#593"> 593: </a>                    <span class="php-comment">// If not HTML or XML assume its right and send it on its way</span>
-</span><span id="594" class="l"><a href="#594"> 594: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> != <span class="php-quote">'html'</span> <span class="php-keyword1">and</span> <span class="php-var">$format</span> != <span class="php-quote">'xml'</span>) {
-</span><span id="595" class="l"><a href="#595"> 595: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="596" class="l"><a href="#596"> 596: </a>                    }
-</span><span id="597" class="l"><a href="#597"> 597: </a>
-</span><span id="598" class="l"><a href="#598"> 598: </a>                    <span class="php-comment">// HTML or XML have shown up as a match</span>
-</span><span id="599" class="l"><a href="#599"> 599: </a>                    <span class="php-keyword1">else</span> {
-</span><span id="600" class="l"><a href="#600"> 600: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
-</span><span id="601" class="l"><a href="#601"> 601: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$format</span> == <span class="php-quote">'html'</span> <span class="php-keyword1">and</span> <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>) {
-</span><span id="602" class="l"><a href="#602"> 602: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="603" class="l"><a href="#603"> 603: </a>                        }
-</span><span id="604" class="l"><a href="#604"> 604: </a>
-</span><span id="605" class="l"><a href="#605"> 605: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
-</span><span id="606" class="l"><a href="#606"> 606: </a>                        <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> == <span class="php-quote">'xml'</span> <span class="php-keyword1">and</span> <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>) {
-</span><span id="607" class="l"><a href="#607"> 607: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="608" class="l"><a href="#608"> 608: </a>                        }
-</span><span id="609" class="l"><a href="#609"> 609: </a>                    }
-</span><span id="610" class="l"><a href="#610"> 610: </a>                }
-</span><span id="611" class="l"><a href="#611"> 611: </a>            }
-</span><span id="612" class="l"><a href="#612"> 612: </a>        } <span class="php-comment">// End HTTP_ACCEPT checking</span>
-</span><span id="613" class="l"><a href="#613"> 613: </a>
-</span><span id="614" class="l"><a href="#614"> 614: </a>        <span class="php-comment">// Well, none of that has worked! Let's see if the controller has a default</span>
-</span><span id="615" class="l"><a href="#615"> 615: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format)) {
-</span><span id="616" class="l"><a href="#616"> 616: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
-</span><span id="617" class="l"><a href="#617"> 617: </a>        }
-</span><span id="618" class="l"><a href="#618"> 618: </a>
-</span><span id="619" class="l"><a href="#619"> 619: </a>        <span class="php-comment">// Just use the default format</span>
-</span><span id="620" class="l"><a href="#620"> 620: </a>        <span class="php-keyword1">return</span> config_item(<span class="php-quote">'rest_default_format'</span>);
-</span><span id="621" class="l"><a href="#621"> 621: </a>    }
-</span><span id="622" class="l"><a href="#622"> 622: </a>
-</span><span id="623" class="l"><a href="#623"> 623: </a>    <span class="php-comment">/**
-</span></span><span id="624" class="l"><a href="#624"> 624: </a><span class="php-comment">     * Detect method
-</span></span><span id="625" class="l"><a href="#625"> 625: </a><span class="php-comment">     *
-</span></span><span id="626" class="l"><a href="#626"> 626: </a><span class="php-comment">     * Detect which HTTP method is being used
-</span></span><span id="627" class="l"><a href="#627"> 627: </a><span class="php-comment">     *
-</span></span><span id="628" class="l"><a href="#628"> 628: </a><span class="php-comment">     * @return string
-</span></span><span id="629" class="l"><a href="#629"> 629: </a><span class="php-comment">     */</span>
-</span><span id="630" class="l"><a href="#630"> 630: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
-</span><span id="631" class="l"><a href="#631"> 631: </a>    {
-</span><span id="632" class="l"><a href="#632"> 632: </a>        <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_METHOD'</span>));
-</span><span id="633" class="l"><a href="#633"> 633: </a>
-</span><span id="634" class="l"><a href="#634"> 634: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>)) {
-</span><span id="635" class="l"><a href="#635"> 635: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>)) {
-</span><span id="636" class="l"><a href="#636"> 636: </a>                <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>));
-</span><span id="637" class="l"><a href="#637"> 637: </a>            } <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>)) {
-</span><span id="638" class="l"><a href="#638"> 638: </a>                <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>));
-</span><span id="639" class="l"><a href="#639"> 639: </a>            }
-</span><span id="640" class="l"><a href="#640"> 640: </a>        }
-</span><span id="641" class="l"><a href="#641"> 641: </a>
-</span><span id="642" class="l"><a href="#642"> 642: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>)) {
-</span><span id="643" class="l"><a href="#643"> 643: </a>            <span class="php-keyword1">return</span> <span class="php-var">$method</span>;
-</span><span id="644" class="l"><a href="#644"> 644: </a>        }
+</span><span id="582" class="l"><a href="#582"> 582: </a>        <span class="php-comment">// If zlib.output_compression is enabled it will compress the output,</span>
+</span><span id="583" class="l"><a href="#583"> 583: </a>        <span class="php-comment">// but it will not modify the content-length header to compensate for</span>
+</span><span id="584" class="l"><a href="#584"> 584: </a>        <span class="php-comment">// the reduction, causing the browser to hang waiting for more data.</span>
+</span><span id="585" class="l"><a href="#585"> 585: </a>        <span class="php-comment">// We'll just skip content-length in those cases</span>
+</span><span id="586" class="l"><a href="#586"> 586: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_zlib_oc &amp;&amp; !<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'compress_output'</span>))
+</span><span id="587" class="l"><a href="#587"> 587: </a>        {
+</span><span id="588" class="l"><a href="#588"> 588: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'Content-Length: '</span> . <span class="php-keyword2">strlen</span>(<span class="php-var">$output</span>));
+</span><span id="589" class="l"><a href="#589"> 589: </a>        }
+</span><span id="590" class="l"><a href="#590"> 590: </a>
+</span><span id="591" class="l"><a href="#591"> 591: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="592" class="l"><a href="#592"> 592: </a>        {
+</span><span id="593" class="l"><a href="#593"> 593: </a>            <span class="php-keyword1">exit</span>(<span class="php-var">$output</span>);
+</span><span id="594" class="l"><a href="#594"> 594: </a>        }
+</span><span id="595" class="l"><a href="#595"> 595: </a>
+</span><span id="596" class="l"><a href="#596"> 596: </a>        <span class="php-keyword1">echo</span>(<span class="php-var">$output</span>);
+</span><span id="597" class="l"><a href="#597"> 597: </a>        <span class="php-keyword2">ob_end_flush</span>();
+</span><span id="598" class="l"><a href="#598"> 598: </a>        <span class="php-keyword2">ob_flush</span>();
+</span><span id="599" class="l"><a href="#599"> 599: </a>        <span class="php-keyword2">flush</span>();
+</span><span id="600" class="l"><a href="#600"> 600: </a>    }
+</span><span id="601" class="l"><a href="#601"> 601: </a>
+</span><span id="602" class="l"><a href="#602"> 602: </a>    <span class="php-comment">/**
+</span></span><span id="603" class="l"><a href="#603"> 603: </a><span class="php-comment">     * Get the input format e.g. json or xml
+</span></span><span id="604" class="l"><a href="#604"> 604: </a><span class="php-comment">     *
+</span></span><span id="605" class="l"><a href="#605"> 605: </a><span class="php-comment">     * @access private
+</span></span><span id="606" class="l"><a href="#606"> 606: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
+</span></span><span id="607" class="l"><a href="#607"> 607: </a><span class="php-comment">     */</span>
+</span><span id="608" class="l"><a href="#608"> 608: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _detect_input_format()
+</span><span id="609" class="l"><a href="#609"> 609: </a>    {
+</span><span id="610" class="l"><a href="#610"> 610: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
+</span><span id="611" class="l"><a href="#611"> 611: </a>        <span class="php-var">$contentType</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
+</span><span id="612" class="l"><a href="#612"> 612: </a>
+</span><span id="613" class="l"><a href="#613"> 613: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$contentType</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="614" class="l"><a href="#614"> 614: </a>        {
+</span><span id="615" class="l"><a href="#615"> 615: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="616" class="l"><a href="#616"> 616: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
+</span><span id="617" class="l"><a href="#617"> 617: </a>            {
+</span><span id="618" class="l"><a href="#618"> 618: </a>                <span class="php-comment">// $key = format e.g. csv</span>
+</span><span id="619" class="l"><a href="#619"> 619: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
+</span><span id="620" class="l"><a href="#620"> 620: </a>
+</span><span id="621" class="l"><a href="#621"> 621: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
+</span><span id="622" class="l"><a href="#622"> 622: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
+</span><span id="623" class="l"><a href="#623"> 623: </a>                <span class="php-var">$contentType</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$contentType</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$contentType</span>)) : <span class="php-var">$contentType</span>);
+</span><span id="624" class="l"><a href="#624"> 624: </a>
+</span><span id="625" class="l"><a href="#625"> 625: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
+</span><span id="626" class="l"><a href="#626"> 626: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$contentType</span> === <span class="php-var">$value</span>)
+</span><span id="627" class="l"><a href="#627"> 627: </a>                {
+</span><span id="628" class="l"><a href="#628"> 628: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
+</span><span id="629" class="l"><a href="#629"> 629: </a>                }
+</span><span id="630" class="l"><a href="#630"> 630: </a>            }
+</span><span id="631" class="l"><a href="#631"> 631: </a>        }
+</span><span id="632" class="l"><a href="#632"> 632: </a>
+</span><span id="633" class="l"><a href="#633"> 633: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="634" class="l"><a href="#634"> 634: </a>    }
+</span><span id="635" class="l"><a href="#635"> 635: </a>
+</span><span id="636" class="l"><a href="#636"> 636: </a>    <span class="php-comment">/**
+</span></span><span id="637" class="l"><a href="#637"> 637: </a><span class="php-comment">     * Detect which format should be used to output the data
+</span></span><span id="638" class="l"><a href="#638"> 638: </a><span class="php-comment">     *
+</span></span><span id="639" class="l"><a href="#639"> 639: </a><span class="php-comment">     * @access protected
+</span></span><span id="640" class="l"><a href="#640"> 640: </a><span class="php-comment">     * @return mixed|NULL|string Output format
+</span></span><span id="641" class="l"><a href="#641"> 641: </a><span class="php-comment">     */</span>
+</span><span id="642" class="l"><a href="#642"> 642: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
+</span><span id="643" class="l"><a href="#643"> 643: </a>    {
+</span><span id="644" class="l"><a href="#644"> 644: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>;
 </span><span id="645" class="l"><a href="#645"> 645: </a>
-</span><span id="646" class="l"><a href="#646"> 646: </a>        <span class="php-keyword1">return</span> <span class="php-quote">'get'</span>;
-</span><span id="647" class="l"><a href="#647"> 647: </a>    }
-</span><span id="648" class="l"><a href="#648"> 648: </a>
-</span><span id="649" class="l"><a href="#649"> 649: </a>    <span class="php-comment">/**
-</span></span><span id="650" class="l"><a href="#650"> 650: </a><span class="php-comment">     * Detect API Key
-</span></span><span id="651" class="l"><a href="#651"> 651: </a><span class="php-comment">     *
-</span></span><span id="652" class="l"><a href="#652"> 652: </a><span class="php-comment">     * See if the user has provided an API key
-</span></span><span id="653" class="l"><a href="#653"> 653: </a><span class="php-comment">     *
-</span></span><span id="654" class="l"><a href="#654"> 654: </a><span class="php-comment">     * @return boolean
-</span></span><span id="655" class="l"><a href="#655"> 655: </a><span class="php-comment">     */</span>
-</span><span id="656" class="l"><a href="#656"> 656: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
-</span><span id="657" class="l"><a href="#657"> 657: </a>    {
-</span><span id="658" class="l"><a href="#658"> 658: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
-</span><span id="659" class="l"><a href="#659"> 659: </a>        <span class="php-var">$api_key_variable</span> = config_item(<span class="php-quote">'rest_key_name'</span>);
+</span><span id="646" class="l"><a href="#646"> 646: </a>        <span class="php-comment">// Check if a file extension is used when no get arguments provided</span>
+</span><span id="647" class="l"><a href="#647"> 647: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="648" class="l"><a href="#648"> 648: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
+</span><span id="649" class="l"><a href="#649"> 649: </a>        {
+</span><span id="650" class="l"><a href="#650"> 650: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
+</span><span id="651" class="l"><a href="#651"> 651: </a>        }
+</span><span id="652" class="l"><a href="#652"> 652: </a>
+</span><span id="653" class="l"><a href="#653"> 653: </a>        <span class="php-comment">// Check if a file extension is used</span>
+</span><span id="654" class="l"><a href="#654"> 654: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args)) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args), <span class="php-var">$matches</span>))
+</span><span id="655" class="l"><a href="#655"> 655: </a>        {
+</span><span id="656" class="l"><a href="#656"> 656: </a>            <span class="php-comment">//elseif ($this-&gt;_get_args and is_array(end($this-&gt;_get_args)) === FALSE and preg_match($pattern, end(array_keys($this-&gt;_get_args)), $matches)) {</span>
+</span><span id="657" class="l"><a href="#657"> 657: </a>            <span class="php-comment">// The key of the last argument</span>
+</span><span id="658" class="l"><a href="#658"> 658: </a>            <span class="php-var">$arg_keys</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_get_args);
+</span><span id="659" class="l"><a href="#659"> 659: </a>            <span class="php-var">$last_key</span> = <span class="php-keyword2">end</span>(<span class="php-var">$arg_keys</span>);
 </span><span id="660" class="l"><a href="#660"> 660: </a>
-</span><span id="661" class="l"><a href="#661"> 661: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
-</span><span id="662" class="l"><a href="#662"> 662: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span>.<span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
-</span><span id="663" class="l"><a href="#663"> 663: </a>
-</span><span id="664" class="l"><a href="#664"> 664: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="665" class="l"><a href="#665"> 665: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
-</span><span id="666" class="l"><a href="#666"> 666: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
-</span><span id="667" class="l"><a href="#667"> 667: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
-</span><span id="668" class="l"><a href="#668"> 668: </a>
-</span><span id="669" class="l"><a href="#669"> 669: </a>        <span class="php-comment">// Find the key from server or arguments</span>
-</span><span id="670" class="l"><a href="#670"> 670: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>))) {
-</span><span id="671" class="l"><a href="#671"> 671: </a>            <span class="php-keyword1">if</span> ( ! (<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(config_item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row())) {
-</span><span id="672" class="l"><a href="#672"> 672: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="673" class="l"><a href="#673"> 673: </a>            }
-</span><span id="674" class="l"><a href="#674"> 674: </a>
-</span><span id="675" class="l"><a href="#675"> 675: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{config_item(<span class="php-quote">'rest_key_column'</span>)};
-</span><span id="676" class="l"><a href="#676"> 676: </a>
-</span><span id="677" class="l"><a href="#677"> 677: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) <span class="php-keyword1">and</span> <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
-</span><span id="678" class="l"><a href="#678"> 678: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) <span class="php-keyword1">and</span> <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
-</span><span id="679" class="l"><a href="#679"> 679: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) <span class="php-keyword1">and</span> <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
-</span><span id="680" class="l"><a href="#680"> 680: </a>
-</span><span id="681" class="l"><a href="#681"> 681: </a>            <span class="php-var">$this</span>-&gt;_apiuser =  <span class="php-var">$row</span>;
-</span><span id="682" class="l"><a href="#682"> 682: </a>
-</span><span id="683" class="l"><a href="#683"> 683: </a>            <span class="php-comment">/*
-</span></span><span id="684" class="l"><a href="#684"> 684: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
-</span></span><span id="685" class="l"><a href="#685"> 685: </a><span class="php-comment">             * of valid ip addresses stored in the database.
-</span></span><span id="686" class="l"><a href="#686"> 686: </a><span class="php-comment">             */</span>
-</span><span id="687" class="l"><a href="#687"> 687: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key)) {
-</span><span id="688" class="l"><a href="#688"> 688: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
-</span><span id="689" class="l"><a href="#689"> 689: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses)) {
-</span><span id="690" class="l"><a href="#690"> 690: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
-</span><span id="691" class="l"><a href="#691"> 691: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">&quot;,&quot;</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
-</span><span id="692" class="l"><a href="#692"> 692: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
-</span><span id="693" class="l"><a href="#693"> 693: </a>
-</span><span id="694" class="l"><a href="#694"> 694: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>) {
-</span><span id="695" class="l"><a href="#695"> 695: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() == <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>)) {
-</span><span id="696" class="l"><a href="#696"> 696: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
-</span><span id="697" class="l"><a href="#697"> 697: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
-</span><span id="698" class="l"><a href="#698"> 698: </a>                            <span class="php-keyword1">break</span>;
-</span><span id="699" class="l"><a href="#699"> 699: </a>                        }
-</span><span id="700" class="l"><a href="#700"> 700: </a>                    }
-</span><span id="701" class="l"><a href="#701"> 701: </a>
-</span><span id="702" class="l"><a href="#702"> 702: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
-</span><span id="703" class="l"><a href="#703"> 703: </a>                } <span class="php-keyword1">else</span> {
-</span><span id="704" class="l"><a href="#704"> 704: </a>                    <span class="php-comment">// There should be at least one IP address for this private key.</span>
-</span><span id="705" class="l"><a href="#705"> 705: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="706" class="l"><a href="#706"> 706: </a>                }
-</span><span id="707" class="l"><a href="#707"> 707: </a>            }
-</span><span id="708" class="l"><a href="#708"> 708: </a>
-</span><span id="709" class="l"><a href="#709"> 709: </a>            <span class="php-keyword1">return</span> <span class="php-var">$row</span>;
-</span><span id="710" class="l"><a href="#710"> 710: </a>        }
-</span><span id="711" class="l"><a href="#711"> 711: </a>
-</span><span id="712" class="l"><a href="#712"> 712: </a>        <span class="php-comment">// No key has been sent</span>
-</span><span id="713" class="l"><a href="#713"> 713: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="714" class="l"><a href="#714"> 714: </a>    }
-</span><span id="715" class="l"><a href="#715"> 715: </a>
-</span><span id="716" class="l"><a href="#716"> 716: </a>    <span class="php-comment">/**
-</span></span><span id="717" class="l"><a href="#717"> 717: </a><span class="php-comment">     * Detect language(s)
-</span></span><span id="718" class="l"><a href="#718"> 718: </a><span class="php-comment">     *
-</span></span><span id="719" class="l"><a href="#719"> 719: </a><span class="php-comment">     * What language do they want it in?
+</span><span id="661" class="l"><a href="#661"> 661: </a>            <span class="php-comment">// Remove the extension from arguments too</span>
+</span><span id="662" class="l"><a href="#662"> 662: </a>            <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>] = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>]);
+</span><span id="663" class="l"><a href="#663"> 663: </a>            <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>] = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>]);
+</span><span id="664" class="l"><a href="#664"> 664: </a>
+</span><span id="665" class="l"><a href="#665"> 665: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
+</span><span id="666" class="l"><a href="#666"> 666: </a>        }
+</span><span id="667" class="l"><a href="#667"> 667: </a>
+</span><span id="668" class="l"><a href="#668"> 668: </a>        <span class="php-comment">// A format has been passed as an argument in the URL and it is supported</span>
+</span><span id="669" class="l"><a href="#669"> 669: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]) &amp;&amp; <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>], <span class="php-var">$this</span>-&gt;_supported_formats))
+</span><span id="670" class="l"><a href="#670"> 670: </a>        {
+</span><span id="671" class="l"><a href="#671"> 671: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>];
+</span><span id="672" class="l"><a href="#672"> 672: </a>        }
+</span><span id="673" class="l"><a href="#673"> 673: </a>
+</span><span id="674" class="l"><a href="#674"> 674: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT (if it exists and we are allowed)</span>
+</span><span id="675" class="l"><a href="#675"> 675: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>))
+</span><span id="676" class="l"><a href="#676"> 676: </a>        {
+</span><span id="677" class="l"><a href="#677"> 677: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="678" class="l"><a href="#678"> 678: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
+</span><span id="679" class="l"><a href="#679"> 679: </a>            {
+</span><span id="680" class="l"><a href="#680"> 680: </a>                <span class="php-comment">// Has this format been requested?</span>
+</span><span id="681" class="l"><a href="#681"> 681: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="682" class="l"><a href="#682"> 682: </a>                {
+</span><span id="683" class="l"><a href="#683"> 683: </a>                    <span class="php-comment">// If not HTML or XML assume its right and send it on its way</span>
+</span><span id="684" class="l"><a href="#684"> 684: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
+</span><span id="685" class="l"><a href="#685"> 685: </a>                    {
+</span><span id="686" class="l"><a href="#686"> 686: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="687" class="l"><a href="#687"> 687: </a>                    }
+</span><span id="688" class="l"><a href="#688"> 688: </a>
+</span><span id="689" class="l"><a href="#689"> 689: </a>                    <span class="php-comment">// HTML or XML have shown up as a match</span>
+</span><span id="690" class="l"><a href="#690"> 690: </a>                    <span class="php-keyword1">else</span>
+</span><span id="691" class="l"><a href="#691"> 691: </a>                    {
+</span><span id="692" class="l"><a href="#692"> 692: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
+</span><span id="693" class="l"><a href="#693"> 693: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$format</span> == <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="694" class="l"><a href="#694"> 694: </a>                        {
+</span><span id="695" class="l"><a href="#695"> 695: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="696" class="l"><a href="#696"> 696: </a>                        }
+</span><span id="697" class="l"><a href="#697"> 697: </a>
+</span><span id="698" class="l"><a href="#698"> 698: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
+</span><span id="699" class="l"><a href="#699"> 699: </a>                        <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> == <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="700" class="l"><a href="#700"> 700: </a>                        {
+</span><span id="701" class="l"><a href="#701"> 701: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="702" class="l"><a href="#702"> 702: </a>                        }
+</span><span id="703" class="l"><a href="#703"> 703: </a>                    }
+</span><span id="704" class="l"><a href="#704"> 704: </a>                }
+</span><span id="705" class="l"><a href="#705"> 705: </a>            }
+</span><span id="706" class="l"><a href="#706"> 706: </a>        } <span class="php-comment">// End HTTP_ACCEPT checking</span>
+</span><span id="707" class="l"><a href="#707"> 707: </a>
+</span><span id="708" class="l"><a href="#708"> 708: </a>        <span class="php-comment">// Well, none of that has worked! Let's see if the controller has a default</span>
+</span><span id="709" class="l"><a href="#709"> 709: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
+</span><span id="710" class="l"><a href="#710"> 710: </a>        {
+</span><span id="711" class="l"><a href="#711"> 711: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
+</span><span id="712" class="l"><a href="#712"> 712: </a>        }
+</span><span id="713" class="l"><a href="#713"> 713: </a>
+</span><span id="714" class="l"><a href="#714"> 714: </a>        <span class="php-comment">// Just use the default format</span>
+</span><span id="715" class="l"><a href="#715"> 715: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
+</span><span id="716" class="l"><a href="#716"> 716: </a>    }
+</span><span id="717" class="l"><a href="#717"> 717: </a>
+</span><span id="718" class="l"><a href="#718"> 718: </a>    <span class="php-comment">/**
+</span></span><span id="719" class="l"><a href="#719"> 719: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
 </span></span><span id="720" class="l"><a href="#720"> 720: </a><span class="php-comment">     *
-</span></span><span id="721" class="l"><a href="#721"> 721: </a><span class="php-comment">     * @return NULL|string The language code.
+</span></span><span id="721" class="l"><a href="#721"> 721: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
 </span></span><span id="722" class="l"><a href="#722"> 722: </a><span class="php-comment">     */</span>
-</span><span id="723" class="l"><a href="#723"> 723: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
+</span><span id="723" class="l"><a href="#723"> 723: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
 </span><span id="724" class="l"><a href="#724"> 724: </a>    {
-</span><span id="725" class="l"><a href="#725"> 725: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>)) {
-</span><span id="726" class="l"><a href="#726"> 726: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="727" class="l"><a href="#727"> 727: </a>        }
-</span><span id="728" class="l"><a href="#728"> 728: </a>
-</span><span id="729" class="l"><a href="#729"> 729: </a>        <span class="php-comment">// They might have sent a few, make it an array</span>
-</span><span id="730" class="l"><a href="#730"> 730: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>) {
-</span><span id="731" class="l"><a href="#731"> 731: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
-</span><span id="732" class="l"><a href="#732"> 732: </a>
-</span><span id="733" class="l"><a href="#733"> 733: </a>            <span class="php-var">$return_langs</span> = <span class="php-keyword1">array</span>();
-</span><span id="734" class="l"><a href="#734"> 734: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>) {
-</span><span id="735" class="l"><a href="#735"> 735: </a>                <span class="php-comment">// Remove weight and strip space</span>
-</span><span id="736" class="l"><a href="#736"> 736: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
-</span><span id="737" class="l"><a href="#737"> 737: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
-</span><span id="738" class="l"><a href="#738"> 738: </a>            }
+</span><span id="725" class="l"><a href="#725"> 725: </a>        <span class="php-comment">// Declare a variable to store the method</span>
+</span><span id="726" class="l"><a href="#726"> 726: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="727" class="l"><a href="#727"> 727: </a>
+</span><span id="728" class="l"><a href="#728"> 728: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
+</span><span id="729" class="l"><a href="#729"> 729: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="730" class="l"><a href="#730"> 730: </a>        {
+</span><span id="731" class="l"><a href="#731"> 731: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
+</span><span id="732" class="l"><a href="#732"> 732: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="733" class="l"><a href="#733"> 733: </a>            {
+</span><span id="734" class="l"><a href="#734"> 734: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
+</span><span id="735" class="l"><a href="#735"> 735: </a>            }
+</span><span id="736" class="l"><a href="#736"> 736: </a>
+</span><span id="737" class="l"><a href="#737"> 737: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
+</span><span id="738" class="l"><a href="#738"> 738: </a>        }
 </span><span id="739" class="l"><a href="#739"> 739: </a>
-</span><span id="740" class="l"><a href="#740"> 740: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
-</span><span id="741" class="l"><a href="#741"> 741: </a>        }
-</span><span id="742" class="l"><a href="#742"> 742: </a>
-</span><span id="743" class="l"><a href="#743"> 743: </a>        <span class="php-comment">// Nope, just return the string</span>
-</span><span id="744" class="l"><a href="#744"> 744: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
-</span><span id="745" class="l"><a href="#745"> 745: </a>    }
-</span><span id="746" class="l"><a href="#746"> 746: </a>
-</span><span id="747" class="l"><a href="#747"> 747: </a>    <span class="php-comment">/**
-</span></span><span id="748" class="l"><a href="#748"> 748: </a><span class="php-comment">     * Log request
-</span></span><span id="749" class="l"><a href="#749"> 749: </a><span class="php-comment">     *
-</span></span><span id="750" class="l"><a href="#750"> 750: </a><span class="php-comment">     * Record the entry for awesomeness purposes
+</span><span id="740" class="l"><a href="#740"> 740: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
+</span><span id="741" class="l"><a href="#741"> 741: </a>        {
+</span><span id="742" class="l"><a href="#742"> 742: </a>            <span class="php-comment">// Get the request method as a lowercase string.</span>
+</span><span id="743" class="l"><a href="#743"> 743: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
+</span><span id="744" class="l"><a href="#744"> 744: </a>        }
+</span><span id="745" class="l"><a href="#745"> 745: </a>
+</span><span id="746" class="l"><a href="#746"> 746: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
+</span><span id="747" class="l"><a href="#747"> 747: </a>    }
+</span><span id="748" class="l"><a href="#748"> 748: </a>
+</span><span id="749" class="l"><a href="#749"> 749: </a>    <span class="php-comment">/**
+</span></span><span id="750" class="l"><a href="#750"> 750: </a><span class="php-comment">     * See if the user has provided an API key
 </span></span><span id="751" class="l"><a href="#751"> 751: </a><span class="php-comment">     *
-</span></span><span id="752" class="l"><a href="#752"> 752: </a><span class="php-comment">     * @param  boolean $authorized
-</span></span><span id="753" class="l"><a href="#753"> 753: </a><span class="php-comment">     * @return object
+</span></span><span id="752" class="l"><a href="#752"> 752: </a><span class="php-comment">     * @access protected
+</span></span><span id="753" class="l"><a href="#753"> 753: </a><span class="php-comment">     * @return bool
 </span></span><span id="754" class="l"><a href="#754"> 754: </a><span class="php-comment">     */</span>
-</span><span id="755" class="l"><a href="#755"> 755: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="755" class="l"><a href="#755"> 755: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
 </span><span id="756" class="l"><a href="#756"> 756: </a>    {
-</span><span id="757" class="l"><a href="#757"> 757: </a>        <span class="php-var">$status</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(config_item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-keyword1">array</span>(
-</span><span id="758" class="l"><a href="#758"> 758: </a>                    <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
-</span><span id="759" class="l"><a href="#759"> 759: </a>                    <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
-</span><span id="760" class="l"><a href="#760"> 760: </a>                    <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (config_item(<span class="php-quote">'rest_logs_json_params'</span>) ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
-</span><span id="761" class="l"><a href="#761"> 761: </a>                    <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="762" class="l"><a href="#762"> 762: </a>                    <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
-</span><span id="763" class="l"><a href="#763"> 763: </a>                    <span class="php-quote">'time'</span> =&gt; <span class="php-keyword2">function_exists</span>(<span class="php-quote">'now'</span>) ? now() : <span class="php-keyword2">time</span>(),
-</span><span id="764" class="l"><a href="#764"> 764: </a>                    <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
-</span><span id="765" class="l"><a href="#765"> 765: </a>                ));
-</span><span id="766" class="l"><a href="#766"> 766: </a>
-</span><span id="767" class="l"><a href="#767"> 767: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
-</span><span id="768" class="l"><a href="#768"> 768: </a>
-</span><span id="769" class="l"><a href="#769"> 769: </a>        <span class="php-keyword1">return</span> <span class="php-var">$status</span>;
-</span><span id="770" class="l"><a href="#770"> 770: </a>    }
-</span><span id="771" class="l"><a href="#771"> 771: </a>
-</span><span id="772" class="l"><a href="#772"> 772: </a>    <span class="php-comment">/**
-</span></span><span id="773" class="l"><a href="#773"> 773: </a><span class="php-comment">     * Limiting requests
-</span></span><span id="774" class="l"><a href="#774"> 774: </a><span class="php-comment">     *
-</span></span><span id="775" class="l"><a href="#775"> 775: </a><span class="php-comment">     * Check if the requests are coming in a tad too fast.
-</span></span><span id="776" class="l"><a href="#776"> 776: </a><span class="php-comment">     *
-</span></span><span id="777" class="l"><a href="#777"> 777: </a><span class="php-comment">     * @param  string  $controller_method The method being called.
-</span></span><span id="778" class="l"><a href="#778"> 778: </a><span class="php-comment">     * @return boolean
-</span></span><span id="779" class="l"><a href="#779"> 779: </a><span class="php-comment">     */</span>
-</span><span id="780" class="l"><a href="#780"> 780: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
-</span><span id="781" class="l"><a href="#781"> 781: </a>    {
-</span><span id="782" class="l"><a href="#782"> 782: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
-</span><span id="783" class="l"><a href="#783"> 783: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) <span class="php-keyword1">or</span> !<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>])) {
-</span><span id="784" class="l"><a href="#784"> 784: </a>            <span class="php-comment">// On your way sonny-jim.</span>
-</span><span id="785" class="l"><a href="#785"> 785: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="786" class="l"><a href="#786"> 786: </a>        }
-</span><span id="787" class="l"><a href="#787"> 787: </a>
-</span><span id="788" class="l"><a href="#788"> 788: </a>        <span class="php-comment">// How many times can you get to this method an hour?</span>
-</span><span id="789" class="l"><a href="#789"> 789: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>];
-</span><span id="790" class="l"><a href="#790"> 790: </a>
-</span><span id="791" class="l"><a href="#791"> 791: </a>        <span class="php-comment">// Get data on a keys usage</span>
-</span><span id="792" class="l"><a href="#792"> 792: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="793" class="l"><a href="#793"> 793: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string())
-</span><span id="794" class="l"><a href="#794"> 794: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="795" class="l"><a href="#795"> 795: </a>                -&gt;get(config_item(<span class="php-quote">'rest_limits_table'</span>))
-</span><span id="796" class="l"><a href="#796"> 796: </a>                -&gt;row();
-</span><span id="797" class="l"><a href="#797"> 797: </a>
-</span><span id="798" class="l"><a href="#798"> 798: </a>        <span class="php-comment">// No calls yet for this key</span>
-</span><span id="799" class="l"><a href="#799"> 799: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-var">$result</span> ) {
-</span><span id="800" class="l"><a href="#800"> 800: </a>            <span class="php-comment">// Right, set one up from scratch</span>
-</span><span id="801" class="l"><a href="#801"> 801: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(config_item(<span class="php-quote">'rest_limits_table'</span>), <span class="php-keyword1">array</span>(
-</span><span id="802" class="l"><a href="#802"> 802: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
-</span><span id="803" class="l"><a href="#803"> 803: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="804" class="l"><a href="#804"> 804: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
-</span><span id="805" class="l"><a href="#805"> 805: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
-</span><span id="806" class="l"><a href="#806"> 806: </a>            ));
-</span><span id="807" class="l"><a href="#807"> 807: </a>        }
-</span><span id="808" class="l"><a href="#808"> 808: </a>
-</span><span id="809" class="l"><a href="#809"> 809: </a>        <span class="php-comment">// Been an hour since they called</span>
-</span><span id="810" class="l"><a href="#810"> 810: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; <span class="php-keyword2">time</span>() - (<span class="php-num">60</span> * <span class="php-num">60</span>)) {
-</span><span id="811" class="l"><a href="#811"> 811: </a>            <span class="php-comment">// Reset the started period</span>
-</span><span id="812" class="l"><a href="#812"> 812: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="813" class="l"><a href="#813"> 813: </a>                    -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string())
-</span><span id="814" class="l"><a href="#814"> 814: </a>                    -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
-</span><span id="815" class="l"><a href="#815"> 815: </a>                    -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
-</span><span id="816" class="l"><a href="#816"> 816: </a>                    -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
-</span><span id="817" class="l"><a href="#817"> 817: </a>                    -&gt;update(config_item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="818" class="l"><a href="#818"> 818: </a>        }
-</span><span id="819" class="l"><a href="#819"> 819: </a>
-</span><span id="820" class="l"><a href="#820"> 820: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
-</span><span id="821" class="l"><a href="#821"> 821: </a>        <span class="php-keyword1">else</span> {
-</span><span id="822" class="l"><a href="#822"> 822: </a>            <span class="php-comment">// Your luck is out, you've called too many times!</span>
-</span><span id="823" class="l"><a href="#823"> 823: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>) {
-</span><span id="824" class="l"><a href="#824"> 824: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="825" class="l"><a href="#825"> 825: </a>            }
-</span><span id="826" class="l"><a href="#826"> 826: </a>
-</span><span id="827" class="l"><a href="#827"> 827: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="828" class="l"><a href="#828"> 828: </a>                    -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string())
-</span><span id="829" class="l"><a href="#829"> 829: </a>                    -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="830" class="l"><a href="#830"> 830: </a>                    -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
-</span><span id="831" class="l"><a href="#831"> 831: </a>                    -&gt;update(config_item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="832" class="l"><a href="#832"> 832: </a>        }
-</span><span id="833" class="l"><a href="#833"> 833: </a>
-</span><span id="834" class="l"><a href="#834"> 834: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="835" class="l"><a href="#835"> 835: </a>    }
-</span><span id="836" class="l"><a href="#836"> 836: </a>
-</span><span id="837" class="l"><a href="#837"> 837: </a>    <span class="php-comment">/**
-</span></span><span id="838" class="l"><a href="#838"> 838: </a><span class="php-comment">     * Auth override check
-</span></span><span id="839" class="l"><a href="#839"> 839: </a><span class="php-comment">     *
-</span></span><span id="840" class="l"><a href="#840"> 840: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method
-</span></span><span id="841" class="l"><a href="#841"> 841: </a><span class="php-comment">     * being called.
-</span></span><span id="842" class="l"><a href="#842"> 842: </a><span class="php-comment">     *
-</span></span><span id="843" class="l"><a href="#843"> 843: </a><span class="php-comment">     * @return boolean
-</span></span><span id="844" class="l"><a href="#844"> 844: </a><span class="php-comment">     */</span>
-</span><span id="845" class="l"><a href="#845"> 845: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
-</span><span id="846" class="l"><a href="#846"> 846: </a>    {
-</span><span id="847" class="l"><a href="#847"> 847: </a>
-</span><span id="848" class="l"><a href="#848"> 848: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
-</span><span id="849" class="l"><a href="#849"> 849: </a>        <span class="php-var">$this</span>-&gt;overrides_array = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
-</span><span id="850" class="l"><a href="#850"> 850: </a>
-</span><span id="851" class="l"><a href="#851"> 851: </a>        <span class="php-comment">// Check to see if the override array is even populated, otherwise return FALSE</span>
-</span><span id="852" class="l"><a href="#852"> 852: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array)) {
-</span><span id="853" class="l"><a href="#853"> 853: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="854" class="l"><a href="#854"> 854: </a>        }
+</span><span id="757" class="l"><a href="#757"> 757: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
+</span><span id="758" class="l"><a href="#758"> 758: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
+</span><span id="759" class="l"><a href="#759"> 759: </a>
+</span><span id="760" class="l"><a href="#760"> 760: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
+</span><span id="761" class="l"><a href="#761"> 761: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
+</span><span id="762" class="l"><a href="#762"> 762: </a>
+</span><span id="763" class="l"><a href="#763"> 763: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="764" class="l"><a href="#764"> 764: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
+</span><span id="765" class="l"><a href="#765"> 765: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
+</span><span id="766" class="l"><a href="#766"> 766: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
+</span><span id="767" class="l"><a href="#767"> 767: </a>
+</span><span id="768" class="l"><a href="#768"> 768: </a>        <span class="php-comment">// Find the key from server or arguments</span>
+</span><span id="769" class="l"><a href="#769"> 769: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
+</span><span id="770" class="l"><a href="#770"> 770: </a>        {
+</span><span id="771" class="l"><a href="#771"> 771: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
+</span><span id="772" class="l"><a href="#772"> 772: </a>            {
+</span><span id="773" class="l"><a href="#773"> 773: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="774" class="l"><a href="#774"> 774: </a>            }
+</span><span id="775" class="l"><a href="#775"> 775: </a>
+</span><span id="776" class="l"><a href="#776"> 776: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
+</span><span id="777" class="l"><a href="#777"> 777: </a>
+</span><span id="778" class="l"><a href="#778"> 778: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
+</span><span id="779" class="l"><a href="#779"> 779: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
+</span><span id="780" class="l"><a href="#780"> 780: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
+</span><span id="781" class="l"><a href="#781"> 781: </a>
+</span><span id="782" class="l"><a href="#782"> 782: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
+</span><span id="783" class="l"><a href="#783"> 783: </a>
+</span><span id="784" class="l"><a href="#784"> 784: </a>            <span class="php-comment">/*
+</span></span><span id="785" class="l"><a href="#785"> 785: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
+</span></span><span id="786" class="l"><a href="#786"> 786: </a><span class="php-comment">             * of valid ip addresses stored in the database.
+</span></span><span id="787" class="l"><a href="#787"> 787: </a><span class="php-comment">             */</span>
+</span><span id="788" class="l"><a href="#788"> 788: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
+</span><span id="789" class="l"><a href="#789"> 789: </a>            {
+</span><span id="790" class="l"><a href="#790"> 790: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
+</span><span id="791" class="l"><a href="#791"> 791: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
+</span><span id="792" class="l"><a href="#792"> 792: </a>                {
+</span><span id="793" class="l"><a href="#793"> 793: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
+</span><span id="794" class="l"><a href="#794"> 794: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
+</span><span id="795" class="l"><a href="#795"> 795: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
+</span><span id="796" class="l"><a href="#796"> 796: </a>
+</span><span id="797" class="l"><a href="#797"> 797: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
+</span><span id="798" class="l"><a href="#798"> 798: </a>                    {
+</span><span id="799" class="l"><a href="#799"> 799: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() == <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
+</span><span id="800" class="l"><a href="#800"> 800: </a>                        {
+</span><span id="801" class="l"><a href="#801"> 801: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
+</span><span id="802" class="l"><a href="#802"> 802: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
+</span><span id="803" class="l"><a href="#803"> 803: </a>                            <span class="php-keyword1">break</span>;
+</span><span id="804" class="l"><a href="#804"> 804: </a>                        }
+</span><span id="805" class="l"><a href="#805"> 805: </a>                    }
+</span><span id="806" class="l"><a href="#806"> 806: </a>
+</span><span id="807" class="l"><a href="#807"> 807: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
+</span><span id="808" class="l"><a href="#808"> 808: </a>                }
+</span><span id="809" class="l"><a href="#809"> 809: </a>                <span class="php-keyword1">else</span>
+</span><span id="810" class="l"><a href="#810"> 810: </a>                {
+</span><span id="811" class="l"><a href="#811"> 811: </a>                    <span class="php-comment">// There should be at least one IP address for this private key.</span>
+</span><span id="812" class="l"><a href="#812"> 812: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="813" class="l"><a href="#813"> 813: </a>                }
+</span><span id="814" class="l"><a href="#814"> 814: </a>            }
+</span><span id="815" class="l"><a href="#815"> 815: </a>
+</span><span id="816" class="l"><a href="#816"> 816: </a>            <span class="php-keyword1">return</span> <span class="php-var">$row</span>;
+</span><span id="817" class="l"><a href="#817"> 817: </a>        }
+</span><span id="818" class="l"><a href="#818"> 818: </a>
+</span><span id="819" class="l"><a href="#819"> 819: </a>        <span class="php-comment">// No key has been sent</span>
+</span><span id="820" class="l"><a href="#820"> 820: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="821" class="l"><a href="#821"> 821: </a>    }
+</span><span id="822" class="l"><a href="#822"> 822: </a>
+</span><span id="823" class="l"><a href="#823"> 823: </a>    <span class="php-comment">/**
+</span></span><span id="824" class="l"><a href="#824"> 824: </a><span class="php-comment">     * What language do they want it in?
+</span></span><span id="825" class="l"><a href="#825"> 825: </a><span class="php-comment">     *
+</span></span><span id="826" class="l"><a href="#826"> 826: </a><span class="php-comment">     * @access protected
+</span></span><span id="827" class="l"><a href="#827"> 827: </a><span class="php-comment">     * @return NULL|string The language code.
+</span></span><span id="828" class="l"><a href="#828"> 828: </a><span class="php-comment">     */</span>
+</span><span id="829" class="l"><a href="#829"> 829: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
+</span><span id="830" class="l"><a href="#830"> 830: </a>    {
+</span><span id="831" class="l"><a href="#831"> 831: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>))
+</span><span id="832" class="l"><a href="#832"> 832: </a>        {
+</span><span id="833" class="l"><a href="#833"> 833: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="834" class="l"><a href="#834"> 834: </a>        }
+</span><span id="835" class="l"><a href="#835"> 835: </a>
+</span><span id="836" class="l"><a href="#836"> 836: </a>        <span class="php-comment">// They might have sent a few, make it an array</span>
+</span><span id="837" class="l"><a href="#837"> 837: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="838" class="l"><a href="#838"> 838: </a>        {
+</span><span id="839" class="l"><a href="#839"> 839: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
+</span><span id="840" class="l"><a href="#840"> 840: </a>
+</span><span id="841" class="l"><a href="#841"> 841: </a>            <span class="php-var">$return_langs</span> = [];
+</span><span id="842" class="l"><a href="#842"> 842: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
+</span><span id="843" class="l"><a href="#843"> 843: </a>            {
+</span><span id="844" class="l"><a href="#844"> 844: </a>                <span class="php-comment">// Remove weight and strip space</span>
+</span><span id="845" class="l"><a href="#845"> 845: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
+</span><span id="846" class="l"><a href="#846"> 846: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
+</span><span id="847" class="l"><a href="#847"> 847: </a>            }
+</span><span id="848" class="l"><a href="#848"> 848: </a>
+</span><span id="849" class="l"><a href="#849"> 849: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
+</span><span id="850" class="l"><a href="#850"> 850: </a>        }
+</span><span id="851" class="l"><a href="#851"> 851: </a>
+</span><span id="852" class="l"><a href="#852"> 852: </a>        <span class="php-comment">// Nope, just return the string</span>
+</span><span id="853" class="l"><a href="#853"> 853: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
+</span><span id="854" class="l"><a href="#854"> 854: </a>    }
 </span><span id="855" class="l"><a href="#855"> 855: </a>
-</span><span id="856" class="l"><a href="#856"> 856: </a>        <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="857" class="l"><a href="#857"> 857: </a>        <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>])){<span class="php-comment">//check for class overides</span>
-</span><span id="858" class="l"><a href="#858"> 858: </a>            <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="859" class="l"><a href="#859"> 859: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'none'</span>)
-</span><span id="860" class="l"><a href="#860"> 860: </a>            {
-</span><span id="861" class="l"><a href="#861"> 861: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="862" class="l"><a href="#862"> 862: </a>            }
-</span><span id="863" class="l"><a href="#863"> 863: </a>
-</span><span id="864" class="l"><a href="#864"> 864: </a>            <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="865" class="l"><a href="#865"> 865: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'basic'</span>)
-</span><span id="866" class="l"><a href="#866"> 866: </a>            {
-</span><span id="867" class="l"><a href="#867"> 867: </a>                <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="868" class="l"><a href="#868"> 868: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="869" class="l"><a href="#869"> 869: </a>            }
-</span><span id="870" class="l"><a href="#870"> 870: </a>
-</span><span id="871" class="l"><a href="#871"> 871: </a>            <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="872" class="l"><a href="#872"> 872: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'digest'</span>)
-</span><span id="873" class="l"><a href="#873"> 873: </a>            {
-</span><span id="874" class="l"><a href="#874"> 874: </a>                <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="875" class="l"><a href="#875"> 875: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="876" class="l"><a href="#876"> 876: </a>            }
-</span><span id="877" class="l"><a href="#877"> 877: </a>
-</span><span id="878" class="l"><a href="#878"> 878: </a>            <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="879" class="l"><a href="#879"> 879: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'whitelist'</span>)
-</span><span id="880" class="l"><a href="#880"> 880: </a>            {
-</span><span id="881" class="l"><a href="#881"> 881: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="882" class="l"><a href="#882"> 882: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="883" class="l"><a href="#883"> 883: </a>            }
-</span><span id="884" class="l"><a href="#884"> 884: </a>        }
+</span><span id="856" class="l"><a href="#856"> 856: </a>    <span class="php-comment">/**
+</span></span><span id="857" class="l"><a href="#857"> 857: </a><span class="php-comment">     * Add the request to the log table
+</span></span><span id="858" class="l"><a href="#858"> 858: </a><span class="php-comment">     *
+</span></span><span id="859" class="l"><a href="#859"> 859: </a><span class="php-comment">     * @access protected
+</span></span><span id="860" class="l"><a href="#860"> 860: </a><span class="php-comment">     *
+</span></span><span id="861" class="l"><a href="#861"> 861: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
+</span></span><span id="862" class="l"><a href="#862"> 862: </a><span class="php-comment">     *
+</span></span><span id="863" class="l"><a href="#863"> 863: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
+</span></span><span id="864" class="l"><a href="#864"> 864: </a><span class="php-comment">     */</span>
+</span><span id="865" class="l"><a href="#865"> 865: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="866" class="l"><a href="#866"> 866: </a>    {
+</span><span id="867" class="l"><a href="#867"> 867: </a>        <span class="php-comment">// Insert the request into the log table</span>
+</span><span id="868" class="l"><a href="#868"> 868: </a>        <span class="php-var">$isInserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="869" class="l"><a href="#869"> 869: </a>            -&gt;insert(
+</span><span id="870" class="l"><a href="#870"> 870: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
+</span><span id="871" class="l"><a href="#871"> 871: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
+</span><span id="872" class="l"><a href="#872"> 872: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
+</span><span id="873" class="l"><a href="#873"> 873: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
+</span><span id="874" class="l"><a href="#874"> 874: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="875" class="l"><a href="#875"> 875: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
+</span><span id="876" class="l"><a href="#876"> 876: </a>                <span class="php-quote">'time'</span> =&gt; now(), <span class="php-comment">// Used to be: function_exists('now') ? now() : time()</span>
+</span><span id="877" class="l"><a href="#877"> 877: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
+</span><span id="878" class="l"><a href="#878"> 878: </a>            ]);
+</span><span id="879" class="l"><a href="#879"> 879: </a>
+</span><span id="880" class="l"><a href="#880"> 880: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
+</span><span id="881" class="l"><a href="#881"> 881: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
+</span><span id="882" class="l"><a href="#882"> 882: </a>
+</span><span id="883" class="l"><a href="#883"> 883: </a>        <span class="php-keyword1">return</span> <span class="php-var">$isInserted</span>;
+</span><span id="884" class="l"><a href="#884"> 884: </a>    }
 </span><span id="885" class="l"><a href="#885"> 885: </a>
-</span><span id="886" class="l"><a href="#886"> 886: </a>        <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
-</span><span id="887" class="l"><a href="#887"> 887: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method])) {
-</span><span id="888" class="l"><a href="#888"> 888: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="889" class="l"><a href="#889"> 889: </a>        }
-</span><span id="890" class="l"><a href="#890"> 890: </a>
-</span><span id="891" class="l"><a href="#891"> 891: </a>        <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="892" class="l"><a href="#892"> 892: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'none'</span>) {
-</span><span id="893" class="l"><a href="#893"> 893: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="894" class="l"><a href="#894"> 894: </a>        }
-</span><span id="895" class="l"><a href="#895"> 895: </a>
-</span><span id="896" class="l"><a href="#896"> 896: </a>        <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="897" class="l"><a href="#897"> 897: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'basic'</span>) {
-</span><span id="898" class="l"><a href="#898"> 898: </a>            <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="899" class="l"><a href="#899"> 899: </a>
-</span><span id="900" class="l"><a href="#900"> 900: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="901" class="l"><a href="#901"> 901: </a>        }
-</span><span id="902" class="l"><a href="#902"> 902: </a>
-</span><span id="903" class="l"><a href="#903"> 903: </a>        <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="904" class="l"><a href="#904"> 904: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'digest'</span>) {
-</span><span id="905" class="l"><a href="#905"> 905: </a>            <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="886" class="l"><a href="#886"> 886: </a>    <span class="php-comment">/**
+</span></span><span id="887" class="l"><a href="#887"> 887: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
+</span></span><span id="888" class="l"><a href="#888"> 888: </a><span class="php-comment">     *
+</span></span><span id="889" class="l"><a href="#889"> 889: </a><span class="php-comment">     * @access protected
+</span></span><span id="890" class="l"><a href="#890"> 890: </a><span class="php-comment">     *
+</span></span><span id="891" class="l"><a href="#891"> 891: </a><span class="php-comment">     * @param  string $controller_method The method being called
+</span></span><span id="892" class="l"><a href="#892"> 892: </a><span class="php-comment">     *
+</span></span><span id="893" class="l"><a href="#893"> 893: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
+</span></span><span id="894" class="l"><a href="#894"> 894: </a><span class="php-comment">     */</span>
+</span><span id="895" class="l"><a href="#895"> 895: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
+</span><span id="896" class="l"><a href="#896"> 896: </a>    {
+</span><span id="897" class="l"><a href="#897"> 897: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
+</span><span id="898" class="l"><a href="#898"> 898: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span> || <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span>)
+</span><span id="899" class="l"><a href="#899"> 899: </a>        {
+</span><span id="900" class="l"><a href="#900"> 900: </a>            <span class="php-comment">// Everything is fine</span>
+</span><span id="901" class="l"><a href="#901"> 901: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="902" class="l"><a href="#902"> 902: </a>        }
+</span><span id="903" class="l"><a href="#903"> 903: </a>
+</span><span id="904" class="l"><a href="#904"> 904: </a>        <span class="php-comment">// How many times can you get to this method in a defined timelimit (default: 1hr)?</span>
+</span><span id="905" class="l"><a href="#905"> 905: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>];
 </span><span id="906" class="l"><a href="#906"> 906: </a>
-</span><span id="907" class="l"><a href="#907"> 907: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="908" class="l"><a href="#908"> 908: </a>        }
-</span><span id="909" class="l"><a href="#909"> 909: </a>
-</span><span id="910" class="l"><a href="#910"> 910: </a>        <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="911" class="l"><a href="#911"> 911: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'whitelist'</span>) {
-</span><span id="912" class="l"><a href="#912"> 912: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="913" class="l"><a href="#913"> 913: </a>
-</span><span id="914" class="l"><a href="#914"> 914: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="915" class="l"><a href="#915"> 915: </a>        }
-</span><span id="916" class="l"><a href="#916"> 916: </a>
-</span><span id="917" class="l"><a href="#917"> 917: </a>        <span class="php-comment">// Return FALSE when there is an override value set but it does not match</span>
-</span><span id="918" class="l"><a href="#918"> 918: </a>        <span class="php-comment">// 'basic', 'digest', or 'none'. (the value was misspelled)</span>
-</span><span id="919" class="l"><a href="#919"> 919: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="920" class="l"><a href="#920"> 920: </a>    }
+</span><span id="907" class="l"><a href="#907"> 907: </a>        <span class="php-var">$uri_noext</span> = <span class="php-var">$this</span>-&gt;uri-&gt;uri_string();
+</span><span id="908" class="l"><a href="#908"> 908: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;uri-&gt;uri_string()), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>) 
+</span><span id="909" class="l"><a href="#909"> 909: </a>        { 
+</span><span id="910" class="l"><a href="#910"> 910: </a>            <span class="php-var">$uri_noext</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)-<span class="php-num">1</span>);
+</span><span id="911" class="l"><a href="#911"> 911: </a>        }
+</span><span id="912" class="l"><a href="#912"> 912: </a>
+</span><span id="913" class="l"><a href="#913"> 913: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
+</span><span id="914" class="l"><a href="#914"> 914: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="915" class="l"><a href="#915"> 915: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
+</span><span id="916" class="l"><a href="#916"> 916: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="917" class="l"><a href="#917"> 917: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
+</span><span id="918" class="l"><a href="#918"> 918: </a>            -&gt;row();
+</span><span id="919" class="l"><a href="#919"> 919: </a>
+</span><span id="920" class="l"><a href="#920"> 920: </a>        <span class="php-var">$timelimit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'time'</span>] : <span class="php-num">60</span> * <span class="php-num">60</span>);
 </span><span id="921" class="l"><a href="#921"> 921: </a>
-</span><span id="922" class="l"><a href="#922"> 922: </a>    <span class="php-comment">/**
-</span></span><span id="923" class="l"><a href="#923"> 923: </a><span class="php-comment">     * Parse GET
-</span></span><span id="924" class="l"><a href="#924"> 924: </a><span class="php-comment">     */</span>
-</span><span id="925" class="l"><a href="#925"> 925: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
-</span><span id="926" class="l"><a href="#926"> 926: </a>    {
-</span><span id="927" class="l"><a href="#927"> 927: </a>        <span class="php-comment">// Fix for Issue #247</span>
-</span><span id="928" class="l"><a href="#928"> 928: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_cli_request()) {
-</span><span id="929" class="l"><a href="#929"> 929: </a>            <span class="php-var">$args</span> = <span class="php-var">$_SERVER</span>[<span class="php-quote">'argv'</span>];
-</span><span id="930" class="l"><a href="#930"> 930: </a>            <span class="php-keyword1">unset</span>(<span class="php-var">$args</span>[<span class="php-num">0</span>]);
-</span><span id="931" class="l"><a href="#931"> 931: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'QUERY_STRING'</span>] =  <span class="php-var">$_SERVER</span>[<span class="php-quote">'PATH_INFO'</span>] = <span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>] = <span class="php-quote">'/'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'/'</span>, <span class="php-var">$args</span>) . <span class="php-quote">'/'</span>;
+</span><span id="922" class="l"><a href="#922"> 922: </a>        <span class="php-comment">// No calls have been made for this key</span>
+</span><span id="923" class="l"><a href="#923"> 923: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="924" class="l"><a href="#924"> 924: </a>        {
+</span><span id="925" class="l"><a href="#925"> 925: </a>            <span class="php-comment">// Create a new row for the following key</span>
+</span><span id="926" class="l"><a href="#926"> 926: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
+</span><span id="927" class="l"><a href="#927"> 927: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
+</span><span id="928" class="l"><a href="#928"> 928: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="929" class="l"><a href="#929"> 929: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
+</span><span id="930" class="l"><a href="#930"> 930: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
+</span><span id="931" class="l"><a href="#931"> 931: </a>            ]);
 </span><span id="932" class="l"><a href="#932"> 932: </a>        }
 </span><span id="933" class="l"><a href="#933"> 933: </a>
-</span><span id="934" class="l"><a href="#934"> 934: </a>        <span class="php-comment">// Grab proper GET variables</span>
-</span><span id="935" class="l"><a href="#935"> 935: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>], PHP_URL_QUERY), <span class="php-var">$get</span>);
-</span><span id="936" class="l"><a href="#936"> 936: </a>
-</span><span id="937" class="l"><a href="#937"> 937: </a>        <span class="php-comment">// Merge both the URI segments and GET params</span>
-</span><span id="938" class="l"><a href="#938"> 938: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$get</span>);
-</span><span id="939" class="l"><a href="#939"> 939: </a>    }
-</span><span id="940" class="l"><a href="#940"> 940: </a>
-</span><span id="941" class="l"><a href="#941"> 941: </a>    <span class="php-comment">/**
-</span></span><span id="942" class="l"><a href="#942"> 942: </a><span class="php-comment">     * Parse POST
-</span></span><span id="943" class="l"><a href="#943"> 943: </a><span class="php-comment">     */</span>
-</span><span id="944" class="l"><a href="#944"> 944: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
-</span><span id="945" class="l"><a href="#945"> 945: </a>    {
-</span><span id="946" class="l"><a href="#946"> 946: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
-</span><span id="947" class="l"><a href="#947"> 947: </a>
-</span><span id="948" class="l"><a href="#948"> 948: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format <span class="php-keyword1">and</span> <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword2">file_get_contents</span>(<span class="php-quote">'php://input'</span>);
-</span><span id="949" class="l"><a href="#949"> 949: </a>    }
-</span><span id="950" class="l"><a href="#950"> 950: </a>
-</span><span id="951" class="l"><a href="#951"> 951: </a>    <span class="php-comment">/**
-</span></span><span id="952" class="l"><a href="#952"> 952: </a><span class="php-comment">     * Parse PUT
-</span></span><span id="953" class="l"><a href="#953"> 953: </a><span class="php-comment">     */</span>
-</span><span id="954" class="l"><a href="#954"> 954: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
-</span><span id="955" class="l"><a href="#955"> 955: </a>    {
-</span><span id="956" class="l"><a href="#956"> 956: </a>        <span class="php-comment">// It might be a HTTP body</span>
-</span><span id="957" class="l"><a href="#957"> 957: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format) {
-</span><span id="958" class="l"><a href="#958"> 958: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword2">file_get_contents</span>(<span class="php-quote">'php://input'</span>);
-</span><span id="959" class="l"><a href="#959"> 959: </a>        }
-</span><span id="960" class="l"><a href="#960"> 960: </a>
-</span><span id="961" class="l"><a href="#961"> 961: </a>        <span class="php-comment">// If no file type is provided, this is probably just arguments</span>
-</span><span id="962" class="l"><a href="#962"> 962: </a>        <span class="php-keyword1">else</span> {
-</span><span id="963" class="l"><a href="#963"> 963: </a>            <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">file_get_contents</span>(<span class="php-quote">'php://input'</span>), <span class="php-var">$this</span>-&gt;_put_args);
-</span><span id="964" class="l"><a href="#964"> 964: </a>        }
+</span><span id="934" class="l"><a href="#934"> 934: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
+</span><span id="935" class="l"><a href="#935"> 935: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$timelimit</span>))
+</span><span id="936" class="l"><a href="#936"> 936: </a>        {
+</span><span id="937" class="l"><a href="#937"> 937: </a>            <span class="php-comment">// Reset the started period and count</span>
+</span><span id="938" class="l"><a href="#938"> 938: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="939" class="l"><a href="#939"> 939: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
+</span><span id="940" class="l"><a href="#940"> 940: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
+</span><span id="941" class="l"><a href="#941"> 941: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
+</span><span id="942" class="l"><a href="#942"> 942: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
+</span><span id="943" class="l"><a href="#943"> 943: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="944" class="l"><a href="#944"> 944: </a>        }
+</span><span id="945" class="l"><a href="#945"> 945: </a>
+</span><span id="946" class="l"><a href="#946"> 946: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
+</span><span id="947" class="l"><a href="#947"> 947: </a>        <span class="php-keyword1">else</span>
+</span><span id="948" class="l"><a href="#948"> 948: </a>        {
+</span><span id="949" class="l"><a href="#949"> 949: </a>            <span class="php-comment">// The limit has been exceeded</span>
+</span><span id="950" class="l"><a href="#950"> 950: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
+</span><span id="951" class="l"><a href="#951"> 951: </a>            {
+</span><span id="952" class="l"><a href="#952"> 952: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="953" class="l"><a href="#953"> 953: </a>            }
+</span><span id="954" class="l"><a href="#954"> 954: </a>
+</span><span id="955" class="l"><a href="#955"> 955: </a>            <span class="php-comment">// Increase the count by one</span>
+</span><span id="956" class="l"><a href="#956"> 956: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="957" class="l"><a href="#957"> 957: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
+</span><span id="958" class="l"><a href="#958"> 958: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="959" class="l"><a href="#959"> 959: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
+</span><span id="960" class="l"><a href="#960"> 960: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="961" class="l"><a href="#961"> 961: </a>        }
+</span><span id="962" class="l"><a href="#962"> 962: </a>
+</span><span id="963" class="l"><a href="#963"> 963: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="964" class="l"><a href="#964"> 964: </a>    }
 </span><span id="965" class="l"><a href="#965"> 965: </a>
-</span><span id="966" class="l"><a href="#966"> 966: </a>    }
-</span><span id="967" class="l"><a href="#967"> 967: </a>
-</span><span id="968" class="l"><a href="#968"> 968: </a>    <span class="php-comment">/**
-</span></span><span id="969" class="l"><a href="#969"> 969: </a><span class="php-comment">     * Parse HEAD
-</span></span><span id="970" class="l"><a href="#970"> 970: </a><span class="php-comment">     */</span>
-</span><span id="971" class="l"><a href="#971"> 971: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
-</span><span id="972" class="l"><a href="#972"> 972: </a>    {
-</span><span id="973" class="l"><a href="#973"> 973: </a>        <span class="php-comment">// Grab proper HEAD variables</span>
-</span><span id="974" class="l"><a href="#974"> 974: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>], PHP_URL_QUERY), <span class="php-var">$head</span>);
-</span><span id="975" class="l"><a href="#975"> 975: </a>
-</span><span id="976" class="l"><a href="#976"> 976: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
-</span><span id="977" class="l"><a href="#977"> 977: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
-</span><span id="978" class="l"><a href="#978"> 978: </a>    }
-</span><span id="979" class="l"><a href="#979"> 979: </a>
-</span><span id="980" class="l"><a href="#980"> 980: </a>    <span class="php-comment">/**
-</span></span><span id="981" class="l"><a href="#981"> 981: </a><span class="php-comment">     * Parse OPTIONS
-</span></span><span id="982" class="l"><a href="#982"> 982: </a><span class="php-comment">     */</span>
-</span><span id="983" class="l"><a href="#983"> 983: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
-</span><span id="984" class="l"><a href="#984"> 984: </a>    {
-</span><span id="985" class="l"><a href="#985"> 985: </a>        <span class="php-comment">// Grab proper OPTIONS variables</span>
-</span><span id="986" class="l"><a href="#986"> 986: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>], PHP_URL_QUERY), <span class="php-var">$options</span>);
-</span><span id="987" class="l"><a href="#987"> 987: </a>
-</span><span id="988" class="l"><a href="#988"> 988: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
-</span><span id="989" class="l"><a href="#989"> 989: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
-</span><span id="990" class="l"><a href="#990"> 990: </a>    }
-</span><span id="991" class="l"><a href="#991"> 991: </a>
-</span><span id="992" class="l"><a href="#992"> 992: </a>    <span class="php-comment">/**
-</span></span><span id="993" class="l"><a href="#993"> 993: </a><span class="php-comment">     * Parse PATCH
-</span></span><span id="994" class="l"><a href="#994"> 994: </a><span class="php-comment">     */</span>
-</span><span id="995" class="l"><a href="#995"> 995: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
-</span><span id="996" class="l"><a href="#996"> 996: </a>    {
-</span><span id="997" class="l"><a href="#997"> 997: </a>        <span class="php-comment">// It might be a HTTP body</span>
-</span><span id="998" class="l"><a href="#998"> 998: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format) {
-</span><span id="999" class="l"><a href="#999"> 999: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword2">file_get_contents</span>(<span class="php-quote">'php://input'</span>);
-</span><span id="1000" class="l"><a href="#1000">1000: </a>        }
+</span><span id="966" class="l"><a href="#966"> 966: </a>    <span class="php-comment">/**
+</span></span><span id="967" class="l"><a href="#967"> 967: </a><span class="php-comment">     * Auth override check
+</span></span><span id="968" class="l"><a href="#968"> 968: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method
+</span></span><span id="969" class="l"><a href="#969"> 969: </a><span class="php-comment">     * being called.
+</span></span><span id="970" class="l"><a href="#970"> 970: </a><span class="php-comment">     *
+</span></span><span id="971" class="l"><a href="#971"> 971: </a><span class="php-comment">     * @access protected
+</span></span><span id="972" class="l"><a href="#972"> 972: </a><span class="php-comment">     * @return bool
+</span></span><span id="973" class="l"><a href="#973"> 973: </a><span class="php-comment">     */</span>
+</span><span id="974" class="l"><a href="#974"> 974: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
+</span><span id="975" class="l"><a href="#975"> 975: </a>    {
+</span><span id="976" class="l"><a href="#976"> 976: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
+</span><span id="977" class="l"><a href="#977"> 977: </a>        <span class="php-var">$this</span>-&gt;overrides_array = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
+</span><span id="978" class="l"><a href="#978"> 978: </a>
+</span><span id="979" class="l"><a href="#979"> 979: </a>        <span class="php-comment">// Check to see if the override array is even populated, otherwise return FALSE</span>
+</span><span id="980" class="l"><a href="#980"> 980: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array))
+</span><span id="981" class="l"><a href="#981"> 981: </a>        {
+</span><span id="982" class="l"><a href="#982"> 982: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="983" class="l"><a href="#983"> 983: </a>        }
+</span><span id="984" class="l"><a href="#984"> 984: </a>
+</span><span id="985" class="l"><a href="#985"> 985: </a>        <span class="php-comment">// check for wildcard flag for rules for classes</span>
+</span><span id="986" class="l"><a href="#986"> 986: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>]) === <span class="php-keyword1">FALSE</span>) <span class="php-comment">// Check for class overrides</span>
+</span><span id="987" class="l"><a href="#987"> 987: </a>        {
+</span><span id="988" class="l"><a href="#988"> 988: </a>            <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="989" class="l"><a href="#989"> 989: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'none'</span>)
+</span><span id="990" class="l"><a href="#990"> 990: </a>            {
+</span><span id="991" class="l"><a href="#991"> 991: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="992" class="l"><a href="#992"> 992: </a>            }
+</span><span id="993" class="l"><a href="#993"> 993: </a>
+</span><span id="994" class="l"><a href="#994"> 994: </a>            <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="995" class="l"><a href="#995"> 995: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'basic'</span>)
+</span><span id="996" class="l"><a href="#996"> 996: </a>            {
+</span><span id="997" class="l"><a href="#997"> 997: </a>                <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="998" class="l"><a href="#998"> 998: </a>
+</span><span id="999" class="l"><a href="#999"> 999: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1000" class="l"><a href="#1000">1000: </a>            }
 </span><span id="1001" class="l"><a href="#1001">1001: </a>
-</span><span id="1002" class="l"><a href="#1002">1002: </a>        <span class="php-comment">// If no file type is provided, this is probably just arguments</span>
-</span><span id="1003" class="l"><a href="#1003">1003: </a>        <span class="php-keyword1">else</span> {
-</span><span id="1004" class="l"><a href="#1004">1004: </a>            <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">file_get_contents</span>(<span class="php-quote">'php://input'</span>), <span class="php-var">$this</span>-&gt;_patch_args);
-</span><span id="1005" class="l"><a href="#1005">1005: </a>        }
-</span><span id="1006" class="l"><a href="#1006">1006: </a>    }
-</span><span id="1007" class="l"><a href="#1007">1007: </a>
-</span><span id="1008" class="l"><a href="#1008">1008: </a>    <span class="php-comment">/**
-</span></span><span id="1009" class="l"><a href="#1009">1009: </a><span class="php-comment">     * Parse DELETE
-</span></span><span id="1010" class="l"><a href="#1010">1010: </a><span class="php-comment">     */</span>
-</span><span id="1011" class="l"><a href="#1011">1011: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
-</span><span id="1012" class="l"><a href="#1012">1012: </a>    {
-</span><span id="1013" class="l"><a href="#1013">1013: </a>        <span class="php-comment">// Set up out DELETE variables (which shouldn't really exist, but sssh!)</span>
-</span><span id="1014" class="l"><a href="#1014">1014: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">file_get_contents</span>(<span class="php-quote">'php://input'</span>), <span class="php-var">$this</span>-&gt;_delete_args);
-</span><span id="1015" class="l"><a href="#1015">1015: </a>    }
-</span><span id="1016" class="l"><a href="#1016">1016: </a>
-</span><span id="1017" class="l"><a href="#1017">1017: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
+</span><span id="1002" class="l"><a href="#1002">1002: </a>            <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1003" class="l"><a href="#1003">1003: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'digest'</span>)
+</span><span id="1004" class="l"><a href="#1004">1004: </a>            {
+</span><span id="1005" class="l"><a href="#1005">1005: </a>                <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1006" class="l"><a href="#1006">1006: </a>
+</span><span id="1007" class="l"><a href="#1007">1007: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1008" class="l"><a href="#1008">1008: </a>            }
+</span><span id="1009" class="l"><a href="#1009">1009: </a>
+</span><span id="1010" class="l"><a href="#1010">1010: </a>            <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1011" class="l"><a href="#1011">1011: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'whitelist'</span>)
+</span><span id="1012" class="l"><a href="#1012">1012: </a>            {
+</span><span id="1013" class="l"><a href="#1013">1013: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1014" class="l"><a href="#1014">1014: </a>
+</span><span id="1015" class="l"><a href="#1015">1015: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1016" class="l"><a href="#1016">1016: </a>            }
+</span><span id="1017" class="l"><a href="#1017">1017: </a>        }
 </span><span id="1018" class="l"><a href="#1018">1018: </a>
-</span><span id="1019" class="l"><a href="#1019">1019: </a>    <span class="php-comment">/**
-</span></span><span id="1020" class="l"><a href="#1020">1020: </a><span class="php-comment">     * Retrieve a value from the GET request arguments.
-</span></span><span id="1021" class="l"><a href="#1021">1021: </a><span class="php-comment">     *
-</span></span><span id="1022" class="l"><a href="#1022">1022: </a><span class="php-comment">     * @param  string  $key       The key for the GET request argument to retrieve
-</span></span><span id="1023" class="l"><a href="#1023">1023: </a><span class="php-comment">     * @param  boolean $xss_clean Whether the value should be XSS cleaned or not.
-</span></span><span id="1024" class="l"><a href="#1024">1024: </a><span class="php-comment">     * @return string  The GET argument value.
-</span></span><span id="1025" class="l"><a href="#1025">1025: </a><span class="php-comment">     */</span>
-</span><span id="1026" class="l"><a href="#1026">1026: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">TRUE</span>)
-</span><span id="1027" class="l"><a href="#1027">1027: </a>    {
-</span><span id="1028" class="l"><a href="#1028">1028: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>) {
-</span><span id="1029" class="l"><a href="#1029">1029: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
-</span><span id="1030" class="l"><a href="#1030">1030: </a>        }
-</span><span id="1031" class="l"><a href="#1031">1031: </a>
-</span><span id="1032" class="l"><a href="#1032">1032: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_get_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1033" class="l"><a href="#1033">1033: </a>    }
-</span><span id="1034" class="l"><a href="#1034">1034: </a>
-</span><span id="1035" class="l"><a href="#1035">1035: </a>    <span class="php-comment">/**
-</span></span><span id="1036" class="l"><a href="#1036">1036: </a><span class="php-comment">     * This function retrieves a values from the OPTIONS request arguments
-</span></span><span id="1037" class="l"><a href="#1037">1037: </a><span class="php-comment">     *
-</span></span><span id="1038" class="l"><a href="#1038">1038: </a><span class="php-comment">     * @param  string  $key       The OPTIONS/GET argument key
-</span></span><span id="1039" class="l"><a href="#1039">1039: </a><span class="php-comment">     * @param  boolean $xss_clean Whether the value should be XSS cleaned or not
-</span></span><span id="1040" class="l"><a href="#1040">1040: </a><span class="php-comment">     * @return string  The OPTIONS/GET argument value
-</span></span><span id="1041" class="l"><a href="#1041">1041: </a><span class="php-comment">     */</span>
-</span><span id="1042" class="l"><a href="#1042">1042: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">TRUE</span>)
-</span><span id="1043" class="l"><a href="#1043">1043: </a>    {
-</span><span id="1044" class="l"><a href="#1044">1044: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>) {
-</span><span id="1045" class="l"><a href="#1045">1045: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
-</span><span id="1046" class="l"><a href="#1046">1046: </a>        }
-</span><span id="1047" class="l"><a href="#1047">1047: </a>
-</span><span id="1048" class="l"><a href="#1048">1048: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_options_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1049" class="l"><a href="#1049">1049: </a>    }
-</span><span id="1050" class="l"><a href="#1050">1050: </a>
-</span><span id="1051" class="l"><a href="#1051">1051: </a>    <span class="php-comment">/**
-</span></span><span id="1052" class="l"><a href="#1052">1052: </a><span class="php-comment">     * This function retrieves a values from the HEAD request arguments
-</span></span><span id="1053" class="l"><a href="#1053">1053: </a><span class="php-comment">     *
-</span></span><span id="1054" class="l"><a href="#1054">1054: </a><span class="php-comment">     * @param  string  $key       The HEAD/GET argument key
-</span></span><span id="1055" class="l"><a href="#1055">1055: </a><span class="php-comment">     * @param  boolean $xss_clean Whether the value should be XSS cleaned or not
-</span></span><span id="1056" class="l"><a href="#1056">1056: </a><span class="php-comment">     * @return string  The HEAD/GET argument value
-</span></span><span id="1057" class="l"><a href="#1057">1057: </a><span class="php-comment">     */</span>
-</span><span id="1058" class="l"><a href="#1058">1058: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">TRUE</span>)
-</span><span id="1059" class="l"><a href="#1059">1059: </a>    {
-</span><span id="1060" class="l"><a href="#1060">1060: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>) {
-</span><span id="1061" class="l"><a href="#1061">1061: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;head_args;
-</span><span id="1062" class="l"><a href="#1062">1062: </a>        }
-</span><span id="1063" class="l"><a href="#1063">1063: </a>
-</span><span id="1064" class="l"><a href="#1064">1064: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;head_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1065" class="l"><a href="#1065">1065: </a>    }
-</span><span id="1066" class="l"><a href="#1066">1066: </a>
-</span><span id="1067" class="l"><a href="#1067">1067: </a>    <span class="php-comment">/**
-</span></span><span id="1068" class="l"><a href="#1068">1068: </a><span class="php-comment">     * Retrieve a value from the POST request arguments.
-</span></span><span id="1069" class="l"><a href="#1069">1069: </a><span class="php-comment">     *
-</span></span><span id="1070" class="l"><a href="#1070">1070: </a><span class="php-comment">     * @param  string  $key       The key for the POST request argument to retrieve
-</span></span><span id="1071" class="l"><a href="#1071">1071: </a><span class="php-comment">     * @param  boolean $xss_clean Whether the value should be XSS cleaned or not.
-</span></span><span id="1072" class="l"><a href="#1072">1072: </a><span class="php-comment">     * @return string  The POST argument value.
-</span></span><span id="1073" class="l"><a href="#1073">1073: </a><span class="php-comment">     */</span>
-</span><span id="1074" class="l"><a href="#1074">1074: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">TRUE</span>)
-</span><span id="1075" class="l"><a href="#1075">1075: </a>    {
-</span><span id="1076" class="l"><a href="#1076">1076: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>) {
-</span><span id="1077" class="l"><a href="#1077">1077: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
-</span><span id="1078" class="l"><a href="#1078">1078: </a>        }
-</span><span id="1079" class="l"><a href="#1079">1079: </a>
-</span><span id="1080" class="l"><a href="#1080">1080: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_post_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1081" class="l"><a href="#1081">1081: </a>    }
-</span><span id="1082" class="l"><a href="#1082">1082: </a>
-</span><span id="1083" class="l"><a href="#1083">1083: </a>    <span class="php-comment">/**
-</span></span><span id="1084" class="l"><a href="#1084">1084: </a><span class="php-comment">     * Retrieve a value from the PUT request arguments.
-</span></span><span id="1085" class="l"><a href="#1085">1085: </a><span class="php-comment">     *
-</span></span><span id="1086" class="l"><a href="#1086">1086: </a><span class="php-comment">     * @param  string  $key       The key for the PUT request argument to retrieve
-</span></span><span id="1087" class="l"><a href="#1087">1087: </a><span class="php-comment">     * @param  boolean $xss_clean Whether the value should be XSS cleaned or not.
-</span></span><span id="1088" class="l"><a href="#1088">1088: </a><span class="php-comment">     * @return string  The PUT argument value.
-</span></span><span id="1089" class="l"><a href="#1089">1089: </a><span class="php-comment">     */</span>
-</span><span id="1090" class="l"><a href="#1090">1090: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">TRUE</span>)
-</span><span id="1091" class="l"><a href="#1091">1091: </a>    {
-</span><span id="1092" class="l"><a href="#1092">1092: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>) {
-</span><span id="1093" class="l"><a href="#1093">1093: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
-</span><span id="1094" class="l"><a href="#1094">1094: </a>        }
-</span><span id="1095" class="l"><a href="#1095">1095: </a>
-</span><span id="1096" class="l"><a href="#1096">1096: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_put_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1019" class="l"><a href="#1019">1019: </a>        <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
+</span><span id="1020" class="l"><a href="#1020">1020: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
+</span><span id="1021" class="l"><a href="#1021">1021: </a>        {
+</span><span id="1022" class="l"><a href="#1022">1022: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1023" class="l"><a href="#1023">1023: </a>        }
+</span><span id="1024" class="l"><a href="#1024">1024: </a>
+</span><span id="1025" class="l"><a href="#1025">1025: </a>        <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1026" class="l"><a href="#1026">1026: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'none'</span>)
+</span><span id="1027" class="l"><a href="#1027">1027: </a>        {
+</span><span id="1028" class="l"><a href="#1028">1028: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1029" class="l"><a href="#1029">1029: </a>        }
+</span><span id="1030" class="l"><a href="#1030">1030: </a>
+</span><span id="1031" class="l"><a href="#1031">1031: </a>        <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1032" class="l"><a href="#1032">1032: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'basic'</span>)
+</span><span id="1033" class="l"><a href="#1033">1033: </a>        {
+</span><span id="1034" class="l"><a href="#1034">1034: </a>            <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1035" class="l"><a href="#1035">1035: </a>
+</span><span id="1036" class="l"><a href="#1036">1036: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1037" class="l"><a href="#1037">1037: </a>        }
+</span><span id="1038" class="l"><a href="#1038">1038: </a>
+</span><span id="1039" class="l"><a href="#1039">1039: </a>        <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1040" class="l"><a href="#1040">1040: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'digest'</span>)
+</span><span id="1041" class="l"><a href="#1041">1041: </a>        {
+</span><span id="1042" class="l"><a href="#1042">1042: </a>            <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1043" class="l"><a href="#1043">1043: </a>
+</span><span id="1044" class="l"><a href="#1044">1044: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1045" class="l"><a href="#1045">1045: </a>        }
+</span><span id="1046" class="l"><a href="#1046">1046: </a>
+</span><span id="1047" class="l"><a href="#1047">1047: </a>        <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1048" class="l"><a href="#1048">1048: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'whitelist'</span>)
+</span><span id="1049" class="l"><a href="#1049">1049: </a>        {
+</span><span id="1050" class="l"><a href="#1050">1050: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1051" class="l"><a href="#1051">1051: </a>
+</span><span id="1052" class="l"><a href="#1052">1052: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1053" class="l"><a href="#1053">1053: </a>        }
+</span><span id="1054" class="l"><a href="#1054">1054: </a>
+</span><span id="1055" class="l"><a href="#1055">1055: </a>        <span class="php-comment">// Return FALSE when there is an override value set but it does not match</span>
+</span><span id="1056" class="l"><a href="#1056">1056: </a>        <span class="php-comment">// 'basic', 'digest', or 'none'. (the value was misspelled)</span>
+</span><span id="1057" class="l"><a href="#1057">1057: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1058" class="l"><a href="#1058">1058: </a>    }
+</span><span id="1059" class="l"><a href="#1059">1059: </a>
+</span><span id="1060" class="l"><a href="#1060">1060: </a>    <span class="php-comment">/**
+</span></span><span id="1061" class="l"><a href="#1061">1061: </a><span class="php-comment">     * Parse the GET request arguments
+</span></span><span id="1062" class="l"><a href="#1062">1062: </a><span class="php-comment">     *
+</span></span><span id="1063" class="l"><a href="#1063">1063: </a><span class="php-comment">     * @access protected
+</span></span><span id="1064" class="l"><a href="#1064">1064: </a><span class="php-comment">     * @return void
+</span></span><span id="1065" class="l"><a href="#1065">1065: </a><span class="php-comment">     */</span>
+</span><span id="1066" class="l"><a href="#1066">1066: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
+</span><span id="1067" class="l"><a href="#1067">1067: </a>    {
+</span><span id="1068" class="l"><a href="#1068">1068: </a>        <span class="php-comment">// Declare a variable that will hold the REQUEST_URI</span>
+</span><span id="1069" class="l"><a href="#1069">1069: </a>        <span class="php-var">$request_uri</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1070" class="l"><a href="#1070">1070: </a>
+</span><span id="1071" class="l"><a href="#1071">1071: </a>        <span class="php-comment">// Fix for Issue #247</span>
+</span><span id="1072" class="l"><a href="#1072">1072: </a>        <span class="php-keyword1">if</span> (is_cli())
+</span><span id="1073" class="l"><a href="#1073">1073: </a>        {
+</span><span id="1074" class="l"><a href="#1074">1074: </a>            <span class="php-var">$args</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'argv'</span>);
+</span><span id="1075" class="l"><a href="#1075">1075: </a>            <span class="php-keyword1">unset</span>(<span class="php-var">$args</span>[<span class="php-num">0</span>]);
+</span><span id="1076" class="l"><a href="#1076">1076: </a>            <span class="php-comment">// Combine the arguments using '/' as the delimiter</span>
+</span><span id="1077" class="l"><a href="#1077">1077: </a>            <span class="php-var">$request_uri</span> = <span class="php-quote">'/'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'/'</span>, <span class="php-var">$args</span>) . <span class="php-quote">'/'</span>;
+</span><span id="1078" class="l"><a href="#1078">1078: </a>
+</span><span id="1079" class="l"><a href="#1079">1079: </a>            <span class="php-comment">// Set the following server variables</span>
+</span><span id="1080" class="l"><a href="#1080">1080: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1081" class="l"><a href="#1081">1081: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'PATH_INFO'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1082" class="l"><a href="#1082">1082: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'QUERY_STRING'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1083" class="l"><a href="#1083">1083: </a>        }
+</span><span id="1084" class="l"><a href="#1084">1084: </a>        <span class="php-keyword1">else</span>
+</span><span id="1085" class="l"><a href="#1085">1085: </a>        {
+</span><span id="1086" class="l"><a href="#1086">1086: </a>            <span class="php-var">$request_uri</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>);
+</span><span id="1087" class="l"><a href="#1087">1087: </a>        }
+</span><span id="1088" class="l"><a href="#1088">1088: </a>
+</span><span id="1089" class="l"><a href="#1089">1089: </a>        <span class="php-comment">// Declare a variable that will hold the parameters</span>
+</span><span id="1090" class="l"><a href="#1090">1090: </a>        <span class="php-var">$get</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1091" class="l"><a href="#1091">1091: </a>
+</span><span id="1092" class="l"><a href="#1092">1092: </a>        <span class="php-comment">// Grab the GET variables from the query string</span>
+</span><span id="1093" class="l"><a href="#1093">1093: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$request_uri</span>, PHP_URL_QUERY), <span class="php-var">$get</span>);
+</span><span id="1094" class="l"><a href="#1094">1094: </a>
+</span><span id="1095" class="l"><a href="#1095">1095: </a>        <span class="php-comment">// Merge both the URI segments and GET params</span>
+</span><span id="1096" class="l"><a href="#1096">1096: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$get</span>);
 </span><span id="1097" class="l"><a href="#1097">1097: </a>    }
 </span><span id="1098" class="l"><a href="#1098">1098: </a>
 </span><span id="1099" class="l"><a href="#1099">1099: </a>    <span class="php-comment">/**
-</span></span><span id="1100" class="l"><a href="#1100">1100: </a><span class="php-comment">     * Retrieve a value from the DELETE request arguments.
+</span></span><span id="1100" class="l"><a href="#1100">1100: </a><span class="php-comment">     * Parse the POST request arguments
 </span></span><span id="1101" class="l"><a href="#1101">1101: </a><span class="php-comment">     *
-</span></span><span id="1102" class="l"><a href="#1102">1102: </a><span class="php-comment">     * @param  string  $key       The key for the DELETE request argument to retrieve
-</span></span><span id="1103" class="l"><a href="#1103">1103: </a><span class="php-comment">     * @param  boolean $xss_clean Whether the value should be XSS cleaned or not.
-</span></span><span id="1104" class="l"><a href="#1104">1104: </a><span class="php-comment">     * @return string  The DELETE argument value.
-</span></span><span id="1105" class="l"><a href="#1105">1105: </a><span class="php-comment">     */</span>
-</span><span id="1106" class="l"><a href="#1106">1106: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">TRUE</span>)
-</span><span id="1107" class="l"><a href="#1107">1107: </a>    {
-</span><span id="1108" class="l"><a href="#1108">1108: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>) {
-</span><span id="1109" class="l"><a href="#1109">1109: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
-</span><span id="1110" class="l"><a href="#1110">1110: </a>        }
-</span><span id="1111" class="l"><a href="#1111">1111: </a>
-</span><span id="1112" class="l"><a href="#1112">1112: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_delete_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span></span><span id="1102" class="l"><a href="#1102">1102: </a><span class="php-comment">     * @access protected
+</span></span><span id="1103" class="l"><a href="#1103">1103: </a><span class="php-comment">     * @return void
+</span></span><span id="1104" class="l"><a href="#1104">1104: </a><span class="php-comment">     */</span>
+</span><span id="1105" class="l"><a href="#1105">1105: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
+</span><span id="1106" class="l"><a href="#1106">1106: </a>    {
+</span><span id="1107" class="l"><a href="#1107">1107: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
+</span><span id="1108" class="l"><a href="#1108">1108: </a>
+</span><span id="1109" class="l"><a href="#1109">1109: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1110" class="l"><a href="#1110">1110: </a>        {
+</span><span id="1111" class="l"><a href="#1111">1111: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1112" class="l"><a href="#1112">1112: </a>        }
 </span><span id="1113" class="l"><a href="#1113">1113: </a>    }
 </span><span id="1114" class="l"><a href="#1114">1114: </a>
 </span><span id="1115" class="l"><a href="#1115">1115: </a>    <span class="php-comment">/**
-</span></span><span id="1116" class="l"><a href="#1116">1116: </a><span class="php-comment">     * Retrieve a value from the PATCH request arguments.
+</span></span><span id="1116" class="l"><a href="#1116">1116: </a><span class="php-comment">     * Parse the PUT request arguments
 </span></span><span id="1117" class="l"><a href="#1117">1117: </a><span class="php-comment">     *
-</span></span><span id="1118" class="l"><a href="#1118">1118: </a><span class="php-comment">     * @param  string  $key       The key for the PATCH request argument to retrieve
-</span></span><span id="1119" class="l"><a href="#1119">1119: </a><span class="php-comment">     * @param  boolean $xss_clean Whether the value should be XSS cleaned or not.
-</span></span><span id="1120" class="l"><a href="#1120">1120: </a><span class="php-comment">     * @return string  The PATCH argument value.
-</span></span><span id="1121" class="l"><a href="#1121">1121: </a><span class="php-comment">     */</span>
-</span><span id="1122" class="l"><a href="#1122">1122: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">TRUE</span>)
-</span><span id="1123" class="l"><a href="#1123">1123: </a>    {
-</span><span id="1124" class="l"><a href="#1124">1124: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>) {
-</span><span id="1125" class="l"><a href="#1125">1125: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
+</span></span><span id="1118" class="l"><a href="#1118">1118: </a><span class="php-comment">     * @access protected
+</span></span><span id="1119" class="l"><a href="#1119">1119: </a><span class="php-comment">     * @return void
+</span></span><span id="1120" class="l"><a href="#1120">1120: </a><span class="php-comment">     */</span>
+</span><span id="1121" class="l"><a href="#1121">1121: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
+</span><span id="1122" class="l"><a href="#1122">1122: </a>    {
+</span><span id="1123" class="l"><a href="#1123">1123: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1124" class="l"><a href="#1124">1124: </a>        {
+</span><span id="1125" class="l"><a href="#1125">1125: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
 </span><span id="1126" class="l"><a href="#1126">1126: </a>        }
-</span><span id="1127" class="l"><a href="#1127">1127: </a>
-</span><span id="1128" class="l"><a href="#1128">1128: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_patch_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1129" class="l"><a href="#1129">1129: </a>    }
-</span><span id="1130" class="l"><a href="#1130">1130: </a>
-</span><span id="1131" class="l"><a href="#1131">1131: </a>    <span class="php-comment">/**
-</span></span><span id="1132" class="l"><a href="#1132">1132: </a><span class="php-comment">     * Process to protect from XSS attacks.
-</span></span><span id="1133" class="l"><a href="#1133">1133: </a><span class="php-comment">     *
-</span></span><span id="1134" class="l"><a href="#1134">1134: </a><span class="php-comment">     * @param  string  $val     The input.
-</span></span><span id="1135" class="l"><a href="#1135">1135: </a><span class="php-comment">     * @param  boolean $process Do clean or note the input.
-</span></span><span id="1136" class="l"><a href="#1136">1136: </a><span class="php-comment">     * @return string
-</span></span><span id="1137" class="l"><a href="#1137">1137: </a><span class="php-comment">     */</span>
-</span><span id="1138" class="l"><a href="#1138">1138: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$val</span>, <span class="php-var">$process</span>)
-</span><span id="1139" class="l"><a href="#1139">1139: </a>    {
-</span><span id="1140" class="l"><a href="#1140">1140: </a>        <span class="php-keyword1">if</span> (CI_VERSION &lt; <span class="php-num">2</span>) {
-</span><span id="1141" class="l"><a href="#1141">1141: </a>            <span class="php-keyword1">return</span> <span class="php-var">$process</span> ? <span class="php-var">$this</span>-&gt;input-&gt;xss_clean(<span class="php-var">$val</span>) : <span class="php-var">$val</span>;
-</span><span id="1142" class="l"><a href="#1142">1142: </a>        }
-</span><span id="1143" class="l"><a href="#1143">1143: </a>
-</span><span id="1144" class="l"><a href="#1144">1144: </a>        <span class="php-keyword1">return</span> <span class="php-var">$process</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$val</span>) : <span class="php-var">$val</span>;
-</span><span id="1145" class="l"><a href="#1145">1145: </a>    }
-</span><span id="1146" class="l"><a href="#1146">1146: </a>
-</span><span id="1147" class="l"><a href="#1147">1147: </a>    <span class="php-comment">/**
-</span></span><span id="1148" class="l"><a href="#1148">1148: </a><span class="php-comment">     * Retrieve the validation errors.
-</span></span><span id="1149" class="l"><a href="#1149">1149: </a><span class="php-comment">     *
-</span></span><span id="1150" class="l"><a href="#1150">1150: </a><span class="php-comment">     * @return array
-</span></span><span id="1151" class="l"><a href="#1151">1151: </a><span class="php-comment">     */</span>
-</span><span id="1152" class="l"><a href="#1152">1152: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
-</span><span id="1153" class="l"><a href="#1153">1153: </a>    {
-</span><span id="1154" class="l"><a href="#1154">1154: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
-</span><span id="1155" class="l"><a href="#1155">1155: </a>
-</span><span id="1156" class="l"><a href="#1156">1156: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(<span class="php-quote">&quot;\n&quot;</span>, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, <span class="php-quote">&quot;\n&quot;</span>));
-</span><span id="1157" class="l"><a href="#1157">1157: </a>    }
-</span><span id="1158" class="l"><a href="#1158">1158: </a>
-</span><span id="1159" class="l"><a href="#1159">1159: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
-</span><span id="1160" class="l"><a href="#1160">1160: </a>
-</span><span id="1161" class="l"><a href="#1161">1161: </a>    <span class="php-comment">/**
-</span></span><span id="1162" class="l"><a href="#1162">1162: </a><span class="php-comment">     * Perform LDAP Authentication
-</span></span><span id="1163" class="l"><a href="#1163">1163: </a><span class="php-comment">     *
-</span></span><span id="1164" class="l"><a href="#1164">1164: </a><span class="php-comment">     * @param  string  $username The username to validate
-</span></span><span id="1165" class="l"><a href="#1165">1165: </a><span class="php-comment">     * @param  string  $password The password to validate
-</span></span><span id="1166" class="l"><a href="#1166">1166: </a><span class="php-comment">     * @return boolean
-</span></span><span id="1167" class="l"><a href="#1167">1167: </a><span class="php-comment">     */</span>
-</span><span id="1168" class="l"><a href="#1168">1168: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1169" class="l"><a href="#1169">1169: </a>    {
-</span><span id="1170" class="l"><a href="#1170">1170: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>)) {
-</span><span id="1171" class="l"><a href="#1171">1171: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
-</span><span id="1172" class="l"><a href="#1172">1172: </a>
-</span><span id="1173" class="l"><a href="#1173">1173: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1174" class="l"><a href="#1174">1174: </a>        }
-</span><span id="1175" class="l"><a href="#1175">1175: </a>
-</span><span id="1176" class="l"><a href="#1176">1176: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading Config'</span>);
-</span><span id="1177" class="l"><a href="#1177">1177: </a>
-</span><span id="1178" class="l"><a href="#1178">1178: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="1179" class="l"><a href="#1179">1179: </a>
-</span><span id="1180" class="l"><a href="#1180">1180: </a>        <span class="php-var">$ldap</span> = <span class="php-keyword1">array</span>(
-</span><span id="1181" class="l"><a href="#1181">1181: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>);
-</span><span id="1182" class="l"><a href="#1182">1182: </a>            <span class="php-quote">'host'</span>    =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>);
-</span><span id="1183" class="l"><a href="#1183">1183: </a>            <span class="php-quote">'port'</span>    =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>);
-</span><span id="1184" class="l"><a href="#1184">1184: </a>            <span class="php-quote">'rdn'</span>     =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>);
-</span><span id="1185" class="l"><a href="#1185">1185: </a>            <span class="php-quote">'pass'</span>    =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>);
-</span><span id="1186" class="l"><a href="#1186">1186: </a>            <span class="php-quote">'basedn'</span>  =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>);
-</span><span id="1187" class="l"><a href="#1187">1187: </a>          );
-</span><span id="1188" class="l"><a href="#1188">1188: </a>
-</span><span id="1189" class="l"><a href="#1189">1189: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . <span class="php-var">$ldaphost</span>);
-</span><span id="1190" class="l"><a href="#1190">1190: </a>
-</span><span id="1191" class="l"><a href="#1191">1191: </a>        <span class="php-var">$ldapconfig</span>[<span class="php-quote">'authrealm'</span>] = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'domain'</span>, <span class="php-quote">'ldap'</span>);
-</span><span id="1192" class="l"><a href="#1192">1192: </a>
-</span><span id="1193" class="l"><a href="#1193">1193: </a>        <span class="php-comment">// connect to ldap server</span>
-</span><span id="1194" class="l"><a href="#1194">1194: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
-</span><span id="1195" class="l"><a href="#1195">1195: </a>
-</span><span id="1196" class="l"><a href="#1196">1196: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>) {
-</span><span id="1197" class="l"><a href="#1197">1197: </a>
-</span><span id="1198" class="l"><a href="#1198">1198: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>] . <span class="php-quote">' seconds'</span>);
-</span><span id="1199" class="l"><a href="#1199">1199: </a>
-</span><span id="1200" class="l"><a href="#1200">1200: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
-</span><span id="1201" class="l"><a href="#1201">1201: </a>
-</span><span id="1202" class="l"><a href="#1202">1202: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>] . <span class="php-quote">' with dn '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
-</span><span id="1203" class="l"><a href="#1203">1203: </a>
-</span><span id="1204" class="l"><a href="#1204">1204: </a>            <span class="php-comment">// binding to ldap server</span>
-</span><span id="1205" class="l"><a href="#1205">1205: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
+</span><span id="1127" class="l"><a href="#1127">1127: </a>        <span class="php-keyword1">else</span>
+</span><span id="1128" class="l"><a href="#1128">1128: </a>        {
+</span><span id="1129" class="l"><a href="#1129">1129: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1130" class="l"><a href="#1130">1130: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
+</span><span id="1131" class="l"><a href="#1131">1131: </a>            {
+</span><span id="1132" class="l"><a href="#1132">1132: </a>                <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1133" class="l"><a href="#1133">1133: </a>            }
+</span><span id="1134" class="l"><a href="#1134">1134: </a>        }
+</span><span id="1135" class="l"><a href="#1135">1135: </a>    }
+</span><span id="1136" class="l"><a href="#1136">1136: </a>
+</span><span id="1137" class="l"><a href="#1137">1137: </a>    <span class="php-comment">/**
+</span></span><span id="1138" class="l"><a href="#1138">1138: </a><span class="php-comment">     * Parse the HEAD request arguments
+</span></span><span id="1139" class="l"><a href="#1139">1139: </a><span class="php-comment">     *
+</span></span><span id="1140" class="l"><a href="#1140">1140: </a><span class="php-comment">     * @access protected
+</span></span><span id="1141" class="l"><a href="#1141">1141: </a><span class="php-comment">     * @return void
+</span></span><span id="1142" class="l"><a href="#1142">1142: </a><span class="php-comment">     */</span>
+</span><span id="1143" class="l"><a href="#1143">1143: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
+</span><span id="1144" class="l"><a href="#1144">1144: </a>    {
+</span><span id="1145" class="l"><a href="#1145">1145: </a>        <span class="php-comment">// Parse the HEAD variables</span>
+</span><span id="1146" class="l"><a href="#1146">1146: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
+</span><span id="1147" class="l"><a href="#1147">1147: </a>
+</span><span id="1148" class="l"><a href="#1148">1148: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
+</span><span id="1149" class="l"><a href="#1149">1149: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
+</span><span id="1150" class="l"><a href="#1150">1150: </a>    }
+</span><span id="1151" class="l"><a href="#1151">1151: </a>
+</span><span id="1152" class="l"><a href="#1152">1152: </a>    <span class="php-comment">/**
+</span></span><span id="1153" class="l"><a href="#1153">1153: </a><span class="php-comment">     * Parse the OPTIONS request arguments
+</span></span><span id="1154" class="l"><a href="#1154">1154: </a><span class="php-comment">     *
+</span></span><span id="1155" class="l"><a href="#1155">1155: </a><span class="php-comment">     * @access protected
+</span></span><span id="1156" class="l"><a href="#1156">1156: </a><span class="php-comment">     * @return void
+</span></span><span id="1157" class="l"><a href="#1157">1157: </a><span class="php-comment">     */</span>
+</span><span id="1158" class="l"><a href="#1158">1158: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
+</span><span id="1159" class="l"><a href="#1159">1159: </a>    {
+</span><span id="1160" class="l"><a href="#1160">1160: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
+</span><span id="1161" class="l"><a href="#1161">1161: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
+</span><span id="1162" class="l"><a href="#1162">1162: </a>
+</span><span id="1163" class="l"><a href="#1163">1163: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
+</span><span id="1164" class="l"><a href="#1164">1164: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
+</span><span id="1165" class="l"><a href="#1165">1165: </a>    }
+</span><span id="1166" class="l"><a href="#1166">1166: </a>
+</span><span id="1167" class="l"><a href="#1167">1167: </a>    <span class="php-comment">/**
+</span></span><span id="1168" class="l"><a href="#1168">1168: </a><span class="php-comment">     * Parse the PATCH request arguments
+</span></span><span id="1169" class="l"><a href="#1169">1169: </a><span class="php-comment">     *
+</span></span><span id="1170" class="l"><a href="#1170">1170: </a><span class="php-comment">     * @access protected
+</span></span><span id="1171" class="l"><a href="#1171">1171: </a><span class="php-comment">     * @return void
+</span></span><span id="1172" class="l"><a href="#1172">1172: </a><span class="php-comment">     */</span>
+</span><span id="1173" class="l"><a href="#1173">1173: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
+</span><span id="1174" class="l"><a href="#1174">1174: </a>    {
+</span><span id="1175" class="l"><a href="#1175">1175: </a>        <span class="php-comment">// It might be a HTTP body</span>
+</span><span id="1176" class="l"><a href="#1176">1176: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1177" class="l"><a href="#1177">1177: </a>        {
+</span><span id="1178" class="l"><a href="#1178">1178: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1179" class="l"><a href="#1179">1179: </a>        }
+</span><span id="1180" class="l"><a href="#1180">1180: </a>        <span class="php-keyword1">else</span>
+</span><span id="1181" class="l"><a href="#1181">1181: </a>        {
+</span><span id="1182" class="l"><a href="#1182">1182: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1183" class="l"><a href="#1183">1183: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
+</span><span id="1184" class="l"><a href="#1184">1184: </a>            {
+</span><span id="1185" class="l"><a href="#1185">1185: </a>                <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1186" class="l"><a href="#1186">1186: </a>            }
+</span><span id="1187" class="l"><a href="#1187">1187: </a>        }
+</span><span id="1188" class="l"><a href="#1188">1188: </a>    }
+</span><span id="1189" class="l"><a href="#1189">1189: </a>
+</span><span id="1190" class="l"><a href="#1190">1190: </a>    <span class="php-comment">/**
+</span></span><span id="1191" class="l"><a href="#1191">1191: </a><span class="php-comment">     * Parse the DELETE request arguments
+</span></span><span id="1192" class="l"><a href="#1192">1192: </a><span class="php-comment">     *
+</span></span><span id="1193" class="l"><a href="#1193">1193: </a><span class="php-comment">     * @access protected
+</span></span><span id="1194" class="l"><a href="#1194">1194: </a><span class="php-comment">     * @return void
+</span></span><span id="1195" class="l"><a href="#1195">1195: </a><span class="php-comment">     */</span>
+</span><span id="1196" class="l"><a href="#1196">1196: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
+</span><span id="1197" class="l"><a href="#1197">1197: </a>    {
+</span><span id="1198" class="l"><a href="#1198">1198: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
+</span><span id="1199" class="l"><a href="#1199">1199: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
+</span><span id="1200" class="l"><a href="#1200">1200: </a>        {
+</span><span id="1201" class="l"><a href="#1201">1201: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1202" class="l"><a href="#1202">1202: </a>        }
+</span><span id="1203" class="l"><a href="#1203">1203: </a>    }
+</span><span id="1204" class="l"><a href="#1204">1204: </a>
+</span><span id="1205" class="l"><a href="#1205">1205: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
 </span><span id="1206" class="l"><a href="#1206">1206: </a>
-</span><span id="1207" class="l"><a href="#1207">1207: </a>            <span class="php-comment">// verify binding</span>
-</span><span id="1208" class="l"><a href="#1208">1208: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span>) {
-</span><span id="1209" class="l"><a href="#1209">1209: </a>                log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
-</span><span id="1210" class="l"><a href="#1210">1210: </a>            } <span class="php-keyword1">else</span> {
-</span><span id="1211" class="l"><a href="#1211">1211: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind unsuccessful'</span>);
-</span><span id="1212" class="l"><a href="#1212">1212: </a>
-</span><span id="1213" class="l"><a href="#1213">1213: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1214" class="l"><a href="#1214">1214: </a>            }
-</span><span id="1215" class="l"><a href="#1215">1215: </a>
-</span><span id="1216" class="l"><a href="#1216">1216: </a>        }
-</span><span id="1217" class="l"><a href="#1217">1217: </a>
-</span><span id="1218" class="l"><a href="#1218">1218: </a>        <span class="php-comment">// search for user</span>
-</span><span id="1219" class="l"><a href="#1219">1219: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>( <span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) == <span class="php-keyword1">FALSE</span>) {
-</span><span id="1220" class="l"><a href="#1220">1220: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span> . <span class="php-var">$username</span> . <span class="php-quote">' not found in search'</span>);
-</span><span id="1221" class="l"><a href="#1221">1221: </a>
-</span><span id="1222" class="l"><a href="#1222">1222: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1207" class="l"><a href="#1207">1207: </a>    <span class="php-comment">/**
+</span></span><span id="1208" class="l"><a href="#1208">1208: </a><span class="php-comment">     * Retrieve a value from a GET request
+</span></span><span id="1209" class="l"><a href="#1209">1209: </a><span class="php-comment">     *
+</span></span><span id="1210" class="l"><a href="#1210">1210: </a><span class="php-comment">     * @access public
+</span></span><span id="1211" class="l"><a href="#1211">1211: </a><span class="php-comment">     *
+</span></span><span id="1212" class="l"><a href="#1212">1212: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
+</span></span><span id="1213" class="l"><a href="#1213">1213: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1214" class="l"><a href="#1214">1214: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1215" class="l"><a href="#1215">1215: </a><span class="php-comment">     *
+</span></span><span id="1216" class="l"><a href="#1216">1216: </a><span class="php-comment">     * @return array|string|FALSE Value from the GET request; otherwise, FALSE
+</span></span><span id="1217" class="l"><a href="#1217">1217: </a><span class="php-comment">     */</span>
+</span><span id="1218" class="l"><a href="#1218">1218: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1219" class="l"><a href="#1219">1219: </a>    {
+</span><span id="1220" class="l"><a href="#1220">1220: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1221" class="l"><a href="#1221">1221: </a>        {
+</span><span id="1222" class="l"><a href="#1222">1222: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
 </span><span id="1223" class="l"><a href="#1223">1223: </a>        }
 </span><span id="1224" class="l"><a href="#1224">1224: </a>
-</span><span id="1225" class="l"><a href="#1225">1225: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) != <span class="php-num">1</span>) {
-</span><span id="1226" class="l"><a href="#1226">1226: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username '</span> . <span class="php-var">$username</span> . <span class="php-quote">'found more than once'</span>);
+</span><span id="1225" class="l"><a href="#1225">1225: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_get_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1226" class="l"><a href="#1226">1226: </a>    }
 </span><span id="1227" class="l"><a href="#1227">1227: </a>
-</span><span id="1228" class="l"><a href="#1228">1228: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1229" class="l"><a href="#1229">1229: </a>        }
-</span><span id="1230" class="l"><a href="#1230">1230: </a>
-</span><span id="1231" class="l"><a href="#1231">1231: </a>        <span class="php-keyword1">if</span> (( <span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>))== <span class="php-keyword1">FALSE</span>) {
-</span><span id="1232" class="l"><a href="#1232">1232: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, entry of searchresult could not be fetched'</span>);
-</span><span id="1233" class="l"><a href="#1233">1233: </a>
-</span><span id="1234" class="l"><a href="#1234">1234: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1235" class="l"><a href="#1235">1235: </a>        }
-</span><span id="1236" class="l"><a href="#1236">1236: </a>
-</span><span id="1237" class="l"><a href="#1237">1237: </a>        <span class="php-keyword1">if</span> (( <span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) == <span class="php-keyword1">FALSE</span>) {
-</span><span id="1238" class="l"><a href="#1238">1238: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, user-dn could not be fetched'</span>);
-</span><span id="1239" class="l"><a href="#1239">1239: </a>
-</span><span id="1240" class="l"><a href="#1240">1240: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1241" class="l"><a href="#1241">1241: </a>        }
-</span><span id="1242" class="l"><a href="#1242">1242: </a>
-</span><span id="1243" class="l"><a href="#1243">1243: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
-</span><span id="1244" class="l"><a href="#1244">1244: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) == <span class="php-keyword1">FALSE</span>) {
-</span><span id="1245" class="l"><a href="#1245">1245: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
-</span><span id="1246" class="l"><a href="#1246">1246: </a>
-</span><span id="1247" class="l"><a href="#1247">1247: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1248" class="l"><a href="#1248">1248: </a>        }
-</span><span id="1249" class="l"><a href="#1249">1249: </a>
-</span><span id="1250" class="l"><a href="#1250">1250: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span> . <span class="php-var">$user_dn</span> . <span class="php-quote">' authenticated successfully'</span>);
-</span><span id="1251" class="l"><a href="#1251">1251: </a>
-</span><span id="1252" class="l"><a href="#1252">1252: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
-</span><span id="1253" class="l"><a href="#1253">1253: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
-</span><span id="1254" class="l"><a href="#1254">1254: </a>
-</span><span id="1255" class="l"><a href="#1255">1255: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1256" class="l"><a href="#1256">1256: </a>    }
-</span><span id="1257" class="l"><a href="#1257">1257: </a>
-</span><span id="1258" class="l"><a href="#1258">1258: </a>    <span class="php-comment">/**
-</span></span><span id="1259" class="l"><a href="#1259">1259: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
-</span></span><span id="1260" class="l"><a href="#1260">1260: </a><span class="php-comment">     *
-</span></span><span id="1261" class="l"><a href="#1261">1261: </a><span class="php-comment">     * @param  string  $username The username to validate
-</span></span><span id="1262" class="l"><a href="#1262">1262: </a><span class="php-comment">     * @param  string  $password The password to validate
-</span></span><span id="1263" class="l"><a href="#1263">1263: </a><span class="php-comment">     * @return boolean
-</span></span><span id="1264" class="l"><a href="#1264">1264: </a><span class="php-comment">     */</span>
-</span><span id="1265" class="l"><a href="#1265">1265: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1266" class="l"><a href="#1266">1266: </a>    {
-</span><span id="1267" class="l"><a href="#1267">1267: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>)) {
-</span><span id="1268" class="l"><a href="#1268">1268: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: failure, empty username'</span>);
-</span><span id="1269" class="l"><a href="#1269">1269: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1270" class="l"><a href="#1270">1270: </a>        }
-</span><span id="1271" class="l"><a href="#1271">1271: </a>
-</span><span id="1272" class="l"><a href="#1272">1272: </a>        <span class="php-var">$auth_library_class</span>     = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
-</span><span id="1273" class="l"><a href="#1273">1273: </a>        <span class="php-var">$auth_library_function</span>  = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
-</span><span id="1274" class="l"><a href="#1274">1274: </a>
-</span><span id="1275" class="l"><a href="#1275">1275: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>)) {
-</span><span id="1276" class="l"><a href="#1276">1276: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_class'</span>);
-</span><span id="1277" class="l"><a href="#1277">1277: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1278" class="l"><a href="#1278">1278: </a>        }
-</span><span id="1279" class="l"><a href="#1279">1279: </a>
-</span><span id="1280" class="l"><a href="#1280">1280: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>)) {
-</span><span id="1281" class="l"><a href="#1281">1281: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_function'</span>);
-</span><span id="1282" class="l"><a href="#1282">1282: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1283" class="l"><a href="#1283">1283: </a>        }
-</span><span id="1284" class="l"><a href="#1284">1284: </a>
-</span><span id="1285" class="l"><a href="#1285">1285: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword2">is_callable</span>(<span class="php-keyword1">array</span>(<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>))) {
-</span><span id="1286" class="l"><a href="#1286">1286: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
-</span><span id="1287" class="l"><a href="#1287">1287: </a>        }
-</span><span id="1288" class="l"><a href="#1288">1288: </a>
-</span><span id="1289" class="l"><a href="#1289">1289: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1290" class="l"><a href="#1290">1290: </a>    }
-</span><span id="1291" class="l"><a href="#1291">1291: </a>
-</span><span id="1292" class="l"><a href="#1292">1292: </a>    <span class="php-comment">/**
-</span></span><span id="1293" class="l"><a href="#1293">1293: </a><span class="php-comment">     * Check if the user is logged in.
-</span></span><span id="1294" class="l"><a href="#1294">1294: </a><span class="php-comment">     *
-</span></span><span id="1295" class="l"><a href="#1295">1295: </a><span class="php-comment">     * @param  string  $username The user's name
-</span></span><span id="1296" class="l"><a href="#1296">1296: </a><span class="php-comment">     * @param  string  $password The user's password
-</span></span><span id="1297" class="l"><a href="#1297">1297: </a><span class="php-comment">     * @return boolean
-</span></span><span id="1298" class="l"><a href="#1298">1298: </a><span class="php-comment">     */</span>
-</span><span id="1299" class="l"><a href="#1299">1299: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1300" class="l"><a href="#1300">1300: </a>    {
-</span><span id="1301" class="l"><a href="#1301">1301: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>)) {
-</span><span id="1302" class="l"><a href="#1302">1302: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1303" class="l"><a href="#1303">1303: </a>        }
-</span><span id="1304" class="l"><a href="#1304">1304: </a>
-</span><span id="1305" class="l"><a href="#1305">1305: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
-</span><span id="1306" class="l"><a href="#1306">1306: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="1307" class="l"><a href="#1307">1307: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
+</span><span id="1228" class="l"><a href="#1228">1228: </a>    <span class="php-comment">/**
+</span></span><span id="1229" class="l"><a href="#1229">1229: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
+</span></span><span id="1230" class="l"><a href="#1230">1230: </a><span class="php-comment">     *
+</span></span><span id="1231" class="l"><a href="#1231">1231: </a><span class="php-comment">     * @access public
+</span></span><span id="1232" class="l"><a href="#1232">1232: </a><span class="php-comment">     *
+</span></span><span id="1233" class="l"><a href="#1233">1233: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
+</span></span><span id="1234" class="l"><a href="#1234">1234: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1235" class="l"><a href="#1235">1235: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1236" class="l"><a href="#1236">1236: </a><span class="php-comment">     *
+</span></span><span id="1237" class="l"><a href="#1237">1237: </a><span class="php-comment">     * @return array|string|FALSE Value from the OPTIONS request; otherwise, FALSE
+</span></span><span id="1238" class="l"><a href="#1238">1238: </a><span class="php-comment">     */</span>
+</span><span id="1239" class="l"><a href="#1239">1239: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1240" class="l"><a href="#1240">1240: </a>    {
+</span><span id="1241" class="l"><a href="#1241">1241: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1242" class="l"><a href="#1242">1242: </a>        {
+</span><span id="1243" class="l"><a href="#1243">1243: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
+</span><span id="1244" class="l"><a href="#1244">1244: </a>        }
+</span><span id="1245" class="l"><a href="#1245">1245: </a>
+</span><span id="1246" class="l"><a href="#1246">1246: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_options_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1247" class="l"><a href="#1247">1247: </a>    }
+</span><span id="1248" class="l"><a href="#1248">1248: </a>
+</span><span id="1249" class="l"><a href="#1249">1249: </a>    <span class="php-comment">/**
+</span></span><span id="1250" class="l"><a href="#1250">1250: </a><span class="php-comment">     * Retrieve a value from a HEAD request
+</span></span><span id="1251" class="l"><a href="#1251">1251: </a><span class="php-comment">     *
+</span></span><span id="1252" class="l"><a href="#1252">1252: </a><span class="php-comment">     * @access public
+</span></span><span id="1253" class="l"><a href="#1253">1253: </a><span class="php-comment">     *
+</span></span><span id="1254" class="l"><a href="#1254">1254: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
+</span></span><span id="1255" class="l"><a href="#1255">1255: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1256" class="l"><a href="#1256">1256: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1257" class="l"><a href="#1257">1257: </a><span class="php-comment">     *
+</span></span><span id="1258" class="l"><a href="#1258">1258: </a><span class="php-comment">     * @return array|string|FALSE Value from the HEAD request; otherwise, FALSE
+</span></span><span id="1259" class="l"><a href="#1259">1259: </a><span class="php-comment">     */</span>
+</span><span id="1260" class="l"><a href="#1260">1260: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1261" class="l"><a href="#1261">1261: </a>    {
+</span><span id="1262" class="l"><a href="#1262">1262: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1263" class="l"><a href="#1263">1263: </a>        {
+</span><span id="1264" class="l"><a href="#1264">1264: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;head_args;
+</span><span id="1265" class="l"><a href="#1265">1265: </a>        }
+</span><span id="1266" class="l"><a href="#1266">1266: </a>
+</span><span id="1267" class="l"><a href="#1267">1267: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;head_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1268" class="l"><a href="#1268">1268: </a>    }
+</span><span id="1269" class="l"><a href="#1269">1269: </a>
+</span><span id="1270" class="l"><a href="#1270">1270: </a>    <span class="php-comment">/**
+</span></span><span id="1271" class="l"><a href="#1271">1271: </a><span class="php-comment">     * Retrieve a value from a POST request
+</span></span><span id="1272" class="l"><a href="#1272">1272: </a><span class="php-comment">     *
+</span></span><span id="1273" class="l"><a href="#1273">1273: </a><span class="php-comment">     * @access public
+</span></span><span id="1274" class="l"><a href="#1274">1274: </a><span class="php-comment">     *
+</span></span><span id="1275" class="l"><a href="#1275">1275: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
+</span></span><span id="1276" class="l"><a href="#1276">1276: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1277" class="l"><a href="#1277">1277: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1278" class="l"><a href="#1278">1278: </a><span class="php-comment">     *
+</span></span><span id="1279" class="l"><a href="#1279">1279: </a><span class="php-comment">     * @return array|string|FALSE Value from the POST request; otherwise, FALSE
+</span></span><span id="1280" class="l"><a href="#1280">1280: </a><span class="php-comment">     */</span>
+</span><span id="1281" class="l"><a href="#1281">1281: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1282" class="l"><a href="#1282">1282: </a>    {
+</span><span id="1283" class="l"><a href="#1283">1283: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1284" class="l"><a href="#1284">1284: </a>        {
+</span><span id="1285" class="l"><a href="#1285">1285: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
+</span><span id="1286" class="l"><a href="#1286">1286: </a>        }
+</span><span id="1287" class="l"><a href="#1287">1287: </a>
+</span><span id="1288" class="l"><a href="#1288">1288: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_post_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1289" class="l"><a href="#1289">1289: </a>    }
+</span><span id="1290" class="l"><a href="#1290">1290: </a>
+</span><span id="1291" class="l"><a href="#1291">1291: </a>    <span class="php-comment">/**
+</span></span><span id="1292" class="l"><a href="#1292">1292: </a><span class="php-comment">     * Retrieve a value from a PUT request
+</span></span><span id="1293" class="l"><a href="#1293">1293: </a><span class="php-comment">     *
+</span></span><span id="1294" class="l"><a href="#1294">1294: </a><span class="php-comment">     * @access public
+</span></span><span id="1295" class="l"><a href="#1295">1295: </a><span class="php-comment">     *
+</span></span><span id="1296" class="l"><a href="#1296">1296: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
+</span></span><span id="1297" class="l"><a href="#1297">1297: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1298" class="l"><a href="#1298">1298: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1299" class="l"><a href="#1299">1299: </a><span class="php-comment">     *
+</span></span><span id="1300" class="l"><a href="#1300">1300: </a><span class="php-comment">     * @return array|string|FALSE Value from the PUT request; otherwise, FALSE
+</span></span><span id="1301" class="l"><a href="#1301">1301: </a><span class="php-comment">     */</span>
+</span><span id="1302" class="l"><a href="#1302">1302: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1303" class="l"><a href="#1303">1303: </a>    {
+</span><span id="1304" class="l"><a href="#1304">1304: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1305" class="l"><a href="#1305">1305: </a>        {
+</span><span id="1306" class="l"><a href="#1306">1306: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
+</span><span id="1307" class="l"><a href="#1307">1307: </a>        }
 </span><span id="1308" class="l"><a href="#1308">1308: </a>
-</span><span id="1309" class="l"><a href="#1309">1309: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> == <span class="php-quote">'digest'</span>) { <span class="php-comment">// for digest we do not have a password passed as argument</span>
-</span><span id="1310" class="l"><a href="#1310">1310: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span>.<span class="php-quote">':'</span>.<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>).<span class="php-quote">':'</span>.(<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>])?<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]:<span class="php-quote">''</span>));
-</span><span id="1311" class="l"><a href="#1311">1311: </a>        }
-</span><span id="1312" class="l"><a href="#1312">1312: </a>
-</span><span id="1313" class="l"><a href="#1313">1313: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>) {
-</span><span id="1314" class="l"><a href="#1314">1314: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1315" class="l"><a href="#1315">1315: </a>        }
-</span><span id="1316" class="l"><a href="#1316">1316: </a>
-</span><span id="1317" class="l"><a href="#1317">1317: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> == <span class="php-quote">'ldap'</span>) {
-</span><span id="1318" class="l"><a href="#1318">1318: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'performing LDAP authentication for $username'</span>);
-</span><span id="1319" class="l"><a href="#1319">1319: </a>
-</span><span id="1320" class="l"><a href="#1320">1320: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1321" class="l"><a href="#1321">1321: </a>        }
-</span><span id="1322" class="l"><a href="#1322">1322: </a>
-</span><span id="1323" class="l"><a href="#1323">1323: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> == <span class="php-quote">'library'</span>) {
-</span><span id="1324" class="l"><a href="#1324">1324: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'performing Library authentication for '</span>.<span class="php-var">$username</span>);
-</span><span id="1325" class="l"><a href="#1325">1325: </a>
-</span><span id="1326" class="l"><a href="#1326">1326: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1327" class="l"><a href="#1327">1327: </a>        }
-</span><span id="1328" class="l"><a href="#1328">1328: </a>
-</span><span id="1329" class="l"><a href="#1329">1329: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>)) {
-</span><span id="1330" class="l"><a href="#1330">1330: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1331" class="l"><a href="#1331">1331: </a>        }
+</span><span id="1309" class="l"><a href="#1309">1309: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_put_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1310" class="l"><a href="#1310">1310: </a>    }
+</span><span id="1311" class="l"><a href="#1311">1311: </a>
+</span><span id="1312" class="l"><a href="#1312">1312: </a>    <span class="php-comment">/**
+</span></span><span id="1313" class="l"><a href="#1313">1313: </a><span class="php-comment">     * Retrieve a value from a DELETE request
+</span></span><span id="1314" class="l"><a href="#1314">1314: </a><span class="php-comment">     *
+</span></span><span id="1315" class="l"><a href="#1315">1315: </a><span class="php-comment">     * @access public
+</span></span><span id="1316" class="l"><a href="#1316">1316: </a><span class="php-comment">     *
+</span></span><span id="1317" class="l"><a href="#1317">1317: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
+</span></span><span id="1318" class="l"><a href="#1318">1318: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1319" class="l"><a href="#1319">1319: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1320" class="l"><a href="#1320">1320: </a><span class="php-comment">     *
+</span></span><span id="1321" class="l"><a href="#1321">1321: </a><span class="php-comment">     * @return array|string|FALSE Value from the DELETE request; otherwise, FALSE
+</span></span><span id="1322" class="l"><a href="#1322">1322: </a><span class="php-comment">     */</span>
+</span><span id="1323" class="l"><a href="#1323">1323: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1324" class="l"><a href="#1324">1324: </a>    {
+</span><span id="1325" class="l"><a href="#1325">1325: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1326" class="l"><a href="#1326">1326: </a>        {
+</span><span id="1327" class="l"><a href="#1327">1327: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
+</span><span id="1328" class="l"><a href="#1328">1328: </a>        }
+</span><span id="1329" class="l"><a href="#1329">1329: </a>
+</span><span id="1330" class="l"><a href="#1330">1330: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_delete_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1331" class="l"><a href="#1331">1331: </a>    }
 </span><span id="1332" class="l"><a href="#1332">1332: </a>
-</span><span id="1333" class="l"><a href="#1333">1333: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] != <span class="php-var">$password</span>) {
-</span><span id="1334" class="l"><a href="#1334">1334: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1335" class="l"><a href="#1335">1335: </a>        }
-</span><span id="1336" class="l"><a href="#1336">1336: </a>
-</span><span id="1337" class="l"><a href="#1337">1337: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1338" class="l"><a href="#1338">1338: </a>    }
-</span><span id="1339" class="l"><a href="#1339">1339: </a>
-</span><span id="1340" class="l"><a href="#1340">1340: </a>    <span class="php-comment">/**
-</span></span><span id="1341" class="l"><a href="#1341">1341: </a><span class="php-comment">     * Check to see if the user is logged into the web app with a php session key.
-</span></span><span id="1342" class="l"><a href="#1342">1342: </a><span class="php-comment">     */</span>
-</span><span id="1343" class="l"><a href="#1343">1343: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
-</span><span id="1344" class="l"><a href="#1344">1344: </a>    {
-</span><span id="1345" class="l"><a href="#1345">1345: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
-</span><span id="1346" class="l"><a href="#1346">1346: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>)) {
-</span><span id="1347" class="l"><a href="#1347">1347: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(<span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Not Authorized'</span>), <span class="php-num">401</span>);
-</span><span id="1348" class="l"><a href="#1348">1348: </a>        }
-</span><span id="1349" class="l"><a href="#1349">1349: </a>    }
+</span><span id="1333" class="l"><a href="#1333">1333: </a>    <span class="php-comment">/**
+</span></span><span id="1334" class="l"><a href="#1334">1334: </a><span class="php-comment">     * Retrieve a value from a PATCH request
+</span></span><span id="1335" class="l"><a href="#1335">1335: </a><span class="php-comment">     *
+</span></span><span id="1336" class="l"><a href="#1336">1336: </a><span class="php-comment">     * @access public
+</span></span><span id="1337" class="l"><a href="#1337">1337: </a><span class="php-comment">     *
+</span></span><span id="1338" class="l"><a href="#1338">1338: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
+</span></span><span id="1339" class="l"><a href="#1339">1339: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1340" class="l"><a href="#1340">1340: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1341" class="l"><a href="#1341">1341: </a><span class="php-comment">     *
+</span></span><span id="1342" class="l"><a href="#1342">1342: </a><span class="php-comment">     * @return array|string|FALSE Value from the PATCH request; otherwise, FALSE
+</span></span><span id="1343" class="l"><a href="#1343">1343: </a><span class="php-comment">     */</span>
+</span><span id="1344" class="l"><a href="#1344">1344: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1345" class="l"><a href="#1345">1345: </a>    {
+</span><span id="1346" class="l"><a href="#1346">1346: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1347" class="l"><a href="#1347">1347: </a>        {
+</span><span id="1348" class="l"><a href="#1348">1348: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
+</span><span id="1349" class="l"><a href="#1349">1349: </a>        }
 </span><span id="1350" class="l"><a href="#1350">1350: </a>
-</span><span id="1351" class="l"><a href="#1351">1351: </a>    <span class="php-comment">/**
-</span></span><span id="1352" class="l"><a href="#1352">1352: </a><span class="php-comment">     * @todo document this.
-</span></span><span id="1353" class="l"><a href="#1353">1353: </a><span class="php-comment">     */</span>
-</span><span id="1354" class="l"><a href="#1354">1354: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
-</span><span id="1355" class="l"><a href="#1355">1355: </a>    {
-</span><span id="1356" class="l"><a href="#1356">1356: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1357" class="l"><a href="#1357">1357: </a>        <span class="php-keyword1">if</span> (config_item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>)) {
-</span><span id="1358" class="l"><a href="#1358">1358: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1359" class="l"><a href="#1359">1359: </a>        }
-</span><span id="1360" class="l"><a href="#1360">1360: </a>
-</span><span id="1361" class="l"><a href="#1361">1361: </a>        <span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1362" class="l"><a href="#1362">1362: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1363" class="l"><a href="#1363">1363: </a>
-</span><span id="1364" class="l"><a href="#1364">1364: </a>        <span class="php-comment">// mod_php</span>
-</span><span id="1365" class="l"><a href="#1365">1365: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>)) {
-</span><span id="1366" class="l"><a href="#1366">1366: </a>            <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
-</span><span id="1367" class="l"><a href="#1367">1367: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
-</span><span id="1368" class="l"><a href="#1368">1368: </a>        }
-</span><span id="1369" class="l"><a href="#1369">1369: </a>
-</span><span id="1370" class="l"><a href="#1370">1370: </a>        <span class="php-comment">// most other servers</span>
-</span><span id="1371" class="l"><a href="#1371">1371: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>)) {
-</span><span id="1372" class="l"><a href="#1372">1372: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>)), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>) {
-</span><span id="1373" class="l"><a href="#1373">1373: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
-</span><span id="1374" class="l"><a href="#1374">1374: </a>            }
-</span><span id="1375" class="l"><a href="#1375">1375: </a>        }
-</span><span id="1376" class="l"><a href="#1376">1376: </a>
-</span><span id="1377" class="l"><a href="#1377">1377: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>)) {
-</span><span id="1378" class="l"><a href="#1378">1378: </a>            <span class="php-var">$this</span>-&gt;_force_login();
-</span><span id="1379" class="l"><a href="#1379">1379: </a>        }
-</span><span id="1380" class="l"><a href="#1380">1380: </a>    }
+</span><span id="1351" class="l"><a href="#1351">1351: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_patch_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1352" class="l"><a href="#1352">1352: </a>    }
+</span><span id="1353" class="l"><a href="#1353">1353: </a>
+</span><span id="1354" class="l"><a href="#1354">1354: </a>    <span class="php-comment">/**
+</span></span><span id="1355" class="l"><a href="#1355">1355: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
+</span></span><span id="1356" class="l"><a href="#1356">1356: </a><span class="php-comment">     * prevented.
+</span></span><span id="1357" class="l"><a href="#1357">1357: </a><span class="php-comment">     *
+</span></span><span id="1358" class="l"><a href="#1358">1358: </a><span class="php-comment">     * @access protected
+</span></span><span id="1359" class="l"><a href="#1359">1359: </a><span class="php-comment">     *
+</span></span><span id="1360" class="l"><a href="#1360">1360: </a><span class="php-comment">     * @param  string $value Input data
+</span></span><span id="1361" class="l"><a href="#1361">1361: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
+</span></span><span id="1362" class="l"><a href="#1362">1362: </a><span class="php-comment">     *
+</span></span><span id="1363" class="l"><a href="#1363">1363: </a><span class="php-comment">     * @return string
+</span></span><span id="1364" class="l"><a href="#1364">1364: </a><span class="php-comment">     */</span>
+</span><span id="1365" class="l"><a href="#1365">1365: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
+</span><span id="1366" class="l"><a href="#1366">1366: </a>    {
+</span><span id="1367" class="l"><a href="#1367">1367: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) <span class="php-keyword1">OR</span> <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
+</span><span id="1368" class="l"><a href="#1368">1368: </a>
+</span><span id="1369" class="l"><a href="#1369">1369: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
+</span><span id="1370" class="l"><a href="#1370">1370: </a>    }
+</span><span id="1371" class="l"><a href="#1371">1371: </a>
+</span><span id="1372" class="l"><a href="#1372">1372: </a>    <span class="php-comment">/**
+</span></span><span id="1373" class="l"><a href="#1373">1373: </a><span class="php-comment">     * Retrieve the validation errors
+</span></span><span id="1374" class="l"><a href="#1374">1374: </a><span class="php-comment">     *
+</span></span><span id="1375" class="l"><a href="#1375">1375: </a><span class="php-comment">     * @access public
+</span></span><span id="1376" class="l"><a href="#1376">1376: </a><span class="php-comment">     * @return array
+</span></span><span id="1377" class="l"><a href="#1377">1377: </a><span class="php-comment">     */</span>
+</span><span id="1378" class="l"><a href="#1378">1378: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
+</span><span id="1379" class="l"><a href="#1379">1379: </a>    {
+</span><span id="1380" class="l"><a href="#1380">1380: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
 </span><span id="1381" class="l"><a href="#1381">1381: </a>
-</span><span id="1382" class="l"><a href="#1382">1382: </a>    <span class="php-comment">/**
-</span></span><span id="1383" class="l"><a href="#1383">1383: </a><span class="php-comment">     * @todo Document this.
-</span></span><span id="1384" class="l"><a href="#1384">1384: </a><span class="php-comment">     */</span>
-</span><span id="1385" class="l"><a href="#1385">1385: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
-</span><span id="1386" class="l"><a href="#1386">1386: </a>    {
-</span><span id="1387" class="l"><a href="#1387">1387: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1388" class="l"><a href="#1388">1388: </a>        <span class="php-keyword1">if</span> (config_item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>)) {
-</span><span id="1389" class="l"><a href="#1389">1389: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1390" class="l"><a href="#1390">1390: </a>        }
-</span><span id="1391" class="l"><a href="#1391">1391: </a>
-</span><span id="1392" class="l"><a href="#1392">1392: </a>        <span class="php-var">$uniqid</span> = <span class="php-keyword2">uniqid</span>(<span class="php-quote">&quot;&quot;</span>); <span class="php-comment">// Empty argument for backward compatibility</span>
-</span><span id="1393" class="l"><a href="#1393">1393: </a>        <span class="php-comment">// We need to test which server authentication variable to use</span>
-</span><span id="1394" class="l"><a href="#1394">1394: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
-</span><span id="1395" class="l"><a href="#1395">1395: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>)) {
-</span><span id="1396" class="l"><a href="#1396">1396: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
-</span><span id="1397" class="l"><a href="#1397">1397: </a>        } <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>)) {
-</span><span id="1398" class="l"><a href="#1398">1398: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
-</span><span id="1399" class="l"><a href="#1399">1399: </a>        } <span class="php-keyword1">else</span> {
-</span><span id="1400" class="l"><a href="#1400">1400: </a>            <span class="php-var">$digest_string</span> = <span class="php-quote">&quot;&quot;</span>;
-</span><span id="1401" class="l"><a href="#1401">1401: </a>        }
+</span><span id="1382" class="l"><a href="#1382">1382: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(<span class="php-quote">&quot;\n&quot;</span>, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, <span class="php-quote">&quot;\n&quot;</span>));
+</span><span id="1383" class="l"><a href="#1383">1383: </a>    }
+</span><span id="1384" class="l"><a href="#1384">1384: </a>
+</span><span id="1385" class="l"><a href="#1385">1385: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
+</span><span id="1386" class="l"><a href="#1386">1386: </a>
+</span><span id="1387" class="l"><a href="#1387">1387: </a>    <span class="php-comment">/**
+</span></span><span id="1388" class="l"><a href="#1388">1388: </a><span class="php-comment">     * Perform LDAP Authentication
+</span></span><span id="1389" class="l"><a href="#1389">1389: </a><span class="php-comment">     *
+</span></span><span id="1390" class="l"><a href="#1390">1390: </a><span class="php-comment">     * @access protected
+</span></span><span id="1391" class="l"><a href="#1391">1391: </a><span class="php-comment">     *
+</span></span><span id="1392" class="l"><a href="#1392">1392: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1393" class="l"><a href="#1393">1393: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1394" class="l"><a href="#1394">1394: </a><span class="php-comment">     *
+</span></span><span id="1395" class="l"><a href="#1395">1395: </a><span class="php-comment">     * @return bool
+</span></span><span id="1396" class="l"><a href="#1396">1396: </a><span class="php-comment">     */</span>
+</span><span id="1397" class="l"><a href="#1397">1397: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1398" class="l"><a href="#1398">1398: </a>    {
+</span><span id="1399" class="l"><a href="#1399">1399: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1400" class="l"><a href="#1400">1400: </a>        {
+</span><span id="1401" class="l"><a href="#1401">1401: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
 </span><span id="1402" class="l"><a href="#1402">1402: </a>
-</span><span id="1403" class="l"><a href="#1403">1403: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
-</span><span id="1404" class="l"><a href="#1404">1404: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information.</span>
-</span><span id="1405" class="l"><a href="#1405">1405: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>)) {
-</span><span id="1406" class="l"><a href="#1406">1406: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqid</span>);
-</span><span id="1407" class="l"><a href="#1407">1407: </a>        }
-</span><span id="1408" class="l"><a href="#1408">1408: </a>
-</span><span id="1409" class="l"><a href="#1409">1409: </a>        <span class="php-comment">// We need to retrieve authentication informations from the $auth_data variable</span>
-</span><span id="1410" class="l"><a href="#1410">1410: </a>        <span class="php-var">$matches</span> = <span class="php-keyword1">array</span>();
-</span><span id="1411" class="l"><a href="#1411">1411: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
-</span><span id="1412" class="l"><a href="#1412">1412: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? <span class="php-keyword1">array</span>() : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
-</span><span id="1413" class="l"><a href="#1413">1413: </a>
-</span><span id="1414" class="l"><a href="#1414">1414: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config</span>
-</span><span id="1415" class="l"><a href="#1415">1415: </a>        <span class="php-var">$A1</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
-</span><span id="1416" class="l"><a href="#1416">1416: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) <span class="php-keyword1">or</span> ! <span class="php-var">$A1</span> ) {
-</span><span id="1417" class="l"><a href="#1417">1417: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqid</span>);
-</span><span id="1418" class="l"><a href="#1418">1418: </a>        }
-</span><span id="1419" class="l"><a href="#1419">1419: </a>
-</span><span id="1420" class="l"><a href="#1420">1420: </a>        <span class="php-var">$A2</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method).<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
-</span><span id="1421" class="l"><a href="#1421">1421: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$A1</span>.<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>].<span class="php-quote">':'</span>.<span class="php-var">$A2</span>);
-</span><span id="1422" class="l"><a href="#1422">1422: </a>
-</span><span id="1423" class="l"><a href="#1423">1423: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>] != <span class="php-var">$valid_response</span>) {
-</span><span id="1424" class="l"><a href="#1424">1424: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(config_item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-num">0</span>, config_item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid credentials'</span>), <span class="php-num">401</span>);
-</span><span id="1425" class="l"><a href="#1425">1425: </a>            <span class="php-keyword1">exit</span>;
-</span><span id="1426" class="l"><a href="#1426">1426: </a>        }
-</span><span id="1427" class="l"><a href="#1427">1427: </a>    }
-</span><span id="1428" class="l"><a href="#1428">1428: </a>
-</span><span id="1429" class="l"><a href="#1429">1429: </a>    <span class="php-comment">/**
-</span></span><span id="1430" class="l"><a href="#1430">1430: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_blacklist' config
-</span></span><span id="1431" class="l"><a href="#1431">1431: </a><span class="php-comment">     */</span>
-</span><span id="1432" class="l"><a href="#1432">1432: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
-</span><span id="1433" class="l"><a href="#1433">1433: </a>    {
-</span><span id="1434" class="l"><a href="#1434">1434: </a>        <span class="php-var">$blacklist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, config_item(<span class="php-quote">'rest_ip_blacklist'</span>));
-</span><span id="1435" class="l"><a href="#1435">1435: </a>
-</span><span id="1436" class="l"><a href="#1436">1436: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$blacklist</span> <span class="php-keyword1">AS</span> &amp;<span class="php-var">$ip</span>) {
-</span><span id="1437" class="l"><a href="#1437">1437: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
-</span><span id="1438" class="l"><a href="#1438">1438: </a>        }
-</span><span id="1439" class="l"><a href="#1439">1439: </a>
-</span><span id="1440" class="l"><a href="#1440">1440: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$blacklist</span>)) {
-</span><span id="1441" class="l"><a href="#1441">1441: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(<span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'IP Denied'</span>), <span class="php-num">401</span>);
-</span><span id="1442" class="l"><a href="#1442">1442: </a>        }
-</span><span id="1443" class="l"><a href="#1443">1443: </a>    }
-</span><span id="1444" class="l"><a href="#1444">1444: </a>
-</span><span id="1445" class="l"><a href="#1445">1445: </a>    <span class="php-comment">/**
-</span></span><span id="1446" class="l"><a href="#1446">1446: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config
-</span></span><span id="1447" class="l"><a href="#1447">1447: </a><span class="php-comment">     */</span>
-</span><span id="1448" class="l"><a href="#1448">1448: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
-</span><span id="1449" class="l"><a href="#1449">1449: </a>    {
-</span><span id="1450" class="l"><a href="#1450">1450: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, config_item(<span class="php-quote">'rest_ip_whitelist'</span>));
-</span><span id="1451" class="l"><a href="#1451">1451: </a>
-</span><span id="1452" class="l"><a href="#1452">1452: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
-</span><span id="1453" class="l"><a href="#1453">1453: </a>
-</span><span id="1454" class="l"><a href="#1454">1454: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">AS</span> &amp;<span class="php-var">$ip</span>) {
-</span><span id="1455" class="l"><a href="#1455">1455: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
-</span><span id="1456" class="l"><a href="#1456">1456: </a>        }
-</span><span id="1457" class="l"><a href="#1457">1457: </a>
-</span><span id="1458" class="l"><a href="#1458">1458: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>)) {
-</span><span id="1459" class="l"><a href="#1459">1459: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(config_item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, config_item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'IP not authorized'</span>), <span class="php-num">401</span>);
-</span><span id="1460" class="l"><a href="#1460">1460: </a>        }
-</span><span id="1461" class="l"><a href="#1461">1461: </a>    }
+</span><span id="1403" class="l"><a href="#1403">1403: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1404" class="l"><a href="#1404">1404: </a>        }
+</span><span id="1405" class="l"><a href="#1405">1405: </a>
+</span><span id="1406" class="l"><a href="#1406">1406: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading Config'</span>);
+</span><span id="1407" class="l"><a href="#1407">1407: </a>
+</span><span id="1408" class="l"><a href="#1408">1408: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="1409" class="l"><a href="#1409">1409: </a>
+</span><span id="1410" class="l"><a href="#1410">1410: </a>        <span class="php-var">$ldap</span> = [
+</span><span id="1411" class="l"><a href="#1411">1411: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1412" class="l"><a href="#1412">1412: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1413" class="l"><a href="#1413">1413: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1414" class="l"><a href="#1414">1414: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1415" class="l"><a href="#1415">1415: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1416" class="l"><a href="#1416">1416: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1417" class="l"><a href="#1417">1417: </a>        ];
+</span><span id="1418" class="l"><a href="#1418">1418: </a>
+</span><span id="1419" class="l"><a href="#1419">1419: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
+</span><span id="1420" class="l"><a href="#1420">1420: </a>
+</span><span id="1421" class="l"><a href="#1421">1421: </a>        <span class="php-comment">// Appears to be unused</span>
+</span><span id="1422" class="l"><a href="#1422">1422: </a>        <span class="php-comment">// $ldapconfig['authrealm'] = $this-&gt;config-&gt;item('domain', 'ldap');</span>
+</span><span id="1423" class="l"><a href="#1423">1423: </a>
+</span><span id="1424" class="l"><a href="#1424">1424: </a>        <span class="php-comment">// connect to ldap server</span>
+</span><span id="1425" class="l"><a href="#1425">1425: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
+</span><span id="1426" class="l"><a href="#1426">1426: </a>
+</span><span id="1427" class="l"><a href="#1427">1427: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
+</span><span id="1428" class="l"><a href="#1428">1428: </a>        {
+</span><span id="1429" class="l"><a href="#1429">1429: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>] . <span class="php-quote">' seconds'</span>);
+</span><span id="1430" class="l"><a href="#1430">1430: </a>
+</span><span id="1431" class="l"><a href="#1431">1431: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
+</span><span id="1432" class="l"><a href="#1432">1432: </a>
+</span><span id="1433" class="l"><a href="#1433">1433: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>] . <span class="php-quote">' with dn '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
+</span><span id="1434" class="l"><a href="#1434">1434: </a>
+</span><span id="1435" class="l"><a href="#1435">1435: </a>            <span class="php-comment">// binding to ldap server</span>
+</span><span id="1436" class="l"><a href="#1436">1436: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
+</span><span id="1437" class="l"><a href="#1437">1437: </a>
+</span><span id="1438" class="l"><a href="#1438">1438: </a>            <span class="php-comment">// verify binding</span>
+</span><span id="1439" class="l"><a href="#1439">1439: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span>)
+</span><span id="1440" class="l"><a href="#1440">1440: </a>            {
+</span><span id="1441" class="l"><a href="#1441">1441: </a>                log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
+</span><span id="1442" class="l"><a href="#1442">1442: </a>            }
+</span><span id="1443" class="l"><a href="#1443">1443: </a>            <span class="php-keyword1">else</span>
+</span><span id="1444" class="l"><a href="#1444">1444: </a>            {
+</span><span id="1445" class="l"><a href="#1445">1445: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind unsuccessful'</span>);
+</span><span id="1446" class="l"><a href="#1446">1446: </a>
+</span><span id="1447" class="l"><a href="#1447">1447: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1448" class="l"><a href="#1448">1448: </a>            }
+</span><span id="1449" class="l"><a href="#1449">1449: </a>        }
+</span><span id="1450" class="l"><a href="#1450">1450: </a>
+</span><span id="1451" class="l"><a href="#1451">1451: </a>        <span class="php-comment">// search for user</span>
+</span><span id="1452" class="l"><a href="#1452">1452: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) == <span class="php-keyword1">FALSE</span>)
+</span><span id="1453" class="l"><a href="#1453">1453: </a>        {
+</span><span id="1454" class="l"><a href="#1454">1454: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span> . <span class="php-var">$username</span> . <span class="php-quote">' not found in search'</span>);
+</span><span id="1455" class="l"><a href="#1455">1455: </a>
+</span><span id="1456" class="l"><a href="#1456">1456: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1457" class="l"><a href="#1457">1457: </a>        }
+</span><span id="1458" class="l"><a href="#1458">1458: </a>
+</span><span id="1459" class="l"><a href="#1459">1459: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
+</span><span id="1460" class="l"><a href="#1460">1460: </a>        {
+</span><span id="1461" class="l"><a href="#1461">1461: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username '</span> . <span class="php-var">$username</span> . <span class="php-quote">'found more than once'</span>);
 </span><span id="1462" class="l"><a href="#1462">1462: </a>
-</span><span id="1463" class="l"><a href="#1463">1463: </a>    <span class="php-comment">/**
-</span></span><span id="1464" class="l"><a href="#1464">1464: </a><span class="php-comment">     * @todo Document this.
-</span></span><span id="1465" class="l"><a href="#1465">1465: </a><span class="php-comment">     *
-</span></span><span id="1466" class="l"><a href="#1466">1466: </a><span class="php-comment">     * @param string $nonce
-</span></span><span id="1467" class="l"><a href="#1467">1467: </a><span class="php-comment">     */</span>
-</span><span id="1468" class="l"><a href="#1468">1468: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
-</span><span id="1469" class="l"><a href="#1469">1469: </a>    {
-</span><span id="1470" class="l"><a href="#1470">1470: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>( <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>) ) == <span class="php-quote">'basic'</span>) {
-</span><span id="1471" class="l"><a href="#1471">1471: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span>.<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>).<span class="php-quote">'&quot;'</span>);
-</span><span id="1472" class="l"><a href="#1472">1472: </a>        } <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>( <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>) ) == <span class="php-quote">'digest'</span>) {
-</span><span id="1473" class="l"><a href="#1473">1473: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span>.<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>).<span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span>.<span class="php-var">$nonce</span>.<span class="php-quote">'&quot;, opaque=&quot;'</span>.<span class="php-keyword2">md5</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>)).<span class="php-quote">'&quot;'</span>);
-</span><span id="1474" class="l"><a href="#1474">1474: </a>        }
-</span><span id="1475" class="l"><a href="#1475">1475: </a>
-</span><span id="1476" class="l"><a href="#1476">1476: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">array</span>(config_item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, config_item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not authorized'</span>), <span class="php-num">401</span>);
-</span><span id="1477" class="l"><a href="#1477">1477: </a>    }
-</span><span id="1478" class="l"><a href="#1478">1478: </a>
-</span><span id="1479" class="l"><a href="#1479">1479: </a>    <span class="php-comment">/**
-</span></span><span id="1480" class="l"><a href="#1480">1480: </a><span class="php-comment">     * Force it into an array
-</span></span><span id="1481" class="l"><a href="#1481">1481: </a><span class="php-comment">     *
-</span></span><span id="1482" class="l"><a href="#1482">1482: </a><span class="php-comment">     * @param  object|array $data
-</span></span><span id="1483" class="l"><a href="#1483">1483: </a><span class="php-comment">     * @return array
-</span></span><span id="1484" class="l"><a href="#1484">1484: </a><span class="php-comment">     */</span>
-</span><span id="1485" class="l"><a href="#1485">1485: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_loopable(<span class="php-var">$data</span>)
-</span><span id="1486" class="l"><a href="#1486">1486: </a>    {
-</span><span id="1487" class="l"><a href="#1487">1487: </a>        <span class="php-comment">// Force it to be something useful</span>
-</span><span id="1488" class="l"><a href="#1488">1488: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) <span class="php-keyword1">and</span> !<span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>)) {
-</span><span id="1489" class="l"><a href="#1489">1489: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
-</span><span id="1490" class="l"><a href="#1490">1490: </a>        }
-</span><span id="1491" class="l"><a href="#1491">1491: </a>
-</span><span id="1492" class="l"><a href="#1492">1492: </a>        <span class="php-keyword1">return</span> <span class="php-var">$data</span>;
-</span><span id="1493" class="l"><a href="#1493">1493: </a>    }
-</span><span id="1494" class="l"><a href="#1494">1494: </a>
-</span><span id="1495" class="l"><a href="#1495">1495: </a>    <span class="php-comment">/**
-</span></span><span id="1496" class="l"><a href="#1496">1496: </a><span class="php-comment">     * updates the log with the access time
-</span></span><span id="1497" class="l"><a href="#1497">1497: </a><span class="php-comment">     *
-</span></span><span id="1498" class="l"><a href="#1498">1498: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="1499" class="l"><a href="#1499">1499: </a><span class="php-comment">     * @return boolean
-</span></span><span id="1500" class="l"><a href="#1500">1500: </a><span class="php-comment">     */</span>
-</span><span id="1501" class="l"><a href="#1501">1501: </a>
-</span><span id="1502" class="l"><a href="#1502">1502: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
-</span><span id="1503" class="l"><a href="#1503">1503: </a>    {
-</span><span id="1504" class="l"><a href="#1504">1504: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
-</span><span id="1505" class="l"><a href="#1505">1505: </a>
-</span><span id="1506" class="l"><a href="#1506">1506: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(config_item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, <span class="php-keyword1">array</span>(<span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id));
-</span><span id="1507" class="l"><a href="#1507">1507: </a>    }
-</span><span id="1508" class="l"><a href="#1508">1508: </a>
-</span><span id="1509" class="l"><a href="#1509">1509: </a>    <span class="php-comment">/**
-</span></span><span id="1510" class="l"><a href="#1510">1510: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
-</span></span><span id="1511" class="l"><a href="#1511">1511: </a><span class="php-comment">     *
-</span></span><span id="1512" class="l"><a href="#1512">1512: </a><span class="php-comment">     * @return boolean
-</span></span><span id="1513" class="l"><a href="#1513">1513: </a><span class="php-comment">     */</span>
-</span><span id="1514" class="l"><a href="#1514">1514: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
-</span><span id="1515" class="l"><a href="#1515">1515: </a>    {
-</span><span id="1516" class="l"><a href="#1516">1516: </a>        <span class="php-comment">// if we don't want to check acccess, just return TRUE</span>
-</span><span id="1517" class="l"><a href="#1517">1517: </a>        <span class="php-keyword1">if</span> (config_item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>) {
-</span><span id="1518" class="l"><a href="#1518">1518: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1519" class="l"><a href="#1519">1519: </a>        }
-</span><span id="1520" class="l"><a href="#1520">1520: </a>
-</span><span id="1521" class="l"><a href="#1521">1521: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
-</span><span id="1522" class="l"><a href="#1522">1522: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>( <span class="php-quote">'/'</span>, <span class="php-keyword1">array</span>(<span class="php-var">$this</span>-&gt;router-&gt;fetch_directory(), <span class="php-var">$this</span>-&gt;router-&gt;fetch_class()) );
-</span><span id="1523" class="l"><a href="#1523">1523: </a>
-</span><span id="1524" class="l"><a href="#1524">1524: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
-</span><span id="1525" class="l"><a href="#1525">1525: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
-</span><span id="1526" class="l"><a href="#1526">1526: </a>
-</span><span id="1527" class="l"><a href="#1527">1527: </a>        <span class="php-comment">// Build access table query</span>
-</span><span id="1528" class="l"><a href="#1528">1528: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;select();
-</span><span id="1529" class="l"><a href="#1529">1529: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>);
-</span><span id="1530" class="l"><a href="#1530">1530: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>);
+</span><span id="1463" class="l"><a href="#1463">1463: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1464" class="l"><a href="#1464">1464: </a>        }
+</span><span id="1465" class="l"><a href="#1465">1465: </a>
+</span><span id="1466" class="l"><a href="#1466">1466: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) == <span class="php-keyword1">FALSE</span>)
+</span><span id="1467" class="l"><a href="#1467">1467: </a>        {
+</span><span id="1468" class="l"><a href="#1468">1468: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, entry of searchresult could not be fetched'</span>);
+</span><span id="1469" class="l"><a href="#1469">1469: </a>
+</span><span id="1470" class="l"><a href="#1470">1470: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1471" class="l"><a href="#1471">1471: </a>        }
+</span><span id="1472" class="l"><a href="#1472">1472: </a>
+</span><span id="1473" class="l"><a href="#1473">1473: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) == <span class="php-keyword1">FALSE</span>)
+</span><span id="1474" class="l"><a href="#1474">1474: </a>        {
+</span><span id="1475" class="l"><a href="#1475">1475: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, user-dn could not be fetched'</span>);
+</span><span id="1476" class="l"><a href="#1476">1476: </a>
+</span><span id="1477" class="l"><a href="#1477">1477: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1478" class="l"><a href="#1478">1478: </a>        }
+</span><span id="1479" class="l"><a href="#1479">1479: </a>
+</span><span id="1480" class="l"><a href="#1480">1480: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
+</span><span id="1481" class="l"><a href="#1481">1481: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) == <span class="php-keyword1">FALSE</span>)
+</span><span id="1482" class="l"><a href="#1482">1482: </a>        {
+</span><span id="1483" class="l"><a href="#1483">1483: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
+</span><span id="1484" class="l"><a href="#1484">1484: </a>
+</span><span id="1485" class="l"><a href="#1485">1485: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1486" class="l"><a href="#1486">1486: </a>        }
+</span><span id="1487" class="l"><a href="#1487">1487: </a>
+</span><span id="1488" class="l"><a href="#1488">1488: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span> . <span class="php-var">$user_dn</span> . <span class="php-quote">' authenticated successfully'</span>);
+</span><span id="1489" class="l"><a href="#1489">1489: </a>
+</span><span id="1490" class="l"><a href="#1490">1490: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
+</span><span id="1491" class="l"><a href="#1491">1491: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
+</span><span id="1492" class="l"><a href="#1492">1492: </a>
+</span><span id="1493" class="l"><a href="#1493">1493: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1494" class="l"><a href="#1494">1494: </a>    }
+</span><span id="1495" class="l"><a href="#1495">1495: </a>
+</span><span id="1496" class="l"><a href="#1496">1496: </a>    <span class="php-comment">/**
+</span></span><span id="1497" class="l"><a href="#1497">1497: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
+</span></span><span id="1498" class="l"><a href="#1498">1498: </a><span class="php-comment">     *
+</span></span><span id="1499" class="l"><a href="#1499">1499: </a><span class="php-comment">     * @access protected
+</span></span><span id="1500" class="l"><a href="#1500">1500: </a><span class="php-comment">     *
+</span></span><span id="1501" class="l"><a href="#1501">1501: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1502" class="l"><a href="#1502">1502: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1503" class="l"><a href="#1503">1503: </a><span class="php-comment">     *
+</span></span><span id="1504" class="l"><a href="#1504">1504: </a><span class="php-comment">     * @return bool
+</span></span><span id="1505" class="l"><a href="#1505">1505: </a><span class="php-comment">     */</span>
+</span><span id="1506" class="l"><a href="#1506">1506: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1507" class="l"><a href="#1507">1507: </a>    {
+</span><span id="1508" class="l"><a href="#1508">1508: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1509" class="l"><a href="#1509">1509: </a>        {
+</span><span id="1510" class="l"><a href="#1510">1510: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: failure, empty username'</span>);
+</span><span id="1511" class="l"><a href="#1511">1511: </a>
+</span><span id="1512" class="l"><a href="#1512">1512: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1513" class="l"><a href="#1513">1513: </a>        }
+</span><span id="1514" class="l"><a href="#1514">1514: </a>
+</span><span id="1515" class="l"><a href="#1515">1515: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
+</span><span id="1516" class="l"><a href="#1516">1516: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
+</span><span id="1517" class="l"><a href="#1517">1517: </a>
+</span><span id="1518" class="l"><a href="#1518">1518: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
+</span><span id="1519" class="l"><a href="#1519">1519: </a>        {
+</span><span id="1520" class="l"><a href="#1520">1520: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_class'</span>);
+</span><span id="1521" class="l"><a href="#1521">1521: </a>
+</span><span id="1522" class="l"><a href="#1522">1522: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1523" class="l"><a href="#1523">1523: </a>        }
+</span><span id="1524" class="l"><a href="#1524">1524: </a>
+</span><span id="1525" class="l"><a href="#1525">1525: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
+</span><span id="1526" class="l"><a href="#1526">1526: </a>        {
+</span><span id="1527" class="l"><a href="#1527">1527: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_function'</span>);
+</span><span id="1528" class="l"><a href="#1528">1528: </a>
+</span><span id="1529" class="l"><a href="#1529">1529: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1530" class="l"><a href="#1530">1530: </a>        }
 </span><span id="1531" class="l"><a href="#1531">1531: </a>
-</span><span id="1532" class="l"><a href="#1532">1532: </a>        <span class="php-var">$query</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;get(config_item(<span class="php-quote">'rest_access_table'</span>));
-</span><span id="1533" class="l"><a href="#1533">1533: </a>
-</span><span id="1534" class="l"><a href="#1534">1534: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$query</span>-&gt;num_rows &gt; <span class="php-num">0</span>) {
-</span><span id="1535" class="l"><a href="#1535">1535: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1536" class="l"><a href="#1536">1536: </a>        }
-</span><span id="1537" class="l"><a href="#1537">1537: </a>
-</span><span id="1538" class="l"><a href="#1538">1538: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1539" class="l"><a href="#1539">1539: </a>    }
-</span><span id="1540" class="l"><a href="#1540">1540: </a>
-</span><span id="1541" class="l"><a href="#1541">1541: </a>}
-</span><span id="1542" class="l"><a href="#1542">1542: </a></span></code></pre>
+</span><span id="1532" class="l"><a href="#1532">1532: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1533" class="l"><a href="#1533">1533: </a>        {
+</span><span id="1534" class="l"><a href="#1534">1534: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
+</span><span id="1535" class="l"><a href="#1535">1535: </a>        }
+</span><span id="1536" class="l"><a href="#1536">1536: </a>
+</span><span id="1537" class="l"><a href="#1537">1537: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1538" class="l"><a href="#1538">1538: </a>    }
+</span><span id="1539" class="l"><a href="#1539">1539: </a>
+</span><span id="1540" class="l"><a href="#1540">1540: </a>    <span class="php-comment">/**
+</span></span><span id="1541" class="l"><a href="#1541">1541: </a><span class="php-comment">     * Check if the user is logged in
+</span></span><span id="1542" class="l"><a href="#1542">1542: </a><span class="php-comment">     *
+</span></span><span id="1543" class="l"><a href="#1543">1543: </a><span class="php-comment">     * @access protected
+</span></span><span id="1544" class="l"><a href="#1544">1544: </a><span class="php-comment">     *
+</span></span><span id="1545" class="l"><a href="#1545">1545: </a><span class="php-comment">     * @param  string $username The user's name
+</span></span><span id="1546" class="l"><a href="#1546">1546: </a><span class="php-comment">     * @param  bool|string $password The user's password
+</span></span><span id="1547" class="l"><a href="#1547">1547: </a><span class="php-comment">     *
+</span></span><span id="1548" class="l"><a href="#1548">1548: </a><span class="php-comment">     * @return bool
+</span></span><span id="1549" class="l"><a href="#1549">1549: </a><span class="php-comment">     */</span>
+</span><span id="1550" class="l"><a href="#1550">1550: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="1551" class="l"><a href="#1551">1551: </a>    {
+</span><span id="1552" class="l"><a href="#1552">1552: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1553" class="l"><a href="#1553">1553: </a>        {
+</span><span id="1554" class="l"><a href="#1554">1554: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1555" class="l"><a href="#1555">1555: </a>        }
+</span><span id="1556" class="l"><a href="#1556">1556: </a>
+</span><span id="1557" class="l"><a href="#1557">1557: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
+</span><span id="1558" class="l"><a href="#1558">1558: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="1559" class="l"><a href="#1559">1559: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
+</span><span id="1560" class="l"><a href="#1560">1560: </a>
+</span><span id="1561" class="l"><a href="#1561">1561: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
+</span><span id="1562" class="l"><a href="#1562">1562: </a>        {
+</span><span id="1563" class="l"><a href="#1563">1563: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
+</span><span id="1564" class="l"><a href="#1564">1564: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>) . <span class="php-quote">':'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
+</span><span id="1565" class="l"><a href="#1565">1565: </a>        }
+</span><span id="1566" class="l"><a href="#1566">1566: </a>
+</span><span id="1567" class="l"><a href="#1567">1567: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1568" class="l"><a href="#1568">1568: </a>        {
+</span><span id="1569" class="l"><a href="#1569">1569: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1570" class="l"><a href="#1570">1570: </a>        }
+</span><span id="1571" class="l"><a href="#1571">1571: </a>
+</span><span id="1572" class="l"><a href="#1572">1572: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
+</span><span id="1573" class="l"><a href="#1573">1573: </a>        {
+</span><span id="1574" class="l"><a href="#1574">1574: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1575" class="l"><a href="#1575">1575: </a>
+</span><span id="1576" class="l"><a href="#1576">1576: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1577" class="l"><a href="#1577">1577: </a>        }
+</span><span id="1578" class="l"><a href="#1578">1578: </a>
+</span><span id="1579" class="l"><a href="#1579">1579: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
+</span><span id="1580" class="l"><a href="#1580">1580: </a>        {
+</span><span id="1581" class="l"><a href="#1581">1581: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1582" class="l"><a href="#1582">1582: </a>
+</span><span id="1583" class="l"><a href="#1583">1583: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1584" class="l"><a href="#1584">1584: </a>        }
+</span><span id="1585" class="l"><a href="#1585">1585: </a>
+</span><span id="1586" class="l"><a href="#1586">1586: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1587" class="l"><a href="#1587">1587: </a>        {
+</span><span id="1588" class="l"><a href="#1588">1588: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1589" class="l"><a href="#1589">1589: </a>        }
+</span><span id="1590" class="l"><a href="#1590">1590: </a>
+</span><span id="1591" class="l"><a href="#1591">1591: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
+</span><span id="1592" class="l"><a href="#1592">1592: </a>        {
+</span><span id="1593" class="l"><a href="#1593">1593: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1594" class="l"><a href="#1594">1594: </a>        }
+</span><span id="1595" class="l"><a href="#1595">1595: </a>
+</span><span id="1596" class="l"><a href="#1596">1596: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1597" class="l"><a href="#1597">1597: </a>    }
+</span><span id="1598" class="l"><a href="#1598">1598: </a>
+</span><span id="1599" class="l"><a href="#1599">1599: </a>    <span class="php-comment">/**
+</span></span><span id="1600" class="l"><a href="#1600">1600: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
+</span></span><span id="1601" class="l"><a href="#1601">1601: </a><span class="php-comment">     *
+</span></span><span id="1602" class="l"><a href="#1602">1602: </a><span class="php-comment">     * @access protected
+</span></span><span id="1603" class="l"><a href="#1603">1603: </a><span class="php-comment">     */</span>
+</span><span id="1604" class="l"><a href="#1604">1604: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
+</span><span id="1605" class="l"><a href="#1605">1605: </a>    {
+</span><span id="1606" class="l"><a href="#1606">1606: </a>        <span class="php-comment">// Get the auth_source config item</span>
+</span><span id="1607" class="l"><a href="#1607">1607: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
+</span><span id="1608" class="l"><a href="#1608">1608: </a>
+</span><span id="1609" class="l"><a href="#1609">1609: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
+</span><span id="1610" class="l"><a href="#1610">1610: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
+</span><span id="1611" class="l"><a href="#1611">1611: </a>        {
+</span><span id="1612" class="l"><a href="#1612">1612: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1613" class="l"><a href="#1613">1613: </a>            <span class="php-var">$this</span>-&gt;response(
+</span><span id="1614" class="l"><a href="#1614">1614: </a>                [
+</span><span id="1615" class="l"><a href="#1615">1615: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1616" class="l"><a href="#1616">1616: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not Authorized'</span>
+</span><span id="1617" class="l"><a href="#1617">1617: </a>                ], <span class="php-num">401</span>);
+</span><span id="1618" class="l"><a href="#1618">1618: </a>        }
+</span><span id="1619" class="l"><a href="#1619">1619: </a>    }
+</span><span id="1620" class="l"><a href="#1620">1620: </a>
+</span><span id="1621" class="l"><a href="#1621">1621: </a>    <span class="php-comment">/**
+</span></span><span id="1622" class="l"><a href="#1622">1622: </a><span class="php-comment">     * Prepares for basic authentication
+</span></span><span id="1623" class="l"><a href="#1623">1623: </a><span class="php-comment">     *
+</span></span><span id="1624" class="l"><a href="#1624">1624: </a><span class="php-comment">     * @access protected
+</span></span><span id="1625" class="l"><a href="#1625">1625: </a><span class="php-comment">     */</span>
+</span><span id="1626" class="l"><a href="#1626">1626: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
+</span><span id="1627" class="l"><a href="#1627">1627: </a>    {
+</span><span id="1628" class="l"><a href="#1628">1628: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1629" class="l"><a href="#1629">1629: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1630" class="l"><a href="#1630">1630: </a>        {
+</span><span id="1631" class="l"><a href="#1631">1631: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1632" class="l"><a href="#1632">1632: </a>        }
+</span><span id="1633" class="l"><a href="#1633">1633: </a>
+</span><span id="1634" class="l"><a href="#1634">1634: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
+</span><span id="1635" class="l"><a href="#1635">1635: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
+</span><span id="1636" class="l"><a href="#1636">1636: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
+</span><span id="1637" class="l"><a href="#1637">1637: </a>
+</span><span id="1638" class="l"><a href="#1638">1638: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1639" class="l"><a href="#1639">1639: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1640" class="l"><a href="#1640">1640: </a>        {
+</span><span id="1641" class="l"><a href="#1641">1641: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
+</span><span id="1642" class="l"><a href="#1642">1642: </a>        }
+</span><span id="1643" class="l"><a href="#1643">1643: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1644" class="l"><a href="#1644">1644: </a>        {
+</span><span id="1645" class="l"><a href="#1645">1645: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
+</span><span id="1646" class="l"><a href="#1646">1646: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
+</span><span id="1647" class="l"><a href="#1647">1647: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
+</span><span id="1648" class="l"><a href="#1648">1648: </a>            {
+</span><span id="1649" class="l"><a href="#1649">1649: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
+</span><span id="1650" class="l"><a href="#1650">1650: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
+</span><span id="1651" class="l"><a href="#1651">1651: </a>            }
+</span><span id="1652" class="l"><a href="#1652">1652: </a>        }
+</span><span id="1653" class="l"><a href="#1653">1653: </a>
+</span><span id="1654" class="l"><a href="#1654">1654: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
+</span><span id="1655" class="l"><a href="#1655">1655: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1656" class="l"><a href="#1656">1656: </a>        {
+</span><span id="1657" class="l"><a href="#1657">1657: </a>            <span class="php-var">$this</span>-&gt;_force_login();
+</span><span id="1658" class="l"><a href="#1658">1658: </a>        }
+</span><span id="1659" class="l"><a href="#1659">1659: </a>    }
+</span><span id="1660" class="l"><a href="#1660">1660: </a>
+</span><span id="1661" class="l"><a href="#1661">1661: </a>    <span class="php-comment">/**
+</span></span><span id="1662" class="l"><a href="#1662">1662: </a><span class="php-comment">     * Prepares for digest authentication
+</span></span><span id="1663" class="l"><a href="#1663">1663: </a><span class="php-comment">     *
+</span></span><span id="1664" class="l"><a href="#1664">1664: </a><span class="php-comment">     * @access protected
+</span></span><span id="1665" class="l"><a href="#1665">1665: </a><span class="php-comment">     */</span>
+</span><span id="1666" class="l"><a href="#1666">1666: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
+</span><span id="1667" class="l"><a href="#1667">1667: </a>    {
+</span><span id="1668" class="l"><a href="#1668">1668: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1669" class="l"><a href="#1669">1669: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1670" class="l"><a href="#1670">1670: </a>        {
+</span><span id="1671" class="l"><a href="#1671">1671: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1672" class="l"><a href="#1672">1672: </a>        }
+</span><span id="1673" class="l"><a href="#1673">1673: </a>
+</span><span id="1674" class="l"><a href="#1674">1674: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
+</span><span id="1675" class="l"><a href="#1675">1675: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
+</span><span id="1676" class="l"><a href="#1676">1676: </a>        <span class="php-var">$digest_string</span> = <span class="php-quote">''</span>;
+</span><span id="1677" class="l"><a href="#1677">1677: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>))
+</span><span id="1678" class="l"><a href="#1678">1678: </a>        {
+</span><span id="1679" class="l"><a href="#1679">1679: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
+</span><span id="1680" class="l"><a href="#1680">1680: </a>        }
+</span><span id="1681" class="l"><a href="#1681">1681: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>))
+</span><span id="1682" class="l"><a href="#1682">1682: </a>        {
+</span><span id="1683" class="l"><a href="#1683">1683: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
+</span><span id="1684" class="l"><a href="#1684">1684: </a>        }
+</span><span id="1685" class="l"><a href="#1685">1685: </a>
+</span><span id="1686" class="l"><a href="#1686">1686: </a>        <span class="php-var">$uniqueId</span> = <span class="php-keyword2">uniqid</span>();
+</span><span id="1687" class="l"><a href="#1687">1687: </a>
+</span><span id="1688" class="l"><a href="#1688">1688: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
+</span><span id="1689" class="l"><a href="#1689">1689: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
+</span><span id="1690" class="l"><a href="#1690">1690: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
+</span><span id="1691" class="l"><a href="#1691">1691: </a>        {
+</span><span id="1692" class="l"><a href="#1692">1692: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqueId</span>);
+</span><span id="1693" class="l"><a href="#1693">1693: </a>        }
+</span><span id="1694" class="l"><a href="#1694">1694: </a>
+</span><span id="1695" class="l"><a href="#1695">1695: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
+</span><span id="1696" class="l"><a href="#1696">1696: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="1697" class="l"><a href="#1697">1697: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
+</span><span id="1698" class="l"><a href="#1698">1698: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
+</span><span id="1699" class="l"><a href="#1699">1699: </a>
+</span><span id="1700" class="l"><a href="#1700">1700: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config</span>
+</span><span id="1701" class="l"><a href="#1701">1701: </a>        <span class="php-var">$A1</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
+</span><span id="1702" class="l"><a href="#1702">1702: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$A1</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1703" class="l"><a href="#1703">1703: </a>        {
+</span><span id="1704" class="l"><a href="#1704">1704: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqueId</span>);
+</span><span id="1705" class="l"><a href="#1705">1705: </a>        }
+</span><span id="1706" class="l"><a href="#1706">1706: </a>
+</span><span id="1707" class="l"><a href="#1707">1707: </a>        <span class="php-var">$A2</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method) . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
+</span><span id="1708" class="l"><a href="#1708">1708: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$A1</span> . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$A2</span>);
+</span><span id="1709" class="l"><a href="#1709">1709: </a>
+</span><span id="1710" class="l"><a href="#1710">1710: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
+</span><span id="1711" class="l"><a href="#1711">1711: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
+</span><span id="1712" class="l"><a href="#1712">1712: </a>        {
+</span><span id="1713" class="l"><a href="#1713">1713: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1714" class="l"><a href="#1714">1714: </a>            <span class="php-var">$this</span>-&gt;response(
+</span><span id="1715" class="l"><a href="#1715">1715: </a>                [
+</span><span id="1716" class="l"><a href="#1716">1716: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-num">0</span>,
+</span><span id="1717" class="l"><a href="#1717">1717: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid credentials'</span>
+</span><span id="1718" class="l"><a href="#1718">1718: </a>                ], <span class="php-num">401</span>);
+</span><span id="1719" class="l"><a href="#1719">1719: </a>        }
+</span><span id="1720" class="l"><a href="#1720">1720: </a>    }
+</span><span id="1721" class="l"><a href="#1721">1721: </a>
+</span><span id="1722" class="l"><a href="#1722">1722: </a>    <span class="php-comment">/**
+</span></span><span id="1723" class="l"><a href="#1723">1723: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
+</span></span><span id="1724" class="l"><a href="#1724">1724: </a><span class="php-comment">     *
+</span></span><span id="1725" class="l"><a href="#1725">1725: </a><span class="php-comment">     * @access protected
+</span></span><span id="1726" class="l"><a href="#1726">1726: </a><span class="php-comment">     */</span>
+</span><span id="1727" class="l"><a href="#1727">1727: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
+</span><span id="1728" class="l"><a href="#1728">1728: </a>    {
+</span><span id="1729" class="l"><a href="#1729">1729: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
+</span><span id="1730" class="l"><a href="#1730">1730: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
+</span><span id="1731" class="l"><a href="#1731">1731: </a>
+</span><span id="1732" class="l"><a href="#1732">1732: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
+</span><span id="1733" class="l"><a href="#1733">1733: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
+</span><span id="1734" class="l"><a href="#1734">1734: </a>        {
+</span><span id="1735" class="l"><a href="#1735">1735: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1736" class="l"><a href="#1736">1736: </a>            <span class="php-var">$this</span>-&gt;response(
+</span><span id="1737" class="l"><a href="#1737">1737: </a>                [
+</span><span id="1738" class="l"><a href="#1738">1738: </a>                    <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1739" class="l"><a href="#1739">1739: </a>                    <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'IP Denied'</span>
+</span><span id="1740" class="l"><a href="#1740">1740: </a>                ],
+</span><span id="1741" class="l"><a href="#1741">1741: </a>                <span class="php-num">401</span>);
+</span><span id="1742" class="l"><a href="#1742">1742: </a>        }
+</span><span id="1743" class="l"><a href="#1743">1743: </a>    }
+</span><span id="1744" class="l"><a href="#1744">1744: </a>
+</span><span id="1745" class="l"><a href="#1745">1745: </a>    <span class="php-comment">/**
+</span></span><span id="1746" class="l"><a href="#1746">1746: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
+</span></span><span id="1747" class="l"><a href="#1747">1747: </a><span class="php-comment">     *
+</span></span><span id="1748" class="l"><a href="#1748">1748: </a><span class="php-comment">     * @access protected
+</span></span><span id="1749" class="l"><a href="#1749">1749: </a><span class="php-comment">     */</span>
+</span><span id="1750" class="l"><a href="#1750">1750: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
+</span><span id="1751" class="l"><a href="#1751">1751: </a>    {
+</span><span id="1752" class="l"><a href="#1752">1752: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
+</span><span id="1753" class="l"><a href="#1753">1753: </a>
+</span><span id="1754" class="l"><a href="#1754">1754: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
+</span><span id="1755" class="l"><a href="#1755">1755: </a>
+</span><span id="1756" class="l"><a href="#1756">1756: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">AS</span> &amp;<span class="php-var">$ip</span>)
+</span><span id="1757" class="l"><a href="#1757">1757: </a>        {
+</span><span id="1758" class="l"><a href="#1758">1758: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
+</span><span id="1759" class="l"><a href="#1759">1759: </a>        }
+</span><span id="1760" class="l"><a href="#1760">1760: </a>
+</span><span id="1761" class="l"><a href="#1761">1761: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1762" class="l"><a href="#1762">1762: </a>        {
+</span><span id="1763" class="l"><a href="#1763">1763: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'IP not authorized'</span>], <span class="php-num">401</span>);
+</span><span id="1764" class="l"><a href="#1764">1764: </a>        }
+</span><span id="1765" class="l"><a href="#1765">1765: </a>    }
+</span><span id="1766" class="l"><a href="#1766">1766: </a>
+</span><span id="1767" class="l"><a href="#1767">1767: </a>    <span class="php-comment">/**
+</span></span><span id="1768" class="l"><a href="#1768">1768: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
+</span></span><span id="1769" class="l"><a href="#1769">1769: </a><span class="php-comment">     *
+</span></span><span id="1770" class="l"><a href="#1770">1770: </a><span class="php-comment">     * @access protected
+</span></span><span id="1771" class="l"><a href="#1771">1771: </a><span class="php-comment">     *
+</span></span><span id="1772" class="l"><a href="#1772">1772: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
+</span></span><span id="1773" class="l"><a href="#1773">1773: </a><span class="php-comment">     * each time
+</span></span><span id="1774" class="l"><a href="#1774">1774: </a><span class="php-comment">     */</span>
+</span><span id="1775" class="l"><a href="#1775">1775: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
+</span><span id="1776" class="l"><a href="#1776">1776: </a>    {
+</span><span id="1777" class="l"><a href="#1777">1777: </a>        <span class="php-var">$restAuth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
+</span><span id="1778" class="l"><a href="#1778">1778: </a>        <span class="php-var">$restRealm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
+</span><span id="1779" class="l"><a href="#1779">1779: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'basic'</span>)
+</span><span id="1780" class="l"><a href="#1780">1780: </a>        {
+</span><span id="1781" class="l"><a href="#1781">1781: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
+</span><span id="1782" class="l"><a href="#1782">1782: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span> . <span class="php-var">$restRealm</span> . <span class="php-quote">'&quot;'</span>);
+</span><span id="1783" class="l"><a href="#1783">1783: </a>        }
+</span><span id="1784" class="l"><a href="#1784">1784: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'digest'</span>)
+</span><span id="1785" class="l"><a href="#1785">1785: </a>        {
+</span><span id="1786" class="l"><a href="#1786">1786: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
+</span><span id="1787" class="l"><a href="#1787">1787: </a>            <span class="php-keyword2">header</span>(
+</span><span id="1788" class="l"><a href="#1788">1788: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span> . <span class="php-var">$restRealm</span>
+</span><span id="1789" class="l"><a href="#1789">1789: </a>                . <span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span> . <span class="php-var">$nonce</span>
+</span><span id="1790" class="l"><a href="#1790">1790: </a>                . <span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$restRealm</span>) . <span class="php-quote">'&quot;'</span>);
+</span><span id="1791" class="l"><a href="#1791">1791: </a>        }
+</span><span id="1792" class="l"><a href="#1792">1792: </a>
+</span><span id="1793" class="l"><a href="#1793">1793: </a>        <span class="php-comment">// Display an error response</span>
+</span><span id="1794" class="l"><a href="#1794">1794: </a>        <span class="php-var">$this</span>-&gt;response(
+</span><span id="1795" class="l"><a href="#1795">1795: </a>            [
+</span><span id="1796" class="l"><a href="#1796">1796: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1797" class="l"><a href="#1797">1797: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not authorized'</span>
+</span><span id="1798" class="l"><a href="#1798">1798: </a>            ], <span class="php-num">401</span>);
+</span><span id="1799" class="l"><a href="#1799">1799: </a>    }
+</span><span id="1800" class="l"><a href="#1800">1800: </a>
+</span><span id="1801" class="l"><a href="#1801">1801: </a>    <span class="php-comment">/**
+</span></span><span id="1802" class="l"><a href="#1802">1802: </a><span class="php-comment">     * Updates the log table with the total access time
+</span></span><span id="1803" class="l"><a href="#1803">1803: </a><span class="php-comment">     *
+</span></span><span id="1804" class="l"><a href="#1804">1804: </a><span class="php-comment">     * @access protected
+</span></span><span id="1805" class="l"><a href="#1805">1805: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="1806" class="l"><a href="#1806">1806: </a><span class="php-comment">     *
+</span></span><span id="1807" class="l"><a href="#1807">1807: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="1808" class="l"><a href="#1808">1808: </a><span class="php-comment">     */</span>
+</span><span id="1809" class="l"><a href="#1809">1809: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
+</span><span id="1810" class="l"><a href="#1810">1810: </a>    {
+</span><span id="1811" class="l"><a href="#1811">1811: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
+</span><span id="1812" class="l"><a href="#1812">1812: </a>
+</span><span id="1813" class="l"><a href="#1813">1813: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1814" class="l"><a href="#1814">1814: </a>            -&gt;update(
+</span><span id="1815" class="l"><a href="#1815">1815: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="1816" class="l"><a href="#1816">1816: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="1817" class="l"><a href="#1817">1817: </a>            ]);
+</span><span id="1818" class="l"><a href="#1818">1818: </a>    }
+</span><span id="1819" class="l"><a href="#1819">1819: </a>
+</span><span id="1820" class="l"><a href="#1820">1820: </a>    <span class="php-comment">/**
+</span></span><span id="1821" class="l"><a href="#1821">1821: </a><span class="php-comment">     * Updates the log table with HTTP response code
+</span></span><span id="1822" class="l"><a href="#1822">1822: </a><span class="php-comment">     *
+</span></span><span id="1823" class="l"><a href="#1823">1823: </a><span class="php-comment">     * @access protected
+</span></span><span id="1824" class="l"><a href="#1824">1824: </a><span class="php-comment">     * @author Justin Chen
+</span></span><span id="1825" class="l"><a href="#1825">1825: </a><span class="php-comment">     *
+</span></span><span id="1826" class="l"><a href="#1826">1826: </a><span class="php-comment">     * @param $http_code int HTTP status code
+</span></span><span id="1827" class="l"><a href="#1827">1827: </a><span class="php-comment">     *
+</span></span><span id="1828" class="l"><a href="#1828">1828: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="1829" class="l"><a href="#1829">1829: </a><span class="php-comment">     */</span>
+</span><span id="1830" class="l"><a href="#1830">1830: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
+</span><span id="1831" class="l"><a href="#1831">1831: </a>    {
+</span><span id="1832" class="l"><a href="#1832">1832: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
+</span><span id="1833" class="l"><a href="#1833">1833: </a>
+</span><span id="1834" class="l"><a href="#1834">1834: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
+</span><span id="1835" class="l"><a href="#1835">1835: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="1836" class="l"><a href="#1836">1836: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="1837" class="l"><a href="#1837">1837: </a>        ]);
+</span><span id="1838" class="l"><a href="#1838">1838: </a>    }
+</span><span id="1839" class="l"><a href="#1839">1839: </a>
+</span><span id="1840" class="l"><a href="#1840">1840: </a>    <span class="php-comment">/**
+</span></span><span id="1841" class="l"><a href="#1841">1841: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
+</span></span><span id="1842" class="l"><a href="#1842">1842: </a><span class="php-comment">     *
+</span></span><span id="1843" class="l"><a href="#1843">1843: </a><span class="php-comment">     * @access protected
+</span></span><span id="1844" class="l"><a href="#1844">1844: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
+</span></span><span id="1845" class="l"><a href="#1845">1845: </a><span class="php-comment">     */</span>
+</span><span id="1846" class="l"><a href="#1846">1846: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
+</span><span id="1847" class="l"><a href="#1847">1847: </a>    {
+</span><span id="1848" class="l"><a href="#1848">1848: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
+</span><span id="1849" class="l"><a href="#1849">1849: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1850" class="l"><a href="#1850">1850: </a>        {
+</span><span id="1851" class="l"><a href="#1851">1851: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1852" class="l"><a href="#1852">1852: </a>        }
+</span><span id="1853" class="l"><a href="#1853">1853: </a>
+</span><span id="1854" class="l"><a href="#1854">1854: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
+</span><span id="1855" class="l"><a href="#1855">1855: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
+</span><span id="1856" class="l"><a href="#1856">1856: </a>            <span class="php-quote">'/'</span>, [
+</span><span id="1857" class="l"><a href="#1857">1857: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
+</span><span id="1858" class="l"><a href="#1858">1858: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
+</span><span id="1859" class="l"><a href="#1859">1859: </a>        ]);
+</span><span id="1860" class="l"><a href="#1860">1860: </a>
+</span><span id="1861" class="l"><a href="#1861">1861: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
+</span><span id="1862" class="l"><a href="#1862">1862: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
+</span><span id="1863" class="l"><a href="#1863">1863: </a>
+</span><span id="1864" class="l"><a href="#1864">1864: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
+</span><span id="1865" class="l"><a href="#1865">1865: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1866" class="l"><a href="#1866">1866: </a>                   -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1867" class="l"><a href="#1867">1867: </a>                   -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
+</span><span id="1868" class="l"><a href="#1868">1868: </a>                   -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
+</span><span id="1869" class="l"><a href="#1869">1869: </a>                   -&gt;num_rows() &gt; <span class="php-num">0</span>;
+</span><span id="1870" class="l"><a href="#1870">1870: </a>    }
+</span><span id="1871" class="l"><a href="#1871">1871: </a>
+</span><span id="1872" class="l"><a href="#1872">1872: </a>}
+</span><span id="1873" class="l"><a href="#1873">1873: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
@@ -1643,6 +1969,6 @@ <h3>Functions</h3>
 </div>
 </div>
 <script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
-<script src="http://github.com/elementlist.js?a84266a83a9e4e19c2425432aca8ea8439364f92"></script>
+<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/source-function-_perform_ldap_auth.html b/documentation/source-function-_perform_ldap_auth.html
deleted file mode 100644
index 3f21a03d..00000000
--- a/documentation/source-function-_perform_ldap_auth.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="robots" content="noindex">
-
-	<title>File dummy.php</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-							</ul></li>
-				<li class="active">
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li><a href="http://github.com/class-Format.html">Format</a></li>
-			</ul>
-
-
-
-
-
-			<h3>Functions</h3>
-			<ul>
-				<li class="active"><a href="http://github.com/function-_perform_ldap_auth.html">_perform_ldap_auth</a></li>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li>
-				<a href="http://github.com/package-None.html" title="Summary of None"><span>Package</span></a>
-			</li>
-			<li>
-				<a href="http://github.com/function-_perform_ldap_auth.html" title="Summary of _perform_ldap_auth"><span>Function</span></a>
-			</li>
-		</ul>
-		<ul>
-			<li>
-				<a href="http://github.com/tree.html" title="Tree view of classes, interfaces, traits and exceptions"><span>Tree</span></a>
-			</li>
-			<li>
-				<a href="http://github.com/todo.html" title="Todo list"><span>Todo</span></a>
-			</li>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<pre><code><span id="1" class="l"><a href="#1"> 1: </a><span class="xlang">&lt;?php</span>
-</span><span id="2" class="l"><a href="#2"> 2: </a>
-</span><span id="3" class="l"><a href="#3"> 3: </a><span class="php-comment">/**
-</span></span><span id="4" class="l"><a href="#4"> 4: </a><span class="php-comment"> * Perform LDAP Authentication
-</span></span><span id="5" class="l"><a href="#5"> 5: </a><span class="php-comment"> *
-</span></span><span id="6" class="l"><a href="#6"> 6: </a><span class="php-comment"> * @param  string  $username The username to validate
-</span></span><span id="7" class="l"><a href="#7"> 7: </a><span class="php-comment"> * @param  string  $password The password to validate
-</span></span><span id="8" class="l"><a href="#8"> 8: </a><span class="php-comment"> * @return boolean
-</span></span><span id="9" class="l"><a href="#9"> 9: </a><span class="php-comment"> */</span>
-</span><span id="10" class="l"><a href="#10">10: </a><span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="11" class="l"><a href="#11">11: </a>{
-</span><span id="12" class="l"><a href="#12">12: </a>    <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>)) {
-</span><span id="13" class="l"><a href="#13">13: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
-</span><span id="14" class="l"><a href="#14">14: </a>
-</span><span id="15" class="l"><a href="#15">15: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="16" class="l"><a href="#16">16: </a>    }
-</span><span id="17" class="l"><a href="#17">17: </a>
-</span><span id="18" class="l"><a href="#18">18: </a>    log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading Config'</span>);
-</span><span id="19" class="l"><a href="#19">19: </a>
-</span><span id="20" class="l"><a href="#20">20: </a>    <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="21" class="l"><a href="#21">21: </a>
-</span><span id="22" class="l"><a href="#22">22: </a>    <span class="php-var">$ldap</span> = <span class="php-keyword1">array</span>(
-</span><span id="23" class="l"><a href="#23">23: </a>        <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>);
-</span><span id="24" class="l"><a href="#24">24: </a>        <span class="php-quote">'host'</span>    =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>);
-</span><span id="25" class="l"><a href="#25">25: </a>        <span class="php-quote">'port'</span>    =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>);
-</span><span id="26" class="l"><a href="#26">26: </a>        <span class="php-quote">'rdn'</span>     =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>);
-</span><span id="27" class="l"><a href="#27">27: </a>        <span class="php-quote">'pass'</span>    =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>);
-</span><span id="28" class="l"><a href="#28">28: </a>        <span class="php-quote">'basedn'</span>  =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>);
-</span><span id="29" class="l"><a href="#29">29: </a>      );
-</span><span id="30" class="l"><a href="#30">30: </a>
-</span><span id="31" class="l"><a href="#31">31: </a>    log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . <span class="php-var">$ldaphost</span>);
-</span><span id="32" class="l"><a href="#32">32: </a>
-</span><span id="33" class="l"><a href="#33">33: </a>    <span class="php-var">$ldapconfig</span>[<span class="php-quote">'authrealm'</span>] = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'domain'</span>, <span class="php-quote">'ldap'</span>);
-</span><span id="34" class="l"><a href="#34">34: </a>
-</span><span id="35" class="l"><a href="#35">35: </a>    <span class="php-comment">// connect to ldap server</span>
-</span><span id="36" class="l"><a href="#36">36: </a>    <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
-</span><span id="37" class="l"><a href="#37">37: </a>
-</span><span id="38" class="l"><a href="#38">38: </a>    <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>) {
-</span><span id="39" class="l"><a href="#39">39: </a>
-</span><span id="40" class="l"><a href="#40">40: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span> . <span class="php-var">$ldaptimeout</span> . <span class="php-quote">' seconds'</span>);
-</span><span id="41" class="l"><a href="#41">41: </a>
-</span><span id="42" class="l"><a href="#42">42: </a>        <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldaptimeout</span>);
-</span><span id="43" class="l"><a href="#43">43: </a>
-</span><span id="44" class="l"><a href="#44">44: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>] . <span class="php-quote">' with dn '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
-</span><span id="45" class="l"><a href="#45">45: </a>
-</span><span id="46" class="l"><a href="#46">46: </a>        <span class="php-comment">// binding to ldap server</span>
-</span><span id="47" class="l"><a href="#47">47: </a>        <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
-</span><span id="48" class="l"><a href="#48">48: </a>
-</span><span id="49" class="l"><a href="#49">49: </a>        <span class="php-comment">// verify binding</span>
-</span><span id="50" class="l"><a href="#50">50: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span>) {
-</span><span id="51" class="l"><a href="#51">51: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
-</span><span id="52" class="l"><a href="#52">52: </a>        } <span class="php-keyword1">else</span> {
-</span><span id="53" class="l"><a href="#53">53: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind unsuccessful'</span>);
-</span><span id="54" class="l"><a href="#54">54: </a>
-</span><span id="55" class="l"><a href="#55">55: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="56" class="l"><a href="#56">56: </a>        }
-</span><span id="57" class="l"><a href="#57">57: </a>
-</span><span id="58" class="l"><a href="#58">58: </a>    }
-</span><span id="59" class="l"><a href="#59">59: </a>
-</span><span id="60" class="l"><a href="#60">60: </a>    <span class="php-comment">// search for user</span>
-</span><span id="61" class="l"><a href="#61">61: </a>    <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>( <span class="php-var">$ldapconn</span>, <span class="php-var">$ldapbasedn</span>, <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) == <span class="php-keyword1">FALSE</span>) {
-</span><span id="62" class="l"><a href="#62">62: </a>        log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span> . <span class="php-var">$username</span> . <span class="php-quote">' not found in search'</span>);
-</span><span id="63" class="l"><a href="#63">63: </a>
-</span><span id="64" class="l"><a href="#64">64: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="65" class="l"><a href="#65">65: </a>    }
-</span><span id="66" class="l"><a href="#66">66: </a>
-</span><span id="67" class="l"><a href="#67">67: </a>    <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) != <span class="php-num">1</span>) {
-</span><span id="68" class="l"><a href="#68">68: </a>        log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username '</span> . <span class="php-var">$username</span> . <span class="php-quote">'found more than once'</span>);
-</span><span id="69" class="l"><a href="#69">69: </a>
-</span><span id="70" class="l"><a href="#70">70: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="71" class="l"><a href="#71">71: </a>    }
-</span><span id="72" class="l"><a href="#72">72: </a>
-</span><span id="73" class="l"><a href="#73">73: </a>    <span class="php-keyword1">if</span> (( <span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>))== <span class="php-keyword1">FALSE</span>) {
-</span><span id="74" class="l"><a href="#74">74: </a>        log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, entry of searchresult could not be fetched'</span>);
-</span><span id="75" class="l"><a href="#75">75: </a>
-</span><span id="76" class="l"><a href="#76">76: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="77" class="l"><a href="#77">77: </a>    }
-</span><span id="78" class="l"><a href="#78">78: </a>
-</span><span id="79" class="l"><a href="#79">79: </a>    <span class="php-keyword1">if</span> (( <span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) == <span class="php-keyword1">FALSE</span>) {
-</span><span id="80" class="l"><a href="#80">80: </a>        log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, user-dn could not be fetched'</span>);
-</span><span id="81" class="l"><a href="#81">81: </a>
-</span><span id="82" class="l"><a href="#82">82: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="83" class="l"><a href="#83">83: </a>    }
-</span><span id="84" class="l"><a href="#84">84: </a>
-</span><span id="85" class="l"><a href="#85">85: </a>    <span class="php-comment">// User found, could not authenticate as user</span>
-</span><span id="86" class="l"><a href="#86">86: </a>    <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) == <span class="php-keyword1">FALSE</span>) {
-</span><span id="87" class="l"><a href="#87">87: </a>        log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
-</span><span id="88" class="l"><a href="#88">88: </a>
-</span><span id="89" class="l"><a href="#89">89: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="90" class="l"><a href="#90">90: </a>    }
-</span><span id="91" class="l"><a href="#91">91: </a>
-</span><span id="92" class="l"><a href="#92">92: </a>    log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span> . <span class="php-var">$user_dn</span> . <span class="php-quote">' authenticated successfully'</span>);
-</span><span id="93" class="l"><a href="#93">93: </a>
-</span><span id="94" class="l"><a href="#94">94: </a>    <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
-</span><span id="95" class="l"><a href="#95">95: </a>    <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
-</span><span id="96" class="l"><a href="#96">96: </a>
-</span><span id="97" class="l"><a href="#97">97: </a>    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="98" class="l"><a href="#98">98: </a>}
-</span><span id="99" class="l"><a href="#99">99: </a></span></code></pre>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
-<script src="http://github.com/elementlist.js?a84266a83a9e4e19c2425432aca8ea8439364f92"></script>
-</body>
-</html>
diff --git a/documentation/todo.html b/documentation/todo.html
deleted file mode 100644
index 37babc69..00000000
--- a/documentation/todo.html
+++ /dev/null
@@ -1,153 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-
-	<title>Todo</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li><a href="http://github.com/class-Format.html">Format</a></li>
-			</ul>
-
-
-
-
-
-			<h3>Functions</h3>
-			<ul>
-				<li class="active"><a href="http://github.com/function-_perform_ldap_auth.html">_perform_ldap_auth</a></li>
-			</ul>
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li>
-<span>Package</span>			</li>
-			<li>
-				<a href="http://github.com/function-_perform_ldap_auth.html" title="Summary of _perform_ldap_auth"><span>Function</span></a>
-			</li>
-		</ul>
-		<ul>
-			<li>
-				<a href="http://github.com/tree.html" title="Tree view of classes, interfaces, traits and exceptions"><span>Tree</span></a>
-			</li>
-			<li class="active">
-<span>Todo</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<div id="content">
-	<h1>Todo</h1>
-
-
-
-
-
-
-	<table class="summary" id="methods">
-		<caption>Methods summary</caption>
-			<tr>
-				<td class="name"><a href="http://github.com/class-Example.html">Example</a></td>
-				<td class="name"><code><a href="http://github.com/class-Example.html#___construct">__construct()</a></code></td>
-				<td>
-						Document more please.
-				</td>
-			</tr>
-			<tr>
-				<td class="name"><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></td>
-				<td class="name"><code><a href="http://github.com/class-REST_Controller.html#___construct">__construct()</a></code></td>
-				<td>
-						Document more please.
-				</td>
-			</tr>
-			<tr>
-				<td class="name"><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></td>
-				<td class="name"><code><a href="http://github.com/class-REST_Controller.html#__prepare_basic_auth">_prepare_basic_auth()</a></code></td>
-				<td>
-						document this.
-				</td>
-			</tr>
-			<tr>
-				<td class="name"><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></td>
-				<td class="name"><code><a href="http://github.com/class-REST_Controller.html#__prepare_digest_auth">_prepare_digest_auth()</a></code></td>
-				<td>
-						Document this.
-				</td>
-			</tr>
-			<tr>
-				<td class="name"><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></td>
-				<td class="name"><code><a href="http://github.com/class-REST_Controller.html#__force_login">_force_login()</a></code></td>
-				<td>
-						Document this.
-				</td>
-			</tr>
-	</table>
-
-
-
-</div>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
-<script src="http://github.com/elementlist.js?a84266a83a9e4e19c2425432aca8ea8439364f92"></script>
-</body>
-</html>

From ce5f56019a424eb38ff9e6f44d65b4457a668288 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 16 Jul 2015 08:59:55 +0300
Subject: [PATCH 044/354] Updated documentation with new changes

---
 documentation/404.html                        |   10 +-
 documentation/class-Example.html              |   27 +-
 documentation/class-Format.html               |  253 +-
 documentation/class-Key.html                  |   27 +-
 documentation/class-REST_Controller.html      |  609 ++-
 documentation/index.html                      |   10 +-
 .../package-CodeIgniter.Libraries.html        |    7 +-
 documentation/package-CodeIgniter.Rest.html   |    5 +-
 documentation/package-CodeIgniter.html        |    5 +-
 documentation/package-None.html               |    5 +-
 documentation/source-class-Example.html       |   29 +-
 documentation/source-class-Format.html        |  933 ++---
 documentation/source-class-Key.html           |  124 +-
 .../source-class-REST_Controller.html         | 3457 +++++++++--------
 14 files changed, 3217 insertions(+), 2284 deletions(-)

diff --git a/documentation/404.html b/documentation/404.html
index d40111fb..8f9bffdb 100644
--- a/documentation/404.html
+++ b/documentation/404.html
@@ -50,7 +50,10 @@ <h3>Packages</h3>
 		<div id="elements">
 			<h3>Classes</h3>
 			<ul>
-				<li class="active"><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
+				<li><a href="http://github.com/class-Example.html">Example</a></li>
+				<li><a href="http://github.com/class-Format.html">Format</a></li>
+				<li><a href="http://github.com/class-Key.html">Key</a></li>
+				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
 			</ul>
 
 
@@ -79,8 +82,7 @@ <h3>Classes</h3>
 			<li>
 <span>Package</span>			</li>
 			<li>
-				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
-			</li>
+<span>Class</span>			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -100,7 +102,7 @@ <h1>Page not found</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
+<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
 <script src="http://github.com/elementlist.js"></script>
 </body>
 </html>
diff --git a/documentation/class-Example.html b/documentation/class-Example.html
index 76e48ed4..21f1d336 100644
--- a/documentation/class-Example.html
+++ b/documentation/class-Example.html
@@ -138,7 +138,7 @@ <h1>Class Example</h1>
 				Phil Sturgeon, Chris Kacerguis<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-Example.html#8-114" title="Go to source code">application/controllers/api/Example.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-Example.html#8-114" title="Go to source code">controllers/api/Example.php</a>
 		<br>
 	</div>
 
@@ -379,6 +379,7 @@ <h4>Overrides</h4>
 			<a href="http://github.com/class-REST_Controller.html#__check_php_session">_check_php_session()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__check_whitelist_auth">_check_whitelist_auth()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_api_key">_detect_api_key()</a>, 
+			<a href="http://github.com/class-REST_Controller.html#__detect_input_format">_detect_input_format()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_lang">_detect_lang()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_method">_detect_method()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_output_format">_detect_output_format()</a>, 
@@ -393,6 +394,7 @@ <h4>Overrides</h4>
 			<a href="http://github.com/class-REST_Controller.html#__parse_patch">_parse_patch()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__parse_post">_parse_post()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__parse_put">_parse_put()</a>, 
+			<a href="http://github.com/class-REST_Controller.html#__parse_query">_parse_query()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__perform_ldap_auth">_perform_ldap_auth()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__perform_library_auth">_perform_library_auth()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__prepare_basic_auth">_prepare_basic_auth()</a>, 
@@ -407,6 +409,7 @@ <h4>Overrides</h4>
 			<a href="http://github.com/class-REST_Controller.html#_patch">patch()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#_post">post()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#_put">put()</a>, 
+			<a href="http://github.com/class-REST_Controller.html#_query">query()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#_response">response()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#_validation_errors">validation_errors()</a>
 		</code></td>
@@ -420,6 +423,26 @@ <h4>Overrides</h4>
 
 
 
+	<table class="summary inherited">
+	<caption>Constants inherited from <a href="http://github.com/class-REST_Controller.html#constants">REST_Controller</a></caption>
+	<tr>
+		<td><code>
+			<a href="http://github.com/class-REST_Controller.html#BAD_REQUEST"><b>BAD_REQUEST</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#CONFLICT"><b>CONFLICT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#CREATED"><b>CREATED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#FORBIDDEN"><b>FORBIDDEN</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#INTERNAL_SERVER_ERROR"><b>INTERNAL_SERVER_ERROR</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#METHOD_NOT_ALLOWED"><b>METHOD_NOT_ALLOWED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#NOT_ACCEPTABLE"><b>NOT_ACCEPTABLE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#NOT_FOUND"><b>NOT_FOUND</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#NOT_IMPLEMENTED"><b>NOT_IMPLEMENTED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#NOT_MODIFIED"><b>NOT_MODIFIED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#NO_CONTENT"><b>NO_CONTENT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#OK"><b>OK</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#UNAUTHORIZED"><b>UNAUTHORIZED</b></a>
+		</code></td>
+	</tr>
+	</table>
 
 
 
@@ -441,11 +464,13 @@ <h4>Overrides</h4>
 			<a href="http://github.com/class-REST_Controller.html#$_patch_args"><var>$_patch_args</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_post_args"><var>$_post_args</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_put_args"><var>$_put_args</var></a>, 
+			<a href="http://github.com/class-REST_Controller.html#$_query_args"><var>$_query_args</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_start_rtime"><var>$_start_rtime</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_supported_formats"><var>$_supported_formats</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_user_ldap_dn"><var>$_user_ldap_dn</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_zlib_oc"><var>$_zlib_oc</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$allowed_http_methods"><var>$allowed_http_methods</var></a>, 
+			<a href="http://github.com/class-REST_Controller.html#$http_status_codes"><var>$http_status_codes</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$methods"><var>$methods</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$request"><var>$request</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$response"><var>$response</var></a>, 
diff --git a/documentation/class-Format.html b/documentation/class-Format.html
index 7e4e5323..274eb215 100644
--- a/documentation/class-Format.html
+++ b/documentation/class-Format.html
@@ -113,7 +113,7 @@ <h1>Class Format</h1>
 				<a href="http://www.dbad-license.org/">http://www.dbad-license.org/</a><br>
 				<b>Author:</b>
 				Phil Sturgeon, Chris Kacerguis<br>
-			<b>Located at</b> <a href="http://github.com/source-class-Format.html#5-457" title="Go to source code">application/libraries/Format.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-Format.html#5-517" title="Go to source code">libraries/Format.php</a>
 		<br>
 	</div>
 
@@ -133,7 +133,7 @@ <h1>Class Format</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___construct">#</a>
-		<code><a href="http://github.com/source-class-Format.html#36-67" title="Go to source code">__construct</a>( <span>null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$from_type</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#76-106" title="Go to source code">__construct</a>( <span>null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$from_type</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>DO NOT CALL THIS DIRECTLY, USE factory()</p>
@@ -174,7 +174,7 @@ <h4>Throws</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_factory">#</a>
-		<code><a href="http://github.com/source-class-Format.html#69-84" title="Go to source code">factory</a>( <span>mixed <var>$data</var></span>, <span>string <var>$from_type</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#108-123" title="Go to source code">factory</a>( <span>mixed <var>$data</var></span>, <span>string <var>$from_type</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Create an instance of the format class
@@ -217,7 +217,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_array">#</a>
-		<code><a href="http://github.com/source-class-Format.html#88-125" title="Go to source code">to_array</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#127-163" title="Go to source code">to_array</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Format data as an array</p>
@@ -257,7 +257,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_xml">#</a>
-		<code><a href="http://github.com/source-class-Format.html#127-211" title="Go to source code">to_xml</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$structure</var> = <span class="php-keyword1">NULL</span></span>, <span>string <var>$basenode</var> = <span class="php-quote">'xml'</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#165-248" title="Go to source code">to_xml</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$structure</var> = <span class="php-keyword1">NULL</span></span>, <span>string <var>$basenode</var> = <span class="php-quote">'xml'</span></span> )</code>
 
 		<div class="description short">
 			<p>Format data as XML</p>
@@ -301,7 +301,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_html">#</a>
-		<code><a href="http://github.com/source-class-Format.html#213-261" title="Go to source code">to_html</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#250-297" title="Go to source code">to_html</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Format data as HTML</p>
@@ -334,21 +334,21 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			mixed
+			string
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_csv">#</a>
-		<code><a href="http://github.com/source-class-Format.html#263-307" title="Go to source code">to_csv</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#299-375" title="Go to source code">to_csv</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>string <var>$delimiter</var> = <span class="php-quote">','</span></span>, <span>string <var>$enclosure</var> = <span class="php-quote">'&quot;'</span></span> )</code>
 
 		<div class="description short">
-			<p>Format data as CSV</p>
+			
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Format data as CSV</p>
+			
 
 
 				<h4>Parameters</h4>
@@ -356,14 +356,24 @@ <h4>Parameters</h4>
 					<dt><var>$data</var></dt>
 					<dd><p>Optional data to pass, so as to override the data passed
 to the constructor</p></dd>
+					<dt><var>$delimiter</var></dt>
+					<dd><p>The optional delimiter parameter sets the field
+delimiter (one character only). NULL will use the default value (,)</p></dd>
+					<dt><var>$enclosure</var></dt>
+					<dd><p>The optional enclosure parameter sets the field
+enclosure (one character only). NULL will use the default value (")</p></dd>
 				</dl></div>
 
 				<h4>Returns</h4>
 				<div class="list">
-					mixed
+					string<br>A csv string
 				</div>
 
 
+				<h4>Link</h4>
+				<div class="list">
+						<a href="http://www.metashock.de/2014/02/create-csv-file-in-memory-php/">http://www.metashock.de/2014/02/create-csv-file-in-memory-php/</a><br>
+				</div>
 
 
 		</div>
@@ -381,7 +391,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_json">#</a>
-		<code><a href="http://github.com/source-class-Format.html#309-346" title="Go to source code">to_json</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#377-413" title="Go to source code">to_json</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Encode data as json</p>
@@ -421,7 +431,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_serialized">#</a>
-		<code><a href="http://github.com/source-class-Format.html#348-366" title="Go to source code">to_serialized</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#415-432" title="Go to source code">to_serialized</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Encode data as a serialized array</p>
@@ -461,7 +471,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_php">#</a>
-		<code><a href="http://github.com/source-class-Format.html#368-386" title="Go to source code">to_php</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#434-451" title="Go to source code">to_php</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Format data using a PHP structure</p>
@@ -501,7 +511,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__from_xml">#</a>
-		<code><a href="http://github.com/source-class-Format.html#390-398" title="Go to source code">_from_xml</a>( <span> <var>$data</var></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#455-462" title="Go to source code">_from_xml</a>( <span> <var>$data</var></span> )</code>
 
 		<div class="description short">
 			
@@ -540,7 +550,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__from_csv">#</a>
-		<code><a href="http://github.com/source-class-Format.html#400-425" title="Go to source code">_from_csv</a>( <span>string <var>$data</var></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#464-488" title="Go to source code">_from_csv</a>( <span>string <var>$data</var></span>, <span>string <var>$delimiter</var> = <span class="php-quote">','</span></span>, <span>string <var>$enclosure</var> = <span class="php-quote">'&quot;'</span></span> )</code>
 
 		<div class="description short">
 			
@@ -554,6 +564,12 @@ <h4>Parameters</h4>
 				<div class="list"><dl>
 					<dt><var>$data</var></dt>
 					<dd>CSV string</dd>
+					<dt><var>$delimiter</var></dt>
+					<dd><p>The optional delimiter parameter sets the field
+delimiter (one character only). NULL will use the default value (,)</p></dd>
+					<dt><var>$enclosure</var></dt>
+					<dd><p>The optional enclosure parameter sets the field
+enclosure (one character only). NULL will use the default value (")</p></dd>
 				</dl></div>
 
 				<h4>Returns</h4>
@@ -580,7 +596,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__from_json">#</a>
-		<code><a href="http://github.com/source-class-Format.html#427-435" title="Go to source code">_from_json</a>( <span> <var>$data</var></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#490-497" title="Go to source code">_from_json</a>( <span> <var>$data</var></span> )</code>
 
 		<div class="description short">
 			
@@ -619,7 +635,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__from_serialize">#</a>
-		<code><a href="http://github.com/source-class-Format.html#437-445" title="Go to source code">_from_serialize</a>( <span>string <var>$data</var></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#499-506" title="Go to source code">_from_serialize</a>( <span>string <var>$data</var></span> )</code>
 
 		<div class="description short">
 			
@@ -658,7 +674,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__from_php">#</a>
-		<code><a href="http://github.com/source-class-Format.html#447-455" title="Go to source code">_from_php</a>( <span> <var>$data</var></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#508-515" title="Go to source code">_from_php</a>( <span> <var>$data</var></span> )</code>
 
 		<div class="description short">
 			
@@ -694,6 +710,201 @@ <h4>Returns</h4>
 
 
 
+	<table class="summary constants" id="constants">
+	<caption>Constants summary</caption>
+	<tr data-order="ARRAY_FORMAT" id="ARRAY_FORMAT">
+
+		<td class="attributes"><code>string</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-Format.html#14-17" title="Go to source code"><b>ARRAY_FORMAT</b></a>
+			</code>
+
+			<div class="description short">
+				<p>Array output format</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>Array output format</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#ARRAY_FORMAT" class="anchor">#</a>
+				<code><span class="php-quote">'array'</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="CSV_FORMAT" id="CSV_FORMAT">
+
+		<td class="attributes"><code>string</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-Format.html#19-22" title="Go to source code"><b>CSV_FORMAT</b></a>
+			</code>
+
+			<div class="description short">
+				<p>Comma Separated Value (CSV) output format</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>Comma Separated Value (CSV) output format</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#CSV_FORMAT" class="anchor">#</a>
+				<code><span class="php-quote">'csv'</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="JSON_FORMAT" id="JSON_FORMAT">
+
+		<td class="attributes"><code>string</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-Format.html#24-27" title="Go to source code"><b>JSON_FORMAT</b></a>
+			</code>
+
+			<div class="description short">
+				<p>Json output format</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>Json output format</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#JSON_FORMAT" class="anchor">#</a>
+				<code><span class="php-quote">'json'</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTML_FORMAT" id="HTML_FORMAT">
+
+		<td class="attributes"><code>string</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-Format.html#29-32" title="Go to source code"><b>HTML_FORMAT</b></a>
+			</code>
+
+			<div class="description short">
+				<p>HTML output format</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>HTML output format</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTML_FORMAT" class="anchor">#</a>
+				<code><span class="php-quote">'html'</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="PHP_FORMAT" id="PHP_FORMAT">
+
+		<td class="attributes"><code>string</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-Format.html#34-37" title="Go to source code"><b>PHP_FORMAT</b></a>
+			</code>
+
+			<div class="description short">
+				<p>PHP output format</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>PHP output format</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#PHP_FORMAT" class="anchor">#</a>
+				<code><span class="php-quote">'php'</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="SERIALIZED_FORMAT" id="SERIALIZED_FORMAT">
+
+		<td class="attributes"><code>string</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-Format.html#39-42" title="Go to source code"><b>SERIALIZED_FORMAT</b></a>
+			</code>
+
+			<div class="description short">
+				<p>Serialized output format</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>Serialized output format</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#SERIALIZED_FORMAT" class="anchor">#</a>
+				<code><span class="php-quote">'serialized'</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="XML_FORMAT" id="XML_FORMAT">
+
+		<td class="attributes"><code>string</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-Format.html#44-47" title="Go to source code"><b>XML_FORMAT</b></a>
+			</code>
+
+			<div class="description short">
+				<p>XML output format</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>XML output format</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#XML_FORMAT" class="anchor">#</a>
+				<code><span class="php-quote">'xml'</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="DEFAULT_FORMAT" id="DEFAULT_FORMAT">
+
+		<td class="attributes"><code>string</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-Format.html#49-52" title="Go to source code"><b>DEFAULT_FORMAT</b></a>
+			</code>
+
+			<div class="description short">
+				<p>Default format of this class</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>Default format of this class</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#DEFAULT_FORMAT" class="anchor">#</a>
+				<code><code><a href="http://github.com/class-Format.html#JSON_FORMAT">Format::<b>JSON_FORMAT</b></a></code></code>
+			</div>
+		</td>
+	</tr>
+	</table>
 
 
 
@@ -707,7 +918,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-Format.html#21-26" title="Go to source code"><var>$_data</var></a>
+				<a href="http://github.com/source-class-Format.html#61-66" title="Go to source code"><var>$_data</var></a>
 
 			<div class="description short">
 				<p>Data to parse</p>
@@ -732,7 +943,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-Format.html#28-33" title="Go to source code"><var>$_from_type</var></a>
+				<a href="http://github.com/source-class-Format.html#68-73" title="Go to source code"><var>$_from_type</var></a>
 
 			<div class="description short">
 				<p>Type to convert from</p>
diff --git a/documentation/class-Key.html b/documentation/class-Key.html
index b286a2d5..6de485a6 100644
--- a/documentation/class-Key.html
+++ b/documentation/class-Key.html
@@ -138,7 +138,7 @@ <h1>Class Key</h1>
 				Phil Sturgeon, Chris Kacerguis<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-Key.html#8-287" title="Go to source code">application/controllers/api/Key.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-Key.html#8-292" title="Go to source code">controllers/api/Key.php</a>
 		<br>
 	</div>
 
@@ -322,6 +322,7 @@ <h1>Class Key</h1>
 			<a href="http://github.com/class-REST_Controller.html#__check_php_session">_check_php_session()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__check_whitelist_auth">_check_whitelist_auth()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_api_key">_detect_api_key()</a>, 
+			<a href="http://github.com/class-REST_Controller.html#__detect_input_format">_detect_input_format()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_lang">_detect_lang()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_method">_detect_method()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_output_format">_detect_output_format()</a>, 
@@ -336,6 +337,7 @@ <h1>Class Key</h1>
 			<a href="http://github.com/class-REST_Controller.html#__parse_patch">_parse_patch()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__parse_post">_parse_post()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__parse_put">_parse_put()</a>, 
+			<a href="http://github.com/class-REST_Controller.html#__parse_query">_parse_query()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__perform_ldap_auth">_perform_ldap_auth()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__perform_library_auth">_perform_library_auth()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__prepare_basic_auth">_prepare_basic_auth()</a>, 
@@ -350,6 +352,7 @@ <h1>Class Key</h1>
 			<a href="http://github.com/class-REST_Controller.html#_patch">patch()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#_post">post()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#_put">put()</a>, 
+			<a href="http://github.com/class-REST_Controller.html#_query">query()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#_response">response()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#_validation_errors">validation_errors()</a>
 		</code></td>
@@ -363,6 +366,26 @@ <h1>Class Key</h1>
 
 
 
+	<table class="summary inherited">
+	<caption>Constants inherited from <a href="http://github.com/class-REST_Controller.html#constants">REST_Controller</a></caption>
+	<tr>
+		<td><code>
+			<a href="http://github.com/class-REST_Controller.html#BAD_REQUEST"><b>BAD_REQUEST</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#CONFLICT"><b>CONFLICT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#CREATED"><b>CREATED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#FORBIDDEN"><b>FORBIDDEN</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#INTERNAL_SERVER_ERROR"><b>INTERNAL_SERVER_ERROR</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#METHOD_NOT_ALLOWED"><b>METHOD_NOT_ALLOWED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#NOT_ACCEPTABLE"><b>NOT_ACCEPTABLE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#NOT_FOUND"><b>NOT_FOUND</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#NOT_IMPLEMENTED"><b>NOT_IMPLEMENTED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#NOT_MODIFIED"><b>NOT_MODIFIED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#NO_CONTENT"><b>NO_CONTENT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#OK"><b>OK</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#UNAUTHORIZED"><b>UNAUTHORIZED</b></a>
+		</code></td>
+	</tr>
+	</table>
 
 
 
@@ -417,11 +440,13 @@ <h1>Class Key</h1>
 			<a href="http://github.com/class-REST_Controller.html#$_patch_args"><var>$_patch_args</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_post_args"><var>$_post_args</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_put_args"><var>$_put_args</var></a>, 
+			<a href="http://github.com/class-REST_Controller.html#$_query_args"><var>$_query_args</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_start_rtime"><var>$_start_rtime</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_supported_formats"><var>$_supported_formats</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_user_ldap_dn"><var>$_user_ldap_dn</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_zlib_oc"><var>$_zlib_oc</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$allowed_http_methods"><var>$allowed_http_methods</var></a>, 
+			<a href="http://github.com/class-REST_Controller.html#$http_status_codes"><var>$http_status_codes</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$request"><var>$request</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$response"><var>$response</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$rest"><var>$rest</var></a>, 
diff --git a/documentation/class-REST_Controller.html b/documentation/class-REST_Controller.html
index a12d2c52..84a6ae64 100644
--- a/documentation/class-REST_Controller.html
+++ b/documentation/class-REST_Controller.html
@@ -137,7 +137,7 @@ <h4>Direct known subclasses</h4>
 				3.0.0<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-1872" title="Go to source code">application/libraries/REST_Controller.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-1982" title="Go to source code">libraries/REST_Controller.php</a>
 		<br>
 	</div>
 
@@ -157,7 +157,7 @@ <h4>Direct known subclasses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_early_checks">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#198-205" title="Go to source code">early_checks</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#307-315" title="Go to source code">early_checks</a>( )</code>
 
 		<div class="description short">
 			<p>Extend this function to apply additional checking early on in the process</p>
@@ -187,7 +187,7 @@ <h4>Direct known subclasses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___construct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#207-367" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#317-479" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
 
 		<div class="description short">
 			<p>Constructor for the REST API</p>
@@ -223,7 +223,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___destruct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#369-385" title="Go to source code">__destruct</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#481-498" title="Go to source code">__destruct</a>( )</code>
 
 		<div class="description short">
 			<p>Deconstructor</p>
@@ -257,7 +257,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__remap">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#387-494" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#500-605" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var></span> )</code>
 
 		<div class="description short">
 			<p>Requests are not made to methods directly, the request will be for
@@ -298,7 +298,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#496-600" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#607-710" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Takes mixed data and optionally a status code, then creates the response</p>
@@ -323,6 +323,40 @@ <h4>Parameters</h4>
 
 
 
+		</div>
+		</div></td>
+	</tr>
+	<tr data-order="_detect_input_format" id="__detect_input_format">
+
+		<td class="attributes"><code>
+			 protected 
+
+			string|null
+			
+			</code>
+		</td>
+
+		<td class="name"><div>
+		<a class="anchor" href="#__detect_input_format">#</a>
+		<code><a href="http://github.com/source-class-REST_Controller.html#712-744" title="Go to source code">_detect_input_format</a>( )</code>
+
+		<div class="description short">
+			<p>Get the input format e.g. json or xml</p>
+		</div>
+
+		<div class="description detailed hidden">
+			<p>Get the input format e.g. json or xml</p>
+
+
+
+				<h4>Returns</h4>
+				<div class="list">
+					string|null<br>Supported input format; otherwise, NULL
+				</div>
+
+
+
+
 		</div>
 		</div></td>
 	</tr>
@@ -338,7 +372,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_output_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#636-716" title="Go to source code">_detect_output_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#746-829" title="Go to source code">_detect_output_format</a>( )</code>
 
 		<div class="description short">
 			<p>Detect which format should be used to output the data</p>
@@ -372,7 +406,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_method">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#718-747" title="Go to source code">_detect_method</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#831-861" title="Go to source code">_detect_method</a>( )</code>
 
 		<div class="description short">
 			<p>Get the HTTP request string e.g. get or post</p>
@@ -406,7 +440,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_api_key">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#749-821" title="Go to source code">_detect_api_key</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#863-935" title="Go to source code">_detect_api_key</a>( )</code>
 
 		<div class="description short">
 			<p>See if the user has provided an API key</p>
@@ -440,7 +474,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_lang">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#823-854" title="Go to source code">_detect_lang</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#937-968" title="Go to source code">_detect_lang</a>( )</code>
 
 		<div class="description short">
 			<p>What language do they want it in?</p>
@@ -474,7 +508,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_request">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#856-884" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#970-996" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Add the request to the log table</p>
@@ -513,7 +547,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_limit">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#886-964" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#998-1074" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
 
 		<div class="description short">
 			<p>Check if the requests to a controller method exceed a limit</p>
@@ -552,18 +586,14 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__auth_override_check">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#966-1058" title="Go to source code">_auth_override_check</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1076-1166" title="Go to source code">_auth_override_check</a>( )</code>
 
 		<div class="description short">
-			<p>Auth override check
-Check if there is a specific auth type set for the current class/method
-being called.</p>
+			<p>Check if there is a specific auth type set for the current class/method being called</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Auth override check
-Check if there is a specific auth type set for the current class/method
-being called.</p>
+			<p>Check if there is a specific auth type set for the current class/method being called</p>
 
 
 
@@ -590,7 +620,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1060-1097" title="Go to source code">_parse_get</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1168-1178" title="Go to source code">_parse_get</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the GET request arguments</p>
@@ -620,7 +650,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1099-1113" title="Go to source code">_parse_post</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1180-1194" title="Go to source code">_parse_post</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the POST request arguments</p>
@@ -650,7 +680,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1115-1135" title="Go to source code">_parse_put</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1196-1216" title="Go to source code">_parse_put</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PUT request arguments</p>
@@ -680,7 +710,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1137-1150" title="Go to source code">_parse_head</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1218-1231" title="Go to source code">_parse_head</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the HEAD request arguments</p>
@@ -710,7 +740,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1152-1165" title="Go to source code">_parse_options</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1233-1246" title="Go to source code">_parse_options</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the OPTIONS request arguments</p>
@@ -740,7 +770,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1167-1188" title="Go to source code">_parse_patch</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1248-1269" title="Go to source code">_parse_patch</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PATCH request arguments</p>
@@ -770,7 +800,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1190-1203" title="Go to source code">_parse_delete</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1271-1284" title="Go to source code">_parse_delete</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the DELETE request arguments</p>
@@ -785,6 +815,36 @@ <h4>Returns</h4>
 
 
 
+		</div>
+		</div></td>
+	</tr>
+	<tr data-order="_parse_query" id="__parse_query">
+
+		<td class="attributes"><code>
+			 protected 
+
+			
+			
+			</code>
+		</td>
+
+		<td class="name"><div>
+		<a class="anchor" href="#__parse_query">#</a>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1286-1318" title="Go to source code">_parse_query</a>( )</code>
+
+		<div class="description short">
+			<p>Parse the query parameters</p>
+		</div>
+
+		<div class="description detailed hidden">
+			<p>Parse the query parameters</p>
+
+
+
+
+
+
+
 		</div>
 		</div></td>
 	</tr>
@@ -800,7 +860,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1207-1226" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1322-1339" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a GET request</p>
@@ -842,7 +902,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1228-1247" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1341-1358" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a OPTIONS request</p>
@@ -884,7 +944,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1249-1268" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1360-1377" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a HEAD request</p>
@@ -926,7 +986,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1270-1289" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1379-1396" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a POST request</p>
@@ -968,7 +1028,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1291-1310" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1398-1415" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PUT request</p>
@@ -1010,7 +1070,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1312-1331" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1417-1434" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a DELETE request</p>
@@ -1052,7 +1112,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1333-1352" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1436-1453" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PATCH request</p>
@@ -1079,6 +1139,48 @@ <h4>Returns</h4>
 
 
 
+		</div>
+		</div></td>
+	</tr>
+	<tr data-order="query" id="_query">
+
+		<td class="attributes"><code>
+			 public 
+
+			array|string|false
+			
+			</code>
+		</td>
+
+		<td class="name"><div>
+		<a class="anchor" href="#_query">#</a>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1455-1472" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+
+		<div class="description short">
+			<p>Retrieve a value from the query parameters</p>
+		</div>
+
+		<div class="description detailed hidden">
+			<p>Retrieve a value from the query parameters</p>
+
+
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$key</var></dt>
+					<dd><p>Key to retrieve from the query parameters
+If NULL an array of arguments is returned</p></dd>
+					<dt><var>$xss_clean</var></dt>
+					<dd>Whether to apply XSS filtering</dd>
+				</dl></div>
+
+				<h4>Returns</h4>
+				<div class="list">
+					array|string|false<br>Value from the query parameters; otherwise, FALSE
+				</div>
+
+
+
+
 		</div>
 		</div></td>
 	</tr>
@@ -1094,7 +1196,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__xss_clean">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1354-1370" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1474-1488" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
 
 		<div class="description short">
 			<p>Sanitizes data so that Cross Site Scripting Hacks can be
@@ -1137,7 +1239,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_validation_errors">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1372-1383" title="Go to source code">validation_errors</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1490-1501" title="Go to source code">validation_errors</a>( )</code>
 
 		<div class="description short">
 			<p>Retrieve the validation errors</p>
@@ -1171,7 +1273,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_ldap_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1387-1494" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1505-1610" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform LDAP Authentication</p>
@@ -1212,7 +1314,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_library_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1496-1538" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1612-1652" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform Library Authentication - Override this function to change the way the library is called</p>
@@ -1253,7 +1355,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1540-1597" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1654-1709" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Check if the user is logged in</p>
@@ -1294,7 +1396,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_php_session">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1599-1619" title="Go to source code">_check_php_session</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1711-1731" title="Go to source code">_check_php_session</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the user is logged in with a PHP session key</p>
@@ -1324,7 +1426,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_basic_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1621-1659" title="Go to source code">_prepare_basic_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1733-1772" title="Go to source code">_prepare_basic_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for basic authentication</p>
@@ -1354,7 +1456,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_digest_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1661-1720" title="Go to source code">_prepare_digest_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1774-1833" title="Go to source code">_prepare_digest_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for digest authentication</p>
@@ -1384,7 +1486,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_blacklist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1722-1743" title="Go to source code">_check_blacklist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1835-1856" title="Go to source code">_check_blacklist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response</p>
@@ -1414,7 +1516,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_whitelist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1745-1765" title="Go to source code">_check_whitelist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1858-1879" title="Go to source code">_check_whitelist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response</p>
@@ -1444,7 +1546,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__force_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1767-1799" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1881-1912" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
 
 		<div class="description short">
 			<p>Force logging in by setting the WWW-Authenticate header</p>
@@ -1480,7 +1582,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_access_time">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1801-1818" title="Go to source code">_log_access_time</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1914-1930" title="Go to source code">_log_access_time</a>( )</code>
 
 		<div class="description short">
 			<p>Updates the log table with the total access time</p>
@@ -1518,7 +1620,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_response_code">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1820-1838" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1932-1948" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
 
 		<div class="description short">
 			<p>Updates the log table with HTTP response code</p>
@@ -1561,7 +1663,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_access">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1840-1870" title="Go to source code">_check_access</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1950-1980" title="Go to source code">_check_access</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the API key has access to the controller and methods</p>
@@ -1592,6 +1694,329 @@ <h4>Returns</h4>
 
 
 
+	<table class="summary constants" id="constants">
+	<caption>Constants summary</caption>
+	<tr data-order="OK" id="OK">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#207-210" title="Go to source code"><b>OK</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The request has succeeded</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The request has succeeded</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#OK" class="anchor">#</a>
+				<code><span class="php-num">200</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="CREATED" id="CREATED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#212-215" title="Go to source code"><b>CREATED</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The server successfully created a new resource</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The server successfully created a new resource</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#CREATED" class="anchor">#</a>
+				<code><span class="php-num">201</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="NO_CONTENT" id="NO_CONTENT">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#217-220" title="Go to source code"><b>NO_CONTENT</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The server successfully processed the request, though no content is returned</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The server successfully processed the request, though no content is returned</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#NO_CONTENT" class="anchor">#</a>
+				<code><span class="php-num">204</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="NOT_MODIFIED" id="NOT_MODIFIED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#224-227" title="Go to source code"><b>NOT_MODIFIED</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The resource has not been modified since the last request</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The resource has not been modified since the last request</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#NOT_MODIFIED" class="anchor">#</a>
+				<code><span class="php-num">304</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="BAD_REQUEST" id="BAD_REQUEST">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#231-234" title="Go to source code"><b>BAD_REQUEST</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The request cannot be fulfilled due to multiple errors</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The request cannot be fulfilled due to multiple errors</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#BAD_REQUEST" class="anchor">#</a>
+				<code><span class="php-num">400</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="UNAUTHORIZED" id="UNAUTHORIZED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#236-239" title="Go to source code"><b>UNAUTHORIZED</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The user is unauthorized to access the requested resource</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The user is unauthorized to access the requested resource</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#UNAUTHORIZED" class="anchor">#</a>
+				<code><span class="php-num">401</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="FORBIDDEN" id="FORBIDDEN">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#241-244" title="Go to source code"><b>FORBIDDEN</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The requested resource is unavailable at this present time</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The requested resource is unavailable at this present time</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#FORBIDDEN" class="anchor">#</a>
+				<code><span class="php-num">403</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="NOT_FOUND" id="NOT_FOUND">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#246-252" title="Go to source code"><b>NOT_FOUND</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The requested resource could not be found</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The requested resource could not be found</p>
+
+<p>Note: This is sometimes used to mask if there was an UNAUTHORIZED (401) or
+FORBIDDEN (403) error, for security reasons</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#NOT_FOUND" class="anchor">#</a>
+				<code><span class="php-num">404</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="METHOD_NOT_ALLOWED" id="METHOD_NOT_ALLOWED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#254-257" title="Go to source code"><b>METHOD_NOT_ALLOWED</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The request method is not supported by the following resource</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The request method is not supported by the following resource</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#METHOD_NOT_ALLOWED" class="anchor">#</a>
+				<code><span class="php-num">405</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="NOT_ACCEPTABLE" id="NOT_ACCEPTABLE">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#259-262" title="Go to source code"><b>NOT_ACCEPTABLE</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The request was not acceptable</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The request was not acceptable</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#NOT_ACCEPTABLE" class="anchor">#</a>
+				<code><span class="php-num">406</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="CONFLICT" id="CONFLICT">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#264-268" title="Go to source code"><b>CONFLICT</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The request could not be completed due to a conflict with the current state
+of the resource</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The request could not be completed due to a conflict with the current state
+of the resource</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#CONFLICT" class="anchor">#</a>
+				<code><span class="php-num">409</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="INTERNAL_SERVER_ERROR" id="INTERNAL_SERVER_ERROR">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#272-278" title="Go to source code"><b>INTERNAL_SERVER_ERROR</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The server encountered an unexpected error</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The server encountered an unexpected error</p>
+
+<p>Note: This is a generic error message when no specific message
+is suitable</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#INTERNAL_SERVER_ERROR" class="anchor">#</a>
+				<code><span class="php-num">500</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="NOT_IMPLEMENTED" id="NOT_IMPLEMENTED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#280-283" title="Go to source code"><b>NOT_IMPLEMENTED</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The server does not recognised the request method</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The server does not recognised the request method</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#NOT_IMPLEMENTED" class="anchor">#</a>
+				<code><span class="php-num">501</span></code>
+			</div>
+		</td>
+	</tr>
+	</table>
 
 
 
@@ -1962,6 +2387,31 @@ <h4>Returns</h4>
 			</div>
 		</td>
 	</tr>
+	<tr data-order="_query_args" id="$_query_args">
+		<td class="attributes"><code>
+			protected  
+			array
+		</code></td>
+
+		<td class="name">
+				<a href="http://github.com/source-class-REST_Controller.html#123-128" title="Go to source code"><var>$_query_args</var></a>
+
+			<div class="description short">
+				<p>The arguments for the query parameters</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The arguments for the query parameters</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#$_query_args" class="anchor">#</a>
+				<code>[]</code>
+			</div>
+		</td>
+	</tr>
 	<tr data-order="_args" id="$_args">
 		<td class="attributes"><code>
 			protected  
@@ -1969,14 +2419,14 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#123-128" title="Go to source code"><var>$_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#130-135" title="Go to source code"><var>$_args</var></a>
 
 			<div class="description short">
-				<p>The arguments from GET, POST, PUT, DELETE request methods combined.</p>
+				<p>The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined</p>
 			</div>
 
 			<div class="description detailed hidden">
-				<p>The arguments from GET, POST, PUT, DELETE request methods combined.</p>
+				<p>The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined</p>
 
 			</div>
 		</td>
@@ -1994,7 +2444,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#130-135" title="Go to source code"><var>$_allow</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#137-142" title="Go to source code"><var>$_allow</var></a>
 
 			<div class="description short">
 				<p>If the request is allowed based on the API key provided.</p>
@@ -2019,7 +2469,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#137-142" title="Go to source code"><var>$_zlib_oc</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#144-149" title="Go to source code"><var>$_zlib_oc</var></a>
 
 			<div class="description short">
 				<p>Determines if output compression is enabled</p>
@@ -2044,7 +2494,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#144-149" title="Go to source code"><var>$_user_ldap_dn</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#151-156" title="Go to source code"><var>$_user_ldap_dn</var></a>
 
 			<div class="description short">
 				<p>The LDAP Distinguished Name of the User post authentication</p>
@@ -2069,7 +2519,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#151-156" title="Go to source code"><var>$_start_rtime</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#158-163" title="Go to source code"><var>$_start_rtime</var></a>
 
 			<div class="description short">
 				<p>The start of the response time from the server</p>
@@ -2094,7 +2544,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#158-163" title="Go to source code"><var>$_end_rtime</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#165-170" title="Go to source code"><var>$_end_rtime</var></a>
 
 			<div class="description short">
 				<p>The end of the response time from the server</p>
@@ -2119,7 +2569,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#165-179" title="Go to source code"><var>$_supported_formats</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#172-186" title="Go to source code"><var>$_supported_formats</var></a>
 
 			<div class="description short">
 				<p>List all supported methods, the first will be the default format</p>
@@ -2153,7 +2603,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#181-186" title="Go to source code"><var>$_apiuser</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#188-193" title="Go to source code"><var>$_apiuser</var></a>
 
 			<div class="description short">
 				<p>Information about the current API user</p>
@@ -2178,7 +2628,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#188-196" title="Go to source code"><var>$_enable_xss</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#195-203" title="Go to source code"><var>$_enable_xss</var></a>
 
 			<div class="description short">
 				<p>Enable XSS flag
@@ -2202,6 +2652,49 @@ <h4>Returns</h4>
 			</div>
 		</td>
 	</tr>
+	<tr data-order="http_status_codes" id="$http_status_codes">
+		<td class="attributes"><code>
+			protected  
+			array
+		</code></td>
+
+		<td class="name">
+				<a href="http://github.com/source-class-REST_Controller.html#285-305" title="Go to source code"><var>$http_status_codes</var></a>
+
+			<div class="description short">
+				<p>HTTP status codes and their respective description</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>HTTP status codes and their respective description</p>
+
+					<h4>Link</h4>
+					<div class="list">
+							<a href="http://www.restapitutorial.com/httpstatuscodes.html">http://www.restapitutorial.com/httpstatuscodes.html</a><br>
+					</div>
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#$http_status_codes" class="anchor">#</a>
+				<code>[
+    self::OK =&gt; <span class="php-quote">'OK'</span>,
+    self::CREATED =&gt; <span class="php-quote">'CREATED'</span>,
+    self::NO_CONTENT =&gt; <span class="php-quote">'NO CONTENT'</span>,
+    self::NOT_MODIFIED =&gt; <span class="php-quote">'NOT MODIFIED'</span>,
+    self::BAD_REQUEST =&gt; <span class="php-quote">'BAD REQUEST'</span>,
+    self::UNAUTHORIZED =&gt; <span class="php-quote">'UNAUTHORIZED'</span>,
+    self::FORBIDDEN =&gt; <span class="php-quote">'FORBIDDEN'</span>,
+    self::NOT_FOUND =&gt; <span class="php-quote">'NOT FOUND'</span>,
+    self::METHOD_NOT_ALLOWED =&gt; <span class="php-quote">'METHOD NOT ALLOWED'</span>,
+    self::NOT_ACCEPTABLE =&gt; <span class="php-quote">'NOT ACCEPTABLE'</span>,
+    self::CONFLICT =&gt; <span class="php-quote">'CONFLICT'</span>,
+    self::INTERNAL_SERVER_ERROR =&gt; <span class="php-quote">'INTERNAL SERVER ERROR'</span>,
+    self::NOT_IMPLEMENTED =&gt; <span class="php-quote">'NOT IMPLEMENTED'</span>
+]</code>
+			</div>
+		</td>
+	</tr>
 	</table>
 
 
diff --git a/documentation/index.html b/documentation/index.html
index 434da845..5eb8bc0a 100644
--- a/documentation/index.html
+++ b/documentation/index.html
@@ -48,7 +48,10 @@ <h3>Packages</h3>
 		<div id="elements">
 			<h3>Classes</h3>
 			<ul>
-				<li class="active"><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
+				<li><a href="http://github.com/class-Example.html">Example</a></li>
+				<li><a href="http://github.com/class-Format.html">Format</a></li>
+				<li><a href="http://github.com/class-Key.html">Key</a></li>
+				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
 			</ul>
 
 
@@ -76,8 +79,7 @@ <h3>Classes</h3>
 			<li>
 <span>Package</span>			</li>
 			<li>
-				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
-			</li>
+<span>Class</span>			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -121,7 +123,7 @@ <h1>Overview</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
+<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/package-CodeIgniter.Libraries.html b/documentation/package-CodeIgniter.Libraries.html
index 8d7ec985..5f599f4f 100644
--- a/documentation/package-CodeIgniter.Libraries.html
+++ b/documentation/package-CodeIgniter.Libraries.html
@@ -49,7 +49,7 @@ <h3>Packages</h3>
 		<div id="elements">
 			<h3>Classes</h3>
 			<ul>
-				<li class="active"><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
+				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
 			</ul>
 
 
@@ -78,8 +78,7 @@ <h3>Classes</h3>
 			<li class="active">
 <span>Package</span>			</li>
 			<li>
-				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
-			</li>
+<span>Class</span>			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -112,7 +111,7 @@ <h1>Package <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\Libraries</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
+<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/package-CodeIgniter.Rest.html b/documentation/package-CodeIgniter.Rest.html
index 29afc146..c231398c 100644
--- a/documentation/package-CodeIgniter.Rest.html
+++ b/documentation/package-CodeIgniter.Rest.html
@@ -79,8 +79,7 @@ <h3>Classes</h3>
 			<li class="active">
 <span>Package</span>			</li>
 			<li>
-				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
-			</li>
+<span>Class</span>			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -118,7 +117,7 @@ <h1>Package <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\Rest</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
+<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/package-CodeIgniter.html b/documentation/package-CodeIgniter.html
index 1cb20267..173c8f58 100644
--- a/documentation/package-CodeIgniter.html
+++ b/documentation/package-CodeIgniter.html
@@ -73,8 +73,7 @@ <h3>Packages</h3>
 			<li class="active">
 <span>Package</span>			</li>
 			<li>
-				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
-			</li>
+<span>Class</span>			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -108,7 +107,7 @@ <h1>Package CodeIgniter</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
+<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/package-None.html b/documentation/package-None.html
index 4f19a520..3ebfafea 100644
--- a/documentation/package-None.html
+++ b/documentation/package-None.html
@@ -78,8 +78,7 @@ <h3>Classes</h3>
 			<li class="active">
 <span>Package</span>			</li>
 			<li>
-				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
-			</li>
+<span>Class</span>			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -112,7 +111,7 @@ <h1>No package</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
+<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Example.html b/documentation/source-class-Example.html
index cdeda9a8..5523d790 100644
--- a/documentation/source-class-Example.html
+++ b/documentation/source-class-Example.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<meta name="robots" content="noindex">
 
-	<title>File application/controllers/api/Example.php</title>
+	<title>File controllers/api/Example.php</title>
 
 	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
 
@@ -36,7 +36,7 @@ <h3>Packages</h3>
 
 						</li>
 							</ul></li>
-				<li class="active">
+				<li>
 					<a href="http://github.com/package-None.html">
 						None					</a>
 
@@ -50,7 +50,10 @@ <h3>Packages</h3>
 		<div id="elements">
 			<h3>Classes</h3>
 			<ul>
+				<li><a href="http://github.com/class-Example.html">Example</a></li>
 				<li><a href="http://github.com/class-Format.html">Format</a></li>
+				<li><a href="http://github.com/class-Key.html">Key</a></li>
+				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
 			</ul>
 
 
@@ -77,11 +80,9 @@ <h3>Classes</h3>
 				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
 			</li>
 			<li>
-				<a href="http://github.com/package-None.html" title="Summary of None"><span>Package</span></a>
-			</li>
+<span>Package</span>			</li>
 			<li>
-				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
-			</li>
+<span>Class</span>			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -126,7 +127,7 @@ <h3>Classes</h3>
 </span><span id="35" class="l"><a href="#35"> 35: </a>    {
 </span><span id="36" class="l"><a href="#36"> 36: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>))
 </span><span id="37" class="l"><a href="#37"> 37: </a>        {
-</span><span id="38" class="l"><a href="#38"> 38: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">NULL</span>, <span class="php-num">400</span>);
+</span><span id="38" class="l"><a href="#38"> 38: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">NULL</span>, REST_Controller::BAD_REQUEST);
 </span><span id="39" class="l"><a href="#39"> 39: </a>        }
 </span><span id="40" class="l"><a href="#40"> 40: </a>
 </span><span id="41" class="l"><a href="#41"> 41: </a>        <span class="php-comment">// $user = $this-&gt;some_model-&gt;getSomething( $this-&gt;get('id') );</span>
@@ -140,12 +141,12 @@ <h3>Classes</h3>
 </span><span id="49" class="l"><a href="#49"> 49: </a>
 </span><span id="50" class="l"><a href="#50"> 50: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$user</span>)
 </span><span id="51" class="l"><a href="#51"> 51: </a>        {
-</span><span id="52" class="l"><a href="#52"> 52: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-var">$user</span>, <span class="php-num">200</span>); <span class="php-comment">// 200 being the HTTP response code</span>
+</span><span id="52" class="l"><a href="#52"> 52: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-var">$user</span>, REST_Controller::OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
 </span><span id="53" class="l"><a href="#53"> 53: </a>        }
 </span><span id="54" class="l"><a href="#54"> 54: </a>
 </span><span id="55" class="l"><a href="#55"> 55: </a>        <span class="php-keyword1">else</span>
 </span><span id="56" class="l"><a href="#56"> 56: </a>        {
-</span><span id="57" class="l"><a href="#57"> 57: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-quote">'error'</span> =&gt; <span class="php-quote">'User could not be found'</span>], <span class="php-num">404</span>);
+</span><span id="57" class="l"><a href="#57"> 57: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-quote">'error'</span> =&gt; <span class="php-quote">'User could not be found'</span>], REST_Controller::NOT_FOUND);
 </span><span id="58" class="l"><a href="#58"> 58: </a>        }
 </span><span id="59" class="l"><a href="#59"> 59: </a>    }
 </span><span id="60" class="l"><a href="#60"> 60: </a>
@@ -159,7 +160,7 @@ <h3>Classes</h3>
 </span><span id="68" class="l"><a href="#68"> 68: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Added a resource'</span>
 </span><span id="69" class="l"><a href="#69"> 69: </a>        ];
 </span><span id="70" class="l"><a href="#70"> 70: </a>
-</span><span id="71" class="l"><a href="#71"> 71: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$message</span>, <span class="php-num">201</span>); <span class="php-comment">// 201 being the HTTP response code</span>
+</span><span id="71" class="l"><a href="#71"> 71: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$message</span>, REST_Controller::CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
 </span><span id="72" class="l"><a href="#72"> 72: </a>    }
 </span><span id="73" class="l"><a href="#73"> 73: </a>
 </span><span id="74" class="l"><a href="#74"> 74: </a>    <span class="php-keyword1">function</span> user_delete()
@@ -170,7 +171,7 @@ <h3>Classes</h3>
 </span><span id="79" class="l"><a href="#79"> 79: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Deleted the resource'</span>
 </span><span id="80" class="l"><a href="#80"> 80: </a>        ];
 </span><span id="81" class="l"><a href="#81"> 81: </a>
-</span><span id="82" class="l"><a href="#82"> 82: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$message</span>, <span class="php-num">204</span>); <span class="php-comment">// 204 being the HTTP response code</span>
+</span><span id="82" class="l"><a href="#82"> 82: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$message</span>, REST_Controller::NO_CONTENT); <span class="php-comment">// NO_CONTENT (204) being the HTTP response code</span>
 </span><span id="83" class="l"><a href="#83"> 83: </a>    }
 </span><span id="84" class="l"><a href="#84"> 84: </a>
 </span><span id="85" class="l"><a href="#85"> 85: </a>    <span class="php-keyword1">function</span> users_get()
@@ -184,12 +185,12 @@ <h3>Classes</h3>
 </span><span id="93" class="l"><a href="#93"> 93: </a>
 </span><span id="94" class="l"><a href="#94"> 94: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$users</span>)
 </span><span id="95" class="l"><a href="#95"> 95: </a>        {
-</span><span id="96" class="l"><a href="#96"> 96: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-var">$users</span>, <span class="php-num">200</span>); <span class="php-comment">// 200 being the HTTP response code</span>
+</span><span id="96" class="l"><a href="#96"> 96: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-var">$users</span>, REST_Controller::OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
 </span><span id="97" class="l"><a href="#97"> 97: </a>        }
 </span><span id="98" class="l"><a href="#98"> 98: </a>
 </span><span id="99" class="l"><a href="#99"> 99: </a>        <span class="php-keyword1">else</span>
 </span><span id="100" class="l"><a href="#100">100: </a>        {
-</span><span id="101" class="l"><a href="#101">101: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Couldn\'t find any users!'</span>], <span class="php-num">404</span>);
+</span><span id="101" class="l"><a href="#101">101: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Couldn\'t find any users!'</span>], REST_Controller::NOT_FOUND);
 </span><span id="102" class="l"><a href="#102">102: </a>        }
 </span><span id="103" class="l"><a href="#103">103: </a>    }
 </span><span id="104" class="l"><a href="#104">104: </a>
@@ -210,7 +211,7 @@ <h3>Classes</h3>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
+<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Format.html b/documentation/source-class-Format.html
index e769e16d..e57443cf 100644
--- a/documentation/source-class-Format.html
+++ b/documentation/source-class-Format.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<meta name="robots" content="noindex">
 
-	<title>File application/libraries/Format.php</title>
+	<title>File libraries/Format.php</title>
 
 	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
 
@@ -36,7 +36,7 @@ <h3>Packages</h3>
 
 						</li>
 							</ul></li>
-				<li class="active">
+				<li>
 					<a href="http://github.com/package-None.html">
 						None					</a>
 
@@ -50,7 +50,10 @@ <h3>Packages</h3>
 		<div id="elements">
 			<h3>Classes</h3>
 			<ul>
+				<li><a href="http://github.com/class-Example.html">Example</a></li>
 				<li><a href="http://github.com/class-Format.html">Format</a></li>
+				<li><a href="http://github.com/class-Key.html">Key</a></li>
+				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
 			</ul>
 
 
@@ -77,11 +80,9 @@ <h3>Classes</h3>
 				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
 			</li>
 			<li>
-				<a href="http://github.com/package-None.html" title="Summary of None"><span>Package</span></a>
-			</li>
+<span>Package</span>			</li>
 			<li>
-				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
-			</li>
+<span>Class</span>			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -103,457 +104,517 @@ <h3>Classes</h3>
 </span><span id="12" class="l"><a href="#12"> 12: </a><span class="php-keyword1">class</span> Format {
 </span><span id="13" class="l"><a href="#13"> 13: </a>
 </span><span id="14" class="l"><a href="#14"> 14: </a>    <span class="php-comment">/**
-</span></span><span id="15" class="l"><a href="#15"> 15: </a><span class="php-comment">     * CodeIgniter instance
-</span></span><span id="16" class="l"><a href="#16"> 16: </a><span class="php-comment">     *
-</span></span><span id="17" class="l"><a href="#17"> 17: </a><span class="php-comment">     * @var object
-</span></span><span id="18" class="l"><a href="#18"> 18: </a><span class="php-comment">     */</span>
-</span><span id="19" class="l"><a href="#19"> 19: </a>    <span class="php-keyword1">private</span> <span class="php-var">$_ci</span>;
-</span><span id="20" class="l"><a href="#20"> 20: </a>
-</span><span id="21" class="l"><a href="#21"> 21: </a>    <span class="php-comment">/**
-</span></span><span id="22" class="l"><a href="#22"> 22: </a><span class="php-comment">     * Data to parse
-</span></span><span id="23" class="l"><a href="#23"> 23: </a><span class="php-comment">     *
-</span></span><span id="24" class="l"><a href="#24"> 24: </a><span class="php-comment">     * @var mixed
-</span></span><span id="25" class="l"><a href="#25"> 25: </a><span class="php-comment">     */</span>
-</span><span id="26" class="l"><a href="#26"> 26: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_data</span> = [];
-</span><span id="27" class="l"><a href="#27"> 27: </a>
-</span><span id="28" class="l"><a href="#28"> 28: </a>    <span class="php-comment">/**
-</span></span><span id="29" class="l"><a href="#29"> 29: </a><span class="php-comment">     * Type to convert from
-</span></span><span id="30" class="l"><a href="#30"> 30: </a><span class="php-comment">     *
-</span></span><span id="31" class="l"><a href="#31"> 31: </a><span class="php-comment">     * @var string
-</span></span><span id="32" class="l"><a href="#32"> 32: </a><span class="php-comment">     */</span>
-</span><span id="33" class="l"><a href="#33"> 33: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_from_type</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="34" class="l"><a href="#34"> 34: </a>
-</span><span id="35" class="l"><a href="#35"> 35: </a>    <span class="php-comment">/**
-</span></span><span id="36" class="l"><a href="#36"> 36: </a><span class="php-comment">     * DO NOT CALL THIS DIRECTLY, USE factory()
-</span></span><span id="37" class="l"><a href="#37"> 37: </a><span class="php-comment">     *
-</span></span><span id="38" class="l"><a href="#38"> 38: </a><span class="php-comment">     * @param NULL $data
-</span></span><span id="39" class="l"><a href="#39"> 39: </a><span class="php-comment">     * @param NULL $from_type
-</span></span><span id="40" class="l"><a href="#40"> 40: </a><span class="php-comment">     *
-</span></span><span id="41" class="l"><a href="#41"> 41: </a><span class="php-comment">     * @throws Exception
-</span></span><span id="42" class="l"><a href="#42"> 42: </a><span class="php-comment">     */</span>
+</span></span><span id="15" class="l"><a href="#15"> 15: </a><span class="php-comment">     * Array output format
+</span></span><span id="16" class="l"><a href="#16"> 16: </a><span class="php-comment">     */</span>
+</span><span id="17" class="l"><a href="#17"> 17: </a>    <span class="php-keyword1">const</span> ARRAY_FORMAT = <span class="php-quote">'array'</span>;
+</span><span id="18" class="l"><a href="#18"> 18: </a>
+</span><span id="19" class="l"><a href="#19"> 19: </a>    <span class="php-comment">/**
+</span></span><span id="20" class="l"><a href="#20"> 20: </a><span class="php-comment">     * Comma Separated Value (CSV) output format
+</span></span><span id="21" class="l"><a href="#21"> 21: </a><span class="php-comment">     */</span>
+</span><span id="22" class="l"><a href="#22"> 22: </a>    <span class="php-keyword1">const</span> CSV_FORMAT = <span class="php-quote">'csv'</span>;
+</span><span id="23" class="l"><a href="#23"> 23: </a>
+</span><span id="24" class="l"><a href="#24"> 24: </a>    <span class="php-comment">/**
+</span></span><span id="25" class="l"><a href="#25"> 25: </a><span class="php-comment">     * Json output format
+</span></span><span id="26" class="l"><a href="#26"> 26: </a><span class="php-comment">     */</span>
+</span><span id="27" class="l"><a href="#27"> 27: </a>    <span class="php-keyword1">const</span> JSON_FORMAT = <span class="php-quote">'json'</span>;
+</span><span id="28" class="l"><a href="#28"> 28: </a>
+</span><span id="29" class="l"><a href="#29"> 29: </a>    <span class="php-comment">/**
+</span></span><span id="30" class="l"><a href="#30"> 30: </a><span class="php-comment">     * HTML output format
+</span></span><span id="31" class="l"><a href="#31"> 31: </a><span class="php-comment">     */</span>
+</span><span id="32" class="l"><a href="#32"> 32: </a>    <span class="php-keyword1">const</span> HTML_FORMAT = <span class="php-quote">'html'</span>;
+</span><span id="33" class="l"><a href="#33"> 33: </a>
+</span><span id="34" class="l"><a href="#34"> 34: </a>    <span class="php-comment">/**
+</span></span><span id="35" class="l"><a href="#35"> 35: </a><span class="php-comment">     * PHP output format
+</span></span><span id="36" class="l"><a href="#36"> 36: </a><span class="php-comment">     */</span>
+</span><span id="37" class="l"><a href="#37"> 37: </a>    <span class="php-keyword1">const</span> PHP_FORMAT = <span class="php-quote">'php'</span>;
+</span><span id="38" class="l"><a href="#38"> 38: </a>
+</span><span id="39" class="l"><a href="#39"> 39: </a>    <span class="php-comment">/**
+</span></span><span id="40" class="l"><a href="#40"> 40: </a><span class="php-comment">     * Serialized output format
+</span></span><span id="41" class="l"><a href="#41"> 41: </a><span class="php-comment">     */</span>
+</span><span id="42" class="l"><a href="#42"> 42: </a>    <span class="php-keyword1">const</span> SERIALIZED_FORMAT = <span class="php-quote">'serialized'</span>;
 </span><span id="43" class="l"><a href="#43"> 43: </a>
-</span><span id="44" class="l"><a href="#44"> 44: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$from_type</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="45" class="l"><a href="#45"> 45: </a>    {
-</span><span id="46" class="l"><a href="#46"> 46: </a>        <span class="php-comment">// Get the CodeIgniter reference</span>
-</span><span id="47" class="l"><a href="#47"> 47: </a>        <span class="php-var">$this</span>-&gt;_ci = &amp;get_instance();
+</span><span id="44" class="l"><a href="#44"> 44: </a>    <span class="php-comment">/**
+</span></span><span id="45" class="l"><a href="#45"> 45: </a><span class="php-comment">     * XML output format
+</span></span><span id="46" class="l"><a href="#46"> 46: </a><span class="php-comment">     */</span>
+</span><span id="47" class="l"><a href="#47"> 47: </a>    <span class="php-keyword1">const</span> XML_FORMAT = <span class="php-quote">'xml'</span>;
 </span><span id="48" class="l"><a href="#48"> 48: </a>
-</span><span id="49" class="l"><a href="#49"> 49: </a>        <span class="php-comment">// Load the inflector helper</span>
-</span><span id="50" class="l"><a href="#50"> 50: </a>        <span class="php-var">$this</span>-&gt;_ci-&gt;load-&gt;helper(<span class="php-quote">'inflector'</span>);
-</span><span id="51" class="l"><a href="#51"> 51: </a>
-</span><span id="52" class="l"><a href="#52"> 52: </a>        <span class="php-comment">// If the provided data is already formatted we should probably convert it to an array</span>
-</span><span id="53" class="l"><a href="#53"> 53: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$from_type</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="54" class="l"><a href="#54"> 54: </a>        {
-</span><span id="55" class="l"><a href="#55"> 55: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span> . <span class="php-var">$from_type</span>))
-</span><span id="56" class="l"><a href="#56"> 56: </a>            {
-</span><span id="57" class="l"><a href="#57"> 57: </a>                <span class="php-var">$data</span> = <span class="php-keyword2">call_user_func</span>([<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span> . <span class="php-var">$from_type</span>], <span class="php-var">$data</span>);
-</span><span id="58" class="l"><a href="#58"> 58: </a>            }
-</span><span id="59" class="l"><a href="#59"> 59: </a>            <span class="php-keyword1">else</span>
-</span><span id="60" class="l"><a href="#60"> 60: </a>            {
-</span><span id="61" class="l"><a href="#61"> 61: </a>                <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'Format class does not support conversion from &quot;'</span> . <span class="php-var">$from_type</span> . <span class="php-quote">'&quot;.'</span>);
-</span><span id="62" class="l"><a href="#62"> 62: </a>            }
-</span><span id="63" class="l"><a href="#63"> 63: </a>        }
-</span><span id="64" class="l"><a href="#64"> 64: </a>
-</span><span id="65" class="l"><a href="#65"> 65: </a>        <span class="php-comment">// Set the member variable to the data passed</span>
-</span><span id="66" class="l"><a href="#66"> 66: </a>        <span class="php-var">$this</span>-&gt;_data = <span class="php-var">$data</span>;
-</span><span id="67" class="l"><a href="#67"> 67: </a>    }
-</span><span id="68" class="l"><a href="#68"> 68: </a>
-</span><span id="69" class="l"><a href="#69"> 69: </a>    <span class="php-comment">/**
-</span></span><span id="70" class="l"><a href="#70"> 70: </a><span class="php-comment">     * Create an instance of the format class
-</span></span><span id="71" class="l"><a href="#71"> 71: </a><span class="php-comment">     * e.g: echo $this-&gt;format-&gt;factory(['foo' =&gt; 'bar'])-&gt;to_csv();
-</span></span><span id="72" class="l"><a href="#72"> 72: </a><span class="php-comment">     *
-</span></span><span id="73" class="l"><a href="#73"> 73: </a><span class="php-comment">     * @param mixed $data Data to convert/parse
-</span></span><span id="74" class="l"><a href="#74"> 74: </a><span class="php-comment">     * @param string $from_type Type to convert from e.g. json, csv, html
-</span></span><span id="75" class="l"><a href="#75"> 75: </a><span class="php-comment">     *
-</span></span><span id="76" class="l"><a href="#76"> 76: </a><span class="php-comment">     * @return object Instance of the format class
-</span></span><span id="77" class="l"><a href="#77"> 77: </a><span class="php-comment">     */</span>
-</span><span id="78" class="l"><a href="#78"> 78: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> factory(<span class="php-var">$data</span>, <span class="php-var">$from_type</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="79" class="l"><a href="#79"> 79: </a>    {
-</span><span id="80" class="l"><a href="#80"> 80: </a>        <span class="php-comment">// $class = __CLASS__;</span>
-</span><span id="81" class="l"><a href="#81"> 81: </a>        <span class="php-comment">// return new $class();</span>
+</span><span id="49" class="l"><a href="#49"> 49: </a>    <span class="php-comment">/**
+</span></span><span id="50" class="l"><a href="#50"> 50: </a><span class="php-comment">     * Default format of this class
+</span></span><span id="51" class="l"><a href="#51"> 51: </a><span class="php-comment">     */</span>
+</span><span id="52" class="l"><a href="#52"> 52: </a>    <span class="php-keyword1">const</span> DEFAULT_FORMAT = self::JSON_FORMAT; <span class="php-comment">// Couldn't be DEFAULT, as this is a keyword</span>
+</span><span id="53" class="l"><a href="#53"> 53: </a>
+</span><span id="54" class="l"><a href="#54"> 54: </a>    <span class="php-comment">/**
+</span></span><span id="55" class="l"><a href="#55"> 55: </a><span class="php-comment">     * CodeIgniter instance
+</span></span><span id="56" class="l"><a href="#56"> 56: </a><span class="php-comment">     *
+</span></span><span id="57" class="l"><a href="#57"> 57: </a><span class="php-comment">     * @var object
+</span></span><span id="58" class="l"><a href="#58"> 58: </a><span class="php-comment">     */</span>
+</span><span id="59" class="l"><a href="#59"> 59: </a>    <span class="php-keyword1">private</span> <span class="php-var">$_ci</span>;
+</span><span id="60" class="l"><a href="#60"> 60: </a>
+</span><span id="61" class="l"><a href="#61"> 61: </a>    <span class="php-comment">/**
+</span></span><span id="62" class="l"><a href="#62"> 62: </a><span class="php-comment">     * Data to parse
+</span></span><span id="63" class="l"><a href="#63"> 63: </a><span class="php-comment">     *
+</span></span><span id="64" class="l"><a href="#64"> 64: </a><span class="php-comment">     * @var mixed
+</span></span><span id="65" class="l"><a href="#65"> 65: </a><span class="php-comment">     */</span>
+</span><span id="66" class="l"><a href="#66"> 66: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_data</span> = [];
+</span><span id="67" class="l"><a href="#67"> 67: </a>
+</span><span id="68" class="l"><a href="#68"> 68: </a>    <span class="php-comment">/**
+</span></span><span id="69" class="l"><a href="#69"> 69: </a><span class="php-comment">     * Type to convert from
+</span></span><span id="70" class="l"><a href="#70"> 70: </a><span class="php-comment">     *
+</span></span><span id="71" class="l"><a href="#71"> 71: </a><span class="php-comment">     * @var string
+</span></span><span id="72" class="l"><a href="#72"> 72: </a><span class="php-comment">     */</span>
+</span><span id="73" class="l"><a href="#73"> 73: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_from_type</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="74" class="l"><a href="#74"> 74: </a>
+</span><span id="75" class="l"><a href="#75"> 75: </a>    <span class="php-comment">/**
+</span></span><span id="76" class="l"><a href="#76"> 76: </a><span class="php-comment">     * DO NOT CALL THIS DIRECTLY, USE factory()
+</span></span><span id="77" class="l"><a href="#77"> 77: </a><span class="php-comment">     *
+</span></span><span id="78" class="l"><a href="#78"> 78: </a><span class="php-comment">     * @param NULL $data
+</span></span><span id="79" class="l"><a href="#79"> 79: </a><span class="php-comment">     * @param NULL $from_type
+</span></span><span id="80" class="l"><a href="#80"> 80: </a><span class="php-comment">     * @throws Exception
+</span></span><span id="81" class="l"><a href="#81"> 81: </a><span class="php-comment">     */</span>
 </span><span id="82" class="l"><a href="#82"> 82: </a>
-</span><span id="83" class="l"><a href="#83"> 83: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">new</span> <span class="php-keyword1">static</span>(<span class="php-var">$data</span>, <span class="php-var">$from_type</span>);
-</span><span id="84" class="l"><a href="#84"> 84: </a>    }
-</span><span id="85" class="l"><a href="#85"> 85: </a>
-</span><span id="86" class="l"><a href="#86"> 86: </a>    <span class="php-comment">// FORMATTING OUTPUT ---------------------------------------------------------</span>
+</span><span id="83" class="l"><a href="#83"> 83: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$from_type</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="84" class="l"><a href="#84"> 84: </a>    {
+</span><span id="85" class="l"><a href="#85"> 85: </a>        <span class="php-comment">// Get the CodeIgniter reference</span>
+</span><span id="86" class="l"><a href="#86"> 86: </a>        <span class="php-var">$this</span>-&gt;_ci = &amp;get_instance();
 </span><span id="87" class="l"><a href="#87"> 87: </a>
-</span><span id="88" class="l"><a href="#88"> 88: </a>    <span class="php-comment">/**
-</span></span><span id="89" class="l"><a href="#89"> 89: </a><span class="php-comment">     * Format data as an array
-</span></span><span id="90" class="l"><a href="#90"> 90: </a><span class="php-comment">     *
-</span></span><span id="91" class="l"><a href="#91"> 91: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="92" class="l"><a href="#92"> 92: </a><span class="php-comment">     * to the constructor
-</span></span><span id="93" class="l"><a href="#93"> 93: </a><span class="php-comment">     *
-</span></span><span id="94" class="l"><a href="#94"> 94: </a><span class="php-comment">     * @return array Data parsed as an array; otherwise, an empty array
-</span></span><span id="95" class="l"><a href="#95"> 95: </a><span class="php-comment">     */</span>
-</span><span id="96" class="l"><a href="#96"> 96: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_array(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="97" class="l"><a href="#97"> 97: </a>    {
-</span><span id="98" class="l"><a href="#98"> 98: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="99" class="l"><a href="#99"> 99: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="100" class="l"><a href="#100">100: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="101" class="l"><a href="#101">101: </a>        {
-</span><span id="102" class="l"><a href="#102">102: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="103" class="l"><a href="#103">103: </a>        }
-</span><span id="104" class="l"><a href="#104">104: </a>
-</span><span id="105" class="l"><a href="#105">105: </a>        <span class="php-comment">// Cast as an array if not already</span>
-</span><span id="106" class="l"><a href="#106">106: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="107" class="l"><a href="#107">107: </a>        {
-</span><span id="108" class="l"><a href="#108">108: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
-</span><span id="109" class="l"><a href="#109">109: </a>        }
-</span><span id="110" class="l"><a href="#110">110: </a>
-</span><span id="111" class="l"><a href="#111">111: </a>        <span class="php-var">$array</span> = [];
-</span><span id="112" class="l"><a href="#112">112: </a>        <span class="php-keyword1">foreach</span> ((<span class="php-keyword1">array</span>) <span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
-</span><span id="113" class="l"><a href="#113">113: </a>        {
-</span><span id="114" class="l"><a href="#114">114: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>) === <span class="php-keyword1">TRUE</span> || <span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="115" class="l"><a href="#115">115: </a>            {
-</span><span id="116" class="l"><a href="#116">116: </a>                <span class="php-var">$array</span>[<span class="php-var">$key</span>] = <span class="php-var">$this</span>-&gt;to_array(<span class="php-var">$value</span>);
-</span><span id="117" class="l"><a href="#117">117: </a>            }
-</span><span id="118" class="l"><a href="#118">118: </a>            <span class="php-keyword1">else</span>
-</span><span id="119" class="l"><a href="#119">119: </a>            {
-</span><span id="120" class="l"><a href="#120">120: </a>                <span class="php-var">$array</span>[<span class="php-var">$key</span>] = <span class="php-var">$value</span>;
-</span><span id="121" class="l"><a href="#121">121: </a>            }
-</span><span id="122" class="l"><a href="#122">122: </a>        }
-</span><span id="123" class="l"><a href="#123">123: </a>
-</span><span id="124" class="l"><a href="#124">124: </a>        <span class="php-keyword1">return</span> <span class="php-var">$array</span>;
-</span><span id="125" class="l"><a href="#125">125: </a>    }
+</span><span id="88" class="l"><a href="#88"> 88: </a>        <span class="php-comment">// Load the inflector helper</span>
+</span><span id="89" class="l"><a href="#89"> 89: </a>        <span class="php-var">$this</span>-&gt;_ci-&gt;load-&gt;helper(<span class="php-quote">'inflector'</span>);
+</span><span id="90" class="l"><a href="#90"> 90: </a>
+</span><span id="91" class="l"><a href="#91"> 91: </a>        <span class="php-comment">// If the provided data is already formatted we should probably convert it to an array</span>
+</span><span id="92" class="l"><a href="#92"> 92: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$from_type</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="93" class="l"><a href="#93"> 93: </a>        {
+</span><span id="94" class="l"><a href="#94"> 94: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span> . <span class="php-var">$from_type</span>))
+</span><span id="95" class="l"><a href="#95"> 95: </a>            {
+</span><span id="96" class="l"><a href="#96"> 96: </a>                <span class="php-var">$data</span> = <span class="php-keyword2">call_user_func</span>([<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span> . <span class="php-var">$from_type</span>], <span class="php-var">$data</span>);
+</span><span id="97" class="l"><a href="#97"> 97: </a>            }
+</span><span id="98" class="l"><a href="#98"> 98: </a>            <span class="php-keyword1">else</span>
+</span><span id="99" class="l"><a href="#99"> 99: </a>            {
+</span><span id="100" class="l"><a href="#100">100: </a>                <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'Format class does not support conversion from &quot;'</span> . <span class="php-var">$from_type</span> . <span class="php-quote">'&quot;.'</span>);
+</span><span id="101" class="l"><a href="#101">101: </a>            }
+</span><span id="102" class="l"><a href="#102">102: </a>        }
+</span><span id="103" class="l"><a href="#103">103: </a>
+</span><span id="104" class="l"><a href="#104">104: </a>        <span class="php-comment">// Set the member variable to the data passed</span>
+</span><span id="105" class="l"><a href="#105">105: </a>        <span class="php-var">$this</span>-&gt;_data = <span class="php-var">$data</span>;
+</span><span id="106" class="l"><a href="#106">106: </a>    }
+</span><span id="107" class="l"><a href="#107">107: </a>
+</span><span id="108" class="l"><a href="#108">108: </a>    <span class="php-comment">/**
+</span></span><span id="109" class="l"><a href="#109">109: </a><span class="php-comment">     * Create an instance of the format class
+</span></span><span id="110" class="l"><a href="#110">110: </a><span class="php-comment">     * e.g: echo $this-&gt;format-&gt;factory(['foo' =&gt; 'bar'])-&gt;to_csv();
+</span></span><span id="111" class="l"><a href="#111">111: </a><span class="php-comment">     *
+</span></span><span id="112" class="l"><a href="#112">112: </a><span class="php-comment">     * @param mixed $data Data to convert/parse
+</span></span><span id="113" class="l"><a href="#113">113: </a><span class="php-comment">     * @param string $from_type Type to convert from e.g. json, csv, html
+</span></span><span id="114" class="l"><a href="#114">114: </a><span class="php-comment">     *
+</span></span><span id="115" class="l"><a href="#115">115: </a><span class="php-comment">     * @return object Instance of the format class
+</span></span><span id="116" class="l"><a href="#116">116: </a><span class="php-comment">     */</span>
+</span><span id="117" class="l"><a href="#117">117: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> factory(<span class="php-var">$data</span>, <span class="php-var">$from_type</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="118" class="l"><a href="#118">118: </a>    {
+</span><span id="119" class="l"><a href="#119">119: </a>        <span class="php-comment">// $class = __CLASS__;</span>
+</span><span id="120" class="l"><a href="#120">120: </a>        <span class="php-comment">// return new $class();</span>
+</span><span id="121" class="l"><a href="#121">121: </a>
+</span><span id="122" class="l"><a href="#122">122: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">new</span> <span class="php-keyword1">static</span>(<span class="php-var">$data</span>, <span class="php-var">$from_type</span>);
+</span><span id="123" class="l"><a href="#123">123: </a>    }
+</span><span id="124" class="l"><a href="#124">124: </a>
+</span><span id="125" class="l"><a href="#125">125: </a>    <span class="php-comment">// FORMATTING OUTPUT ---------------------------------------------------------</span>
 </span><span id="126" class="l"><a href="#126">126: </a>
 </span><span id="127" class="l"><a href="#127">127: </a>    <span class="php-comment">/**
-</span></span><span id="128" class="l"><a href="#128">128: </a><span class="php-comment">     * Format data as XML
+</span></span><span id="128" class="l"><a href="#128">128: </a><span class="php-comment">     * Format data as an array
 </span></span><span id="129" class="l"><a href="#129">129: </a><span class="php-comment">     *
 </span></span><span id="130" class="l"><a href="#130">130: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
 </span></span><span id="131" class="l"><a href="#131">131: </a><span class="php-comment">     * to the constructor
-</span></span><span id="132" class="l"><a href="#132">132: </a><span class="php-comment">     * @param NULL $structure
-</span></span><span id="133" class="l"><a href="#133">133: </a><span class="php-comment">     * @param string $basenode
-</span></span><span id="134" class="l"><a href="#134">134: </a><span class="php-comment">     *
-</span></span><span id="135" class="l"><a href="#135">135: </a><span class="php-comment">     * @return mixed
-</span></span><span id="136" class="l"><a href="#136">136: </a><span class="php-comment">     */</span>
-</span><span id="137" class="l"><a href="#137">137: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_xml(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$structure</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$basenode</span> = <span class="php-quote">'xml'</span>)
-</span><span id="138" class="l"><a href="#138">138: </a>    {
-</span><span id="139" class="l"><a href="#139">139: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="140" class="l"><a href="#140">140: </a>        {
-</span><span id="141" class="l"><a href="#141">141: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="142" class="l"><a href="#142">142: </a>        }
-</span><span id="143" class="l"><a href="#143">143: </a>
-</span><span id="144" class="l"><a href="#144">144: </a>        <span class="php-comment">// turn off compatibility mode as simple xml throws a wobbly if you don't.</span>
-</span><span id="145" class="l"><a href="#145">145: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ini_get</span>(<span class="php-quote">'zend.ze1_compatibility_mode'</span>) == <span class="php-num">1</span>)
-</span><span id="146" class="l"><a href="#146">146: </a>        {
-</span><span id="147" class="l"><a href="#147">147: </a>            <span class="php-keyword2">ini_set</span>(<span class="php-quote">'zend.ze1_compatibility_mode'</span>, <span class="php-num">0</span>);
-</span><span id="148" class="l"><a href="#148">148: </a>        }
-</span><span id="149" class="l"><a href="#149">149: </a>
-</span><span id="150" class="l"><a href="#150">150: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$structure</span> === <span class="php-keyword1">NULL</span>)
+</span></span><span id="132" class="l"><a href="#132">132: </a><span class="php-comment">     * @return array Data parsed as an array; otherwise, an empty array
+</span></span><span id="133" class="l"><a href="#133">133: </a><span class="php-comment">     */</span>
+</span><span id="134" class="l"><a href="#134">134: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_array(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="135" class="l"><a href="#135">135: </a>    {
+</span><span id="136" class="l"><a href="#136">136: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="137" class="l"><a href="#137">137: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="138" class="l"><a href="#138">138: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="139" class="l"><a href="#139">139: </a>        {
+</span><span id="140" class="l"><a href="#140">140: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="141" class="l"><a href="#141">141: </a>        }
+</span><span id="142" class="l"><a href="#142">142: </a>
+</span><span id="143" class="l"><a href="#143">143: </a>        <span class="php-comment">// Cast as an array if not already</span>
+</span><span id="144" class="l"><a href="#144">144: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="145" class="l"><a href="#145">145: </a>        {
+</span><span id="146" class="l"><a href="#146">146: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
+</span><span id="147" class="l"><a href="#147">147: </a>        }
+</span><span id="148" class="l"><a href="#148">148: </a>
+</span><span id="149" class="l"><a href="#149">149: </a>        <span class="php-var">$array</span> = [];
+</span><span id="150" class="l"><a href="#150">150: </a>        <span class="php-keyword1">foreach</span> ((<span class="php-keyword1">array</span>) <span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
 </span><span id="151" class="l"><a href="#151">151: </a>        {
-</span><span id="152" class="l"><a href="#152">152: </a>            <span class="php-var">$structure</span> = <span class="php-keyword2">simplexml_load_string</span>(<span class="php-quote">&quot;&lt;?xml version='1.0' encoding='utf-8'?&gt;&lt;</span><span class="php-var">$basenode</span><span class="php-quote"> /&gt;&quot;</span>);
-</span><span id="153" class="l"><a href="#153">153: </a>        }
-</span><span id="154" class="l"><a href="#154">154: </a>
-</span><span id="155" class="l"><a href="#155">155: </a>        <span class="php-comment">// Force it to be something useful</span>
-</span><span id="156" class="l"><a href="#156">156: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="157" class="l"><a href="#157">157: </a>        {
-</span><span id="158" class="l"><a href="#158">158: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
-</span><span id="159" class="l"><a href="#159">159: </a>        }
-</span><span id="160" class="l"><a href="#160">160: </a>
-</span><span id="161" class="l"><a href="#161">161: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
-</span><span id="162" class="l"><a href="#162">162: </a>        {
-</span><span id="163" class="l"><a href="#163">163: </a>
-</span><span id="164" class="l"><a href="#164">164: </a>            <span class="php-comment">//change false/true to 0/1</span>
-</span><span id="165" class="l"><a href="#165">165: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">is_bool</span>(<span class="php-var">$value</span>))
-</span><span id="166" class="l"><a href="#166">166: </a>            {
-</span><span id="167" class="l"><a href="#167">167: </a>                <span class="php-var">$value</span> = (int) <span class="php-var">$value</span>;
-</span><span id="168" class="l"><a href="#168">168: </a>            }
-</span><span id="169" class="l"><a href="#169">169: </a>
-</span><span id="170" class="l"><a href="#170">170: </a>            <span class="php-comment">// no numeric keys in our xml please!</span>
-</span><span id="171" class="l"><a href="#171">171: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">is_numeric</span>(<span class="php-var">$key</span>))
-</span><span id="172" class="l"><a href="#172">172: </a>            {
-</span><span id="173" class="l"><a href="#173">173: </a>                <span class="php-comment">// make string key...</span>
-</span><span id="174" class="l"><a href="#174">174: </a>                <span class="php-var">$key</span> = (singular(<span class="php-var">$basenode</span>) != <span class="php-var">$basenode</span>) ? singular(<span class="php-var">$basenode</span>) : <span class="php-quote">'item'</span>;
-</span><span id="175" class="l"><a href="#175">175: </a>            }
-</span><span id="176" class="l"><a href="#176">176: </a>
-</span><span id="177" class="l"><a href="#177">177: </a>            <span class="php-comment">// replace anything not alpha numeric</span>
-</span><span id="178" class="l"><a href="#178">178: </a>            <span class="php-var">$key</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/[^a-z_\-0-9]/i'</span>, <span class="php-quote">''</span>, <span class="php-var">$key</span>);
-</span><span id="179" class="l"><a href="#179">179: </a>
-</span><span id="180" class="l"><a href="#180">180: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-quote">'_attributes'</span> &amp;&amp; (<span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>)))
-</span><span id="181" class="l"><a href="#181">181: </a>            {
-</span><span id="182" class="l"><a href="#182">182: </a>                <span class="php-var">$attributes</span> = <span class="php-var">$value</span>;
-</span><span id="183" class="l"><a href="#183">183: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_object</span>(<span class="php-var">$attributes</span>))
-</span><span id="184" class="l"><a href="#184">184: </a>                {
-</span><span id="185" class="l"><a href="#185">185: </a>                    <span class="php-var">$attributes</span> = <span class="php-keyword2">get_object_vars</span>(<span class="php-var">$attributes</span>);
-</span><span id="186" class="l"><a href="#186">186: </a>                }
-</span><span id="187" class="l"><a href="#187">187: </a>
-</span><span id="188" class="l"><a href="#188">188: </a>                <span class="php-keyword1">foreach</span> (<span class="php-var">$attributes</span> <span class="php-keyword1">as</span> <span class="php-var">$attributeName</span> =&gt; <span class="php-var">$attributeValue</span>)
-</span><span id="189" class="l"><a href="#189">189: </a>                {
-</span><span id="190" class="l"><a href="#190">190: </a>                    <span class="php-var">$structure</span>-&gt;addAttribute(<span class="php-var">$attributeName</span>, <span class="php-var">$attributeValue</span>);
-</span><span id="191" class="l"><a href="#191">191: </a>                }
-</span><span id="192" class="l"><a href="#192">192: </a>            }
-</span><span id="193" class="l"><a href="#193">193: </a>            <span class="php-comment">// if there is another array found recursively call this function</span>
-</span><span id="194" class="l"><a href="#194">194: </a>            <span class="php-keyword1">elseif</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>))
-</span><span id="195" class="l"><a href="#195">195: </a>            {
-</span><span id="196" class="l"><a href="#196">196: </a>                <span class="php-var">$node</span> = <span class="php-var">$structure</span>-&gt;addChild(<span class="php-var">$key</span>);
+</span><span id="152" class="l"><a href="#152">152: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>) === <span class="php-keyword1">TRUE</span> || <span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="153" class="l"><a href="#153">153: </a>            {
+</span><span id="154" class="l"><a href="#154">154: </a>                <span class="php-var">$array</span>[<span class="php-var">$key</span>] = <span class="php-var">$this</span>-&gt;to_array(<span class="php-var">$value</span>);
+</span><span id="155" class="l"><a href="#155">155: </a>            }
+</span><span id="156" class="l"><a href="#156">156: </a>            <span class="php-keyword1">else</span>
+</span><span id="157" class="l"><a href="#157">157: </a>            {
+</span><span id="158" class="l"><a href="#158">158: </a>                <span class="php-var">$array</span>[<span class="php-var">$key</span>] = <span class="php-var">$value</span>;
+</span><span id="159" class="l"><a href="#159">159: </a>            }
+</span><span id="160" class="l"><a href="#160">160: </a>        }
+</span><span id="161" class="l"><a href="#161">161: </a>
+</span><span id="162" class="l"><a href="#162">162: </a>        <span class="php-keyword1">return</span> <span class="php-var">$array</span>;
+</span><span id="163" class="l"><a href="#163">163: </a>    }
+</span><span id="164" class="l"><a href="#164">164: </a>
+</span><span id="165" class="l"><a href="#165">165: </a>    <span class="php-comment">/**
+</span></span><span id="166" class="l"><a href="#166">166: </a><span class="php-comment">     * Format data as XML
+</span></span><span id="167" class="l"><a href="#167">167: </a><span class="php-comment">     *
+</span></span><span id="168" class="l"><a href="#168">168: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="169" class="l"><a href="#169">169: </a><span class="php-comment">     * to the constructor
+</span></span><span id="170" class="l"><a href="#170">170: </a><span class="php-comment">     * @param NULL $structure
+</span></span><span id="171" class="l"><a href="#171">171: </a><span class="php-comment">     * @param string $basenode
+</span></span><span id="172" class="l"><a href="#172">172: </a><span class="php-comment">     * @return mixed
+</span></span><span id="173" class="l"><a href="#173">173: </a><span class="php-comment">     */</span>
+</span><span id="174" class="l"><a href="#174">174: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_xml(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$structure</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$basenode</span> = <span class="php-quote">'xml'</span>)
+</span><span id="175" class="l"><a href="#175">175: </a>    {
+</span><span id="176" class="l"><a href="#176">176: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="177" class="l"><a href="#177">177: </a>        {
+</span><span id="178" class="l"><a href="#178">178: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="179" class="l"><a href="#179">179: </a>        }
+</span><span id="180" class="l"><a href="#180">180: </a>
+</span><span id="181" class="l"><a href="#181">181: </a>        <span class="php-comment">// turn off compatibility mode as simple xml throws a wobbly if you don't.</span>
+</span><span id="182" class="l"><a href="#182">182: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ini_get</span>(<span class="php-quote">'zend.ze1_compatibility_mode'</span>) == <span class="php-num">1</span>)
+</span><span id="183" class="l"><a href="#183">183: </a>        {
+</span><span id="184" class="l"><a href="#184">184: </a>            <span class="php-keyword2">ini_set</span>(<span class="php-quote">'zend.ze1_compatibility_mode'</span>, <span class="php-num">0</span>);
+</span><span id="185" class="l"><a href="#185">185: </a>        }
+</span><span id="186" class="l"><a href="#186">186: </a>
+</span><span id="187" class="l"><a href="#187">187: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$structure</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="188" class="l"><a href="#188">188: </a>        {
+</span><span id="189" class="l"><a href="#189">189: </a>            <span class="php-var">$structure</span> = <span class="php-keyword2">simplexml_load_string</span>(<span class="php-quote">&quot;&lt;?xml version='1.0' encoding='utf-8'?&gt;&lt;</span><span class="php-var">$basenode</span><span class="php-quote"> /&gt;&quot;</span>);
+</span><span id="190" class="l"><a href="#190">190: </a>        }
+</span><span id="191" class="l"><a href="#191">191: </a>
+</span><span id="192" class="l"><a href="#192">192: </a>        <span class="php-comment">// Force it to be something useful</span>
+</span><span id="193" class="l"><a href="#193">193: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="194" class="l"><a href="#194">194: </a>        {
+</span><span id="195" class="l"><a href="#195">195: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
+</span><span id="196" class="l"><a href="#196">196: </a>        }
 </span><span id="197" class="l"><a href="#197">197: </a>
-</span><span id="198" class="l"><a href="#198">198: </a>                <span class="php-comment">// recursive call.</span>
-</span><span id="199" class="l"><a href="#199">199: </a>                <span class="php-var">$this</span>-&gt;to_xml(<span class="php-var">$value</span>, <span class="php-var">$node</span>, <span class="php-var">$key</span>);
-</span><span id="200" class="l"><a href="#200">200: </a>            }
-</span><span id="201" class="l"><a href="#201">201: </a>            <span class="php-keyword1">else</span>
-</span><span id="202" class="l"><a href="#202">202: </a>            {
-</span><span id="203" class="l"><a href="#203">203: </a>                <span class="php-comment">// add single node.</span>
-</span><span id="204" class="l"><a href="#204">204: </a>                <span class="php-var">$value</span> = <span class="php-keyword2">htmlspecialchars</span>(<span class="php-keyword2">html_entity_decode</span>(<span class="php-var">$value</span>, ENT_QUOTES, <span class="php-quote">'UTF-8'</span>), ENT_QUOTES, <span class="php-quote">'UTF-8'</span>);
-</span><span id="205" class="l"><a href="#205">205: </a>
-</span><span id="206" class="l"><a href="#206">206: </a>                <span class="php-var">$structure</span>-&gt;addChild(<span class="php-var">$key</span>, <span class="php-var">$value</span>);
-</span><span id="207" class="l"><a href="#207">207: </a>            }
-</span><span id="208" class="l"><a href="#208">208: </a>        }
-</span><span id="209" class="l"><a href="#209">209: </a>
-</span><span id="210" class="l"><a href="#210">210: </a>        <span class="php-keyword1">return</span> <span class="php-var">$structure</span>-&gt;asXML();
-</span><span id="211" class="l"><a href="#211">211: </a>    }
-</span><span id="212" class="l"><a href="#212">212: </a>
-</span><span id="213" class="l"><a href="#213">213: </a>    <span class="php-comment">/**
-</span></span><span id="214" class="l"><a href="#214">214: </a><span class="php-comment">     * Format data as HTML
-</span></span><span id="215" class="l"><a href="#215">215: </a><span class="php-comment">     *
-</span></span><span id="216" class="l"><a href="#216">216: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="217" class="l"><a href="#217">217: </a><span class="php-comment">     * to the constructor
-</span></span><span id="218" class="l"><a href="#218">218: </a><span class="php-comment">     *
-</span></span><span id="219" class="l"><a href="#219">219: </a><span class="php-comment">     * @return mixed
-</span></span><span id="220" class="l"><a href="#220">220: </a><span class="php-comment">     */</span>
-</span><span id="221" class="l"><a href="#221">221: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_html(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="222" class="l"><a href="#222">222: </a>    {
-</span><span id="223" class="l"><a href="#223">223: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="224" class="l"><a href="#224">224: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="225" class="l"><a href="#225">225: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="226" class="l"><a href="#226">226: </a>        {
-</span><span id="227" class="l"><a href="#227">227: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="228" class="l"><a href="#228">228: </a>        }
-</span><span id="229" class="l"><a href="#229">229: </a>
-</span><span id="230" class="l"><a href="#230">230: </a>        <span class="php-comment">// Cast as an array if not already</span>
-</span><span id="231" class="l"><a href="#231">231: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="232" class="l"><a href="#232">232: </a>        {
-</span><span id="233" class="l"><a href="#233">233: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
-</span><span id="234" class="l"><a href="#234">234: </a>        }
-</span><span id="235" class="l"><a href="#235">235: </a>
-</span><span id="236" class="l"><a href="#236">236: </a>        <span class="php-comment">// Multi-dimensional array</span>
-</span><span id="237" class="l"><a href="#237">237: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]) &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]))
-</span><span id="238" class="l"><a href="#238">238: </a>        {
-</span><span id="239" class="l"><a href="#239">239: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]);
-</span><span id="240" class="l"><a href="#240">240: </a>        }
-</span><span id="241" class="l"><a href="#241">241: </a>
-</span><span id="242" class="l"><a href="#242">242: </a>        <span class="php-comment">// Single array</span>
-</span><span id="243" class="l"><a href="#243">243: </a>        <span class="php-keyword1">else</span>
-</span><span id="244" class="l"><a href="#244">244: </a>        {
-</span><span id="245" class="l"><a href="#245">245: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>);
-</span><span id="246" class="l"><a href="#246">246: </a>            <span class="php-var">$data</span> = [<span class="php-var">$data</span>];
-</span><span id="247" class="l"><a href="#247">247: </a>        }
-</span><span id="248" class="l"><a href="#248">248: </a>
-</span><span id="249" class="l"><a href="#249">249: </a>        <span class="php-comment">// Load the table library</span>
-</span><span id="250" class="l"><a href="#250">250: </a>        <span class="php-var">$this</span>-&gt;_ci-&gt;load-&gt;library(<span class="php-quote">'table'</span>);
-</span><span id="251" class="l"><a href="#251">251: </a>
-</span><span id="252" class="l"><a href="#252">252: </a>        <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;set_heading(<span class="php-var">$headings</span>);
-</span><span id="253" class="l"><a href="#253">253: </a>
-</span><span id="254" class="l"><a href="#254">254: </a>        <span class="php-comment">// Should row used as a reference?</span>
-</span><span id="255" class="l"><a href="#255">255: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$row</span>)
-</span><span id="256" class="l"><a href="#256">256: </a>        {
-</span><span id="257" class="l"><a href="#257">257: </a>            <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;add_row(<span class="php-var">$row</span>);
-</span><span id="258" class="l"><a href="#258">258: </a>        }
-</span><span id="259" class="l"><a href="#259">259: </a>
-</span><span id="260" class="l"><a href="#260">260: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;generate();
-</span><span id="261" class="l"><a href="#261">261: </a>    }
-</span><span id="262" class="l"><a href="#262">262: </a>
-</span><span id="263" class="l"><a href="#263">263: </a>    <span class="php-comment">/**
-</span></span><span id="264" class="l"><a href="#264">264: </a><span class="php-comment">     * Format data as CSV
-</span></span><span id="265" class="l"><a href="#265">265: </a><span class="php-comment">     *
-</span></span><span id="266" class="l"><a href="#266">266: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="267" class="l"><a href="#267">267: </a><span class="php-comment">     * to the constructor
-</span></span><span id="268" class="l"><a href="#268">268: </a><span class="php-comment">     *
-</span></span><span id="269" class="l"><a href="#269">269: </a><span class="php-comment">     * @return mixed
-</span></span><span id="270" class="l"><a href="#270">270: </a><span class="php-comment">     */</span>
-</span><span id="271" class="l"><a href="#271">271: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_csv(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="272" class="l"><a href="#272">272: </a>    {
-</span><span id="273" class="l"><a href="#273">273: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="274" class="l"><a href="#274">274: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="275" class="l"><a href="#275">275: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="276" class="l"><a href="#276">276: </a>        {
-</span><span id="277" class="l"><a href="#277">277: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="278" class="l"><a href="#278">278: </a>        }
-</span><span id="279" class="l"><a href="#279">279: </a>
-</span><span id="280" class="l"><a href="#280">280: </a>        <span class="php-comment">// Cast as an array if not already</span>
-</span><span id="281" class="l"><a href="#281">281: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="282" class="l"><a href="#282">282: </a>        {
-</span><span id="283" class="l"><a href="#283">283: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
-</span><span id="284" class="l"><a href="#284">284: </a>        }
-</span><span id="285" class="l"><a href="#285">285: </a>
-</span><span id="286" class="l"><a href="#286">286: </a>        <span class="php-comment">// Multi-dimensional array</span>
-</span><span id="287" class="l"><a href="#287">287: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]) &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]))
-</span><span id="288" class="l"><a href="#288">288: </a>        {
-</span><span id="289" class="l"><a href="#289">289: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]);
-</span><span id="290" class="l"><a href="#290">290: </a>        }
-</span><span id="291" class="l"><a href="#291">291: </a>
-</span><span id="292" class="l"><a href="#292">292: </a>        <span class="php-comment">// Single array</span>
-</span><span id="293" class="l"><a href="#293">293: </a>        <span class="php-keyword1">else</span>
-</span><span id="294" class="l"><a href="#294">294: </a>        {
-</span><span id="295" class="l"><a href="#295">295: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>);
-</span><span id="296" class="l"><a href="#296">296: </a>            <span class="php-var">$data</span> = [<span class="php-var">$data</span>];
-</span><span id="297" class="l"><a href="#297">297: </a>        }
+</span><span id="198" class="l"><a href="#198">198: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
+</span><span id="199" class="l"><a href="#199">199: </a>        {
+</span><span id="200" class="l"><a href="#200">200: </a>
+</span><span id="201" class="l"><a href="#201">201: </a>            <span class="php-comment">//change false/true to 0/1</span>
+</span><span id="202" class="l"><a href="#202">202: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">is_bool</span>(<span class="php-var">$value</span>))
+</span><span id="203" class="l"><a href="#203">203: </a>            {
+</span><span id="204" class="l"><a href="#204">204: </a>                <span class="php-var">$value</span> = (int) <span class="php-var">$value</span>;
+</span><span id="205" class="l"><a href="#205">205: </a>            }
+</span><span id="206" class="l"><a href="#206">206: </a>
+</span><span id="207" class="l"><a href="#207">207: </a>            <span class="php-comment">// no numeric keys in our xml please!</span>
+</span><span id="208" class="l"><a href="#208">208: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">is_numeric</span>(<span class="php-var">$key</span>))
+</span><span id="209" class="l"><a href="#209">209: </a>            {
+</span><span id="210" class="l"><a href="#210">210: </a>                <span class="php-comment">// make string key...</span>
+</span><span id="211" class="l"><a href="#211">211: </a>                <span class="php-var">$key</span> = (singular(<span class="php-var">$basenode</span>) != <span class="php-var">$basenode</span>) ? singular(<span class="php-var">$basenode</span>) : <span class="php-quote">'item'</span>;
+</span><span id="212" class="l"><a href="#212">212: </a>            }
+</span><span id="213" class="l"><a href="#213">213: </a>
+</span><span id="214" class="l"><a href="#214">214: </a>            <span class="php-comment">// replace anything not alpha numeric</span>
+</span><span id="215" class="l"><a href="#215">215: </a>            <span class="php-var">$key</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/[^a-z_\-0-9]/i'</span>, <span class="php-quote">''</span>, <span class="php-var">$key</span>);
+</span><span id="216" class="l"><a href="#216">216: </a>
+</span><span id="217" class="l"><a href="#217">217: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-quote">'_attributes'</span> &amp;&amp; (<span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>)))
+</span><span id="218" class="l"><a href="#218">218: </a>            {
+</span><span id="219" class="l"><a href="#219">219: </a>                <span class="php-var">$attributes</span> = <span class="php-var">$value</span>;
+</span><span id="220" class="l"><a href="#220">220: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_object</span>(<span class="php-var">$attributes</span>))
+</span><span id="221" class="l"><a href="#221">221: </a>                {
+</span><span id="222" class="l"><a href="#222">222: </a>                    <span class="php-var">$attributes</span> = <span class="php-keyword2">get_object_vars</span>(<span class="php-var">$attributes</span>);
+</span><span id="223" class="l"><a href="#223">223: </a>                }
+</span><span id="224" class="l"><a href="#224">224: </a>
+</span><span id="225" class="l"><a href="#225">225: </a>                <span class="php-keyword1">foreach</span> (<span class="php-var">$attributes</span> <span class="php-keyword1">as</span> <span class="php-var">$attributeName</span> =&gt; <span class="php-var">$attributeValue</span>)
+</span><span id="226" class="l"><a href="#226">226: </a>                {
+</span><span id="227" class="l"><a href="#227">227: </a>                    <span class="php-var">$structure</span>-&gt;addAttribute(<span class="php-var">$attributeName</span>, <span class="php-var">$attributeValue</span>);
+</span><span id="228" class="l"><a href="#228">228: </a>                }
+</span><span id="229" class="l"><a href="#229">229: </a>            }
+</span><span id="230" class="l"><a href="#230">230: </a>            <span class="php-comment">// if there is another array found recursively call this function</span>
+</span><span id="231" class="l"><a href="#231">231: </a>            <span class="php-keyword1">elseif</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>))
+</span><span id="232" class="l"><a href="#232">232: </a>            {
+</span><span id="233" class="l"><a href="#233">233: </a>                <span class="php-var">$node</span> = <span class="php-var">$structure</span>-&gt;addChild(<span class="php-var">$key</span>);
+</span><span id="234" class="l"><a href="#234">234: </a>
+</span><span id="235" class="l"><a href="#235">235: </a>                <span class="php-comment">// recursive call.</span>
+</span><span id="236" class="l"><a href="#236">236: </a>                <span class="php-var">$this</span>-&gt;to_xml(<span class="php-var">$value</span>, <span class="php-var">$node</span>, <span class="php-var">$key</span>);
+</span><span id="237" class="l"><a href="#237">237: </a>            }
+</span><span id="238" class="l"><a href="#238">238: </a>            <span class="php-keyword1">else</span>
+</span><span id="239" class="l"><a href="#239">239: </a>            {
+</span><span id="240" class="l"><a href="#240">240: </a>                <span class="php-comment">// add single node.</span>
+</span><span id="241" class="l"><a href="#241">241: </a>                <span class="php-var">$value</span> = <span class="php-keyword2">htmlspecialchars</span>(<span class="php-keyword2">html_entity_decode</span>(<span class="php-var">$value</span>, ENT_QUOTES, <span class="php-quote">'UTF-8'</span>), ENT_QUOTES, <span class="php-quote">'UTF-8'</span>);
+</span><span id="242" class="l"><a href="#242">242: </a>
+</span><span id="243" class="l"><a href="#243">243: </a>                <span class="php-var">$structure</span>-&gt;addChild(<span class="php-var">$key</span>, <span class="php-var">$value</span>);
+</span><span id="244" class="l"><a href="#244">244: </a>            }
+</span><span id="245" class="l"><a href="#245">245: </a>        }
+</span><span id="246" class="l"><a href="#246">246: </a>
+</span><span id="247" class="l"><a href="#247">247: </a>        <span class="php-keyword1">return</span> <span class="php-var">$structure</span>-&gt;asXML();
+</span><span id="248" class="l"><a href="#248">248: </a>    }
+</span><span id="249" class="l"><a href="#249">249: </a>
+</span><span id="250" class="l"><a href="#250">250: </a>    <span class="php-comment">/**
+</span></span><span id="251" class="l"><a href="#251">251: </a><span class="php-comment">     * Format data as HTML
+</span></span><span id="252" class="l"><a href="#252">252: </a><span class="php-comment">     *
+</span></span><span id="253" class="l"><a href="#253">253: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="254" class="l"><a href="#254">254: </a><span class="php-comment">     * to the constructor
+</span></span><span id="255" class="l"><a href="#255">255: </a><span class="php-comment">     * @return mixed
+</span></span><span id="256" class="l"><a href="#256">256: </a><span class="php-comment">     */</span>
+</span><span id="257" class="l"><a href="#257">257: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_html(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="258" class="l"><a href="#258">258: </a>    {
+</span><span id="259" class="l"><a href="#259">259: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="260" class="l"><a href="#260">260: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="261" class="l"><a href="#261">261: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="262" class="l"><a href="#262">262: </a>        {
+</span><span id="263" class="l"><a href="#263">263: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="264" class="l"><a href="#264">264: </a>        }
+</span><span id="265" class="l"><a href="#265">265: </a>
+</span><span id="266" class="l"><a href="#266">266: </a>        <span class="php-comment">// Cast as an array if not already</span>
+</span><span id="267" class="l"><a href="#267">267: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="268" class="l"><a href="#268">268: </a>        {
+</span><span id="269" class="l"><a href="#269">269: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
+</span><span id="270" class="l"><a href="#270">270: </a>        }
+</span><span id="271" class="l"><a href="#271">271: </a>
+</span><span id="272" class="l"><a href="#272">272: </a>        <span class="php-comment">// Multi-dimensional array</span>
+</span><span id="273" class="l"><a href="#273">273: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]) &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]))
+</span><span id="274" class="l"><a href="#274">274: </a>        {
+</span><span id="275" class="l"><a href="#275">275: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]);
+</span><span id="276" class="l"><a href="#276">276: </a>        }
+</span><span id="277" class="l"><a href="#277">277: </a>
+</span><span id="278" class="l"><a href="#278">278: </a>        <span class="php-comment">// Single array</span>
+</span><span id="279" class="l"><a href="#279">279: </a>        <span class="php-keyword1">else</span>
+</span><span id="280" class="l"><a href="#280">280: </a>        {
+</span><span id="281" class="l"><a href="#281">281: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>);
+</span><span id="282" class="l"><a href="#282">282: </a>            <span class="php-var">$data</span> = [<span class="php-var">$data</span>];
+</span><span id="283" class="l"><a href="#283">283: </a>        }
+</span><span id="284" class="l"><a href="#284">284: </a>
+</span><span id="285" class="l"><a href="#285">285: </a>        <span class="php-comment">// Load the table library</span>
+</span><span id="286" class="l"><a href="#286">286: </a>        <span class="php-var">$this</span>-&gt;_ci-&gt;load-&gt;library(<span class="php-quote">'table'</span>);
+</span><span id="287" class="l"><a href="#287">287: </a>
+</span><span id="288" class="l"><a href="#288">288: </a>        <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;set_heading(<span class="php-var">$headings</span>);
+</span><span id="289" class="l"><a href="#289">289: </a>
+</span><span id="290" class="l"><a href="#290">290: </a>        <span class="php-comment">// Should row used as a reference?</span>
+</span><span id="291" class="l"><a href="#291">291: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$row</span>)
+</span><span id="292" class="l"><a href="#292">292: </a>        {
+</span><span id="293" class="l"><a href="#293">293: </a>            <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;add_row(<span class="php-var">$row</span>);
+</span><span id="294" class="l"><a href="#294">294: </a>        }
+</span><span id="295" class="l"><a href="#295">295: </a>
+</span><span id="296" class="l"><a href="#296">296: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;generate();
+</span><span id="297" class="l"><a href="#297">297: </a>    }
 </span><span id="298" class="l"><a href="#298">298: </a>
-</span><span id="299" class="l"><a href="#299">299: </a>        <span class="php-var">$output</span> = <span class="php-quote">'&quot;'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'&quot;,&quot;'</span>, <span class="php-var">$headings</span>) . <span class="php-quote">'&quot;'</span> . PHP_EOL;
-</span><span id="300" class="l"><a href="#300">300: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$row</span>)
-</span><span id="301" class="l"><a href="#301">301: </a>        {
-</span><span id="302" class="l"><a href="#302">302: </a>            <span class="php-var">$row</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'&quot;'</span>, <span class="php-quote">'&quot;&quot;'</span>, <span class="php-var">$row</span>); <span class="php-comment">// Escape dbl quotes per RFC 4180</span>
-</span><span id="303" class="l"><a href="#303">303: </a>            <span class="php-var">$output</span> .= <span class="php-quote">'&quot;'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'&quot;,&quot;'</span>, <span class="php-var">$row</span>) . <span class="php-quote">'&quot;'</span> . PHP_EOL;
-</span><span id="304" class="l"><a href="#304">304: </a>        }
-</span><span id="305" class="l"><a href="#305">305: </a>
-</span><span id="306" class="l"><a href="#306">306: </a>        <span class="php-keyword1">return</span> <span class="php-var">$output</span>;
-</span><span id="307" class="l"><a href="#307">307: </a>    }
-</span><span id="308" class="l"><a href="#308">308: </a>
-</span><span id="309" class="l"><a href="#309">309: </a>    <span class="php-comment">/**
-</span></span><span id="310" class="l"><a href="#310">310: </a><span class="php-comment">     * Encode data as json
-</span></span><span id="311" class="l"><a href="#311">311: </a><span class="php-comment">     *
-</span></span><span id="312" class="l"><a href="#312">312: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="313" class="l"><a href="#313">313: </a><span class="php-comment">     * to the constructor
-</span></span><span id="314" class="l"><a href="#314">314: </a><span class="php-comment">     *
-</span></span><span id="315" class="l"><a href="#315">315: </a><span class="php-comment">     * @return string Json representation of a value
-</span></span><span id="316" class="l"><a href="#316">316: </a><span class="php-comment">     */</span>
-</span><span id="317" class="l"><a href="#317">317: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_json(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="318" class="l"><a href="#318">318: </a>    {
-</span><span id="319" class="l"><a href="#319">319: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="320" class="l"><a href="#320">320: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="321" class="l"><a href="#321">321: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="322" class="l"><a href="#322">322: </a>        {
-</span><span id="323" class="l"><a href="#323">323: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="324" class="l"><a href="#324">324: </a>        }
-</span><span id="325" class="l"><a href="#325">325: </a>
-</span><span id="326" class="l"><a href="#326">326: </a>        <span class="php-comment">// Get the callback parameter (if set)</span>
-</span><span id="327" class="l"><a href="#327">327: </a>        <span class="php-var">$callback</span> = <span class="php-var">$this</span>-&gt;_ci-&gt;input-&gt;get(<span class="php-quote">'callback'</span>);
-</span><span id="328" class="l"><a href="#328">328: </a>
-</span><span id="329" class="l"><a href="#329">329: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$callback</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="330" class="l"><a href="#330">330: </a>        {
-</span><span id="331" class="l"><a href="#331">331: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
-</span><span id="332" class="l"><a href="#332">332: </a>        }
-</span><span id="333" class="l"><a href="#333">333: </a>
-</span><span id="334" class="l"><a href="#334">334: </a>        <span class="php-comment">// We only honour a jsonp callback which are valid javascript identifiers</span>
-</span><span id="335" class="l"><a href="#335">335: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">preg_match</span>(<span class="php-quote">'/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i'</span>, <span class="php-var">$callback</span>))
-</span><span id="336" class="l"><a href="#336">336: </a>        {
-</span><span id="337" class="l"><a href="#337">337: </a>            <span class="php-comment">// Return the data as encoded json with a callback</span>
-</span><span id="338" class="l"><a href="#338">338: </a>            <span class="php-keyword1">return</span> <span class="php-var">$callback</span> . <span class="php-quote">'('</span> . <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>) . <span class="php-quote">');'</span>;
-</span><span id="339" class="l"><a href="#339">339: </a>        }
-</span><span id="340" class="l"><a href="#340">340: </a>
-</span><span id="341" class="l"><a href="#341">341: </a>        <span class="php-comment">// An invalid jsonp callback function provided.</span>
-</span><span id="342" class="l"><a href="#342">342: </a>        <span class="php-comment">// Though I don't believe this should be hardcoded here</span>
-</span><span id="343" class="l"><a href="#343">343: </a>        <span class="php-var">$data</span>[<span class="php-quote">'warning'</span>] = <span class="php-quote">'INVALID JSONP CALLBACK: '</span> . <span class="php-var">$callback</span>;
-</span><span id="344" class="l"><a href="#344">344: </a>
-</span><span id="345" class="l"><a href="#345">345: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
-</span><span id="346" class="l"><a href="#346">346: </a>    }
-</span><span id="347" class="l"><a href="#347">347: </a>
-</span><span id="348" class="l"><a href="#348">348: </a>    <span class="php-comment">/**
-</span></span><span id="349" class="l"><a href="#349">349: </a><span class="php-comment">     * Encode data as a serialized array
-</span></span><span id="350" class="l"><a href="#350">350: </a><span class="php-comment">     *
-</span></span><span id="351" class="l"><a href="#351">351: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="352" class="l"><a href="#352">352: </a><span class="php-comment">     * to the constructor
-</span></span><span id="353" class="l"><a href="#353">353: </a><span class="php-comment">     *
-</span></span><span id="354" class="l"><a href="#354">354: </a><span class="php-comment">     * @return string Serialized data
-</span></span><span id="355" class="l"><a href="#355">355: </a><span class="php-comment">     */</span>
-</span><span id="356" class="l"><a href="#356">356: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_serialized(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="357" class="l"><a href="#357">357: </a>    {
-</span><span id="358" class="l"><a href="#358">358: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="359" class="l"><a href="#359">359: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="360" class="l"><a href="#360">360: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="361" class="l"><a href="#361">361: </a>        {
-</span><span id="362" class="l"><a href="#362">362: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="299" class="l"><a href="#299">299: </a>    <span class="php-comment">/**
+</span></span><span id="300" class="l"><a href="#300">300: </a><span class="php-comment">     * @link http://www.metashock.de/2014/02/create-csv-file-in-memory-php/
+</span></span><span id="301" class="l"><a href="#301">301: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="302" class="l"><a href="#302">302: </a><span class="php-comment">     * to the constructor
+</span></span><span id="303" class="l"><a href="#303">303: </a><span class="php-comment">     * @param string $delimiter The optional delimiter parameter sets the field
+</span></span><span id="304" class="l"><a href="#304">304: </a><span class="php-comment">     * delimiter (one character only). NULL will use the default value (,)
+</span></span><span id="305" class="l"><a href="#305">305: </a><span class="php-comment">     * @param string $enclosure The optional enclosure parameter sets the field
+</span></span><span id="306" class="l"><a href="#306">306: </a><span class="php-comment">     * enclosure (one character only). NULL will use the default value (&quot;)
+</span></span><span id="307" class="l"><a href="#307">307: </a><span class="php-comment">     * @return string A csv string
+</span></span><span id="308" class="l"><a href="#308">308: </a><span class="php-comment">     */</span>
+</span><span id="309" class="l"><a href="#309">309: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_csv(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>, <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>)
+</span><span id="310" class="l"><a href="#310">310: </a>    {
+</span><span id="311" class="l"><a href="#311">311: </a>        <span class="php-comment">// Use a threshold of 1 MB (1024 * 1024)</span>
+</span><span id="312" class="l"><a href="#312">312: </a>        <span class="php-var">$handle</span> = <span class="php-keyword2">fopen</span>(<span class="php-quote">'php://temp/maxmemory:1048576'</span>, <span class="php-quote">'w'</span>);
+</span><span id="313" class="l"><a href="#313">313: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$handle</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="314" class="l"><a href="#314">314: </a>        {
+</span><span id="315" class="l"><a href="#315">315: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="316" class="l"><a href="#316">316: </a>        }
+</span><span id="317" class="l"><a href="#317">317: </a>
+</span><span id="318" class="l"><a href="#318">318: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="319" class="l"><a href="#319">319: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="320" class="l"><a href="#320">320: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="321" class="l"><a href="#321">321: </a>        {
+</span><span id="322" class="l"><a href="#322">322: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="323" class="l"><a href="#323">323: </a>        }
+</span><span id="324" class="l"><a href="#324">324: </a>
+</span><span id="325" class="l"><a href="#325">325: </a>        <span class="php-comment">// If NULL, then set as the default delimiter</span>
+</span><span id="326" class="l"><a href="#326">326: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$delimiter</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="327" class="l"><a href="#327">327: </a>        {
+</span><span id="328" class="l"><a href="#328">328: </a>            <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>;
+</span><span id="329" class="l"><a href="#329">329: </a>        }
+</span><span id="330" class="l"><a href="#330">330: </a>
+</span><span id="331" class="l"><a href="#331">331: </a>        <span class="php-comment">// If NULL, then set as the default enclosure</span>
+</span><span id="332" class="l"><a href="#332">332: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$enclosure</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="333" class="l"><a href="#333">333: </a>        {
+</span><span id="334" class="l"><a href="#334">334: </a>            <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>;
+</span><span id="335" class="l"><a href="#335">335: </a>        }
+</span><span id="336" class="l"><a href="#336">336: </a>
+</span><span id="337" class="l"><a href="#337">337: </a>        <span class="php-comment">// Cast as an array if not already</span>
+</span><span id="338" class="l"><a href="#338">338: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="339" class="l"><a href="#339">339: </a>        {
+</span><span id="340" class="l"><a href="#340">340: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
+</span><span id="341" class="l"><a href="#341">341: </a>        }
+</span><span id="342" class="l"><a href="#342">342: </a>
+</span><span id="343" class="l"><a href="#343">343: </a>        <span class="php-comment">// Check if it's a multi-dimensional array</span>
+</span><span id="344" class="l"><a href="#344">344: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]) &amp;&amp; <span class="php-keyword2">count</span>(<span class="php-var">$data</span>) !== <span class="php-keyword2">count</span>(<span class="php-var">$data</span>, COUNT_RECURSIVE))
+</span><span id="345" class="l"><a href="#345">345: </a>        {
+</span><span id="346" class="l"><a href="#346">346: </a>            <span class="php-comment">// Multi-dimensional array</span>
+</span><span id="347" class="l"><a href="#347">347: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]);
+</span><span id="348" class="l"><a href="#348">348: </a>        }
+</span><span id="349" class="l"><a href="#349">349: </a>        <span class="php-keyword1">else</span>
+</span><span id="350" class="l"><a href="#350">350: </a>        {
+</span><span id="351" class="l"><a href="#351">351: </a>            <span class="php-comment">// Single array</span>
+</span><span id="352" class="l"><a href="#352">352: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>);
+</span><span id="353" class="l"><a href="#353">353: </a>            <span class="php-var">$data</span> = [<span class="php-var">$data</span>];
+</span><span id="354" class="l"><a href="#354">354: </a>        }
+</span><span id="355" class="l"><a href="#355">355: </a>
+</span><span id="356" class="l"><a href="#356">356: </a>        <span class="php-comment">// Apply the headings</span>
+</span><span id="357" class="l"><a href="#357">357: </a>        <span class="php-keyword2">fputcsv</span>(<span class="php-var">$handle</span>, <span class="php-var">$headers</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
+</span><span id="358" class="l"><a href="#358">358: </a>
+</span><span id="359" class="l"><a href="#359">359: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$record</span>)
+</span><span id="360" class="l"><a href="#360">360: </a>        {
+</span><span id="361" class="l"><a href="#361">361: </a>            <span class="php-comment">// Returns the length of the string written or FALSE</span>
+</span><span id="362" class="l"><a href="#362">362: </a>            <span class="php-keyword2">fputcsv</span>(<span class="php-var">$handle</span>, <span class="php-var">$record</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
 </span><span id="363" class="l"><a href="#363">363: </a>        }
 </span><span id="364" class="l"><a href="#364">364: </a>
-</span><span id="365" class="l"><a href="#365">365: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">serialize</span>(<span class="php-var">$data</span>);
-</span><span id="366" class="l"><a href="#366">366: </a>    }
+</span><span id="365" class="l"><a href="#365">365: </a>        <span class="php-comment">// Reset the file pointer</span>
+</span><span id="366" class="l"><a href="#366">366: </a>        <span class="php-keyword2">rewind</span>(<span class="php-var">$handle</span>);
 </span><span id="367" class="l"><a href="#367">367: </a>
-</span><span id="368" class="l"><a href="#368">368: </a>    <span class="php-comment">/**
-</span></span><span id="369" class="l"><a href="#369">369: </a><span class="php-comment">     * Format data using a PHP structure
-</span></span><span id="370" class="l"><a href="#370">370: </a><span class="php-comment">     *
-</span></span><span id="371" class="l"><a href="#371">371: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="372" class="l"><a href="#372">372: </a><span class="php-comment">     * to the constructor
-</span></span><span id="373" class="l"><a href="#373">373: </a><span class="php-comment">     *
-</span></span><span id="374" class="l"><a href="#374">374: </a><span class="php-comment">     * @return mixed String representation of a variable
-</span></span><span id="375" class="l"><a href="#375">375: </a><span class="php-comment">     */</span>
-</span><span id="376" class="l"><a href="#376">376: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_php(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="377" class="l"><a href="#377">377: </a>    {
-</span><span id="378" class="l"><a href="#378">378: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="379" class="l"><a href="#379">379: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="380" class="l"><a href="#380">380: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="381" class="l"><a href="#381">381: </a>        {
-</span><span id="382" class="l"><a href="#382">382: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="383" class="l"><a href="#383">383: </a>        }
-</span><span id="384" class="l"><a href="#384">384: </a>
-</span><span id="385" class="l"><a href="#385">385: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">var_export</span>(<span class="php-var">$data</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="386" class="l"><a href="#386">386: </a>    }
-</span><span id="387" class="l"><a href="#387">387: </a>
-</span><span id="388" class="l"><a href="#388">388: </a>    <span class="php-comment">// INTERNAL FUNCTIONS</span>
-</span><span id="389" class="l"><a href="#389">389: </a>
-</span><span id="390" class="l"><a href="#390">390: </a>    <span class="php-comment">/**
-</span></span><span id="391" class="l"><a href="#391">391: </a><span class="php-comment">     * @param $data XML string
-</span></span><span id="392" class="l"><a href="#392">392: </a><span class="php-comment">     *
-</span></span><span id="393" class="l"><a href="#393">393: </a><span class="php-comment">     * @return SimpleXMLElement XML element object; otherwise, empty array
-</span></span><span id="394" class="l"><a href="#394">394: </a><span class="php-comment">     */</span>
-</span><span id="395" class="l"><a href="#395">395: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_xml(<span class="php-var">$data</span>)
-</span><span id="396" class="l"><a href="#396">396: </a>    {
-</span><span id="397" class="l"><a href="#397">397: </a>        <span class="php-keyword1">return</span> <span class="php-var">$data</span> ? (<span class="php-keyword1">array</span>) <span class="php-keyword2">simplexml_load_string</span>(<span class="php-var">$data</span>, <span class="php-quote">'SimpleXMLElement'</span>, LIBXML_NOCDATA) : [];
-</span><span id="398" class="l"><a href="#398">398: </a>    }
-</span><span id="399" class="l"><a href="#399">399: </a>
-</span><span id="400" class="l"><a href="#400">400: </a>    <span class="php-comment">/**
-</span></span><span id="401" class="l"><a href="#401">401: </a><span class="php-comment">     * @param string $data CSV string
-</span></span><span id="402" class="l"><a href="#402">402: </a><span class="php-comment">     *
-</span></span><span id="403" class="l"><a href="#403">403: </a><span class="php-comment">     * @return array A multi-dimensional array with the outer array being the number of rows
-</span></span><span id="404" class="l"><a href="#404">404: </a><span class="php-comment">     * and the inner arrays the individual fields
-</span></span><span id="405" class="l"><a href="#405">405: </a><span class="php-comment">     */</span>
-</span><span id="406" class="l"><a href="#406">406: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_csv(<span class="php-var">$data</span>)
-</span><span id="407" class="l"><a href="#407">407: </a>    {
-</span><span id="408" class="l"><a href="#408">408: </a>        <span class="php-var">$array</span> = [];
-</span><span id="409" class="l"><a href="#409">409: </a>
-</span><span id="410" class="l"><a href="#410">410: </a>        <span class="php-comment">// Splits</span>
-</span><span id="411" class="l"><a href="#411">411: </a>        <span class="php-var">$rows</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">&quot;\n&quot;</span>, <span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
-</span><span id="412" class="l"><a href="#412">412: </a>        <span class="php-var">$headings</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-keyword2">array_shift</span>(<span class="php-var">$rows</span>));
-</span><span id="413" class="l"><a href="#413">413: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$rows</span> <span class="php-keyword1">as</span> <span class="php-var">$row</span>)
-</span><span id="414" class="l"><a href="#414">414: </a>        {
-</span><span id="415" class="l"><a href="#415">415: </a>            <span class="php-comment">// The substr removes &quot; from start and end</span>
-</span><span id="416" class="l"><a href="#416">416: </a>            <span class="php-var">$data_fields</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">'&quot;,&quot;'</span>, <span class="php-keyword2">trim</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$row</span>, <span class="php-num">1</span>, -<span class="php-num">1</span>)));
-</span><span id="417" class="l"><a href="#417">417: </a>
-</span><span id="418" class="l"><a href="#418">418: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">count</span>(<span class="php-var">$data_fields</span>) === <span class="php-keyword2">count</span>(<span class="php-var">$headings</span>))
-</span><span id="419" class="l"><a href="#419">419: </a>            {
-</span><span id="420" class="l"><a href="#420">420: </a>                <span class="php-var">$array</span>[] = <span class="php-keyword2">array_combine</span>(<span class="php-var">$headings</span>, <span class="php-var">$data_fields</span>);
-</span><span id="421" class="l"><a href="#421">421: </a>            }
-</span><span id="422" class="l"><a href="#422">422: </a>        }
-</span><span id="423" class="l"><a href="#423">423: </a>
-</span><span id="424" class="l"><a href="#424">424: </a>        <span class="php-keyword1">return</span> <span class="php-var">$array</span>;
-</span><span id="425" class="l"><a href="#425">425: </a>    }
-</span><span id="426" class="l"><a href="#426">426: </a>
-</span><span id="427" class="l"><a href="#427">427: </a>    <span class="php-comment">/**
-</span></span><span id="428" class="l"><a href="#428">428: </a><span class="php-comment">     * @param $data Encoded json string
-</span></span><span id="429" class="l"><a href="#429">429: </a><span class="php-comment">     *
-</span></span><span id="430" class="l"><a href="#430">430: </a><span class="php-comment">     * @return mixed Decoded json string with leading and trailing whitespace removed
-</span></span><span id="431" class="l"><a href="#431">431: </a><span class="php-comment">     */</span>
-</span><span id="432" class="l"><a href="#432">432: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_json(<span class="php-var">$data</span>)
-</span><span id="433" class="l"><a href="#433">433: </a>    {
-</span><span id="434" class="l"><a href="#434">434: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_decode</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
-</span><span id="435" class="l"><a href="#435">435: </a>    }
-</span><span id="436" class="l"><a href="#436">436: </a>
-</span><span id="437" class="l"><a href="#437">437: </a>    <span class="php-comment">/**
-</span></span><span id="438" class="l"><a href="#438">438: </a><span class="php-comment">     * @param string Data to unserialized
-</span></span><span id="439" class="l"><a href="#439">439: </a><span class="php-comment">     *
-</span></span><span id="440" class="l"><a href="#440">440: </a><span class="php-comment">     * @return mixed Unserialized data
-</span></span><span id="441" class="l"><a href="#441">441: </a><span class="php-comment">     */</span>
-</span><span id="442" class="l"><a href="#442">442: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_serialize(<span class="php-var">$data</span>)
-</span><span id="443" class="l"><a href="#443">443: </a>    {
-</span><span id="444" class="l"><a href="#444">444: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">unserialize</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
-</span><span id="445" class="l"><a href="#445">445: </a>    }
-</span><span id="446" class="l"><a href="#446">446: </a>
-</span><span id="447" class="l"><a href="#447">447: </a>    <span class="php-comment">/**
-</span></span><span id="448" class="l"><a href="#448">448: </a><span class="php-comment">     * @param $data Data to trim leading and trailing whitespace
-</span></span><span id="449" class="l"><a href="#449">449: </a><span class="php-comment">     *
-</span></span><span id="450" class="l"><a href="#450">450: </a><span class="php-comment">     * @return string Data with leading and trailing whitespace removed
-</span></span><span id="451" class="l"><a href="#451">451: </a><span class="php-comment">     */</span>
-</span><span id="452" class="l"><a href="#452">452: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_php(<span class="php-var">$data</span>)
-</span><span id="453" class="l"><a href="#453">453: </a>    {
-</span><span id="454" class="l"><a href="#454">454: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">trim</span>(<span class="php-var">$data</span>);
-</span><span id="455" class="l"><a href="#455">455: </a>    }
-</span><span id="456" class="l"><a href="#456">456: </a>
-</span><span id="457" class="l"><a href="#457">457: </a>}
-</span><span id="458" class="l"><a href="#458">458: </a></span></code></pre>
+</span><span id="368" class="l"><a href="#368">368: </a>        <span class="php-comment">// Retrieve the csv contents</span>
+</span><span id="369" class="l"><a href="#369">369: </a>        <span class="php-var">$csv</span> = <span class="php-keyword2">stream_get_contents</span>(<span class="php-var">$handle</span>);
+</span><span id="370" class="l"><a href="#370">370: </a>
+</span><span id="371" class="l"><a href="#371">371: </a>        <span class="php-comment">// Close the handle</span>
+</span><span id="372" class="l"><a href="#372">372: </a>        <span class="php-keyword2">fclose</span>(<span class="php-var">$handle</span>);
+</span><span id="373" class="l"><a href="#373">373: </a>
+</span><span id="374" class="l"><a href="#374">374: </a>        <span class="php-keyword1">return</span> <span class="php-var">$csv</span>;
+</span><span id="375" class="l"><a href="#375">375: </a>    }
+</span><span id="376" class="l"><a href="#376">376: </a>
+</span><span id="377" class="l"><a href="#377">377: </a>    <span class="php-comment">/**
+</span></span><span id="378" class="l"><a href="#378">378: </a><span class="php-comment">     * Encode data as json
+</span></span><span id="379" class="l"><a href="#379">379: </a><span class="php-comment">     *
+</span></span><span id="380" class="l"><a href="#380">380: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="381" class="l"><a href="#381">381: </a><span class="php-comment">     * to the constructor
+</span></span><span id="382" class="l"><a href="#382">382: </a><span class="php-comment">     * @return string Json representation of a value
+</span></span><span id="383" class="l"><a href="#383">383: </a><span class="php-comment">     */</span>
+</span><span id="384" class="l"><a href="#384">384: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_json(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="385" class="l"><a href="#385">385: </a>    {
+</span><span id="386" class="l"><a href="#386">386: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="387" class="l"><a href="#387">387: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="388" class="l"><a href="#388">388: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="389" class="l"><a href="#389">389: </a>        {
+</span><span id="390" class="l"><a href="#390">390: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="391" class="l"><a href="#391">391: </a>        }
+</span><span id="392" class="l"><a href="#392">392: </a>
+</span><span id="393" class="l"><a href="#393">393: </a>        <span class="php-comment">// Get the callback parameter (if set)</span>
+</span><span id="394" class="l"><a href="#394">394: </a>        <span class="php-var">$callback</span> = <span class="php-var">$this</span>-&gt;_ci-&gt;input-&gt;get(<span class="php-quote">'callback'</span>);
+</span><span id="395" class="l"><a href="#395">395: </a>
+</span><span id="396" class="l"><a href="#396">396: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$callback</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="397" class="l"><a href="#397">397: </a>        {
+</span><span id="398" class="l"><a href="#398">398: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
+</span><span id="399" class="l"><a href="#399">399: </a>        }
+</span><span id="400" class="l"><a href="#400">400: </a>
+</span><span id="401" class="l"><a href="#401">401: </a>        <span class="php-comment">// We only honour a jsonp callback which are valid javascript identifiers</span>
+</span><span id="402" class="l"><a href="#402">402: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">preg_match</span>(<span class="php-quote">'/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i'</span>, <span class="php-var">$callback</span>))
+</span><span id="403" class="l"><a href="#403">403: </a>        {
+</span><span id="404" class="l"><a href="#404">404: </a>            <span class="php-comment">// Return the data as encoded json with a callback</span>
+</span><span id="405" class="l"><a href="#405">405: </a>            <span class="php-keyword1">return</span> <span class="php-var">$callback</span> . <span class="php-quote">'('</span> . <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>) . <span class="php-quote">');'</span>;
+</span><span id="406" class="l"><a href="#406">406: </a>        }
+</span><span id="407" class="l"><a href="#407">407: </a>
+</span><span id="408" class="l"><a href="#408">408: </a>        <span class="php-comment">// An invalid jsonp callback function provided.</span>
+</span><span id="409" class="l"><a href="#409">409: </a>        <span class="php-comment">// Though I don't believe this should be hardcoded here</span>
+</span><span id="410" class="l"><a href="#410">410: </a>        <span class="php-var">$data</span>[<span class="php-quote">'warning'</span>] = <span class="php-quote">'INVALID JSONP CALLBACK: '</span> . <span class="php-var">$callback</span>;
+</span><span id="411" class="l"><a href="#411">411: </a>
+</span><span id="412" class="l"><a href="#412">412: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
+</span><span id="413" class="l"><a href="#413">413: </a>    }
+</span><span id="414" class="l"><a href="#414">414: </a>
+</span><span id="415" class="l"><a href="#415">415: </a>    <span class="php-comment">/**
+</span></span><span id="416" class="l"><a href="#416">416: </a><span class="php-comment">     * Encode data as a serialized array
+</span></span><span id="417" class="l"><a href="#417">417: </a><span class="php-comment">     *
+</span></span><span id="418" class="l"><a href="#418">418: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="419" class="l"><a href="#419">419: </a><span class="php-comment">     * to the constructor
+</span></span><span id="420" class="l"><a href="#420">420: </a><span class="php-comment">     * @return string Serialized data
+</span></span><span id="421" class="l"><a href="#421">421: </a><span class="php-comment">     */</span>
+</span><span id="422" class="l"><a href="#422">422: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_serialized(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="423" class="l"><a href="#423">423: </a>    {
+</span><span id="424" class="l"><a href="#424">424: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="425" class="l"><a href="#425">425: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="426" class="l"><a href="#426">426: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="427" class="l"><a href="#427">427: </a>        {
+</span><span id="428" class="l"><a href="#428">428: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="429" class="l"><a href="#429">429: </a>        }
+</span><span id="430" class="l"><a href="#430">430: </a>
+</span><span id="431" class="l"><a href="#431">431: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">serialize</span>(<span class="php-var">$data</span>);
+</span><span id="432" class="l"><a href="#432">432: </a>    }
+</span><span id="433" class="l"><a href="#433">433: </a>
+</span><span id="434" class="l"><a href="#434">434: </a>    <span class="php-comment">/**
+</span></span><span id="435" class="l"><a href="#435">435: </a><span class="php-comment">     * Format data using a PHP structure
+</span></span><span id="436" class="l"><a href="#436">436: </a><span class="php-comment">     *
+</span></span><span id="437" class="l"><a href="#437">437: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="438" class="l"><a href="#438">438: </a><span class="php-comment">     * to the constructor
+</span></span><span id="439" class="l"><a href="#439">439: </a><span class="php-comment">     * @return mixed String representation of a variable
+</span></span><span id="440" class="l"><a href="#440">440: </a><span class="php-comment">     */</span>
+</span><span id="441" class="l"><a href="#441">441: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_php(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="442" class="l"><a href="#442">442: </a>    {
+</span><span id="443" class="l"><a href="#443">443: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="444" class="l"><a href="#444">444: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="445" class="l"><a href="#445">445: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="446" class="l"><a href="#446">446: </a>        {
+</span><span id="447" class="l"><a href="#447">447: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="448" class="l"><a href="#448">448: </a>        }
+</span><span id="449" class="l"><a href="#449">449: </a>
+</span><span id="450" class="l"><a href="#450">450: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">var_export</span>(<span class="php-var">$data</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="451" class="l"><a href="#451">451: </a>    }
+</span><span id="452" class="l"><a href="#452">452: </a>
+</span><span id="453" class="l"><a href="#453">453: </a>    <span class="php-comment">// INTERNAL FUNCTIONS</span>
+</span><span id="454" class="l"><a href="#454">454: </a>
+</span><span id="455" class="l"><a href="#455">455: </a>    <span class="php-comment">/**
+</span></span><span id="456" class="l"><a href="#456">456: </a><span class="php-comment">     * @param $data XML string
+</span></span><span id="457" class="l"><a href="#457">457: </a><span class="php-comment">     * @return SimpleXMLElement XML element object; otherwise, empty array
+</span></span><span id="458" class="l"><a href="#458">458: </a><span class="php-comment">     */</span>
+</span><span id="459" class="l"><a href="#459">459: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_xml(<span class="php-var">$data</span>)
+</span><span id="460" class="l"><a href="#460">460: </a>    {
+</span><span id="461" class="l"><a href="#461">461: </a>        <span class="php-keyword1">return</span> <span class="php-var">$data</span> ? (<span class="php-keyword1">array</span>) <span class="php-keyword2">simplexml_load_string</span>(<span class="php-var">$data</span>, <span class="php-quote">'SimpleXMLElement'</span>, LIBXML_NOCDATA) : [];
+</span><span id="462" class="l"><a href="#462">462: </a>    }
+</span><span id="463" class="l"><a href="#463">463: </a>
+</span><span id="464" class="l"><a href="#464">464: </a>    <span class="php-comment">/**
+</span></span><span id="465" class="l"><a href="#465">465: </a><span class="php-comment">     * @param string $data CSV string
+</span></span><span id="466" class="l"><a href="#466">466: </a><span class="php-comment">     * @param string $delimiter The optional delimiter parameter sets the field
+</span></span><span id="467" class="l"><a href="#467">467: </a><span class="php-comment">     * delimiter (one character only). NULL will use the default value (,)
+</span></span><span id="468" class="l"><a href="#468">468: </a><span class="php-comment">     * @param string $enclosure The optional enclosure parameter sets the field
+</span></span><span id="469" class="l"><a href="#469">469: </a><span class="php-comment">     * enclosure (one character only). NULL will use the default value (&quot;)
+</span></span><span id="470" class="l"><a href="#470">470: </a><span class="php-comment">     * @return array A multi-dimensional array with the outer array being the number of rows
+</span></span><span id="471" class="l"><a href="#471">471: </a><span class="php-comment">     * and the inner arrays the individual fields
+</span></span><span id="472" class="l"><a href="#472">472: </a><span class="php-comment">     */</span>
+</span><span id="473" class="l"><a href="#473">473: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_csv(<span class="php-var">$data</span>, <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>, <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>)
+</span><span id="474" class="l"><a href="#474">474: </a>    {
+</span><span id="475" class="l"><a href="#475">475: </a>        <span class="php-comment">// If NULL, then set as the default delimiter</span>
+</span><span id="476" class="l"><a href="#476">476: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$delimiter</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="477" class="l"><a href="#477">477: </a>        {
+</span><span id="478" class="l"><a href="#478">478: </a>            <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>;
+</span><span id="479" class="l"><a href="#479">479: </a>        }
+</span><span id="480" class="l"><a href="#480">480: </a>
+</span><span id="481" class="l"><a href="#481">481: </a>        <span class="php-comment">// If NULL, then set as the default enclosure</span>
+</span><span id="482" class="l"><a href="#482">482: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$enclosure</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="483" class="l"><a href="#483">483: </a>        {
+</span><span id="484" class="l"><a href="#484">484: </a>            <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>;
+</span><span id="485" class="l"><a href="#485">485: </a>        }
+</span><span id="486" class="l"><a href="#486">486: </a>
+</span><span id="487" class="l"><a href="#487">487: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">str_getcsv</span>(<span class="php-var">$data</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
+</span><span id="488" class="l"><a href="#488">488: </a>    }
+</span><span id="489" class="l"><a href="#489">489: </a>
+</span><span id="490" class="l"><a href="#490">490: </a>    <span class="php-comment">/**
+</span></span><span id="491" class="l"><a href="#491">491: </a><span class="php-comment">     * @param $data Encoded json string
+</span></span><span id="492" class="l"><a href="#492">492: </a><span class="php-comment">     * @return mixed Decoded json string with leading and trailing whitespace removed
+</span></span><span id="493" class="l"><a href="#493">493: </a><span class="php-comment">     */</span>
+</span><span id="494" class="l"><a href="#494">494: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_json(<span class="php-var">$data</span>)
+</span><span id="495" class="l"><a href="#495">495: </a>    {
+</span><span id="496" class="l"><a href="#496">496: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_decode</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
+</span><span id="497" class="l"><a href="#497">497: </a>    }
+</span><span id="498" class="l"><a href="#498">498: </a>
+</span><span id="499" class="l"><a href="#499">499: </a>    <span class="php-comment">/**
+</span></span><span id="500" class="l"><a href="#500">500: </a><span class="php-comment">     * @param string Data to unserialized
+</span></span><span id="501" class="l"><a href="#501">501: </a><span class="php-comment">     * @return mixed Unserialized data
+</span></span><span id="502" class="l"><a href="#502">502: </a><span class="php-comment">     */</span>
+</span><span id="503" class="l"><a href="#503">503: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_serialize(<span class="php-var">$data</span>)
+</span><span id="504" class="l"><a href="#504">504: </a>    {
+</span><span id="505" class="l"><a href="#505">505: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">unserialize</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
+</span><span id="506" class="l"><a href="#506">506: </a>    }
+</span><span id="507" class="l"><a href="#507">507: </a>
+</span><span id="508" class="l"><a href="#508">508: </a>    <span class="php-comment">/**
+</span></span><span id="509" class="l"><a href="#509">509: </a><span class="php-comment">     * @param $data Data to trim leading and trailing whitespace
+</span></span><span id="510" class="l"><a href="#510">510: </a><span class="php-comment">     * @return string Data with leading and trailing whitespace removed
+</span></span><span id="511" class="l"><a href="#511">511: </a><span class="php-comment">     */</span>
+</span><span id="512" class="l"><a href="#512">512: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_php(<span class="php-var">$data</span>)
+</span><span id="513" class="l"><a href="#513">513: </a>    {
+</span><span id="514" class="l"><a href="#514">514: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">trim</span>(<span class="php-var">$data</span>);
+</span><span id="515" class="l"><a href="#515">515: </a>    }
+</span><span id="516" class="l"><a href="#516">516: </a>
+</span><span id="517" class="l"><a href="#517">517: </a>}
+</span><span id="518" class="l"><a href="#518">518: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
+<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Key.html b/documentation/source-class-Key.html
index d47c058c..8894a880 100644
--- a/documentation/source-class-Key.html
+++ b/documentation/source-class-Key.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<meta name="robots" content="noindex">
 
-	<title>File application/controllers/api/Key.php</title>
+	<title>File controllers/api/Key.php</title>
 
 	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
 
@@ -36,7 +36,7 @@ <h3>Packages</h3>
 
 						</li>
 							</ul></li>
-				<li class="active">
+				<li>
 					<a href="http://github.com/package-None.html">
 						None					</a>
 
@@ -50,7 +50,10 @@ <h3>Packages</h3>
 		<div id="elements">
 			<h3>Classes</h3>
 			<ul>
+				<li><a href="http://github.com/class-Example.html">Example</a></li>
 				<li><a href="http://github.com/class-Format.html">Format</a></li>
+				<li><a href="http://github.com/class-Key.html">Key</a></li>
+				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
 			</ul>
 
 
@@ -77,11 +80,9 @@ <h3>Classes</h3>
 				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
 			</li>
 			<li>
-				<a href="http://github.com/package-None.html" title="Summary of None"><span>Package</span></a>
-			</li>
+<span>Package</span>			</li>
 			<li>
-				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
-			</li>
+<span>Class</span>			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -138,14 +139,14 @@ <h3>Classes</h3>
 </span><span id="47" class="l"><a href="#47"> 47: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="48" class="l"><a href="#48"> 48: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
 </span><span id="49" class="l"><a href="#49"> 49: </a>                <span class="php-quote">'key'</span> =&gt; <span class="php-var">$key</span>
-</span><span id="50" class="l"><a href="#50"> 50: </a>            ], <span class="php-num">201</span>); <span class="php-comment">// 201 = Created</span>
+</span><span id="50" class="l"><a href="#50"> 50: </a>            ], REST_Controller::CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
 </span><span id="51" class="l"><a href="#51"> 51: </a>        }
 </span><span id="52" class="l"><a href="#52"> 52: </a>        <span class="php-keyword1">else</span>
 </span><span id="53" class="l"><a href="#53"> 53: </a>        {
 </span><span id="54" class="l"><a href="#54"> 54: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="55" class="l"><a href="#55"> 55: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>,
 </span><span id="56" class="l"><a href="#56"> 56: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
-</span><span id="57" class="l"><a href="#57"> 57: </a>            ], <span class="php-num">500</span>); <span class="php-comment">// 500 = Internal Server Error</span>
+</span><span id="57" class="l"><a href="#57"> 57: </a>            ], REST_Controller::INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
 </span><span id="58" class="l"><a href="#58"> 58: </a>        }
 </span><span id="59" class="l"><a href="#59"> 59: </a>    }
 </span><span id="60" class="l"><a href="#60"> 60: </a>
@@ -168,7 +169,7 @@ <h3>Classes</h3>
 </span><span id="77" class="l"><a href="#77"> 77: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
 </span><span id="78" class="l"><a href="#78"> 78: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="79" class="l"><a href="#79"> 79: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key'</span>
-</span><span id="80" class="l"><a href="#80"> 80: </a>            ], <span class="php-num">400</span>); <span class="php-comment">// 400 = Bad Request</span>
+</span><span id="80" class="l"><a href="#80"> 80: </a>            ], REST_Controller::BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
 </span><span id="81" class="l"><a href="#81"> 81: </a>        }
 </span><span id="82" class="l"><a href="#82"> 82: </a>
 </span><span id="83" class="l"><a href="#83"> 83: </a>        <span class="php-comment">// Destroy it</span>
@@ -178,7 +179,7 @@ <h3>Classes</h3>
 </span><span id="87" class="l"><a href="#87"> 87: </a>        <span class="php-var">$this</span>-&gt;response([
 </span><span id="88" class="l"><a href="#88"> 88: </a>            <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
 </span><span id="89" class="l"><a href="#89"> 89: </a>            <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API Key was deleted'</span>
-</span><span id="90" class="l"><a href="#90"> 90: </a>            ], <span class="php-num">204</span>); <span class="php-comment">// 204 = Success, No Content</span>
+</span><span id="90" class="l"><a href="#90"> 90: </a>            ], REST_Controller::NO_CONTENT); <span class="php-comment">// NO_CONTENT (204) being the HTTP response code</span>
 </span><span id="91" class="l"><a href="#91"> 91: </a>    }
 </span><span id="92" class="l"><a href="#92"> 92: </a>
 </span><span id="93" class="l"><a href="#93"> 93: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
@@ -201,7 +202,7 @@ <h3>Classes</h3>
 </span><span id="110" class="l"><a href="#110">110: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
 </span><span id="111" class="l"><a href="#111">111: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="112" class="l"><a href="#112">112: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key'</span>
-</span><span id="113" class="l"><a href="#113">113: </a>            ], <span class="php-num">400</span>); <span class="php-comment">// 400 = Bad Request</span>
+</span><span id="113" class="l"><a href="#113">113: </a>            ], REST_Controller::BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
 </span><span id="114" class="l"><a href="#114">114: </a>        }
 </span><span id="115" class="l"><a href="#115">115: </a>
 </span><span id="116" class="l"><a href="#116">116: </a>        <span class="php-comment">// Update the key level</span>
@@ -210,14 +211,14 @@ <h3>Classes</h3>
 </span><span id="119" class="l"><a href="#119">119: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="120" class="l"><a href="#120">120: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
 </span><span id="121" class="l"><a href="#121">121: </a>                <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API Key was updated'</span>
-</span><span id="122" class="l"><a href="#122">122: </a>            ], <span class="php-num">200</span>); <span class="php-comment">// 200 = OK</span>
+</span><span id="122" class="l"><a href="#122">122: </a>            ], REST_Controller::OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
 </span><span id="123" class="l"><a href="#123">123: </a>        }
 </span><span id="124" class="l"><a href="#124">124: </a>        <span class="php-keyword1">else</span>
 </span><span id="125" class="l"><a href="#125">125: </a>        {
 </span><span id="126" class="l"><a href="#126">126: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="127" class="l"><a href="#127">127: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>,
 </span><span id="128" class="l"><a href="#128">128: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not update the key level'</span>
-</span><span id="129" class="l"><a href="#129">129: </a>            ], <span class="php-num">500</span>); <span class="php-comment">// 500 = Internal Server Error</span>
+</span><span id="129" class="l"><a href="#129">129: </a>            ], REST_Controller::INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
 </span><span id="130" class="l"><a href="#130">130: </a>        }
 </span><span id="131" class="l"><a href="#131">131: </a>    }
 </span><span id="132" class="l"><a href="#132">132: </a>
@@ -240,7 +241,7 @@ <h3>Classes</h3>
 </span><span id="149" class="l"><a href="#149">149: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
 </span><span id="150" class="l"><a href="#150">150: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="151" class="l"><a href="#151">151: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key'</span>
-</span><span id="152" class="l"><a href="#152">152: </a>            ], <span class="php-num">400</span>); <span class="php-comment">// 400 = Bad Request</span>
+</span><span id="152" class="l"><a href="#152">152: </a>            ], REST_Controller::BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
 </span><span id="153" class="l"><a href="#153">153: </a>        }
 </span><span id="154" class="l"><a href="#154">154: </a>
 </span><span id="155" class="l"><a href="#155">155: </a>        <span class="php-comment">// Update the key level</span>
@@ -249,14 +250,14 @@ <h3>Classes</h3>
 </span><span id="158" class="l"><a href="#158">158: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="159" class="l"><a href="#159">159: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
 </span><span id="160" class="l"><a href="#160">160: </a>                <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'Key was suspended'</span>
-</span><span id="161" class="l"><a href="#161">161: </a>            ], <span class="php-num">200</span>); <span class="php-comment">// 200 = OK</span>
+</span><span id="161" class="l"><a href="#161">161: </a>            ], REST_Controller::OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
 </span><span id="162" class="l"><a href="#162">162: </a>        }
 </span><span id="163" class="l"><a href="#163">163: </a>        <span class="php-keyword1">else</span>
 </span><span id="164" class="l"><a href="#164">164: </a>        {
 </span><span id="165" class="l"><a href="#165">165: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="166" class="l"><a href="#166">166: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>,
 </span><span id="167" class="l"><a href="#167">167: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not suspend the user'</span>
-</span><span id="168" class="l"><a href="#168">168: </a>            ], <span class="php-num">500</span>); <span class="php-comment">// 500 = Internal Server Error</span>
+</span><span id="168" class="l"><a href="#168">168: </a>            ], REST_Controller::INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
 </span><span id="169" class="l"><a href="#169">169: </a>        }
 </span><span id="170" class="l"><a href="#170">170: </a>    }
 </span><span id="171" class="l"><a href="#171">171: </a>
@@ -280,7 +281,7 @@ <h3>Classes</h3>
 </span><span id="189" class="l"><a href="#189">189: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
 </span><span id="190" class="l"><a href="#190">190: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="191" class="l"><a href="#191">191: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key'</span>
-</span><span id="192" class="l"><a href="#192">192: </a>            ], <span class="php-num">400</span>); <span class="php-comment">// 400 = Bad Request</span>
+</span><span id="192" class="l"><a href="#192">192: </a>            ], REST_Controller::BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
 </span><span id="193" class="l"><a href="#193">193: </a>        }
 </span><span id="194" class="l"><a href="#194">194: </a>
 </span><span id="195" class="l"><a href="#195">195: </a>        <span class="php-comment">// Build a new key</span>
@@ -295,14 +296,14 @@ <h3>Classes</h3>
 </span><span id="204" class="l"><a href="#204">204: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="205" class="l"><a href="#205">205: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
 </span><span id="206" class="l"><a href="#206">206: </a>                <span class="php-quote">'key'</span> =&gt; <span class="php-var">$new_key</span>
-</span><span id="207" class="l"><a href="#207">207: </a>            ], <span class="php-num">201</span>); <span class="php-comment">// 201 = Created</span>
+</span><span id="207" class="l"><a href="#207">207: </a>            ], REST_Controller::CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
 </span><span id="208" class="l"><a href="#208">208: </a>        }
 </span><span id="209" class="l"><a href="#209">209: </a>        <span class="php-keyword1">else</span>
 </span><span id="210" class="l"><a href="#210">210: </a>        {
 </span><span id="211" class="l"><a href="#211">211: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="212" class="l"><a href="#212">212: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>,
 </span><span id="213" class="l"><a href="#213">213: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
-</span><span id="214" class="l"><a href="#214">214: </a>            ], <span class="php-num">500</span>); <span class="php-comment">// 500 = Internal Server Error</span>
+</span><span id="214" class="l"><a href="#214">214: </a>            ], REST_Controller::INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
 </span><span id="215" class="l"><a href="#215">215: </a>        }
 </span><span id="216" class="l"><a href="#216">216: </a>    }
 </span><span id="217" class="l"><a href="#217">217: </a>
@@ -336,54 +337,59 @@ <h3>Classes</h3>
 </span><span id="245" class="l"><a href="#245">245: </a>
 </span><span id="246" class="l"><a href="#246">246: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _get_key(<span class="php-var">$key</span>)
 </span><span id="247" class="l"><a href="#247">247: </a>    {
-</span><span id="248" class="l"><a href="#248">248: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db-&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(config_item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row();
-</span><span id="249" class="l"><a href="#249">249: </a>    }
-</span><span id="250" class="l"><a href="#250">250: </a>
-</span><span id="251" class="l"><a href="#251">251: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="252" class="l"><a href="#252">252: </a>
-</span><span id="253" class="l"><a href="#253">253: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _key_exists(<span class="php-var">$key</span>)
-</span><span id="254" class="l"><a href="#254">254: </a>    {
-</span><span id="255" class="l"><a href="#255">255: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db-&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;count_all_results(config_item(<span class="php-quote">'rest_keys_table'</span>)) &gt; <span class="php-num">0</span>;
-</span><span id="256" class="l"><a href="#256">256: </a>    }
-</span><span id="257" class="l"><a href="#257">257: </a>
-</span><span id="258" class="l"><a href="#258">258: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="259" class="l"><a href="#259">259: </a>
-</span><span id="260" class="l"><a href="#260">260: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _insert_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
-</span><span id="261" class="l"><a href="#261">261: </a>    {
-</span><span id="262" class="l"><a href="#262">262: </a>        <span class="php-var">$data</span>[config_item(<span class="php-quote">'rest_key_column'</span>)] = <span class="php-var">$key</span>;
-</span><span id="263" class="l"><a href="#263">263: </a>        <span class="php-var">$data</span>[<span class="php-quote">'date_created'</span>] = <span class="php-keyword2">function_exists</span>(<span class="php-quote">'now'</span>) ? now() : <span class="php-keyword2">time</span>();
+</span><span id="248" class="l"><a href="#248">248: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="249" class="l"><a href="#249">249: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
+</span><span id="250" class="l"><a href="#250">250: </a>            -&gt;get(config_item(<span class="php-quote">'rest_keys_table'</span>))
+</span><span id="251" class="l"><a href="#251">251: </a>            -&gt;row();
+</span><span id="252" class="l"><a href="#252">252: </a>    }
+</span><span id="253" class="l"><a href="#253">253: </a>
+</span><span id="254" class="l"><a href="#254">254: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="255" class="l"><a href="#255">255: </a>
+</span><span id="256" class="l"><a href="#256">256: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _key_exists(<span class="php-var">$key</span>)
+</span><span id="257" class="l"><a href="#257">257: </a>    {
+</span><span id="258" class="l"><a href="#258">258: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="259" class="l"><a href="#259">259: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
+</span><span id="260" class="l"><a href="#260">260: </a>            -&gt;count_all_results(config_item(<span class="php-quote">'rest_keys_table'</span>)) &gt; <span class="php-num">0</span>;
+</span><span id="261" class="l"><a href="#261">261: </a>    }
+</span><span id="262" class="l"><a href="#262">262: </a>
+</span><span id="263" class="l"><a href="#263">263: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
 </span><span id="264" class="l"><a href="#264">264: </a>
-</span><span id="265" class="l"><a href="#265">265: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="266" class="l"><a href="#266">266: </a>            -&gt;set(<span class="php-var">$data</span>)
-</span><span id="267" class="l"><a href="#267">267: </a>            -&gt;insert(config_item(<span class="php-quote">'rest_keys_table'</span>));
-</span><span id="268" class="l"><a href="#268">268: </a>    }
+</span><span id="265" class="l"><a href="#265">265: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _insert_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
+</span><span id="266" class="l"><a href="#266">266: </a>    {
+</span><span id="267" class="l"><a href="#267">267: </a>        <span class="php-var">$data</span>[config_item(<span class="php-quote">'rest_key_column'</span>)] = <span class="php-var">$key</span>;
+</span><span id="268" class="l"><a href="#268">268: </a>        <span class="php-var">$data</span>[<span class="php-quote">'date_created'</span>] = <span class="php-keyword2">function_exists</span>(<span class="php-quote">'now'</span>) ? now() : <span class="php-keyword2">time</span>();
 </span><span id="269" class="l"><a href="#269">269: </a>
-</span><span id="270" class="l"><a href="#270">270: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="271" class="l"><a href="#271">271: </a>
-</span><span id="272" class="l"><a href="#272">272: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _update_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
-</span><span id="273" class="l"><a href="#273">273: </a>    {
-</span><span id="274" class="l"><a href="#274">274: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="275" class="l"><a href="#275">275: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
-</span><span id="276" class="l"><a href="#276">276: </a>            -&gt;update(config_item(<span class="php-quote">'rest_keys_table'</span>), <span class="php-var">$data</span>);
-</span><span id="277" class="l"><a href="#277">277: </a>    }
-</span><span id="278" class="l"><a href="#278">278: </a>
-</span><span id="279" class="l"><a href="#279">279: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="280" class="l"><a href="#280">280: </a>
-</span><span id="281" class="l"><a href="#281">281: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _delete_key(<span class="php-var">$key</span>)
-</span><span id="282" class="l"><a href="#282">282: </a>    {
-</span><span id="283" class="l"><a href="#283">283: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="284" class="l"><a href="#284">284: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
-</span><span id="285" class="l"><a href="#285">285: </a>            -&gt;<span class="php-keyword2">delete</span>(config_item(<span class="php-quote">'rest_keys_table'</span>));
-</span><span id="286" class="l"><a href="#286">286: </a>    }
-</span><span id="287" class="l"><a href="#287">287: </a>}
-</span><span id="288" class="l"><a href="#288">288: </a></span></code></pre>
+</span><span id="270" class="l"><a href="#270">270: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="271" class="l"><a href="#271">271: </a>            -&gt;set(<span class="php-var">$data</span>)
+</span><span id="272" class="l"><a href="#272">272: </a>            -&gt;insert(config_item(<span class="php-quote">'rest_keys_table'</span>));
+</span><span id="273" class="l"><a href="#273">273: </a>    }
+</span><span id="274" class="l"><a href="#274">274: </a>
+</span><span id="275" class="l"><a href="#275">275: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="276" class="l"><a href="#276">276: </a>
+</span><span id="277" class="l"><a href="#277">277: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _update_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
+</span><span id="278" class="l"><a href="#278">278: </a>    {
+</span><span id="279" class="l"><a href="#279">279: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="280" class="l"><a href="#280">280: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
+</span><span id="281" class="l"><a href="#281">281: </a>            -&gt;update(config_item(<span class="php-quote">'rest_keys_table'</span>), <span class="php-var">$data</span>);
+</span><span id="282" class="l"><a href="#282">282: </a>    }
+</span><span id="283" class="l"><a href="#283">283: </a>
+</span><span id="284" class="l"><a href="#284">284: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="285" class="l"><a href="#285">285: </a>
+</span><span id="286" class="l"><a href="#286">286: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _delete_key(<span class="php-var">$key</span>)
+</span><span id="287" class="l"><a href="#287">287: </a>    {
+</span><span id="288" class="l"><a href="#288">288: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="289" class="l"><a href="#289">289: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
+</span><span id="290" class="l"><a href="#290">290: </a>            -&gt;<span class="php-keyword2">delete</span>(config_item(<span class="php-quote">'rest_keys_table'</span>));
+</span><span id="291" class="l"><a href="#291">291: </a>    }
+</span><span id="292" class="l"><a href="#292">292: </a>}
+</span><span id="293" class="l"><a href="#293">293: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
+<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/source-class-REST_Controller.html b/documentation/source-class-REST_Controller.html
index 122dd871..d4e8cae4 100644
--- a/documentation/source-class-REST_Controller.html
+++ b/documentation/source-class-REST_Controller.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<meta name="robots" content="noindex">
 
-	<title>File application/libraries/REST_Controller.php</title>
+	<title>File libraries/REST_Controller.php</title>
 
 	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
 
@@ -36,7 +36,7 @@ <h3>Packages</h3>
 
 						</li>
 							</ul></li>
-				<li class="active">
+				<li>
 					<a href="http://github.com/package-None.html">
 						None					</a>
 
@@ -50,7 +50,10 @@ <h3>Packages</h3>
 		<div id="elements">
 			<h3>Classes</h3>
 			<ul>
+				<li><a href="http://github.com/class-Example.html">Example</a></li>
 				<li><a href="http://github.com/class-Format.html">Format</a></li>
+				<li><a href="http://github.com/class-Key.html">Key</a></li>
+				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
 			</ul>
 
 
@@ -77,11 +80,9 @@ <h3>Classes</h3>
 				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
 			</li>
 			<li>
-				<a href="http://github.com/package-None.html" title="Summary of None"><span>Package</span></a>
-			</li>
+<span>Package</span>			</li>
 			<li>
-				<a href="http://github.com/class-REST_Controller.html" title="Summary of REST_Controller"><span>Class</span></a>
-			</li>
+<span>Class</span>			</li>
 		</ul>
 		<ul>
 		</ul>
@@ -212,1763 +213,1873 @@ <h3>Classes</h3>
 </span><span id="121" class="l"><a href="#121"> 121: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_options_args</span> = [];
 </span><span id="122" class="l"><a href="#122"> 122: </a>
 </span><span id="123" class="l"><a href="#123"> 123: </a>    <span class="php-comment">/**
-</span></span><span id="124" class="l"><a href="#124"> 124: </a><span class="php-comment">     * The arguments from GET, POST, PUT, DELETE request methods combined.
+</span></span><span id="124" class="l"><a href="#124"> 124: </a><span class="php-comment">     * The arguments for the query parameters
 </span></span><span id="125" class="l"><a href="#125"> 125: </a><span class="php-comment">     *
 </span></span><span id="126" class="l"><a href="#126"> 126: </a><span class="php-comment">     * @var array
 </span></span><span id="127" class="l"><a href="#127"> 127: </a><span class="php-comment">     */</span>
-</span><span id="128" class="l"><a href="#128"> 128: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_args</span> = [];
+</span><span id="128" class="l"><a href="#128"> 128: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_query_args</span> = [];
 </span><span id="129" class="l"><a href="#129"> 129: </a>
 </span><span id="130" class="l"><a href="#130"> 130: </a>    <span class="php-comment">/**
-</span></span><span id="131" class="l"><a href="#131"> 131: </a><span class="php-comment">     * If the request is allowed based on the API key provided.
+</span></span><span id="131" class="l"><a href="#131"> 131: </a><span class="php-comment">     * The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined
 </span></span><span id="132" class="l"><a href="#132"> 132: </a><span class="php-comment">     *
-</span></span><span id="133" class="l"><a href="#133"> 133: </a><span class="php-comment">     * @var bool
+</span></span><span id="133" class="l"><a href="#133"> 133: </a><span class="php-comment">     * @var array
 </span></span><span id="134" class="l"><a href="#134"> 134: </a><span class="php-comment">     */</span>
-</span><span id="135" class="l"><a href="#135"> 135: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_allow</span> = <span class="php-keyword1">TRUE</span>;
+</span><span id="135" class="l"><a href="#135"> 135: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_args</span> = [];
 </span><span id="136" class="l"><a href="#136"> 136: </a>
 </span><span id="137" class="l"><a href="#137"> 137: </a>    <span class="php-comment">/**
-</span></span><span id="138" class="l"><a href="#138"> 138: </a><span class="php-comment">     * Determines if output compression is enabled
+</span></span><span id="138" class="l"><a href="#138"> 138: </a><span class="php-comment">     * If the request is allowed based on the API key provided.
 </span></span><span id="139" class="l"><a href="#139"> 139: </a><span class="php-comment">     *
 </span></span><span id="140" class="l"><a href="#140"> 140: </a><span class="php-comment">     * @var bool
 </span></span><span id="141" class="l"><a href="#141"> 141: </a><span class="php-comment">     */</span>
-</span><span id="142" class="l"><a href="#142"> 142: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_zlib_oc</span> = <span class="php-keyword1">FALSE</span>;
+</span><span id="142" class="l"><a href="#142"> 142: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_allow</span> = <span class="php-keyword1">TRUE</span>;
 </span><span id="143" class="l"><a href="#143"> 143: </a>
 </span><span id="144" class="l"><a href="#144"> 144: </a>    <span class="php-comment">/**
-</span></span><span id="145" class="l"><a href="#145"> 145: </a><span class="php-comment">     * The LDAP Distinguished Name of the User post authentication
+</span></span><span id="145" class="l"><a href="#145"> 145: </a><span class="php-comment">     * Determines if output compression is enabled
 </span></span><span id="146" class="l"><a href="#146"> 146: </a><span class="php-comment">     *
-</span></span><span id="147" class="l"><a href="#147"> 147: </a><span class="php-comment">     * @var string
+</span></span><span id="147" class="l"><a href="#147"> 147: </a><span class="php-comment">     * @var bool
 </span></span><span id="148" class="l"><a href="#148"> 148: </a><span class="php-comment">     */</span>
-</span><span id="149" class="l"><a href="#149"> 149: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_user_ldap_dn</span> = <span class="php-quote">''</span>;
+</span><span id="149" class="l"><a href="#149"> 149: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_zlib_oc</span> = <span class="php-keyword1">FALSE</span>;
 </span><span id="150" class="l"><a href="#150"> 150: </a>
 </span><span id="151" class="l"><a href="#151"> 151: </a>    <span class="php-comment">/**
-</span></span><span id="152" class="l"><a href="#152"> 152: </a><span class="php-comment">     * The start of the response time from the server
+</span></span><span id="152" class="l"><a href="#152"> 152: </a><span class="php-comment">     * The LDAP Distinguished Name of the User post authentication
 </span></span><span id="153" class="l"><a href="#153"> 153: </a><span class="php-comment">     *
 </span></span><span id="154" class="l"><a href="#154"> 154: </a><span class="php-comment">     * @var string
 </span></span><span id="155" class="l"><a href="#155"> 155: </a><span class="php-comment">     */</span>
-</span><span id="156" class="l"><a href="#156"> 156: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_start_rtime</span> = <span class="php-quote">''</span>;
+</span><span id="156" class="l"><a href="#156"> 156: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_user_ldap_dn</span> = <span class="php-quote">''</span>;
 </span><span id="157" class="l"><a href="#157"> 157: </a>
 </span><span id="158" class="l"><a href="#158"> 158: </a>    <span class="php-comment">/**
-</span></span><span id="159" class="l"><a href="#159"> 159: </a><span class="php-comment">     * The end of the response time from the server
+</span></span><span id="159" class="l"><a href="#159"> 159: </a><span class="php-comment">     * The start of the response time from the server
 </span></span><span id="160" class="l"><a href="#160"> 160: </a><span class="php-comment">     *
 </span></span><span id="161" class="l"><a href="#161"> 161: </a><span class="php-comment">     * @var string
 </span></span><span id="162" class="l"><a href="#162"> 162: </a><span class="php-comment">     */</span>
-</span><span id="163" class="l"><a href="#163"> 163: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_end_rtime</span> = <span class="php-quote">''</span>;
+</span><span id="163" class="l"><a href="#163"> 163: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_start_rtime</span> = <span class="php-quote">''</span>;
 </span><span id="164" class="l"><a href="#164"> 164: </a>
 </span><span id="165" class="l"><a href="#165"> 165: </a>    <span class="php-comment">/**
-</span></span><span id="166" class="l"><a href="#166"> 166: </a><span class="php-comment">     * List all supported methods, the first will be the default format
+</span></span><span id="166" class="l"><a href="#166"> 166: </a><span class="php-comment">     * The end of the response time from the server
 </span></span><span id="167" class="l"><a href="#167"> 167: </a><span class="php-comment">     *
-</span></span><span id="168" class="l"><a href="#168"> 168: </a><span class="php-comment">     * @var array
+</span></span><span id="168" class="l"><a href="#168"> 168: </a><span class="php-comment">     * @var string
 </span></span><span id="169" class="l"><a href="#169"> 169: </a><span class="php-comment">     */</span>
-</span><span id="170" class="l"><a href="#170"> 170: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_supported_formats</span> = [
-</span><span id="171" class="l"><a href="#171"> 171: </a>            <span class="php-quote">'json'</span> =&gt; <span class="php-quote">'application/json'</span>,
-</span><span id="172" class="l"><a href="#172"> 172: </a>            <span class="php-quote">'array'</span> =&gt; <span class="php-quote">'application/json'</span>,
-</span><span id="173" class="l"><a href="#173"> 173: </a>            <span class="php-quote">'csv'</span> =&gt; <span class="php-quote">'application/csv'</span>,
-</span><span id="174" class="l"><a href="#174"> 174: </a>            <span class="php-quote">'html'</span> =&gt; <span class="php-quote">'text/html'</span>,
-</span><span id="175" class="l"><a href="#175"> 175: </a>            <span class="php-quote">'jsonp'</span> =&gt; <span class="php-quote">'application/javascript'</span>,
-</span><span id="176" class="l"><a href="#176"> 176: </a>            <span class="php-quote">'php'</span> =&gt; <span class="php-quote">'text/plain'</span>,
-</span><span id="177" class="l"><a href="#177"> 177: </a>            <span class="php-quote">'serialized'</span> =&gt; <span class="php-quote">'application/vnd.php.serialized'</span>,
-</span><span id="178" class="l"><a href="#178"> 178: </a>            <span class="php-quote">'xml'</span> =&gt; <span class="php-quote">'application/xml'</span>
-</span><span id="179" class="l"><a href="#179"> 179: </a>        ];
-</span><span id="180" class="l"><a href="#180"> 180: </a>
-</span><span id="181" class="l"><a href="#181"> 181: </a>    <span class="php-comment">/**
-</span></span><span id="182" class="l"><a href="#182"> 182: </a><span class="php-comment">     * Information about the current API user
-</span></span><span id="183" class="l"><a href="#183"> 183: </a><span class="php-comment">     *
-</span></span><span id="184" class="l"><a href="#184"> 184: </a><span class="php-comment">     * @var object
-</span></span><span id="185" class="l"><a href="#185"> 185: </a><span class="php-comment">     */</span>
-</span><span id="186" class="l"><a href="#186"> 186: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_apiuser</span>;
+</span><span id="170" class="l"><a href="#170"> 170: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_end_rtime</span> = <span class="php-quote">''</span>;
+</span><span id="171" class="l"><a href="#171"> 171: </a>
+</span><span id="172" class="l"><a href="#172"> 172: </a>    <span class="php-comment">/**
+</span></span><span id="173" class="l"><a href="#173"> 173: </a><span class="php-comment">     * List all supported methods, the first will be the default format
+</span></span><span id="174" class="l"><a href="#174"> 174: </a><span class="php-comment">     *
+</span></span><span id="175" class="l"><a href="#175"> 175: </a><span class="php-comment">     * @var array
+</span></span><span id="176" class="l"><a href="#176"> 176: </a><span class="php-comment">     */</span>
+</span><span id="177" class="l"><a href="#177"> 177: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_supported_formats</span> = [
+</span><span id="178" class="l"><a href="#178"> 178: </a>            <span class="php-quote">'json'</span> =&gt; <span class="php-quote">'application/json'</span>,
+</span><span id="179" class="l"><a href="#179"> 179: </a>            <span class="php-quote">'array'</span> =&gt; <span class="php-quote">'application/json'</span>,
+</span><span id="180" class="l"><a href="#180"> 180: </a>            <span class="php-quote">'csv'</span> =&gt; <span class="php-quote">'application/csv'</span>,
+</span><span id="181" class="l"><a href="#181"> 181: </a>            <span class="php-quote">'html'</span> =&gt; <span class="php-quote">'text/html'</span>,
+</span><span id="182" class="l"><a href="#182"> 182: </a>            <span class="php-quote">'jsonp'</span> =&gt; <span class="php-quote">'application/javascript'</span>,
+</span><span id="183" class="l"><a href="#183"> 183: </a>            <span class="php-quote">'php'</span> =&gt; <span class="php-quote">'text/plain'</span>,
+</span><span id="184" class="l"><a href="#184"> 184: </a>            <span class="php-quote">'serialized'</span> =&gt; <span class="php-quote">'application/vnd.php.serialized'</span>,
+</span><span id="185" class="l"><a href="#185"> 185: </a>            <span class="php-quote">'xml'</span> =&gt; <span class="php-quote">'application/xml'</span>
+</span><span id="186" class="l"><a href="#186"> 186: </a>        ];
 </span><span id="187" class="l"><a href="#187"> 187: </a>
 </span><span id="188" class="l"><a href="#188"> 188: </a>    <span class="php-comment">/**
-</span></span><span id="189" class="l"><a href="#189"> 189: </a><span class="php-comment">     * Enable XSS flag
-</span></span><span id="190" class="l"><a href="#190"> 190: </a><span class="php-comment">     * Determines whether the XSS filter is always active when
-</span></span><span id="191" class="l"><a href="#191"> 191: </a><span class="php-comment">     * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered.
-</span></span><span id="192" class="l"><a href="#192"> 192: </a><span class="php-comment">     * Set automatically based on config setting.
-</span></span><span id="193" class="l"><a href="#193"> 193: </a><span class="php-comment">     *
-</span></span><span id="194" class="l"><a href="#194"> 194: </a><span class="php-comment">     * @var bool
-</span></span><span id="195" class="l"><a href="#195"> 195: </a><span class="php-comment">     */</span>
-</span><span id="196" class="l"><a href="#196"> 196: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_enable_xss</span> = <span class="php-keyword1">FALSE</span>;
-</span><span id="197" class="l"><a href="#197"> 197: </a>
-</span><span id="198" class="l"><a href="#198"> 198: </a>    <span class="php-comment">/**
-</span></span><span id="199" class="l"><a href="#199"> 199: </a><span class="php-comment">     * Extend this function to apply additional checking early on in the process
+</span></span><span id="189" class="l"><a href="#189"> 189: </a><span class="php-comment">     * Information about the current API user
+</span></span><span id="190" class="l"><a href="#190"> 190: </a><span class="php-comment">     *
+</span></span><span id="191" class="l"><a href="#191"> 191: </a><span class="php-comment">     * @var object
+</span></span><span id="192" class="l"><a href="#192"> 192: </a><span class="php-comment">     */</span>
+</span><span id="193" class="l"><a href="#193"> 193: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_apiuser</span>;
+</span><span id="194" class="l"><a href="#194"> 194: </a>
+</span><span id="195" class="l"><a href="#195"> 195: </a>    <span class="php-comment">/**
+</span></span><span id="196" class="l"><a href="#196"> 196: </a><span class="php-comment">     * Enable XSS flag
+</span></span><span id="197" class="l"><a href="#197"> 197: </a><span class="php-comment">     * Determines whether the XSS filter is always active when
+</span></span><span id="198" class="l"><a href="#198"> 198: </a><span class="php-comment">     * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered.
+</span></span><span id="199" class="l"><a href="#199"> 199: </a><span class="php-comment">     * Set automatically based on config setting.
 </span></span><span id="200" class="l"><a href="#200"> 200: </a><span class="php-comment">     *
-</span></span><span id="201" class="l"><a href="#201"> 201: </a><span class="php-comment">     * @access protected
+</span></span><span id="201" class="l"><a href="#201"> 201: </a><span class="php-comment">     * @var bool
 </span></span><span id="202" class="l"><a href="#202"> 202: </a><span class="php-comment">     */</span>
-</span><span id="203" class="l"><a href="#203"> 203: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> early_checks()
-</span><span id="204" class="l"><a href="#204"> 204: </a>    {
-</span><span id="205" class="l"><a href="#205"> 205: </a>    }
+</span><span id="203" class="l"><a href="#203"> 203: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_enable_xss</span> = <span class="php-keyword1">FALSE</span>;
+</span><span id="204" class="l"><a href="#204"> 204: </a>
+</span><span id="205" class="l"><a href="#205"> 205: </a>    <span class="php-comment">// Success</span>
 </span><span id="206" class="l"><a href="#206"> 206: </a>
 </span><span id="207" class="l"><a href="#207"> 207: </a>    <span class="php-comment">/**
-</span></span><span id="208" class="l"><a href="#208"> 208: </a><span class="php-comment">     * Constructor for the REST API
-</span></span><span id="209" class="l"><a href="#209"> 209: </a><span class="php-comment">     *
-</span></span><span id="210" class="l"><a href="#210"> 210: </a><span class="php-comment">     * @access public
-</span></span><span id="211" class="l"><a href="#211"> 211: </a><span class="php-comment">     *
-</span></span><span id="212" class="l"><a href="#212"> 212: </a><span class="php-comment">     * @param string $config Configuration filename minus the file extension
-</span></span><span id="213" class="l"><a href="#213"> 213: </a><span class="php-comment">     * e.g: my_rest.php is passed as 'my_rest'
+</span></span><span id="208" class="l"><a href="#208"> 208: </a><span class="php-comment">     * The request has succeeded
+</span></span><span id="209" class="l"><a href="#209"> 209: </a><span class="php-comment">     */</span>
+</span><span id="210" class="l"><a href="#210"> 210: </a>    <span class="php-keyword1">const</span> OK = <span class="php-num">200</span>;
+</span><span id="211" class="l"><a href="#211"> 211: </a>
+</span><span id="212" class="l"><a href="#212"> 212: </a>    <span class="php-comment">/**
+</span></span><span id="213" class="l"><a href="#213"> 213: </a><span class="php-comment">     * The server successfully created a new resource
 </span></span><span id="214" class="l"><a href="#214"> 214: </a><span class="php-comment">     */</span>
-</span><span id="215" class="l"><a href="#215"> 215: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$config</span> = <span class="php-quote">'rest'</span>)
-</span><span id="216" class="l"><a href="#216"> 216: </a>    {
-</span><span id="217" class="l"><a href="#217"> 217: </a>        parent::__construct();
-</span><span id="218" class="l"><a href="#218"> 218: </a>
-</span><span id="219" class="l"><a href="#219"> 219: </a>        <span class="php-comment">// Disable XML Entity (security vulnerability)</span>
-</span><span id="220" class="l"><a href="#220"> 220: </a>        <span class="php-keyword2">libxml_disable_entity_loader</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="215" class="l"><a href="#215"> 215: </a>    <span class="php-keyword1">const</span> CREATED = <span class="php-num">201</span>;
+</span><span id="216" class="l"><a href="#216"> 216: </a>
+</span><span id="217" class="l"><a href="#217"> 217: </a>    <span class="php-comment">/**
+</span></span><span id="218" class="l"><a href="#218"> 218: </a><span class="php-comment">     * The server successfully processed the request, though no content is returned
+</span></span><span id="219" class="l"><a href="#219"> 219: </a><span class="php-comment">     */</span>
+</span><span id="220" class="l"><a href="#220"> 220: </a>    <span class="php-keyword1">const</span> NO_CONTENT = <span class="php-num">204</span>;
 </span><span id="221" class="l"><a href="#221"> 221: </a>
-</span><span id="222" class="l"><a href="#222"> 222: </a>        <span class="php-comment">// Check to see if PHP is equal to or greater than 5.4.x</span>
-</span><span id="223" class="l"><a href="#223"> 223: </a>        <span class="php-keyword1">if</span> (is_php(<span class="php-quote">'5.4'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="224" class="l"><a href="#224"> 224: </a>        {
-</span><span id="225" class="l"><a href="#225"> 225: </a>            <span class="php-comment">// CodeIgniter 3 is recommended for v5.4 or above</span>
-</span><span id="226" class="l"><a href="#226"> 226: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'Using PHP v'</span> . PHP_VERSION . <span class="php-quote">', though PHP v5.4 or greater is required'</span>);
-</span><span id="227" class="l"><a href="#227"> 227: </a>        }
+</span><span id="222" class="l"><a href="#222"> 222: </a>    <span class="php-comment">// Redirection</span>
+</span><span id="223" class="l"><a href="#223"> 223: </a>
+</span><span id="224" class="l"><a href="#224"> 224: </a>    <span class="php-comment">/**
+</span></span><span id="225" class="l"><a href="#225"> 225: </a><span class="php-comment">     * The resource has not been modified since the last request
+</span></span><span id="226" class="l"><a href="#226"> 226: </a><span class="php-comment">     */</span>
+</span><span id="227" class="l"><a href="#227"> 227: </a>    <span class="php-keyword1">const</span> NOT_MODIFIED = <span class="php-num">304</span>;
 </span><span id="228" class="l"><a href="#228"> 228: </a>
-</span><span id="229" class="l"><a href="#229"> 229: </a>        <span class="php-comment">// Check to see if this is CI 3.x</span>
-</span><span id="230" class="l"><a href="#230"> 230: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">explode</span>(<span class="php-quote">'.'</span>, CI_VERSION, <span class="php-num">2</span>)[<span class="php-num">0</span>] &lt; <span class="php-num">3</span>)
-</span><span id="231" class="l"><a href="#231"> 231: </a>        {
-</span><span id="232" class="l"><a href="#232"> 232: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
-</span><span id="233" class="l"><a href="#233"> 233: </a>        }
-</span><span id="234" class="l"><a href="#234"> 234: </a>
-</span><span id="235" class="l"><a href="#235"> 235: </a>        <span class="php-comment">// Set the default value of global xss filtering. Same approach as CodeIgniter 3</span>
-</span><span id="236" class="l"><a href="#236"> 236: </a>        <span class="php-var">$this</span>-&gt;_enable_xss = (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'global_xss_filtering'</span>) === <span class="php-keyword1">TRUE</span>);
-</span><span id="237" class="l"><a href="#237"> 237: </a>
-</span><span id="238" class="l"><a href="#238"> 238: </a>        <span class="php-comment">// Start the timer for how long the request takes</span>
-</span><span id="239" class="l"><a href="#239"> 239: </a>        <span class="php-var">$this</span>-&gt;_start_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="229" class="l"><a href="#229"> 229: </a>    <span class="php-comment">// Client Error</span>
+</span><span id="230" class="l"><a href="#230"> 230: </a>
+</span><span id="231" class="l"><a href="#231"> 231: </a>    <span class="php-comment">/**
+</span></span><span id="232" class="l"><a href="#232"> 232: </a><span class="php-comment">     * The request cannot be fulfilled due to multiple errors
+</span></span><span id="233" class="l"><a href="#233"> 233: </a><span class="php-comment">     */</span>
+</span><span id="234" class="l"><a href="#234"> 234: </a>    <span class="php-keyword1">const</span> BAD_REQUEST = <span class="php-num">400</span>;
+</span><span id="235" class="l"><a href="#235"> 235: </a>
+</span><span id="236" class="l"><a href="#236"> 236: </a>    <span class="php-comment">/**
+</span></span><span id="237" class="l"><a href="#237"> 237: </a><span class="php-comment">     * The user is unauthorized to access the requested resource
+</span></span><span id="238" class="l"><a href="#238"> 238: </a><span class="php-comment">     */</span>
+</span><span id="239" class="l"><a href="#239"> 239: </a>    <span class="php-keyword1">const</span> UNAUTHORIZED = <span class="php-num">401</span>;
 </span><span id="240" class="l"><a href="#240"> 240: </a>
-</span><span id="241" class="l"><a href="#241"> 241: </a>        <span class="php-comment">// Load the rest.php configuration file</span>
-</span><span id="242" class="l"><a href="#242"> 242: </a>        <span class="php-var">$this</span>-&gt;load-&gt;config(<span class="php-var">$config</span>);
-</span><span id="243" class="l"><a href="#243"> 243: </a>
-</span><span id="244" class="l"><a href="#244"> 244: </a>        <span class="php-comment">// At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)</span>
-</span><span id="245" class="l"><a href="#245"> 245: </a>        <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-quote">'format'</span>);
-</span><span id="246" class="l"><a href="#246"> 246: </a>
-</span><span id="247" class="l"><a href="#247"> 247: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
-</span><span id="248" class="l"><a href="#248"> 248: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
-</span><span id="249" class="l"><a href="#249"> 249: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
-</span><span id="250" class="l"><a href="#250"> 250: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
-</span><span id="251" class="l"><a href="#251"> 251: </a>
-</span><span id="252" class="l"><a href="#252"> 252: </a>        <span class="php-var">$this</span>-&gt;_zlib_oc = @<span class="php-keyword2">ini_get</span>(<span class="php-quote">'zlib.output_compression'</span>);
+</span><span id="241" class="l"><a href="#241"> 241: </a>    <span class="php-comment">/**
+</span></span><span id="242" class="l"><a href="#242"> 242: </a><span class="php-comment">     * The requested resource is unavailable at this present time
+</span></span><span id="243" class="l"><a href="#243"> 243: </a><span class="php-comment">     */</span>
+</span><span id="244" class="l"><a href="#244"> 244: </a>    <span class="php-keyword1">const</span> FORBIDDEN = <span class="php-num">403</span>;
+</span><span id="245" class="l"><a href="#245"> 245: </a>
+</span><span id="246" class="l"><a href="#246"> 246: </a>    <span class="php-comment">/**
+</span></span><span id="247" class="l"><a href="#247"> 247: </a><span class="php-comment">     * The requested resource could not be found
+</span></span><span id="248" class="l"><a href="#248"> 248: </a><span class="php-comment">     *
+</span></span><span id="249" class="l"><a href="#249"> 249: </a><span class="php-comment">     * Note: This is sometimes used to mask if there was an UNAUTHORIZED (401) or
+</span></span><span id="250" class="l"><a href="#250"> 250: </a><span class="php-comment">     * FORBIDDEN (403) error, for security reasons
+</span></span><span id="251" class="l"><a href="#251"> 251: </a><span class="php-comment">     */</span>
+</span><span id="252" class="l"><a href="#252"> 252: </a>    <span class="php-keyword1">const</span> NOT_FOUND = <span class="php-num">404</span>;
 </span><span id="253" class="l"><a href="#253"> 253: </a>
-</span><span id="254" class="l"><a href="#254"> 254: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
-</span><span id="255" class="l"><a href="#255"> 255: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="256" class="l"><a href="#256"> 256: </a>        {
-</span><span id="257" class="l"><a href="#257"> 257: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
-</span><span id="258" class="l"><a href="#258"> 258: </a>        }
-</span><span id="259" class="l"><a href="#259"> 259: </a>
-</span><span id="260" class="l"><a href="#260"> 260: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
-</span><span id="261" class="l"><a href="#261"> 261: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
-</span><span id="262" class="l"><a href="#262"> 262: </a>
-</span><span id="263" class="l"><a href="#263"> 263: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
-</span><span id="264" class="l"><a href="#264"> 264: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
-</span><span id="265" class="l"><a href="#265"> 265: </a>
-</span><span id="266" class="l"><a href="#266"> 266: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
-</span><span id="267" class="l"><a href="#267"> 267: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
-</span><span id="268" class="l"><a href="#268"> 268: </a>        {
-</span><span id="269" class="l"><a href="#269"> 269: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = [];
-</span><span id="270" class="l"><a href="#270"> 270: </a>        }
+</span><span id="254" class="l"><a href="#254"> 254: </a>    <span class="php-comment">/**
+</span></span><span id="255" class="l"><a href="#255"> 255: </a><span class="php-comment">     * The request method is not supported by the following resource
+</span></span><span id="256" class="l"><a href="#256"> 256: </a><span class="php-comment">     */</span>
+</span><span id="257" class="l"><a href="#257"> 257: </a>    <span class="php-keyword1">const</span> METHOD_NOT_ALLOWED = <span class="php-num">405</span>;
+</span><span id="258" class="l"><a href="#258"> 258: </a>
+</span><span id="259" class="l"><a href="#259"> 259: </a>    <span class="php-comment">/**
+</span></span><span id="260" class="l"><a href="#260"> 260: </a><span class="php-comment">     * The request was not acceptable
+</span></span><span id="261" class="l"><a href="#261"> 261: </a><span class="php-comment">     */</span>
+</span><span id="262" class="l"><a href="#262"> 262: </a>    <span class="php-keyword1">const</span> NOT_ACCEPTABLE = <span class="php-num">406</span>;
+</span><span id="263" class="l"><a href="#263"> 263: </a>
+</span><span id="264" class="l"><a href="#264"> 264: </a>    <span class="php-comment">/**
+</span></span><span id="265" class="l"><a href="#265"> 265: </a><span class="php-comment">     * The request could not be completed due to a conflict with the current state
+</span></span><span id="266" class="l"><a href="#266"> 266: </a><span class="php-comment">     * of the resource
+</span></span><span id="267" class="l"><a href="#267"> 267: </a><span class="php-comment">     */</span>
+</span><span id="268" class="l"><a href="#268"> 268: </a>    <span class="php-keyword1">const</span> CONFLICT = <span class="php-num">409</span>;
+</span><span id="269" class="l"><a href="#269"> 269: </a>
+</span><span id="270" class="l"><a href="#270"> 270: </a>    <span class="php-comment">// Server Error</span>
 </span><span id="271" class="l"><a href="#271"> 271: </a>
-</span><span id="272" class="l"><a href="#272"> 272: </a>        <span class="php-comment">// Set up the GET variables</span>
-</span><span id="273" class="l"><a href="#273"> 273: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
-</span><span id="274" class="l"><a href="#274"> 274: </a>
-</span><span id="275" class="l"><a href="#275"> 275: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
-</span><span id="276" class="l"><a href="#276"> 276: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
-</span><span id="277" class="l"><a href="#277"> 277: </a>
-</span><span id="278" class="l"><a href="#278"> 278: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
-</span><span id="279" class="l"><a href="#279"> 279: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
-</span><span id="280" class="l"><a href="#280"> 280: </a>
-</span><span id="281" class="l"><a href="#281"> 281: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
-</span><span id="282" class="l"><a href="#282"> 282: </a>
-</span><span id="283" class="l"><a href="#283"> 283: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
-</span><span id="284" class="l"><a href="#284"> 284: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
-</span><span id="285" class="l"><a href="#285"> 285: </a>        {
-</span><span id="286" class="l"><a href="#286"> 286: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
-</span><span id="287" class="l"><a href="#287"> 287: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
-</span><span id="288" class="l"><a href="#288"> 288: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
-</span><span id="289" class="l"><a href="#289"> 289: </a>        }
-</span><span id="290" class="l"><a href="#290"> 290: </a>
-</span><span id="291" class="l"><a href="#291"> 291: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
-</span><span id="292" class="l"><a href="#292"> 292: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
-</span><span id="293" class="l"><a href="#293"> 293: </a>            <span class="php-var">$this</span>-&gt;_get_args,
-</span><span id="294" class="l"><a href="#294"> 294: </a>            <span class="php-var">$this</span>-&gt;_options_args,
-</span><span id="295" class="l"><a href="#295"> 295: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
-</span><span id="296" class="l"><a href="#296"> 296: </a>            <span class="php-var">$this</span>-&gt;_head_args,
-</span><span id="297" class="l"><a href="#297"> 297: </a>            <span class="php-var">$this</span>-&gt;_put_args,
-</span><span id="298" class="l"><a href="#298"> 298: </a>            <span class="php-var">$this</span>-&gt;_post_args,
-</span><span id="299" class="l"><a href="#299"> 299: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
-</span><span id="300" class="l"><a href="#300"> 300: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}
-</span><span id="301" class="l"><a href="#301"> 301: </a>        );
-</span><span id="302" class="l"><a href="#302"> 302: </a>
-</span><span id="303" class="l"><a href="#303"> 303: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
-</span><span id="304" class="l"><a href="#304"> 304: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
-</span><span id="305" class="l"><a href="#305"> 305: </a>
-</span><span id="306" class="l"><a href="#306"> 306: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
-</span><span id="307" class="l"><a href="#307"> 307: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
-</span><span id="308" class="l"><a href="#308"> 308: </a>
-</span><span id="309" class="l"><a href="#309"> 309: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
-</span><span id="310" class="l"><a href="#310"> 310: </a>        <span class="php-var">$this</span>-&gt;early_checks();
-</span><span id="311" class="l"><a href="#311"> 311: </a>
-</span><span id="312" class="l"><a href="#312"> 312: </a>        <span class="php-comment">// Load DB if its enabled</span>
-</span><span id="313" class="l"><a href="#313"> 313: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
-</span><span id="314" class="l"><a href="#314"> 314: </a>        {
-</span><span id="315" class="l"><a href="#315"> 315: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
-</span><span id="316" class="l"><a href="#316"> 316: </a>        }
-</span><span id="317" class="l"><a href="#317"> 317: </a>
-</span><span id="318" class="l"><a href="#318"> 318: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
-</span><span id="319" class="l"><a href="#319"> 319: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
-</span><span id="320" class="l"><a href="#320"> 320: </a>        {
-</span><span id="321" class="l"><a href="#321"> 321: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
-</span><span id="322" class="l"><a href="#322"> 322: </a>        }
-</span><span id="323" class="l"><a href="#323"> 323: </a>
-</span><span id="324" class="l"><a href="#324"> 324: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
-</span><span id="325" class="l"><a href="#325"> 325: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
-</span><span id="326" class="l"><a href="#326"> 326: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
-</span><span id="327" class="l"><a href="#327"> 327: </a>
-</span><span id="328" class="l"><a href="#328"> 328: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
-</span><span id="329" class="l"><a href="#329"> 329: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
-</span><span id="330" class="l"><a href="#330"> 330: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
-</span><span id="331" class="l"><a href="#331"> 331: </a>        {
-</span><span id="332" class="l"><a href="#332"> 332: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
-</span><span id="333" class="l"><a href="#333"> 333: </a>        }
-</span><span id="334" class="l"><a href="#334"> 334: </a>
-</span><span id="335" class="l"><a href="#335"> 335: </a>        <span class="php-comment">// Only allow ajax requests</span>
-</span><span id="336" class="l"><a href="#336"> 336: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
-</span><span id="337" class="l"><a href="#337"> 337: </a>        {
-</span><span id="338" class="l"><a href="#338"> 338: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="339" class="l"><a href="#339"> 339: </a>            <span class="php-var">$this</span>-&gt;response(
-</span><span id="340" class="l"><a href="#340"> 340: </a>                [
-</span><span id="341" class="l"><a href="#341"> 341: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="342" class="l"><a href="#342"> 342: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Only AJAX requests are acceptable'</span>
-</span><span id="343" class="l"><a href="#343"> 343: </a>                ], <span class="php-num">406</span>); <span class="php-comment">// Set status to 406 NOT ACCEPTABLE</span>
-</span><span id="344" class="l"><a href="#344"> 344: </a>        }
-</span><span id="345" class="l"><a href="#345"> 345: </a>
-</span><span id="346" class="l"><a href="#346"> 346: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
-</span><span id="347" class="l"><a href="#347"> 347: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; !(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
-</span><span id="348" class="l"><a href="#348"> 348: </a>        {
-</span><span id="349" class="l"><a href="#349"> 349: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="350" class="l"><a href="#350"> 350: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
-</span><span id="351" class="l"><a href="#351"> 351: </a>            {
-</span><span id="352" class="l"><a href="#352"> 352: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
-</span><span id="353" class="l"><a href="#353"> 353: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="354" class="l"><a href="#354"> 354: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="355" class="l"><a href="#355"> 355: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
-</span><span id="356" class="l"><a href="#356"> 356: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="357" class="l"><a href="#357"> 357: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="358" class="l"><a href="#358"> 358: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
-</span><span id="359" class="l"><a href="#359"> 359: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="360" class="l"><a href="#360"> 360: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="361" class="l"><a href="#361"> 361: </a>            }
-</span><span id="362" class="l"><a href="#362"> 362: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="363" class="l"><a href="#363"> 363: </a>            {
-</span><span id="364" class="l"><a href="#364"> 364: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="365" class="l"><a href="#365"> 365: </a>            }
-</span><span id="366" class="l"><a href="#366"> 366: </a>        }
-</span><span id="367" class="l"><a href="#367"> 367: </a>    }
-</span><span id="368" class="l"><a href="#368"> 368: </a>
-</span><span id="369" class="l"><a href="#369"> 369: </a>    <span class="php-comment">/**
-</span></span><span id="370" class="l"><a href="#370"> 370: </a><span class="php-comment">     * Deconstructor
-</span></span><span id="371" class="l"><a href="#371"> 371: </a><span class="php-comment">     *
-</span></span><span id="372" class="l"><a href="#372"> 372: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="373" class="l"><a href="#373"> 373: </a><span class="php-comment">     * @access public
-</span></span><span id="374" class="l"><a href="#374"> 374: </a><span class="php-comment">     */</span>
-</span><span id="375" class="l"><a href="#375"> 375: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
-</span><span id="376" class="l"><a href="#376"> 376: </a>    {
-</span><span id="377" class="l"><a href="#377"> 377: </a>        <span class="php-comment">// Get the current timestamp</span>
-</span><span id="378" class="l"><a href="#378"> 378: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="379" class="l"><a href="#379"> 379: </a>
-</span><span id="380" class="l"><a href="#380"> 380: </a>        <span class="php-comment">// Log the loading time to the log table</span>
-</span><span id="381" class="l"><a href="#381"> 381: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="382" class="l"><a href="#382"> 382: </a>        {
-</span><span id="383" class="l"><a href="#383"> 383: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
-</span><span id="384" class="l"><a href="#384"> 384: </a>        }
-</span><span id="385" class="l"><a href="#385"> 385: </a>    }
-</span><span id="386" class="l"><a href="#386"> 386: </a>
-</span><span id="387" class="l"><a href="#387"> 387: </a>    <span class="php-comment">/**
-</span></span><span id="388" class="l"><a href="#388"> 388: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
-</span></span><span id="389" class="l"><a href="#389"> 389: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
-</span></span><span id="390" class="l"><a href="#390"> 390: </a><span class="php-comment">     * Controller method.
-</span></span><span id="391" class="l"><a href="#391"> 391: </a><span class="php-comment">     *
-</span></span><span id="392" class="l"><a href="#392"> 392: </a><span class="php-comment">     * @access public
-</span></span><span id="393" class="l"><a href="#393"> 393: </a><span class="php-comment">     *
-</span></span><span id="394" class="l"><a href="#394"> 394: </a><span class="php-comment">     * @param  string $object_called
-</span></span><span id="395" class="l"><a href="#395"> 395: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method.
-</span></span><span id="396" class="l"><a href="#396"> 396: </a><span class="php-comment">     */</span>
-</span><span id="397" class="l"><a href="#397"> 397: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span>)
-</span><span id="398" class="l"><a href="#398"> 398: </a>    {
-</span><span id="399" class="l"><a href="#399"> 399: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
-</span><span id="400" class="l"><a href="#400"> 400: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
-</span><span id="401" class="l"><a href="#401"> 401: </a>        {
-</span><span id="402" class="l"><a href="#402"> 402: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unsupported protocol'</span>], <span class="php-num">403</span>);
-</span><span id="403" class="l"><a href="#403"> 403: </a>        }
-</span><span id="404" class="l"><a href="#404"> 404: </a>
-</span><span id="405" class="l"><a href="#405"> 405: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
-</span><span id="406" class="l"><a href="#406"> 406: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
-</span><span id="407" class="l"><a href="#407"> 407: </a>
-</span><span id="408" class="l"><a href="#408"> 408: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span> . <span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method;
-</span><span id="409" class="l"><a href="#409"> 409: </a>
-</span><span id="410" class="l"><a href="#410"> 410: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
-</span><span id="411" class="l"><a href="#411"> 411: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] == <span class="php-keyword1">FALSE</span>);
-</span><span id="412" class="l"><a href="#412"> 412: </a>
-</span><span id="413" class="l"><a href="#413"> 413: </a>        <span class="php-comment">// Use keys for this method?</span>
-</span><span id="414" class="l"><a href="#414"> 414: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] == <span class="php-keyword1">FALSE</span>);
+</span><span id="272" class="l"><a href="#272"> 272: </a>    <span class="php-comment">/**
+</span></span><span id="273" class="l"><a href="#273"> 273: </a><span class="php-comment">     * The server encountered an unexpected error
+</span></span><span id="274" class="l"><a href="#274"> 274: </a><span class="php-comment">     *
+</span></span><span id="275" class="l"><a href="#275"> 275: </a><span class="php-comment">     * Note: This is a generic error message when no specific message
+</span></span><span id="276" class="l"><a href="#276"> 276: </a><span class="php-comment">     * is suitable
+</span></span><span id="277" class="l"><a href="#277"> 277: </a><span class="php-comment">     */</span>
+</span><span id="278" class="l"><a href="#278"> 278: </a>    <span class="php-keyword1">const</span> INTERNAL_SERVER_ERROR = <span class="php-num">500</span>;
+</span><span id="279" class="l"><a href="#279"> 279: </a>
+</span><span id="280" class="l"><a href="#280"> 280: </a>    <span class="php-comment">/**
+</span></span><span id="281" class="l"><a href="#281"> 281: </a><span class="php-comment">     * The server does not recognised the request method
+</span></span><span id="282" class="l"><a href="#282"> 282: </a><span class="php-comment">     */</span>
+</span><span id="283" class="l"><a href="#283"> 283: </a>    <span class="php-keyword1">const</span> NOT_IMPLEMENTED = <span class="php-num">501</span>;
+</span><span id="284" class="l"><a href="#284"> 284: </a>
+</span><span id="285" class="l"><a href="#285"> 285: </a>    <span class="php-comment">/**
+</span></span><span id="286" class="l"><a href="#286"> 286: </a><span class="php-comment">     * HTTP status codes and their respective description
+</span></span><span id="287" class="l"><a href="#287"> 287: </a><span class="php-comment">     *
+</span></span><span id="288" class="l"><a href="#288"> 288: </a><span class="php-comment">     * @var array
+</span></span><span id="289" class="l"><a href="#289"> 289: </a><span class="php-comment">     * @link http://www.restapitutorial.com/httpstatuscodes.html
+</span></span><span id="290" class="l"><a href="#290"> 290: </a><span class="php-comment">     */</span>
+</span><span id="291" class="l"><a href="#291"> 291: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$http_status_codes</span> = [
+</span><span id="292" class="l"><a href="#292"> 292: </a>        self::OK =&gt; <span class="php-quote">'OK'</span>,
+</span><span id="293" class="l"><a href="#293"> 293: </a>        self::CREATED =&gt; <span class="php-quote">'CREATED'</span>,
+</span><span id="294" class="l"><a href="#294"> 294: </a>        self::NO_CONTENT =&gt; <span class="php-quote">'NO CONTENT'</span>,
+</span><span id="295" class="l"><a href="#295"> 295: </a>        self::NOT_MODIFIED =&gt; <span class="php-quote">'NOT MODIFIED'</span>,
+</span><span id="296" class="l"><a href="#296"> 296: </a>        self::BAD_REQUEST =&gt; <span class="php-quote">'BAD REQUEST'</span>,
+</span><span id="297" class="l"><a href="#297"> 297: </a>        self::UNAUTHORIZED =&gt; <span class="php-quote">'UNAUTHORIZED'</span>,
+</span><span id="298" class="l"><a href="#298"> 298: </a>        self::FORBIDDEN =&gt; <span class="php-quote">'FORBIDDEN'</span>,
+</span><span id="299" class="l"><a href="#299"> 299: </a>        self::NOT_FOUND =&gt; <span class="php-quote">'NOT FOUND'</span>,
+</span><span id="300" class="l"><a href="#300"> 300: </a>        self::METHOD_NOT_ALLOWED =&gt; <span class="php-quote">'METHOD NOT ALLOWED'</span>,
+</span><span id="301" class="l"><a href="#301"> 301: </a>        self::NOT_ACCEPTABLE =&gt; <span class="php-quote">'NOT ACCEPTABLE'</span>,
+</span><span id="302" class="l"><a href="#302"> 302: </a>        self::CONFLICT =&gt; <span class="php-quote">'CONFLICT'</span>,
+</span><span id="303" class="l"><a href="#303"> 303: </a>        self::INTERNAL_SERVER_ERROR =&gt; <span class="php-quote">'INTERNAL SERVER ERROR'</span>,
+</span><span id="304" class="l"><a href="#304"> 304: </a>        self::NOT_IMPLEMENTED =&gt; <span class="php-quote">'NOT IMPLEMENTED'</span>
+</span><span id="305" class="l"><a href="#305"> 305: </a>    ];
+</span><span id="306" class="l"><a href="#306"> 306: </a>
+</span><span id="307" class="l"><a href="#307"> 307: </a>    <span class="php-comment">/**
+</span></span><span id="308" class="l"><a href="#308"> 308: </a><span class="php-comment">     * Extend this function to apply additional checking early on in the process
+</span></span><span id="309" class="l"><a href="#309"> 309: </a><span class="php-comment">     *
+</span></span><span id="310" class="l"><a href="#310"> 310: </a><span class="php-comment">     * @access protected
+</span></span><span id="311" class="l"><a href="#311"> 311: </a><span class="php-comment">     * @return void
+</span></span><span id="312" class="l"><a href="#312"> 312: </a><span class="php-comment">     */</span>
+</span><span id="313" class="l"><a href="#313"> 313: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> early_checks()
+</span><span id="314" class="l"><a href="#314"> 314: </a>    {
+</span><span id="315" class="l"><a href="#315"> 315: </a>    }
+</span><span id="316" class="l"><a href="#316"> 316: </a>
+</span><span id="317" class="l"><a href="#317"> 317: </a>    <span class="php-comment">/**
+</span></span><span id="318" class="l"><a href="#318"> 318: </a><span class="php-comment">     * Constructor for the REST API
+</span></span><span id="319" class="l"><a href="#319"> 319: </a><span class="php-comment">     *
+</span></span><span id="320" class="l"><a href="#320"> 320: </a><span class="php-comment">     * @access public
+</span></span><span id="321" class="l"><a href="#321"> 321: </a><span class="php-comment">     * @param string $config Configuration filename minus the file extension
+</span></span><span id="322" class="l"><a href="#322"> 322: </a><span class="php-comment">     * e.g: my_rest.php is passed as 'my_rest'
+</span></span><span id="323" class="l"><a href="#323"> 323: </a><span class="php-comment">     * @return void
+</span></span><span id="324" class="l"><a href="#324"> 324: </a><span class="php-comment">     */</span>
+</span><span id="325" class="l"><a href="#325"> 325: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$config</span> = <span class="php-quote">'rest'</span>)
+</span><span id="326" class="l"><a href="#326"> 326: </a>    {
+</span><span id="327" class="l"><a href="#327"> 327: </a>        parent::__construct();
+</span><span id="328" class="l"><a href="#328"> 328: </a>
+</span><span id="329" class="l"><a href="#329"> 329: </a>        <span class="php-comment">// Disable XML Entity (security vulnerability)</span>
+</span><span id="330" class="l"><a href="#330"> 330: </a>        <span class="php-keyword2">libxml_disable_entity_loader</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="331" class="l"><a href="#331"> 331: </a>
+</span><span id="332" class="l"><a href="#332"> 332: </a>        <span class="php-comment">// Check to see if PHP is equal to or greater than 5.4.x</span>
+</span><span id="333" class="l"><a href="#333"> 333: </a>        <span class="php-keyword1">if</span> (is_php(<span class="php-quote">'5.4'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="334" class="l"><a href="#334"> 334: </a>        {
+</span><span id="335" class="l"><a href="#335"> 335: </a>            <span class="php-comment">// CodeIgniter 3 is recommended for v5.4 or above</span>
+</span><span id="336" class="l"><a href="#336"> 336: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'Using PHP v'</span> . PHP_VERSION . <span class="php-quote">', though PHP v5.4 or greater is required'</span>);
+</span><span id="337" class="l"><a href="#337"> 337: </a>        }
+</span><span id="338" class="l"><a href="#338"> 338: </a>
+</span><span id="339" class="l"><a href="#339"> 339: </a>        <span class="php-comment">// Check to see if this is CI 3.x</span>
+</span><span id="340" class="l"><a href="#340"> 340: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">explode</span>(<span class="php-quote">'.'</span>, CI_VERSION, <span class="php-num">2</span>)[<span class="php-num">0</span>] &lt; <span class="php-num">3</span>)
+</span><span id="341" class="l"><a href="#341"> 341: </a>        {
+</span><span id="342" class="l"><a href="#342"> 342: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
+</span><span id="343" class="l"><a href="#343"> 343: </a>        }
+</span><span id="344" class="l"><a href="#344"> 344: </a>
+</span><span id="345" class="l"><a href="#345"> 345: </a>        <span class="php-comment">// Set the default value of global xss filtering. Same approach as CodeIgniter 3</span>
+</span><span id="346" class="l"><a href="#346"> 346: </a>        <span class="php-var">$this</span>-&gt;_enable_xss = (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'global_xss_filtering'</span>) === <span class="php-keyword1">TRUE</span>);
+</span><span id="347" class="l"><a href="#347"> 347: </a>
+</span><span id="348" class="l"><a href="#348"> 348: </a>        <span class="php-comment">// Start the timer for how long the request takes</span>
+</span><span id="349" class="l"><a href="#349"> 349: </a>        <span class="php-var">$this</span>-&gt;_start_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="350" class="l"><a href="#350"> 350: </a>
+</span><span id="351" class="l"><a href="#351"> 351: </a>        <span class="php-comment">// Load the rest.php configuration file</span>
+</span><span id="352" class="l"><a href="#352"> 352: </a>        <span class="php-var">$this</span>-&gt;load-&gt;config(<span class="php-var">$config</span>);
+</span><span id="353" class="l"><a href="#353"> 353: </a>
+</span><span id="354" class="l"><a href="#354"> 354: </a>        <span class="php-comment">// At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)</span>
+</span><span id="355" class="l"><a href="#355"> 355: </a>        <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-quote">'format'</span>);
+</span><span id="356" class="l"><a href="#356"> 356: </a>
+</span><span id="357" class="l"><a href="#357"> 357: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
+</span><span id="358" class="l"><a href="#358"> 358: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
+</span><span id="359" class="l"><a href="#359"> 359: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
+</span><span id="360" class="l"><a href="#360"> 360: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
+</span><span id="361" class="l"><a href="#361"> 361: </a>
+</span><span id="362" class="l"><a href="#362"> 362: </a>        <span class="php-var">$this</span>-&gt;_zlib_oc = @<span class="php-keyword2">ini_get</span>(<span class="php-quote">'zlib.output_compression'</span>);
+</span><span id="363" class="l"><a href="#363"> 363: </a>
+</span><span id="364" class="l"><a href="#364"> 364: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
+</span><span id="365" class="l"><a href="#365"> 365: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="366" class="l"><a href="#366"> 366: </a>        {
+</span><span id="367" class="l"><a href="#367"> 367: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
+</span><span id="368" class="l"><a href="#368"> 368: </a>        }
+</span><span id="369" class="l"><a href="#369"> 369: </a>
+</span><span id="370" class="l"><a href="#370"> 370: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
+</span><span id="371" class="l"><a href="#371"> 371: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
+</span><span id="372" class="l"><a href="#372"> 372: </a>
+</span><span id="373" class="l"><a href="#373"> 373: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
+</span><span id="374" class="l"><a href="#374"> 374: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
+</span><span id="375" class="l"><a href="#375"> 375: </a>
+</span><span id="376" class="l"><a href="#376"> 376: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
+</span><span id="377" class="l"><a href="#377"> 377: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
+</span><span id="378" class="l"><a href="#378"> 378: </a>        {
+</span><span id="379" class="l"><a href="#379"> 379: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = [];
+</span><span id="380" class="l"><a href="#380"> 380: </a>        }
+</span><span id="381" class="l"><a href="#381"> 381: </a>
+</span><span id="382" class="l"><a href="#382"> 382: </a>        <span class="php-comment">// Set up the query parameters</span>
+</span><span id="383" class="l"><a href="#383"> 383: </a>        <span class="php-var">$this</span>-&gt;_parse_query();
+</span><span id="384" class="l"><a href="#384"> 384: </a>
+</span><span id="385" class="l"><a href="#385"> 385: </a>        <span class="php-comment">// Set up the GET variables</span>
+</span><span id="386" class="l"><a href="#386"> 386: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
+</span><span id="387" class="l"><a href="#387"> 387: </a>
+</span><span id="388" class="l"><a href="#388"> 388: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
+</span><span id="389" class="l"><a href="#389"> 389: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
+</span><span id="390" class="l"><a href="#390"> 390: </a>
+</span><span id="391" class="l"><a href="#391"> 391: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
+</span><span id="392" class="l"><a href="#392"> 392: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
+</span><span id="393" class="l"><a href="#393"> 393: </a>
+</span><span id="394" class="l"><a href="#394"> 394: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
+</span><span id="395" class="l"><a href="#395"> 395: </a>
+</span><span id="396" class="l"><a href="#396"> 396: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
+</span><span id="397" class="l"><a href="#397"> 397: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
+</span><span id="398" class="l"><a href="#398"> 398: </a>        {
+</span><span id="399" class="l"><a href="#399"> 399: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
+</span><span id="400" class="l"><a href="#400"> 400: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
+</span><span id="401" class="l"><a href="#401"> 401: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
+</span><span id="402" class="l"><a href="#402"> 402: </a>        }
+</span><span id="403" class="l"><a href="#403"> 403: </a>
+</span><span id="404" class="l"><a href="#404"> 404: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
+</span><span id="405" class="l"><a href="#405"> 405: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
+</span><span id="406" class="l"><a href="#406"> 406: </a>            <span class="php-var">$this</span>-&gt;_get_args,
+</span><span id="407" class="l"><a href="#407"> 407: </a>            <span class="php-var">$this</span>-&gt;_options_args,
+</span><span id="408" class="l"><a href="#408"> 408: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
+</span><span id="409" class="l"><a href="#409"> 409: </a>            <span class="php-var">$this</span>-&gt;_head_args,
+</span><span id="410" class="l"><a href="#410"> 410: </a>            <span class="php-var">$this</span>-&gt;_put_args,
+</span><span id="411" class="l"><a href="#411"> 411: </a>            <span class="php-var">$this</span>-&gt;_post_args,
+</span><span id="412" class="l"><a href="#412"> 412: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
+</span><span id="413" class="l"><a href="#413"> 413: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}
+</span><span id="414" class="l"><a href="#414"> 414: </a>        );
 </span><span id="415" class="l"><a href="#415"> 415: </a>
-</span><span id="416" class="l"><a href="#416"> 416: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here.</span>
-</span><span id="417" class="l"><a href="#417"> 417: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
-</span><span id="418" class="l"><a href="#418"> 418: </a>        {
-</span><span id="419" class="l"><a href="#419"> 419: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="420" class="l"><a href="#420"> 420: </a>            {
-</span><span id="421" class="l"><a href="#421"> 421: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="422" class="l"><a href="#422"> 422: </a>            }
-</span><span id="423" class="l"><a href="#423"> 423: </a>
-</span><span id="424" class="l"><a href="#424"> 424: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid API Key '</span> . <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>], <span class="php-num">403</span>);
-</span><span id="425" class="l"><a href="#425"> 425: </a>        }
-</span><span id="426" class="l"><a href="#426"> 426: </a>
-</span><span id="427" class="l"><a href="#427"> 427: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller.</span>
-</span><span id="428" class="l"><a href="#428"> 428: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
-</span><span id="429" class="l"><a href="#429"> 429: </a>        {
-</span><span id="430" class="l"><a href="#430"> 430: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="431" class="l"><a href="#431"> 431: </a>            {
-</span><span id="432" class="l"><a href="#432"> 432: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="433" class="l"><a href="#433"> 433: </a>            }
-</span><span id="434" class="l"><a href="#434"> 434: </a>
-</span><span id="435" class="l"><a href="#435"> 435: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have access to the requested controller.'</span>], <span class="php-num">401</span>);
-</span><span id="436" class="l"><a href="#436"> 436: </a>        }
-</span><span id="437" class="l"><a href="#437"> 437: </a>
-</span><span id="438" class="l"><a href="#438"> 438: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
-</span><span id="439" class="l"><a href="#439"> 439: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="440" class="l"><a href="#440"> 440: </a>        {
-</span><span id="441" class="l"><a href="#441"> 441: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unknown method.'</span>], <span class="php-num">404</span>);
-</span><span id="442" class="l"><a href="#442"> 442: </a>        }
-</span><span id="443" class="l"><a href="#443"> 443: </a>
-</span><span id="444" class="l"><a href="#444"> 444: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
-</span><span id="445" class="l"><a href="#445"> 445: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="446" class="l"><a href="#446"> 446: </a>        {
-</span><span id="447" class="l"><a href="#447"> 447: </a>            <span class="php-comment">// Check the limit</span>
-</span><span id="448" class="l"><a href="#448"> 448: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="449" class="l"><a href="#449"> 449: </a>            {
-</span><span id="450" class="l"><a href="#450"> 450: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key has reached the time limit for this method.'</span>];
-</span><span id="451" class="l"><a href="#451"> 451: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, <span class="php-num">401</span>);
-</span><span id="452" class="l"><a href="#452"> 452: </a>            }
-</span><span id="453" class="l"><a href="#453"> 453: </a>
-</span><span id="454" class="l"><a href="#454"> 454: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
-</span><span id="455" class="l"><a href="#455"> 455: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
-</span><span id="456" class="l"><a href="#456"> 456: </a>
-</span><span id="457" class="l"><a href="#457"> 457: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
-</span><span id="458" class="l"><a href="#458"> 458: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
-</span><span id="459" class="l"><a href="#459"> 459: </a>
-</span><span id="460" class="l"><a href="#460"> 460: </a>            <span class="php-comment">// IM TELLIN!</span>
-</span><span id="461" class="l"><a href="#461"> 461: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="462" class="l"><a href="#462"> 462: </a>            {
-</span><span id="463" class="l"><a href="#463"> 463: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
-</span><span id="464" class="l"><a href="#464"> 464: </a>            }
-</span><span id="465" class="l"><a href="#465"> 465: </a>
-</span><span id="466" class="l"><a href="#466"> 466: </a>            <span class="php-comment">// They don't have good enough perms</span>
-</span><span id="467" class="l"><a href="#467"> 467: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have enough permissions.'</span>];
-</span><span id="468" class="l"><a href="#468"> 468: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, <span class="php-num">401</span>);
-</span><span id="469" class="l"><a href="#469"> 469: </a>        }
-</span><span id="470" class="l"><a href="#470"> 470: </a>
-</span><span id="471" class="l"><a href="#471"> 471: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
-</span><span id="472" class="l"><a href="#472"> 472: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="473" class="l"><a href="#473"> 473: </a>        {
-</span><span id="474" class="l"><a href="#474"> 474: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
-</span><span id="475" class="l"><a href="#475"> 475: </a>        }
-</span><span id="476" class="l"><a href="#476"> 476: </a>
-</span><span id="477" class="l"><a href="#477"> 477: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
-</span><span id="478" class="l"><a href="#478"> 478: </a>        <span class="php-keyword1">try</span>
-</span><span id="479" class="l"><a href="#479"> 479: </a>        {
-</span><span id="480" class="l"><a href="#480"> 480: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
-</span><span id="481" class="l"><a href="#481"> 481: </a>        }
-</span><span id="482" class="l"><a href="#482"> 482: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
-</span><span id="483" class="l"><a href="#483"> 483: </a>        {
-</span><span id="484" class="l"><a href="#484"> 484: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
-</span><span id="485" class="l"><a href="#485"> 485: </a>            <span class="php-var">$this</span>-&gt;response(
-</span><span id="486" class="l"><a href="#486"> 486: </a>                [
-</span><span id="487" class="l"><a href="#487"> 487: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="488" class="l"><a href="#488"> 488: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
-</span><span id="489" class="l"><a href="#489"> 489: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
-</span><span id="490" class="l"><a href="#490"> 490: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
-</span><span id="491" class="l"><a href="#491"> 491: </a>                    ]
-</span><span id="492" class="l"><a href="#492"> 492: </a>                ], <span class="php-num">500</span>);
-</span><span id="493" class="l"><a href="#493"> 493: </a>        }
-</span><span id="494" class="l"><a href="#494"> 494: </a>    }
-</span><span id="495" class="l"><a href="#495"> 495: </a>
-</span><span id="496" class="l"><a href="#496"> 496: </a>    <span class="php-comment">/**
-</span></span><span id="497" class="l"><a href="#497"> 497: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
-</span></span><span id="498" class="l"><a href="#498"> 498: </a><span class="php-comment">     *
-</span></span><span id="499" class="l"><a href="#499"> 499: </a><span class="php-comment">     * @access public
-</span></span><span id="500" class="l"><a href="#500"> 500: </a><span class="php-comment">     *
-</span></span><span id="501" class="l"><a href="#501"> 501: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
-</span></span><span id="502" class="l"><a href="#502"> 502: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
-</span></span><span id="503" class="l"><a href="#503"> 503: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
-</span></span><span id="504" class="l"><a href="#504"> 504: </a><span class="php-comment">     * running the script; otherwise, exit
-</span></span><span id="505" class="l"><a href="#505"> 505: </a><span class="php-comment">     */</span>
-</span><span id="506" class="l"><a href="#506"> 506: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="507" class="l"><a href="#507"> 507: </a>    {
-</span><span id="508" class="l"><a href="#508"> 508: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
-</span><span id="509" class="l"><a href="#509"> 509: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="510" class="l"><a href="#510"> 510: </a>        {
-</span><span id="511" class="l"><a href="#511"> 511: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
-</span><span id="512" class="l"><a href="#512"> 512: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
-</span><span id="513" class="l"><a href="#513"> 513: </a>        }
-</span><span id="514" class="l"><a href="#514"> 514: </a>
-</span><span id="515" class="l"><a href="#515"> 515: </a>        <span class="php-comment">// Set the output as NULL by default</span>
-</span><span id="516" class="l"><a href="#516"> 516: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="517" class="l"><a href="#517"> 517: </a>
-</span><span id="518" class="l"><a href="#518"> 518: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
-</span><span id="519" class="l"><a href="#519"> 519: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="520" class="l"><a href="#520"> 520: </a>        {
-</span><span id="521" class="l"><a href="#521"> 521: </a>            <span class="php-var">$http_code</span> = <span class="php-num">404</span>;
-</span><span id="522" class="l"><a href="#522"> 522: </a>        }
-</span><span id="523" class="l"><a href="#523"> 523: </a>
-</span><span id="524" class="l"><a href="#524"> 524: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
-</span><span id="525" class="l"><a href="#525"> 525: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="526" class="l"><a href="#526"> 526: </a>        {
-</span><span id="527" class="l"><a href="#527"> 527: </a>            <span class="php-comment">// Is compression enabled and available?</span>
-</span><span id="528" class="l"><a href="#528"> 528: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'compress_output'</span>) === <span class="php-keyword1">TRUE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_zlib_oc == <span class="php-keyword1">FALSE</span>)
-</span><span id="529" class="l"><a href="#529"> 529: </a>            {
-</span><span id="530" class="l"><a href="#530"> 530: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">extension_loaded</span>(<span class="php-quote">'zlib'</span>))
-</span><span id="531" class="l"><a href="#531"> 531: </a>                {
-</span><span id="532" class="l"><a href="#532"> 532: </a>                    <span class="php-var">$http_encoding</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_ENCODING'</span>);
-</span><span id="533" class="l"><a href="#533"> 533: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$http_encoding</span> !== <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_encoding</span>, <span class="php-quote">'gzip'</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="534" class="l"><a href="#534"> 534: </a>                    {
-</span><span id="535" class="l"><a href="#535"> 535: </a>                        <span class="php-keyword2">ob_start</span>(<span class="php-quote">'ob_gzhandler'</span>);
-</span><span id="536" class="l"><a href="#536"> 536: </a>                    }
-</span><span id="537" class="l"><a href="#537"> 537: </a>                }
-</span><span id="538" class="l"><a href="#538"> 538: </a>            }
-</span><span id="539" class="l"><a href="#539"> 539: </a>
-</span><span id="540" class="l"><a href="#540"> 540: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
-</span><span id="541" class="l"><a href="#541"> 541: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
-</span><span id="542" class="l"><a href="#542"> 542: </a>            {
-</span><span id="543" class="l"><a href="#543"> 543: </a>                <span class="php-comment">// Set the format header</span>
-</span><span id="544" class="l"><a href="#544"> 544: </a>                <span class="php-keyword2">header</span>(<span class="php-quote">'Content-Type: '</span> . <span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format]
-</span><span id="545" class="l"><a href="#545"> 545: </a>                       . <span class="php-quote">'; charset='</span> . <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
+</span><span id="416" class="l"><a href="#416"> 416: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
+</span><span id="417" class="l"><a href="#417"> 417: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
+</span><span id="418" class="l"><a href="#418"> 418: </a>
+</span><span id="419" class="l"><a href="#419"> 419: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
+</span><span id="420" class="l"><a href="#420"> 420: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
+</span><span id="421" class="l"><a href="#421"> 421: </a>
+</span><span id="422" class="l"><a href="#422"> 422: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
+</span><span id="423" class="l"><a href="#423"> 423: </a>        <span class="php-var">$this</span>-&gt;early_checks();
+</span><span id="424" class="l"><a href="#424"> 424: </a>
+</span><span id="425" class="l"><a href="#425"> 425: </a>        <span class="php-comment">// Load DB if its enabled</span>
+</span><span id="426" class="l"><a href="#426"> 426: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
+</span><span id="427" class="l"><a href="#427"> 427: </a>        {
+</span><span id="428" class="l"><a href="#428"> 428: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
+</span><span id="429" class="l"><a href="#429"> 429: </a>        }
+</span><span id="430" class="l"><a href="#430"> 430: </a>
+</span><span id="431" class="l"><a href="#431"> 431: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
+</span><span id="432" class="l"><a href="#432"> 432: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
+</span><span id="433" class="l"><a href="#433"> 433: </a>        {
+</span><span id="434" class="l"><a href="#434"> 434: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
+</span><span id="435" class="l"><a href="#435"> 435: </a>        }
+</span><span id="436" class="l"><a href="#436"> 436: </a>
+</span><span id="437" class="l"><a href="#437"> 437: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
+</span><span id="438" class="l"><a href="#438"> 438: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
+</span><span id="439" class="l"><a href="#439"> 439: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
+</span><span id="440" class="l"><a href="#440"> 440: </a>
+</span><span id="441" class="l"><a href="#441"> 441: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
+</span><span id="442" class="l"><a href="#442"> 442: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
+</span><span id="443" class="l"><a href="#443"> 443: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
+</span><span id="444" class="l"><a href="#444"> 444: </a>        {
+</span><span id="445" class="l"><a href="#445"> 445: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
+</span><span id="446" class="l"><a href="#446"> 446: </a>        }
+</span><span id="447" class="l"><a href="#447"> 447: </a>
+</span><span id="448" class="l"><a href="#448"> 448: </a>        <span class="php-comment">// Only allow ajax requests</span>
+</span><span id="449" class="l"><a href="#449"> 449: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
+</span><span id="450" class="l"><a href="#450"> 450: </a>        {
+</span><span id="451" class="l"><a href="#451"> 451: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="452" class="l"><a href="#452"> 452: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="453" class="l"><a href="#453"> 453: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="454" class="l"><a href="#454"> 454: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Only AJAX requests are acceptable'</span>
+</span><span id="455" class="l"><a href="#455"> 455: </a>                ], self::NOT_ACCEPTABLE);
+</span><span id="456" class="l"><a href="#456"> 456: </a>        }
+</span><span id="457" class="l"><a href="#457"> 457: </a>
+</span><span id="458" class="l"><a href="#458"> 458: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
+</span><span id="459" class="l"><a href="#459"> 459: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; !(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
+</span><span id="460" class="l"><a href="#460"> 460: </a>        {
+</span><span id="461" class="l"><a href="#461"> 461: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="462" class="l"><a href="#462"> 462: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
+</span><span id="463" class="l"><a href="#463"> 463: </a>            {
+</span><span id="464" class="l"><a href="#464"> 464: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
+</span><span id="465" class="l"><a href="#465"> 465: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="466" class="l"><a href="#466"> 466: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="467" class="l"><a href="#467"> 467: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
+</span><span id="468" class="l"><a href="#468"> 468: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="469" class="l"><a href="#469"> 469: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="470" class="l"><a href="#470"> 470: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
+</span><span id="471" class="l"><a href="#471"> 471: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="472" class="l"><a href="#472"> 472: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="473" class="l"><a href="#473"> 473: </a>            }
+</span><span id="474" class="l"><a href="#474"> 474: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="475" class="l"><a href="#475"> 475: </a>            {
+</span><span id="476" class="l"><a href="#476"> 476: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="477" class="l"><a href="#477"> 477: </a>            }
+</span><span id="478" class="l"><a href="#478"> 478: </a>        }
+</span><span id="479" class="l"><a href="#479"> 479: </a>    }
+</span><span id="480" class="l"><a href="#480"> 480: </a>
+</span><span id="481" class="l"><a href="#481"> 481: </a>    <span class="php-comment">/**
+</span></span><span id="482" class="l"><a href="#482"> 482: </a><span class="php-comment">     * Deconstructor
+</span></span><span id="483" class="l"><a href="#483"> 483: </a><span class="php-comment">     *
+</span></span><span id="484" class="l"><a href="#484"> 484: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="485" class="l"><a href="#485"> 485: </a><span class="php-comment">     * @access public
+</span></span><span id="486" class="l"><a href="#486"> 486: </a><span class="php-comment">     * @return void
+</span></span><span id="487" class="l"><a href="#487"> 487: </a><span class="php-comment">     */</span>
+</span><span id="488" class="l"><a href="#488"> 488: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
+</span><span id="489" class="l"><a href="#489"> 489: </a>    {
+</span><span id="490" class="l"><a href="#490"> 490: </a>        <span class="php-comment">// Get the current timestamp</span>
+</span><span id="491" class="l"><a href="#491"> 491: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="492" class="l"><a href="#492"> 492: </a>
+</span><span id="493" class="l"><a href="#493"> 493: </a>        <span class="php-comment">// Log the loading time to the log table</span>
+</span><span id="494" class="l"><a href="#494"> 494: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="495" class="l"><a href="#495"> 495: </a>        {
+</span><span id="496" class="l"><a href="#496"> 496: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
+</span><span id="497" class="l"><a href="#497"> 497: </a>        }
+</span><span id="498" class="l"><a href="#498"> 498: </a>    }
+</span><span id="499" class="l"><a href="#499"> 499: </a>
+</span><span id="500" class="l"><a href="#500"> 500: </a>    <span class="php-comment">/**
+</span></span><span id="501" class="l"><a href="#501"> 501: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
+</span></span><span id="502" class="l"><a href="#502"> 502: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
+</span></span><span id="503" class="l"><a href="#503"> 503: </a><span class="php-comment">     * Controller method.
+</span></span><span id="504" class="l"><a href="#504"> 504: </a><span class="php-comment">     *
+</span></span><span id="505" class="l"><a href="#505"> 505: </a><span class="php-comment">     * @access public
+</span></span><span id="506" class="l"><a href="#506"> 506: </a><span class="php-comment">     * @param  string $object_called
+</span></span><span id="507" class="l"><a href="#507"> 507: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method.
+</span></span><span id="508" class="l"><a href="#508"> 508: </a><span class="php-comment">     */</span>
+</span><span id="509" class="l"><a href="#509"> 509: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span>)
+</span><span id="510" class="l"><a href="#510"> 510: </a>    {
+</span><span id="511" class="l"><a href="#511"> 511: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
+</span><span id="512" class="l"><a href="#512"> 512: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
+</span><span id="513" class="l"><a href="#513"> 513: </a>        {
+</span><span id="514" class="l"><a href="#514"> 514: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unsupported protocol'</span>], self::FORBIDDEN);
+</span><span id="515" class="l"><a href="#515"> 515: </a>        }
+</span><span id="516" class="l"><a href="#516"> 516: </a>
+</span><span id="517" class="l"><a href="#517"> 517: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
+</span><span id="518" class="l"><a href="#518"> 518: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
+</span><span id="519" class="l"><a href="#519"> 519: </a>
+</span><span id="520" class="l"><a href="#520"> 520: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span> . <span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method;
+</span><span id="521" class="l"><a href="#521"> 521: </a>
+</span><span id="522" class="l"><a href="#522"> 522: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
+</span><span id="523" class="l"><a href="#523"> 523: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] == <span class="php-keyword1">FALSE</span>);
+</span><span id="524" class="l"><a href="#524"> 524: </a>
+</span><span id="525" class="l"><a href="#525"> 525: </a>        <span class="php-comment">// Use keys for this method?</span>
+</span><span id="526" class="l"><a href="#526"> 526: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] == <span class="php-keyword1">FALSE</span>);
+</span><span id="527" class="l"><a href="#527"> 527: </a>
+</span><span id="528" class="l"><a href="#528"> 528: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here.</span>
+</span><span id="529" class="l"><a href="#529"> 529: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
+</span><span id="530" class="l"><a href="#530"> 530: </a>        {
+</span><span id="531" class="l"><a href="#531"> 531: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="532" class="l"><a href="#532"> 532: </a>            {
+</span><span id="533" class="l"><a href="#533"> 533: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="534" class="l"><a href="#534"> 534: </a>            }
+</span><span id="535" class="l"><a href="#535"> 535: </a>
+</span><span id="536" class="l"><a href="#536"> 536: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid API Key '</span> . <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>], self::FORBIDDEN);
+</span><span id="537" class="l"><a href="#537"> 537: </a>        }
+</span><span id="538" class="l"><a href="#538"> 538: </a>
+</span><span id="539" class="l"><a href="#539"> 539: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller.</span>
+</span><span id="540" class="l"><a href="#540"> 540: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
+</span><span id="541" class="l"><a href="#541"> 541: </a>        {
+</span><span id="542" class="l"><a href="#542"> 542: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="543" class="l"><a href="#543"> 543: </a>            {
+</span><span id="544" class="l"><a href="#544"> 544: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="545" class="l"><a href="#545"> 545: </a>            }
 </span><span id="546" class="l"><a href="#546"> 546: </a>
-</span><span id="547" class="l"><a href="#547"> 547: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
-</span><span id="548" class="l"><a href="#548"> 548: </a>
-</span><span id="549" class="l"><a href="#549"> 549: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error.</span>
-</span><span id="550" class="l"><a href="#550"> 550: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
-</span><span id="551" class="l"><a href="#551"> 551: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
-</span><span id="552" class="l"><a href="#552"> 552: </a>                {
-</span><span id="553" class="l"><a href="#553"> 553: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="554" class="l"><a href="#554"> 554: </a>                }
-</span><span id="555" class="l"><a href="#555"> 555: </a>            }
-</span><span id="556" class="l"><a href="#556"> 556: </a>            <span class="php-keyword1">else</span>
-</span><span id="557" class="l"><a href="#557"> 557: </a>            {
-</span><span id="558" class="l"><a href="#558"> 558: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
-</span><span id="559" class="l"><a href="#559"> 559: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
-</span><span id="560" class="l"><a href="#560"> 560: </a>                {
-</span><span id="561" class="l"><a href="#561"> 561: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="562" class="l"><a href="#562"> 562: </a>                }
-</span><span id="563" class="l"><a href="#563"> 563: </a>
-</span><span id="564" class="l"><a href="#564"> 564: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
-</span><span id="565" class="l"><a href="#565"> 565: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
-</span><span id="566" class="l"><a href="#566"> 566: </a>            }
-</span><span id="567" class="l"><a href="#567"> 567: </a>        }
+</span><span id="547" class="l"><a href="#547"> 547: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have access to the requested controller.'</span>], self::UNAUTHORIZED);
+</span><span id="548" class="l"><a href="#548"> 548: </a>        }
+</span><span id="549" class="l"><a href="#549"> 549: </a>
+</span><span id="550" class="l"><a href="#550"> 550: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
+</span><span id="551" class="l"><a href="#551"> 551: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="552" class="l"><a href="#552"> 552: </a>        {
+</span><span id="553" class="l"><a href="#553"> 553: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unknown method.'</span>], self::NOT_FOUND);
+</span><span id="554" class="l"><a href="#554"> 554: </a>        }
+</span><span id="555" class="l"><a href="#555"> 555: </a>
+</span><span id="556" class="l"><a href="#556"> 556: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
+</span><span id="557" class="l"><a href="#557"> 557: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="558" class="l"><a href="#558"> 558: </a>        {
+</span><span id="559" class="l"><a href="#559"> 559: </a>            <span class="php-comment">// Check the limit</span>
+</span><span id="560" class="l"><a href="#560"> 560: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="561" class="l"><a href="#561"> 561: </a>            {
+</span><span id="562" class="l"><a href="#562"> 562: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key has reached the time limit for this method.'</span>];
+</span><span id="563" class="l"><a href="#563"> 563: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::UNAUTHORIZED);
+</span><span id="564" class="l"><a href="#564"> 564: </a>            }
+</span><span id="565" class="l"><a href="#565"> 565: </a>
+</span><span id="566" class="l"><a href="#566"> 566: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
+</span><span id="567" class="l"><a href="#567"> 567: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
 </span><span id="568" class="l"><a href="#568"> 568: </a>
-</span><span id="569" class="l"><a href="#569"> 569: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
-</span><span id="570" class="l"><a href="#570"> 570: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
-</span><span id="571" class="l"><a href="#571"> 571: </a>        <span class="php-comment">// correct HTTP status code</span>
-</span><span id="572" class="l"><a href="#572"> 572: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = <span class="php-num">200</span>;
-</span><span id="573" class="l"><a href="#573"> 573: </a>
-</span><span id="574" class="l"><a href="#574"> 574: </a>        set_status_header(<span class="php-var">$http_code</span>);
-</span><span id="575" class="l"><a href="#575"> 575: </a>
-</span><span id="576" class="l"><a href="#576"> 576: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
-</span><span id="577" class="l"><a href="#577"> 577: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="578" class="l"><a href="#578"> 578: </a>        {
-</span><span id="579" class="l"><a href="#579"> 579: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
-</span><span id="580" class="l"><a href="#580"> 580: </a>        }
-</span><span id="581" class="l"><a href="#581"> 581: </a>
-</span><span id="582" class="l"><a href="#582"> 582: </a>        <span class="php-comment">// If zlib.output_compression is enabled it will compress the output,</span>
-</span><span id="583" class="l"><a href="#583"> 583: </a>        <span class="php-comment">// but it will not modify the content-length header to compensate for</span>
-</span><span id="584" class="l"><a href="#584"> 584: </a>        <span class="php-comment">// the reduction, causing the browser to hang waiting for more data.</span>
-</span><span id="585" class="l"><a href="#585"> 585: </a>        <span class="php-comment">// We'll just skip content-length in those cases</span>
-</span><span id="586" class="l"><a href="#586"> 586: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_zlib_oc &amp;&amp; !<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'compress_output'</span>))
-</span><span id="587" class="l"><a href="#587"> 587: </a>        {
-</span><span id="588" class="l"><a href="#588"> 588: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'Content-Length: '</span> . <span class="php-keyword2">strlen</span>(<span class="php-var">$output</span>));
-</span><span id="589" class="l"><a href="#589"> 589: </a>        }
-</span><span id="590" class="l"><a href="#590"> 590: </a>
-</span><span id="591" class="l"><a href="#591"> 591: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="592" class="l"><a href="#592"> 592: </a>        {
-</span><span id="593" class="l"><a href="#593"> 593: </a>            <span class="php-keyword1">exit</span>(<span class="php-var">$output</span>);
-</span><span id="594" class="l"><a href="#594"> 594: </a>        }
-</span><span id="595" class="l"><a href="#595"> 595: </a>
-</span><span id="596" class="l"><a href="#596"> 596: </a>        <span class="php-keyword1">echo</span>(<span class="php-var">$output</span>);
-</span><span id="597" class="l"><a href="#597"> 597: </a>        <span class="php-keyword2">ob_end_flush</span>();
-</span><span id="598" class="l"><a href="#598"> 598: </a>        <span class="php-keyword2">ob_flush</span>();
-</span><span id="599" class="l"><a href="#599"> 599: </a>        <span class="php-keyword2">flush</span>();
-</span><span id="600" class="l"><a href="#600"> 600: </a>    }
-</span><span id="601" class="l"><a href="#601"> 601: </a>
-</span><span id="602" class="l"><a href="#602"> 602: </a>    <span class="php-comment">/**
-</span></span><span id="603" class="l"><a href="#603"> 603: </a><span class="php-comment">     * Get the input format e.g. json or xml
-</span></span><span id="604" class="l"><a href="#604"> 604: </a><span class="php-comment">     *
-</span></span><span id="605" class="l"><a href="#605"> 605: </a><span class="php-comment">     * @access private
-</span></span><span id="606" class="l"><a href="#606"> 606: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
-</span></span><span id="607" class="l"><a href="#607"> 607: </a><span class="php-comment">     */</span>
-</span><span id="608" class="l"><a href="#608"> 608: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _detect_input_format()
-</span><span id="609" class="l"><a href="#609"> 609: </a>    {
-</span><span id="610" class="l"><a href="#610"> 610: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
-</span><span id="611" class="l"><a href="#611"> 611: </a>        <span class="php-var">$contentType</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
-</span><span id="612" class="l"><a href="#612"> 612: </a>
-</span><span id="613" class="l"><a href="#613"> 613: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$contentType</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="614" class="l"><a href="#614"> 614: </a>        {
-</span><span id="615" class="l"><a href="#615"> 615: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="616" class="l"><a href="#616"> 616: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
-</span><span id="617" class="l"><a href="#617"> 617: </a>            {
-</span><span id="618" class="l"><a href="#618"> 618: </a>                <span class="php-comment">// $key = format e.g. csv</span>
-</span><span id="619" class="l"><a href="#619"> 619: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
-</span><span id="620" class="l"><a href="#620"> 620: </a>
-</span><span id="621" class="l"><a href="#621"> 621: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
-</span><span id="622" class="l"><a href="#622"> 622: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
-</span><span id="623" class="l"><a href="#623"> 623: </a>                <span class="php-var">$contentType</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$contentType</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$contentType</span>)) : <span class="php-var">$contentType</span>);
+</span><span id="569" class="l"><a href="#569"> 569: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
+</span><span id="570" class="l"><a href="#570"> 570: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
+</span><span id="571" class="l"><a href="#571"> 571: </a>
+</span><span id="572" class="l"><a href="#572"> 572: </a>            <span class="php-comment">// IM TELLIN!</span>
+</span><span id="573" class="l"><a href="#573"> 573: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="574" class="l"><a href="#574"> 574: </a>            {
+</span><span id="575" class="l"><a href="#575"> 575: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
+</span><span id="576" class="l"><a href="#576"> 576: </a>            }
+</span><span id="577" class="l"><a href="#577"> 577: </a>
+</span><span id="578" class="l"><a href="#578"> 578: </a>            <span class="php-comment">// They don't have good enough perms</span>
+</span><span id="579" class="l"><a href="#579"> 579: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have enough permissions.'</span>];
+</span><span id="580" class="l"><a href="#580"> 580: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::UNAUTHORIZED);
+</span><span id="581" class="l"><a href="#581"> 581: </a>        }
+</span><span id="582" class="l"><a href="#582"> 582: </a>
+</span><span id="583" class="l"><a href="#583"> 583: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
+</span><span id="584" class="l"><a href="#584"> 584: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="585" class="l"><a href="#585"> 585: </a>        {
+</span><span id="586" class="l"><a href="#586"> 586: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
+</span><span id="587" class="l"><a href="#587"> 587: </a>        }
+</span><span id="588" class="l"><a href="#588"> 588: </a>
+</span><span id="589" class="l"><a href="#589"> 589: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
+</span><span id="590" class="l"><a href="#590"> 590: </a>        <span class="php-keyword1">try</span>
+</span><span id="591" class="l"><a href="#591"> 591: </a>        {
+</span><span id="592" class="l"><a href="#592"> 592: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
+</span><span id="593" class="l"><a href="#593"> 593: </a>        }
+</span><span id="594" class="l"><a href="#594"> 594: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
+</span><span id="595" class="l"><a href="#595"> 595: </a>        {
+</span><span id="596" class="l"><a href="#596"> 596: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
+</span><span id="597" class="l"><a href="#597"> 597: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="598" class="l"><a href="#598"> 598: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="599" class="l"><a href="#599"> 599: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
+</span><span id="600" class="l"><a href="#600"> 600: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
+</span><span id="601" class="l"><a href="#601"> 601: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
+</span><span id="602" class="l"><a href="#602"> 602: </a>                    ]
+</span><span id="603" class="l"><a href="#603"> 603: </a>                ], self::INTERNAL_SERVER_ERROR);
+</span><span id="604" class="l"><a href="#604"> 604: </a>        }
+</span><span id="605" class="l"><a href="#605"> 605: </a>    }
+</span><span id="606" class="l"><a href="#606"> 606: </a>
+</span><span id="607" class="l"><a href="#607"> 607: </a>    <span class="php-comment">/**
+</span></span><span id="608" class="l"><a href="#608"> 608: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
+</span></span><span id="609" class="l"><a href="#609"> 609: </a><span class="php-comment">     *
+</span></span><span id="610" class="l"><a href="#610"> 610: </a><span class="php-comment">     * @access public
+</span></span><span id="611" class="l"><a href="#611"> 611: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
+</span></span><span id="612" class="l"><a href="#612"> 612: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
+</span></span><span id="613" class="l"><a href="#613"> 613: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
+</span></span><span id="614" class="l"><a href="#614"> 614: </a><span class="php-comment">     * running the script; otherwise, exit
+</span></span><span id="615" class="l"><a href="#615"> 615: </a><span class="php-comment">     */</span>
+</span><span id="616" class="l"><a href="#616"> 616: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="617" class="l"><a href="#617"> 617: </a>    {
+</span><span id="618" class="l"><a href="#618"> 618: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
+</span><span id="619" class="l"><a href="#619"> 619: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="620" class="l"><a href="#620"> 620: </a>        {
+</span><span id="621" class="l"><a href="#621"> 621: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
+</span><span id="622" class="l"><a href="#622"> 622: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
+</span><span id="623" class="l"><a href="#623"> 623: </a>        }
 </span><span id="624" class="l"><a href="#624"> 624: </a>
-</span><span id="625" class="l"><a href="#625"> 625: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
-</span><span id="626" class="l"><a href="#626"> 626: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$contentType</span> === <span class="php-var">$value</span>)
-</span><span id="627" class="l"><a href="#627"> 627: </a>                {
-</span><span id="628" class="l"><a href="#628"> 628: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
-</span><span id="629" class="l"><a href="#629"> 629: </a>                }
-</span><span id="630" class="l"><a href="#630"> 630: </a>            }
-</span><span id="631" class="l"><a href="#631"> 631: </a>        }
-</span><span id="632" class="l"><a href="#632"> 632: </a>
-</span><span id="633" class="l"><a href="#633"> 633: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="634" class="l"><a href="#634"> 634: </a>    }
-</span><span id="635" class="l"><a href="#635"> 635: </a>
-</span><span id="636" class="l"><a href="#636"> 636: </a>    <span class="php-comment">/**
-</span></span><span id="637" class="l"><a href="#637"> 637: </a><span class="php-comment">     * Detect which format should be used to output the data
-</span></span><span id="638" class="l"><a href="#638"> 638: </a><span class="php-comment">     *
-</span></span><span id="639" class="l"><a href="#639"> 639: </a><span class="php-comment">     * @access protected
-</span></span><span id="640" class="l"><a href="#640"> 640: </a><span class="php-comment">     * @return mixed|NULL|string Output format
-</span></span><span id="641" class="l"><a href="#641"> 641: </a><span class="php-comment">     */</span>
-</span><span id="642" class="l"><a href="#642"> 642: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
-</span><span id="643" class="l"><a href="#643"> 643: </a>    {
-</span><span id="644" class="l"><a href="#644"> 644: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>;
-</span><span id="645" class="l"><a href="#645"> 645: </a>
-</span><span id="646" class="l"><a href="#646"> 646: </a>        <span class="php-comment">// Check if a file extension is used when no get arguments provided</span>
-</span><span id="647" class="l"><a href="#647"> 647: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="648" class="l"><a href="#648"> 648: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
-</span><span id="649" class="l"><a href="#649"> 649: </a>        {
-</span><span id="650" class="l"><a href="#650"> 650: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
-</span><span id="651" class="l"><a href="#651"> 651: </a>        }
-</span><span id="652" class="l"><a href="#652"> 652: </a>
-</span><span id="653" class="l"><a href="#653"> 653: </a>        <span class="php-comment">// Check if a file extension is used</span>
-</span><span id="654" class="l"><a href="#654"> 654: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args)) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args), <span class="php-var">$matches</span>))
-</span><span id="655" class="l"><a href="#655"> 655: </a>        {
-</span><span id="656" class="l"><a href="#656"> 656: </a>            <span class="php-comment">//elseif ($this-&gt;_get_args and is_array(end($this-&gt;_get_args)) === FALSE and preg_match($pattern, end(array_keys($this-&gt;_get_args)), $matches)) {</span>
-</span><span id="657" class="l"><a href="#657"> 657: </a>            <span class="php-comment">// The key of the last argument</span>
-</span><span id="658" class="l"><a href="#658"> 658: </a>            <span class="php-var">$arg_keys</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_get_args);
-</span><span id="659" class="l"><a href="#659"> 659: </a>            <span class="php-var">$last_key</span> = <span class="php-keyword2">end</span>(<span class="php-var">$arg_keys</span>);
-</span><span id="660" class="l"><a href="#660"> 660: </a>
-</span><span id="661" class="l"><a href="#661"> 661: </a>            <span class="php-comment">// Remove the extension from arguments too</span>
-</span><span id="662" class="l"><a href="#662"> 662: </a>            <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>] = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>]);
-</span><span id="663" class="l"><a href="#663"> 663: </a>            <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>] = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>]);
-</span><span id="664" class="l"><a href="#664"> 664: </a>
-</span><span id="665" class="l"><a href="#665"> 665: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
-</span><span id="666" class="l"><a href="#666"> 666: </a>        }
-</span><span id="667" class="l"><a href="#667"> 667: </a>
-</span><span id="668" class="l"><a href="#668"> 668: </a>        <span class="php-comment">// A format has been passed as an argument in the URL and it is supported</span>
-</span><span id="669" class="l"><a href="#669"> 669: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]) &amp;&amp; <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>], <span class="php-var">$this</span>-&gt;_supported_formats))
-</span><span id="670" class="l"><a href="#670"> 670: </a>        {
-</span><span id="671" class="l"><a href="#671"> 671: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>];
-</span><span id="672" class="l"><a href="#672"> 672: </a>        }
+</span><span id="625" class="l"><a href="#625"> 625: </a>        <span class="php-comment">// Set the output as NULL by default</span>
+</span><span id="626" class="l"><a href="#626"> 626: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="627" class="l"><a href="#627"> 627: </a>
+</span><span id="628" class="l"><a href="#628"> 628: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
+</span><span id="629" class="l"><a href="#629"> 629: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="630" class="l"><a href="#630"> 630: </a>        {
+</span><span id="631" class="l"><a href="#631"> 631: </a>            <span class="php-var">$http_code</span> = self::NOT_FOUND;
+</span><span id="632" class="l"><a href="#632"> 632: </a>        }
+</span><span id="633" class="l"><a href="#633"> 633: </a>
+</span><span id="634" class="l"><a href="#634"> 634: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
+</span><span id="635" class="l"><a href="#635"> 635: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="636" class="l"><a href="#636"> 636: </a>        {
+</span><span id="637" class="l"><a href="#637"> 637: </a>            <span class="php-comment">// Is compression enabled and available?</span>
+</span><span id="638" class="l"><a href="#638"> 638: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'compress_output'</span>) === <span class="php-keyword1">TRUE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_zlib_oc == <span class="php-keyword1">FALSE</span>)
+</span><span id="639" class="l"><a href="#639"> 639: </a>            {
+</span><span id="640" class="l"><a href="#640"> 640: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">extension_loaded</span>(<span class="php-quote">'zlib'</span>))
+</span><span id="641" class="l"><a href="#641"> 641: </a>                {
+</span><span id="642" class="l"><a href="#642"> 642: </a>                    <span class="php-var">$http_encoding</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_ENCODING'</span>);
+</span><span id="643" class="l"><a href="#643"> 643: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$http_encoding</span> !== <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_encoding</span>, <span class="php-quote">'gzip'</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="644" class="l"><a href="#644"> 644: </a>                    {
+</span><span id="645" class="l"><a href="#645"> 645: </a>                        <span class="php-keyword2">ob_start</span>(<span class="php-quote">'ob_gzhandler'</span>);
+</span><span id="646" class="l"><a href="#646"> 646: </a>                    }
+</span><span id="647" class="l"><a href="#647"> 647: </a>                }
+</span><span id="648" class="l"><a href="#648"> 648: </a>            }
+</span><span id="649" class="l"><a href="#649"> 649: </a>
+</span><span id="650" class="l"><a href="#650"> 650: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
+</span><span id="651" class="l"><a href="#651"> 651: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
+</span><span id="652" class="l"><a href="#652"> 652: </a>            {
+</span><span id="653" class="l"><a href="#653"> 653: </a>                <span class="php-comment">// Set the format header</span>
+</span><span id="654" class="l"><a href="#654"> 654: </a>                <span class="php-keyword2">header</span>(<span class="php-quote">'Content-Type: '</span> . <span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format]
+</span><span id="655" class="l"><a href="#655"> 655: </a>                       . <span class="php-quote">'; charset='</span> . <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
+</span><span id="656" class="l"><a href="#656"> 656: </a>
+</span><span id="657" class="l"><a href="#657"> 657: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
+</span><span id="658" class="l"><a href="#658"> 658: </a>
+</span><span id="659" class="l"><a href="#659"> 659: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error.</span>
+</span><span id="660" class="l"><a href="#660"> 660: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
+</span><span id="661" class="l"><a href="#661"> 661: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
+</span><span id="662" class="l"><a href="#662"> 662: </a>                {
+</span><span id="663" class="l"><a href="#663"> 663: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="664" class="l"><a href="#664"> 664: </a>                }
+</span><span id="665" class="l"><a href="#665"> 665: </a>            }
+</span><span id="666" class="l"><a href="#666"> 666: </a>            <span class="php-keyword1">else</span>
+</span><span id="667" class="l"><a href="#667"> 667: </a>            {
+</span><span id="668" class="l"><a href="#668"> 668: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
+</span><span id="669" class="l"><a href="#669"> 669: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
+</span><span id="670" class="l"><a href="#670"> 670: </a>                {
+</span><span id="671" class="l"><a href="#671"> 671: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="672" class="l"><a href="#672"> 672: </a>                }
 </span><span id="673" class="l"><a href="#673"> 673: </a>
-</span><span id="674" class="l"><a href="#674"> 674: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT (if it exists and we are allowed)</span>
-</span><span id="675" class="l"><a href="#675"> 675: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>))
-</span><span id="676" class="l"><a href="#676"> 676: </a>        {
-</span><span id="677" class="l"><a href="#677"> 677: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="678" class="l"><a href="#678"> 678: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
-</span><span id="679" class="l"><a href="#679"> 679: </a>            {
-</span><span id="680" class="l"><a href="#680"> 680: </a>                <span class="php-comment">// Has this format been requested?</span>
-</span><span id="681" class="l"><a href="#681"> 681: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="682" class="l"><a href="#682"> 682: </a>                {
-</span><span id="683" class="l"><a href="#683"> 683: </a>                    <span class="php-comment">// If not HTML or XML assume its right and send it on its way</span>
-</span><span id="684" class="l"><a href="#684"> 684: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
-</span><span id="685" class="l"><a href="#685"> 685: </a>                    {
-</span><span id="686" class="l"><a href="#686"> 686: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="687" class="l"><a href="#687"> 687: </a>                    }
-</span><span id="688" class="l"><a href="#688"> 688: </a>
-</span><span id="689" class="l"><a href="#689"> 689: </a>                    <span class="php-comment">// HTML or XML have shown up as a match</span>
-</span><span id="690" class="l"><a href="#690"> 690: </a>                    <span class="php-keyword1">else</span>
-</span><span id="691" class="l"><a href="#691"> 691: </a>                    {
-</span><span id="692" class="l"><a href="#692"> 692: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
-</span><span id="693" class="l"><a href="#693"> 693: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$format</span> == <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="694" class="l"><a href="#694"> 694: </a>                        {
-</span><span id="695" class="l"><a href="#695"> 695: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="696" class="l"><a href="#696"> 696: </a>                        }
-</span><span id="697" class="l"><a href="#697"> 697: </a>
-</span><span id="698" class="l"><a href="#698"> 698: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
-</span><span id="699" class="l"><a href="#699"> 699: </a>                        <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> == <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="700" class="l"><a href="#700"> 700: </a>                        {
-</span><span id="701" class="l"><a href="#701"> 701: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="702" class="l"><a href="#702"> 702: </a>                        }
-</span><span id="703" class="l"><a href="#703"> 703: </a>                    }
-</span><span id="704" class="l"><a href="#704"> 704: </a>                }
-</span><span id="705" class="l"><a href="#705"> 705: </a>            }
-</span><span id="706" class="l"><a href="#706"> 706: </a>        } <span class="php-comment">// End HTTP_ACCEPT checking</span>
-</span><span id="707" class="l"><a href="#707"> 707: </a>
-</span><span id="708" class="l"><a href="#708"> 708: </a>        <span class="php-comment">// Well, none of that has worked! Let's see if the controller has a default</span>
-</span><span id="709" class="l"><a href="#709"> 709: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
-</span><span id="710" class="l"><a href="#710"> 710: </a>        {
-</span><span id="711" class="l"><a href="#711"> 711: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
-</span><span id="712" class="l"><a href="#712"> 712: </a>        }
-</span><span id="713" class="l"><a href="#713"> 713: </a>
-</span><span id="714" class="l"><a href="#714"> 714: </a>        <span class="php-comment">// Just use the default format</span>
-</span><span id="715" class="l"><a href="#715"> 715: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
-</span><span id="716" class="l"><a href="#716"> 716: </a>    }
-</span><span id="717" class="l"><a href="#717"> 717: </a>
-</span><span id="718" class="l"><a href="#718"> 718: </a>    <span class="php-comment">/**
-</span></span><span id="719" class="l"><a href="#719"> 719: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
-</span></span><span id="720" class="l"><a href="#720"> 720: </a><span class="php-comment">     *
-</span></span><span id="721" class="l"><a href="#721"> 721: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
-</span></span><span id="722" class="l"><a href="#722"> 722: </a><span class="php-comment">     */</span>
-</span><span id="723" class="l"><a href="#723"> 723: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
-</span><span id="724" class="l"><a href="#724"> 724: </a>    {
-</span><span id="725" class="l"><a href="#725"> 725: </a>        <span class="php-comment">// Declare a variable to store the method</span>
-</span><span id="726" class="l"><a href="#726"> 726: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="727" class="l"><a href="#727"> 727: </a>
-</span><span id="728" class="l"><a href="#728"> 728: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
-</span><span id="729" class="l"><a href="#729"> 729: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="730" class="l"><a href="#730"> 730: </a>        {
-</span><span id="731" class="l"><a href="#731"> 731: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
-</span><span id="732" class="l"><a href="#732"> 732: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="733" class="l"><a href="#733"> 733: </a>            {
-</span><span id="734" class="l"><a href="#734"> 734: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
-</span><span id="735" class="l"><a href="#735"> 735: </a>            }
-</span><span id="736" class="l"><a href="#736"> 736: </a>
-</span><span id="737" class="l"><a href="#737"> 737: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
-</span><span id="738" class="l"><a href="#738"> 738: </a>        }
-</span><span id="739" class="l"><a href="#739"> 739: </a>
-</span><span id="740" class="l"><a href="#740"> 740: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
-</span><span id="741" class="l"><a href="#741"> 741: </a>        {
-</span><span id="742" class="l"><a href="#742"> 742: </a>            <span class="php-comment">// Get the request method as a lowercase string.</span>
-</span><span id="743" class="l"><a href="#743"> 743: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
-</span><span id="744" class="l"><a href="#744"> 744: </a>        }
+</span><span id="674" class="l"><a href="#674"> 674: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
+</span><span id="675" class="l"><a href="#675"> 675: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
+</span><span id="676" class="l"><a href="#676"> 676: </a>            }
+</span><span id="677" class="l"><a href="#677"> 677: </a>        }
+</span><span id="678" class="l"><a href="#678"> 678: </a>
+</span><span id="679" class="l"><a href="#679"> 679: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
+</span><span id="680" class="l"><a href="#680"> 680: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
+</span><span id="681" class="l"><a href="#681"> 681: </a>        <span class="php-comment">// correct HTTP status code</span>
+</span><span id="682" class="l"><a href="#682"> 682: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = <span class="php-num">200</span>;
+</span><span id="683" class="l"><a href="#683"> 683: </a>
+</span><span id="684" class="l"><a href="#684"> 684: </a>        set_status_header(<span class="php-var">$http_code</span>);
+</span><span id="685" class="l"><a href="#685"> 685: </a>
+</span><span id="686" class="l"><a href="#686"> 686: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
+</span><span id="687" class="l"><a href="#687"> 687: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="688" class="l"><a href="#688"> 688: </a>        {
+</span><span id="689" class="l"><a href="#689"> 689: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
+</span><span id="690" class="l"><a href="#690"> 690: </a>        }
+</span><span id="691" class="l"><a href="#691"> 691: </a>
+</span><span id="692" class="l"><a href="#692"> 692: </a>        <span class="php-comment">// If zlib.output_compression is enabled it will compress the output,</span>
+</span><span id="693" class="l"><a href="#693"> 693: </a>        <span class="php-comment">// but it will not modify the content-length header to compensate for</span>
+</span><span id="694" class="l"><a href="#694"> 694: </a>        <span class="php-comment">// the reduction, causing the browser to hang waiting for more data.</span>
+</span><span id="695" class="l"><a href="#695"> 695: </a>        <span class="php-comment">// We'll just skip content-length in those cases</span>
+</span><span id="696" class="l"><a href="#696"> 696: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_zlib_oc &amp;&amp; !<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'compress_output'</span>))
+</span><span id="697" class="l"><a href="#697"> 697: </a>        {
+</span><span id="698" class="l"><a href="#698"> 698: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'Content-Length: '</span> . <span class="php-keyword2">strlen</span>(<span class="php-var">$output</span>));
+</span><span id="699" class="l"><a href="#699"> 699: </a>        }
+</span><span id="700" class="l"><a href="#700"> 700: </a>
+</span><span id="701" class="l"><a href="#701"> 701: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="702" class="l"><a href="#702"> 702: </a>        {
+</span><span id="703" class="l"><a href="#703"> 703: </a>            <span class="php-keyword1">exit</span>(<span class="php-var">$output</span>);
+</span><span id="704" class="l"><a href="#704"> 704: </a>        }
+</span><span id="705" class="l"><a href="#705"> 705: </a>
+</span><span id="706" class="l"><a href="#706"> 706: </a>        <span class="php-keyword1">echo</span>(<span class="php-var">$output</span>);
+</span><span id="707" class="l"><a href="#707"> 707: </a>        <span class="php-keyword2">ob_end_flush</span>();
+</span><span id="708" class="l"><a href="#708"> 708: </a>        <span class="php-keyword2">ob_flush</span>();
+</span><span id="709" class="l"><a href="#709"> 709: </a>        <span class="php-keyword2">flush</span>();
+</span><span id="710" class="l"><a href="#710"> 710: </a>    }
+</span><span id="711" class="l"><a href="#711"> 711: </a>
+</span><span id="712" class="l"><a href="#712"> 712: </a>    <span class="php-comment">/**
+</span></span><span id="713" class="l"><a href="#713"> 713: </a><span class="php-comment">     * Get the input format e.g. json or xml
+</span></span><span id="714" class="l"><a href="#714"> 714: </a><span class="php-comment">     *
+</span></span><span id="715" class="l"><a href="#715"> 715: </a><span class="php-comment">     * @access protected
+</span></span><span id="716" class="l"><a href="#716"> 716: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
+</span></span><span id="717" class="l"><a href="#717"> 717: </a><span class="php-comment">     */</span>
+</span><span id="718" class="l"><a href="#718"> 718: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
+</span><span id="719" class="l"><a href="#719"> 719: </a>    {
+</span><span id="720" class="l"><a href="#720"> 720: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
+</span><span id="721" class="l"><a href="#721"> 721: </a>        <span class="php-var">$contentType</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
+</span><span id="722" class="l"><a href="#722"> 722: </a>
+</span><span id="723" class="l"><a href="#723"> 723: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$contentType</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="724" class="l"><a href="#724"> 724: </a>        {
+</span><span id="725" class="l"><a href="#725"> 725: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="726" class="l"><a href="#726"> 726: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
+</span><span id="727" class="l"><a href="#727"> 727: </a>            {
+</span><span id="728" class="l"><a href="#728"> 728: </a>                <span class="php-comment">// $key = format e.g. csv</span>
+</span><span id="729" class="l"><a href="#729"> 729: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
+</span><span id="730" class="l"><a href="#730"> 730: </a>
+</span><span id="731" class="l"><a href="#731"> 731: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
+</span><span id="732" class="l"><a href="#732"> 732: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
+</span><span id="733" class="l"><a href="#733"> 733: </a>                <span class="php-var">$contentType</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$contentType</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$contentType</span>)) : <span class="php-var">$contentType</span>);
+</span><span id="734" class="l"><a href="#734"> 734: </a>
+</span><span id="735" class="l"><a href="#735"> 735: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
+</span><span id="736" class="l"><a href="#736"> 736: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$contentType</span> === <span class="php-var">$value</span>)
+</span><span id="737" class="l"><a href="#737"> 737: </a>                {
+</span><span id="738" class="l"><a href="#738"> 738: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
+</span><span id="739" class="l"><a href="#739"> 739: </a>                }
+</span><span id="740" class="l"><a href="#740"> 740: </a>            }
+</span><span id="741" class="l"><a href="#741"> 741: </a>        }
+</span><span id="742" class="l"><a href="#742"> 742: </a>
+</span><span id="743" class="l"><a href="#743"> 743: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="744" class="l"><a href="#744"> 744: </a>    }
 </span><span id="745" class="l"><a href="#745"> 745: </a>
-</span><span id="746" class="l"><a href="#746"> 746: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
-</span><span id="747" class="l"><a href="#747"> 747: </a>    }
-</span><span id="748" class="l"><a href="#748"> 748: </a>
-</span><span id="749" class="l"><a href="#749"> 749: </a>    <span class="php-comment">/**
-</span></span><span id="750" class="l"><a href="#750"> 750: </a><span class="php-comment">     * See if the user has provided an API key
-</span></span><span id="751" class="l"><a href="#751"> 751: </a><span class="php-comment">     *
-</span></span><span id="752" class="l"><a href="#752"> 752: </a><span class="php-comment">     * @access protected
-</span></span><span id="753" class="l"><a href="#753"> 753: </a><span class="php-comment">     * @return bool
-</span></span><span id="754" class="l"><a href="#754"> 754: </a><span class="php-comment">     */</span>
-</span><span id="755" class="l"><a href="#755"> 755: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
-</span><span id="756" class="l"><a href="#756"> 756: </a>    {
-</span><span id="757" class="l"><a href="#757"> 757: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
-</span><span id="758" class="l"><a href="#758"> 758: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
-</span><span id="759" class="l"><a href="#759"> 759: </a>
-</span><span id="760" class="l"><a href="#760"> 760: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
-</span><span id="761" class="l"><a href="#761"> 761: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
+</span><span id="746" class="l"><a href="#746"> 746: </a>    <span class="php-comment">/**
+</span></span><span id="747" class="l"><a href="#747"> 747: </a><span class="php-comment">     * Detect which format should be used to output the data
+</span></span><span id="748" class="l"><a href="#748"> 748: </a><span class="php-comment">     *
+</span></span><span id="749" class="l"><a href="#749"> 749: </a><span class="php-comment">     * @access protected
+</span></span><span id="750" class="l"><a href="#750"> 750: </a><span class="php-comment">     * @return mixed|NULL|string Output format
+</span></span><span id="751" class="l"><a href="#751"> 751: </a><span class="php-comment">     */</span>
+</span><span id="752" class="l"><a href="#752"> 752: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
+</span><span id="753" class="l"><a href="#753"> 753: </a>    {
+</span><span id="754" class="l"><a href="#754"> 754: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>;
+</span><span id="755" class="l"><a href="#755"> 755: </a>
+</span><span id="756" class="l"><a href="#756"> 756: </a>        <span class="php-comment">// Check if a file extension is used when no get arguments provided</span>
+</span><span id="757" class="l"><a href="#757"> 757: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="758" class="l"><a href="#758"> 758: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
+</span><span id="759" class="l"><a href="#759"> 759: </a>        {
+</span><span id="760" class="l"><a href="#760"> 760: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
+</span><span id="761" class="l"><a href="#761"> 761: </a>        }
 </span><span id="762" class="l"><a href="#762"> 762: </a>
-</span><span id="763" class="l"><a href="#763"> 763: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="764" class="l"><a href="#764"> 764: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
-</span><span id="765" class="l"><a href="#765"> 765: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
-</span><span id="766" class="l"><a href="#766"> 766: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
-</span><span id="767" class="l"><a href="#767"> 767: </a>
-</span><span id="768" class="l"><a href="#768"> 768: </a>        <span class="php-comment">// Find the key from server or arguments</span>
-</span><span id="769" class="l"><a href="#769"> 769: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
-</span><span id="770" class="l"><a href="#770"> 770: </a>        {
-</span><span id="771" class="l"><a href="#771"> 771: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
-</span><span id="772" class="l"><a href="#772"> 772: </a>            {
-</span><span id="773" class="l"><a href="#773"> 773: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="774" class="l"><a href="#774"> 774: </a>            }
-</span><span id="775" class="l"><a href="#775"> 775: </a>
-</span><span id="776" class="l"><a href="#776"> 776: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
+</span><span id="763" class="l"><a href="#763"> 763: </a>        <span class="php-comment">// Check if a file extension is used</span>
+</span><span id="764" class="l"><a href="#764"> 764: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args)) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args), <span class="php-var">$matches</span>))
+</span><span id="765" class="l"><a href="#765"> 765: </a>        {
+</span><span id="766" class="l"><a href="#766"> 766: </a>            <span class="php-comment">//elseif ($this-&gt;_get_args and is_array(end($this-&gt;_get_args)) === FALSE and preg_match($pattern, end(array_keys($this-&gt;_get_args)), $matches)) {</span>
+</span><span id="767" class="l"><a href="#767"> 767: </a>            <span class="php-comment">// The key of the last argument</span>
+</span><span id="768" class="l"><a href="#768"> 768: </a>            <span class="php-var">$arg_keys</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_get_args);
+</span><span id="769" class="l"><a href="#769"> 769: </a>            <span class="php-var">$last_key</span> = <span class="php-keyword2">end</span>(<span class="php-var">$arg_keys</span>);
+</span><span id="770" class="l"><a href="#770"> 770: </a>
+</span><span id="771" class="l"><a href="#771"> 771: </a>            <span class="php-comment">// Remove the extension from arguments too</span>
+</span><span id="772" class="l"><a href="#772"> 772: </a>            <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>] = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>]);
+</span><span id="773" class="l"><a href="#773"> 773: </a>            <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>] = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>]);
+</span><span id="774" class="l"><a href="#774"> 774: </a>
+</span><span id="775" class="l"><a href="#775"> 775: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
+</span><span id="776" class="l"><a href="#776"> 776: </a>        }
 </span><span id="777" class="l"><a href="#777"> 777: </a>
-</span><span id="778" class="l"><a href="#778"> 778: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
-</span><span id="779" class="l"><a href="#779"> 779: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
-</span><span id="780" class="l"><a href="#780"> 780: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
-</span><span id="781" class="l"><a href="#781"> 781: </a>
-</span><span id="782" class="l"><a href="#782"> 782: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
-</span><span id="783" class="l"><a href="#783"> 783: </a>
-</span><span id="784" class="l"><a href="#784"> 784: </a>            <span class="php-comment">/*
-</span></span><span id="785" class="l"><a href="#785"> 785: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
-</span></span><span id="786" class="l"><a href="#786"> 786: </a><span class="php-comment">             * of valid ip addresses stored in the database.
-</span></span><span id="787" class="l"><a href="#787"> 787: </a><span class="php-comment">             */</span>
-</span><span id="788" class="l"><a href="#788"> 788: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
-</span><span id="789" class="l"><a href="#789"> 789: </a>            {
-</span><span id="790" class="l"><a href="#790"> 790: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
-</span><span id="791" class="l"><a href="#791"> 791: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
-</span><span id="792" class="l"><a href="#792"> 792: </a>                {
-</span><span id="793" class="l"><a href="#793"> 793: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
-</span><span id="794" class="l"><a href="#794"> 794: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
-</span><span id="795" class="l"><a href="#795"> 795: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
-</span><span id="796" class="l"><a href="#796"> 796: </a>
-</span><span id="797" class="l"><a href="#797"> 797: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
+</span><span id="778" class="l"><a href="#778"> 778: </a>        <span class="php-comment">// Get the format</span>
+</span><span id="779" class="l"><a href="#779"> 779: </a>        <span class="php-var">$format</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]) ? <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]) : <span class="php-keyword1">NULL</span>;
+</span><span id="780" class="l"><a href="#780"> 780: </a>
+</span><span id="781" class="l"><a href="#781"> 781: </a>        <span class="php-comment">// A format has been passed as an argument in the URL and it is supported</span>
+</span><span id="782" class="l"><a href="#782"> 782: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]))
+</span><span id="783" class="l"><a href="#783"> 783: </a>        {
+</span><span id="784" class="l"><a href="#784"> 784: </a>            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="785" class="l"><a href="#785"> 785: </a>        }
+</span><span id="786" class="l"><a href="#786"> 786: </a>
+</span><span id="787" class="l"><a href="#787"> 787: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT (if it exists and we are allowed)</span>
+</span><span id="788" class="l"><a href="#788"> 788: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>))
+</span><span id="789" class="l"><a href="#789"> 789: </a>        {
+</span><span id="790" class="l"><a href="#790"> 790: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="791" class="l"><a href="#791"> 791: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
+</span><span id="792" class="l"><a href="#792"> 792: </a>            {
+</span><span id="793" class="l"><a href="#793"> 793: </a>                <span class="php-comment">// Has this format been requested?</span>
+</span><span id="794" class="l"><a href="#794"> 794: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="795" class="l"><a href="#795"> 795: </a>                {
+</span><span id="796" class="l"><a href="#796"> 796: </a>                    <span class="php-comment">// If not HTML or XML assume its right and send it on its way</span>
+</span><span id="797" class="l"><a href="#797"> 797: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
 </span><span id="798" class="l"><a href="#798"> 798: </a>                    {
-</span><span id="799" class="l"><a href="#799"> 799: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() == <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
-</span><span id="800" class="l"><a href="#800"> 800: </a>                        {
-</span><span id="801" class="l"><a href="#801"> 801: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
-</span><span id="802" class="l"><a href="#802"> 802: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
-</span><span id="803" class="l"><a href="#803"> 803: </a>                            <span class="php-keyword1">break</span>;
-</span><span id="804" class="l"><a href="#804"> 804: </a>                        }
-</span><span id="805" class="l"><a href="#805"> 805: </a>                    }
-</span><span id="806" class="l"><a href="#806"> 806: </a>
-</span><span id="807" class="l"><a href="#807"> 807: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
-</span><span id="808" class="l"><a href="#808"> 808: </a>                }
-</span><span id="809" class="l"><a href="#809"> 809: </a>                <span class="php-keyword1">else</span>
-</span><span id="810" class="l"><a href="#810"> 810: </a>                {
-</span><span id="811" class="l"><a href="#811"> 811: </a>                    <span class="php-comment">// There should be at least one IP address for this private key.</span>
-</span><span id="812" class="l"><a href="#812"> 812: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="813" class="l"><a href="#813"> 813: </a>                }
-</span><span id="814" class="l"><a href="#814"> 814: </a>            }
-</span><span id="815" class="l"><a href="#815"> 815: </a>
-</span><span id="816" class="l"><a href="#816"> 816: </a>            <span class="php-keyword1">return</span> <span class="php-var">$row</span>;
-</span><span id="817" class="l"><a href="#817"> 817: </a>        }
-</span><span id="818" class="l"><a href="#818"> 818: </a>
-</span><span id="819" class="l"><a href="#819"> 819: </a>        <span class="php-comment">// No key has been sent</span>
-</span><span id="820" class="l"><a href="#820"> 820: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="821" class="l"><a href="#821"> 821: </a>    }
-</span><span id="822" class="l"><a href="#822"> 822: </a>
-</span><span id="823" class="l"><a href="#823"> 823: </a>    <span class="php-comment">/**
-</span></span><span id="824" class="l"><a href="#824"> 824: </a><span class="php-comment">     * What language do they want it in?
-</span></span><span id="825" class="l"><a href="#825"> 825: </a><span class="php-comment">     *
-</span></span><span id="826" class="l"><a href="#826"> 826: </a><span class="php-comment">     * @access protected
-</span></span><span id="827" class="l"><a href="#827"> 827: </a><span class="php-comment">     * @return NULL|string The language code.
-</span></span><span id="828" class="l"><a href="#828"> 828: </a><span class="php-comment">     */</span>
-</span><span id="829" class="l"><a href="#829"> 829: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
-</span><span id="830" class="l"><a href="#830"> 830: </a>    {
-</span><span id="831" class="l"><a href="#831"> 831: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>))
-</span><span id="832" class="l"><a href="#832"> 832: </a>        {
-</span><span id="833" class="l"><a href="#833"> 833: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="834" class="l"><a href="#834"> 834: </a>        }
-</span><span id="835" class="l"><a href="#835"> 835: </a>
-</span><span id="836" class="l"><a href="#836"> 836: </a>        <span class="php-comment">// They might have sent a few, make it an array</span>
-</span><span id="837" class="l"><a href="#837"> 837: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="838" class="l"><a href="#838"> 838: </a>        {
-</span><span id="839" class="l"><a href="#839"> 839: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
-</span><span id="840" class="l"><a href="#840"> 840: </a>
-</span><span id="841" class="l"><a href="#841"> 841: </a>            <span class="php-var">$return_langs</span> = [];
-</span><span id="842" class="l"><a href="#842"> 842: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
-</span><span id="843" class="l"><a href="#843"> 843: </a>            {
-</span><span id="844" class="l"><a href="#844"> 844: </a>                <span class="php-comment">// Remove weight and strip space</span>
-</span><span id="845" class="l"><a href="#845"> 845: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
-</span><span id="846" class="l"><a href="#846"> 846: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
-</span><span id="847" class="l"><a href="#847"> 847: </a>            }
-</span><span id="848" class="l"><a href="#848"> 848: </a>
-</span><span id="849" class="l"><a href="#849"> 849: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
-</span><span id="850" class="l"><a href="#850"> 850: </a>        }
-</span><span id="851" class="l"><a href="#851"> 851: </a>
-</span><span id="852" class="l"><a href="#852"> 852: </a>        <span class="php-comment">// Nope, just return the string</span>
-</span><span id="853" class="l"><a href="#853"> 853: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
-</span><span id="854" class="l"><a href="#854"> 854: </a>    }
-</span><span id="855" class="l"><a href="#855"> 855: </a>
-</span><span id="856" class="l"><a href="#856"> 856: </a>    <span class="php-comment">/**
-</span></span><span id="857" class="l"><a href="#857"> 857: </a><span class="php-comment">     * Add the request to the log table
-</span></span><span id="858" class="l"><a href="#858"> 858: </a><span class="php-comment">     *
-</span></span><span id="859" class="l"><a href="#859"> 859: </a><span class="php-comment">     * @access protected
-</span></span><span id="860" class="l"><a href="#860"> 860: </a><span class="php-comment">     *
-</span></span><span id="861" class="l"><a href="#861"> 861: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
-</span></span><span id="862" class="l"><a href="#862"> 862: </a><span class="php-comment">     *
-</span></span><span id="863" class="l"><a href="#863"> 863: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
-</span></span><span id="864" class="l"><a href="#864"> 864: </a><span class="php-comment">     */</span>
-</span><span id="865" class="l"><a href="#865"> 865: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="866" class="l"><a href="#866"> 866: </a>    {
-</span><span id="867" class="l"><a href="#867"> 867: </a>        <span class="php-comment">// Insert the request into the log table</span>
-</span><span id="868" class="l"><a href="#868"> 868: </a>        <span class="php-var">$isInserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="869" class="l"><a href="#869"> 869: </a>            -&gt;insert(
-</span><span id="870" class="l"><a href="#870"> 870: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
-</span><span id="871" class="l"><a href="#871"> 871: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
-</span><span id="872" class="l"><a href="#872"> 872: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
-</span><span id="873" class="l"><a href="#873"> 873: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
-</span><span id="874" class="l"><a href="#874"> 874: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="875" class="l"><a href="#875"> 875: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
-</span><span id="876" class="l"><a href="#876"> 876: </a>                <span class="php-quote">'time'</span> =&gt; now(), <span class="php-comment">// Used to be: function_exists('now') ? now() : time()</span>
-</span><span id="877" class="l"><a href="#877"> 877: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
-</span><span id="878" class="l"><a href="#878"> 878: </a>            ]);
-</span><span id="879" class="l"><a href="#879"> 879: </a>
-</span><span id="880" class="l"><a href="#880"> 880: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
-</span><span id="881" class="l"><a href="#881"> 881: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
-</span><span id="882" class="l"><a href="#882"> 882: </a>
-</span><span id="883" class="l"><a href="#883"> 883: </a>        <span class="php-keyword1">return</span> <span class="php-var">$isInserted</span>;
-</span><span id="884" class="l"><a href="#884"> 884: </a>    }
-</span><span id="885" class="l"><a href="#885"> 885: </a>
-</span><span id="886" class="l"><a href="#886"> 886: </a>    <span class="php-comment">/**
-</span></span><span id="887" class="l"><a href="#887"> 887: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
-</span></span><span id="888" class="l"><a href="#888"> 888: </a><span class="php-comment">     *
-</span></span><span id="889" class="l"><a href="#889"> 889: </a><span class="php-comment">     * @access protected
-</span></span><span id="890" class="l"><a href="#890"> 890: </a><span class="php-comment">     *
-</span></span><span id="891" class="l"><a href="#891"> 891: </a><span class="php-comment">     * @param  string $controller_method The method being called
-</span></span><span id="892" class="l"><a href="#892"> 892: </a><span class="php-comment">     *
-</span></span><span id="893" class="l"><a href="#893"> 893: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
-</span></span><span id="894" class="l"><a href="#894"> 894: </a><span class="php-comment">     */</span>
-</span><span id="895" class="l"><a href="#895"> 895: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
-</span><span id="896" class="l"><a href="#896"> 896: </a>    {
-</span><span id="897" class="l"><a href="#897"> 897: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
-</span><span id="898" class="l"><a href="#898"> 898: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span> || <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span>)
-</span><span id="899" class="l"><a href="#899"> 899: </a>        {
-</span><span id="900" class="l"><a href="#900"> 900: </a>            <span class="php-comment">// Everything is fine</span>
-</span><span id="901" class="l"><a href="#901"> 901: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="902" class="l"><a href="#902"> 902: </a>        }
-</span><span id="903" class="l"><a href="#903"> 903: </a>
-</span><span id="904" class="l"><a href="#904"> 904: </a>        <span class="php-comment">// How many times can you get to this method in a defined timelimit (default: 1hr)?</span>
-</span><span id="905" class="l"><a href="#905"> 905: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>];
-</span><span id="906" class="l"><a href="#906"> 906: </a>
-</span><span id="907" class="l"><a href="#907"> 907: </a>        <span class="php-var">$uri_noext</span> = <span class="php-var">$this</span>-&gt;uri-&gt;uri_string();
-</span><span id="908" class="l"><a href="#908"> 908: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;uri-&gt;uri_string()), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>) 
-</span><span id="909" class="l"><a href="#909"> 909: </a>        { 
-</span><span id="910" class="l"><a href="#910"> 910: </a>            <span class="php-var">$uri_noext</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)-<span class="php-num">1</span>);
-</span><span id="911" class="l"><a href="#911"> 911: </a>        }
-</span><span id="912" class="l"><a href="#912"> 912: </a>
-</span><span id="913" class="l"><a href="#913"> 913: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
-</span><span id="914" class="l"><a href="#914"> 914: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="915" class="l"><a href="#915"> 915: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
-</span><span id="916" class="l"><a href="#916"> 916: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="917" class="l"><a href="#917"> 917: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
-</span><span id="918" class="l"><a href="#918"> 918: </a>            -&gt;row();
-</span><span id="919" class="l"><a href="#919"> 919: </a>
-</span><span id="920" class="l"><a href="#920"> 920: </a>        <span class="php-var">$timelimit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'time'</span>] : <span class="php-num">60</span> * <span class="php-num">60</span>);
-</span><span id="921" class="l"><a href="#921"> 921: </a>
-</span><span id="922" class="l"><a href="#922"> 922: </a>        <span class="php-comment">// No calls have been made for this key</span>
-</span><span id="923" class="l"><a href="#923"> 923: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="924" class="l"><a href="#924"> 924: </a>        {
-</span><span id="925" class="l"><a href="#925"> 925: </a>            <span class="php-comment">// Create a new row for the following key</span>
-</span><span id="926" class="l"><a href="#926"> 926: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
-</span><span id="927" class="l"><a href="#927"> 927: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
-</span><span id="928" class="l"><a href="#928"> 928: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="929" class="l"><a href="#929"> 929: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
-</span><span id="930" class="l"><a href="#930"> 930: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
-</span><span id="931" class="l"><a href="#931"> 931: </a>            ]);
-</span><span id="932" class="l"><a href="#932"> 932: </a>        }
-</span><span id="933" class="l"><a href="#933"> 933: </a>
-</span><span id="934" class="l"><a href="#934"> 934: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
-</span><span id="935" class="l"><a href="#935"> 935: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$timelimit</span>))
-</span><span id="936" class="l"><a href="#936"> 936: </a>        {
-</span><span id="937" class="l"><a href="#937"> 937: </a>            <span class="php-comment">// Reset the started period and count</span>
-</span><span id="938" class="l"><a href="#938"> 938: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="939" class="l"><a href="#939"> 939: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
-</span><span id="940" class="l"><a href="#940"> 940: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
-</span><span id="941" class="l"><a href="#941"> 941: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
-</span><span id="942" class="l"><a href="#942"> 942: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
-</span><span id="943" class="l"><a href="#943"> 943: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="944" class="l"><a href="#944"> 944: </a>        }
-</span><span id="945" class="l"><a href="#945"> 945: </a>
-</span><span id="946" class="l"><a href="#946"> 946: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
-</span><span id="947" class="l"><a href="#947"> 947: </a>        <span class="php-keyword1">else</span>
-</span><span id="948" class="l"><a href="#948"> 948: </a>        {
-</span><span id="949" class="l"><a href="#949"> 949: </a>            <span class="php-comment">// The limit has been exceeded</span>
-</span><span id="950" class="l"><a href="#950"> 950: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
-</span><span id="951" class="l"><a href="#951"> 951: </a>            {
-</span><span id="952" class="l"><a href="#952"> 952: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="953" class="l"><a href="#953"> 953: </a>            }
+</span><span id="799" class="l"><a href="#799"> 799: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="800" class="l"><a href="#800"> 800: </a>                    }
+</span><span id="801" class="l"><a href="#801"> 801: </a>
+</span><span id="802" class="l"><a href="#802"> 802: </a>                    <span class="php-comment">// HTML or XML have shown up as a match</span>
+</span><span id="803" class="l"><a href="#803"> 803: </a>                    <span class="php-keyword1">else</span>
+</span><span id="804" class="l"><a href="#804"> 804: </a>                    {
+</span><span id="805" class="l"><a href="#805"> 805: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
+</span><span id="806" class="l"><a href="#806"> 806: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="807" class="l"><a href="#807"> 807: </a>                        {
+</span><span id="808" class="l"><a href="#808"> 808: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="809" class="l"><a href="#809"> 809: </a>                        }
+</span><span id="810" class="l"><a href="#810"> 810: </a>
+</span><span id="811" class="l"><a href="#811"> 811: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
+</span><span id="812" class="l"><a href="#812"> 812: </a>                        <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="813" class="l"><a href="#813"> 813: </a>                        {
+</span><span id="814" class="l"><a href="#814"> 814: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="815" class="l"><a href="#815"> 815: </a>                        }
+</span><span id="816" class="l"><a href="#816"> 816: </a>                    }
+</span><span id="817" class="l"><a href="#817"> 817: </a>                }
+</span><span id="818" class="l"><a href="#818"> 818: </a>            }
+</span><span id="819" class="l"><a href="#819"> 819: </a>        } <span class="php-comment">// End HTTP_ACCEPT checking</span>
+</span><span id="820" class="l"><a href="#820"> 820: </a>
+</span><span id="821" class="l"><a href="#821"> 821: </a>        <span class="php-comment">// Well, none of that has worked! Let's see if the controller has a default</span>
+</span><span id="822" class="l"><a href="#822"> 822: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
+</span><span id="823" class="l"><a href="#823"> 823: </a>        {
+</span><span id="824" class="l"><a href="#824"> 824: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
+</span><span id="825" class="l"><a href="#825"> 825: </a>        }
+</span><span id="826" class="l"><a href="#826"> 826: </a>
+</span><span id="827" class="l"><a href="#827"> 827: </a>        <span class="php-comment">// Just use the default format</span>
+</span><span id="828" class="l"><a href="#828"> 828: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
+</span><span id="829" class="l"><a href="#829"> 829: </a>    }
+</span><span id="830" class="l"><a href="#830"> 830: </a>
+</span><span id="831" class="l"><a href="#831"> 831: </a>    <span class="php-comment">/**
+</span></span><span id="832" class="l"><a href="#832"> 832: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
+</span></span><span id="833" class="l"><a href="#833"> 833: </a><span class="php-comment">     *
+</span></span><span id="834" class="l"><a href="#834"> 834: </a><span class="php-comment">     * @access protected
+</span></span><span id="835" class="l"><a href="#835"> 835: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
+</span></span><span id="836" class="l"><a href="#836"> 836: </a><span class="php-comment">     */</span>
+</span><span id="837" class="l"><a href="#837"> 837: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
+</span><span id="838" class="l"><a href="#838"> 838: </a>    {
+</span><span id="839" class="l"><a href="#839"> 839: </a>        <span class="php-comment">// Declare a variable to store the method</span>
+</span><span id="840" class="l"><a href="#840"> 840: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="841" class="l"><a href="#841"> 841: </a>
+</span><span id="842" class="l"><a href="#842"> 842: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
+</span><span id="843" class="l"><a href="#843"> 843: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="844" class="l"><a href="#844"> 844: </a>        {
+</span><span id="845" class="l"><a href="#845"> 845: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
+</span><span id="846" class="l"><a href="#846"> 846: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="847" class="l"><a href="#847"> 847: </a>            {
+</span><span id="848" class="l"><a href="#848"> 848: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
+</span><span id="849" class="l"><a href="#849"> 849: </a>            }
+</span><span id="850" class="l"><a href="#850"> 850: </a>
+</span><span id="851" class="l"><a href="#851"> 851: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
+</span><span id="852" class="l"><a href="#852"> 852: </a>        }
+</span><span id="853" class="l"><a href="#853"> 853: </a>
+</span><span id="854" class="l"><a href="#854"> 854: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
+</span><span id="855" class="l"><a href="#855"> 855: </a>        {
+</span><span id="856" class="l"><a href="#856"> 856: </a>            <span class="php-comment">// Get the request method as a lowercase string.</span>
+</span><span id="857" class="l"><a href="#857"> 857: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
+</span><span id="858" class="l"><a href="#858"> 858: </a>        }
+</span><span id="859" class="l"><a href="#859"> 859: </a>
+</span><span id="860" class="l"><a href="#860"> 860: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
+</span><span id="861" class="l"><a href="#861"> 861: </a>    }
+</span><span id="862" class="l"><a href="#862"> 862: </a>
+</span><span id="863" class="l"><a href="#863"> 863: </a>    <span class="php-comment">/**
+</span></span><span id="864" class="l"><a href="#864"> 864: </a><span class="php-comment">     * See if the user has provided an API key
+</span></span><span id="865" class="l"><a href="#865"> 865: </a><span class="php-comment">     *
+</span></span><span id="866" class="l"><a href="#866"> 866: </a><span class="php-comment">     * @access protected
+</span></span><span id="867" class="l"><a href="#867"> 867: </a><span class="php-comment">     * @return bool
+</span></span><span id="868" class="l"><a href="#868"> 868: </a><span class="php-comment">     */</span>
+</span><span id="869" class="l"><a href="#869"> 869: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
+</span><span id="870" class="l"><a href="#870"> 870: </a>    {
+</span><span id="871" class="l"><a href="#871"> 871: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
+</span><span id="872" class="l"><a href="#872"> 872: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
+</span><span id="873" class="l"><a href="#873"> 873: </a>
+</span><span id="874" class="l"><a href="#874"> 874: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
+</span><span id="875" class="l"><a href="#875"> 875: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
+</span><span id="876" class="l"><a href="#876"> 876: </a>
+</span><span id="877" class="l"><a href="#877"> 877: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="878" class="l"><a href="#878"> 878: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
+</span><span id="879" class="l"><a href="#879"> 879: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
+</span><span id="880" class="l"><a href="#880"> 880: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
+</span><span id="881" class="l"><a href="#881"> 881: </a>
+</span><span id="882" class="l"><a href="#882"> 882: </a>        <span class="php-comment">// Find the key from server or arguments</span>
+</span><span id="883" class="l"><a href="#883"> 883: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
+</span><span id="884" class="l"><a href="#884"> 884: </a>        {
+</span><span id="885" class="l"><a href="#885"> 885: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
+</span><span id="886" class="l"><a href="#886"> 886: </a>            {
+</span><span id="887" class="l"><a href="#887"> 887: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="888" class="l"><a href="#888"> 888: </a>            }
+</span><span id="889" class="l"><a href="#889"> 889: </a>
+</span><span id="890" class="l"><a href="#890"> 890: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
+</span><span id="891" class="l"><a href="#891"> 891: </a>
+</span><span id="892" class="l"><a href="#892"> 892: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
+</span><span id="893" class="l"><a href="#893"> 893: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
+</span><span id="894" class="l"><a href="#894"> 894: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
+</span><span id="895" class="l"><a href="#895"> 895: </a>
+</span><span id="896" class="l"><a href="#896"> 896: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
+</span><span id="897" class="l"><a href="#897"> 897: </a>
+</span><span id="898" class="l"><a href="#898"> 898: </a>            <span class="php-comment">/*
+</span></span><span id="899" class="l"><a href="#899"> 899: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
+</span></span><span id="900" class="l"><a href="#900"> 900: </a><span class="php-comment">             * of valid ip addresses stored in the database.
+</span></span><span id="901" class="l"><a href="#901"> 901: </a><span class="php-comment">             */</span>
+</span><span id="902" class="l"><a href="#902"> 902: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
+</span><span id="903" class="l"><a href="#903"> 903: </a>            {
+</span><span id="904" class="l"><a href="#904"> 904: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
+</span><span id="905" class="l"><a href="#905"> 905: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
+</span><span id="906" class="l"><a href="#906"> 906: </a>                {
+</span><span id="907" class="l"><a href="#907"> 907: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
+</span><span id="908" class="l"><a href="#908"> 908: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
+</span><span id="909" class="l"><a href="#909"> 909: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
+</span><span id="910" class="l"><a href="#910"> 910: </a>
+</span><span id="911" class="l"><a href="#911"> 911: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
+</span><span id="912" class="l"><a href="#912"> 912: </a>                    {
+</span><span id="913" class="l"><a href="#913"> 913: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() == <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
+</span><span id="914" class="l"><a href="#914"> 914: </a>                        {
+</span><span id="915" class="l"><a href="#915"> 915: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
+</span><span id="916" class="l"><a href="#916"> 916: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
+</span><span id="917" class="l"><a href="#917"> 917: </a>                            <span class="php-keyword1">break</span>;
+</span><span id="918" class="l"><a href="#918"> 918: </a>                        }
+</span><span id="919" class="l"><a href="#919"> 919: </a>                    }
+</span><span id="920" class="l"><a href="#920"> 920: </a>
+</span><span id="921" class="l"><a href="#921"> 921: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
+</span><span id="922" class="l"><a href="#922"> 922: </a>                }
+</span><span id="923" class="l"><a href="#923"> 923: </a>                <span class="php-keyword1">else</span>
+</span><span id="924" class="l"><a href="#924"> 924: </a>                {
+</span><span id="925" class="l"><a href="#925"> 925: </a>                    <span class="php-comment">// There should be at least one IP address for this private key.</span>
+</span><span id="926" class="l"><a href="#926"> 926: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="927" class="l"><a href="#927"> 927: </a>                }
+</span><span id="928" class="l"><a href="#928"> 928: </a>            }
+</span><span id="929" class="l"><a href="#929"> 929: </a>
+</span><span id="930" class="l"><a href="#930"> 930: </a>            <span class="php-keyword1">return</span> <span class="php-var">$row</span>;
+</span><span id="931" class="l"><a href="#931"> 931: </a>        }
+</span><span id="932" class="l"><a href="#932"> 932: </a>
+</span><span id="933" class="l"><a href="#933"> 933: </a>        <span class="php-comment">// No key has been sent</span>
+</span><span id="934" class="l"><a href="#934"> 934: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="935" class="l"><a href="#935"> 935: </a>    }
+</span><span id="936" class="l"><a href="#936"> 936: </a>
+</span><span id="937" class="l"><a href="#937"> 937: </a>    <span class="php-comment">/**
+</span></span><span id="938" class="l"><a href="#938"> 938: </a><span class="php-comment">     * What language do they want it in?
+</span></span><span id="939" class="l"><a href="#939"> 939: </a><span class="php-comment">     *
+</span></span><span id="940" class="l"><a href="#940"> 940: </a><span class="php-comment">     * @access protected
+</span></span><span id="941" class="l"><a href="#941"> 941: </a><span class="php-comment">     * @return NULL|string The language code.
+</span></span><span id="942" class="l"><a href="#942"> 942: </a><span class="php-comment">     */</span>
+</span><span id="943" class="l"><a href="#943"> 943: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
+</span><span id="944" class="l"><a href="#944"> 944: </a>    {
+</span><span id="945" class="l"><a href="#945"> 945: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>))
+</span><span id="946" class="l"><a href="#946"> 946: </a>        {
+</span><span id="947" class="l"><a href="#947"> 947: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="948" class="l"><a href="#948"> 948: </a>        }
+</span><span id="949" class="l"><a href="#949"> 949: </a>
+</span><span id="950" class="l"><a href="#950"> 950: </a>        <span class="php-comment">// They might have sent a few, make it an array</span>
+</span><span id="951" class="l"><a href="#951"> 951: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="952" class="l"><a href="#952"> 952: </a>        {
+</span><span id="953" class="l"><a href="#953"> 953: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
 </span><span id="954" class="l"><a href="#954"> 954: </a>
-</span><span id="955" class="l"><a href="#955"> 955: </a>            <span class="php-comment">// Increase the count by one</span>
-</span><span id="956" class="l"><a href="#956"> 956: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="957" class="l"><a href="#957"> 957: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
-</span><span id="958" class="l"><a href="#958"> 958: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="959" class="l"><a href="#959"> 959: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
-</span><span id="960" class="l"><a href="#960"> 960: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="961" class="l"><a href="#961"> 961: </a>        }
+</span><span id="955" class="l"><a href="#955"> 955: </a>            <span class="php-var">$return_langs</span> = [];
+</span><span id="956" class="l"><a href="#956"> 956: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
+</span><span id="957" class="l"><a href="#957"> 957: </a>            {
+</span><span id="958" class="l"><a href="#958"> 958: </a>                <span class="php-comment">// Remove weight and strip space</span>
+</span><span id="959" class="l"><a href="#959"> 959: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
+</span><span id="960" class="l"><a href="#960"> 960: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
+</span><span id="961" class="l"><a href="#961"> 961: </a>            }
 </span><span id="962" class="l"><a href="#962"> 962: </a>
-</span><span id="963" class="l"><a href="#963"> 963: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="964" class="l"><a href="#964"> 964: </a>    }
+</span><span id="963" class="l"><a href="#963"> 963: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
+</span><span id="964" class="l"><a href="#964"> 964: </a>        }
 </span><span id="965" class="l"><a href="#965"> 965: </a>
-</span><span id="966" class="l"><a href="#966"> 966: </a>    <span class="php-comment">/**
-</span></span><span id="967" class="l"><a href="#967"> 967: </a><span class="php-comment">     * Auth override check
-</span></span><span id="968" class="l"><a href="#968"> 968: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method
-</span></span><span id="969" class="l"><a href="#969"> 969: </a><span class="php-comment">     * being called.
-</span></span><span id="970" class="l"><a href="#970"> 970: </a><span class="php-comment">     *
-</span></span><span id="971" class="l"><a href="#971"> 971: </a><span class="php-comment">     * @access protected
-</span></span><span id="972" class="l"><a href="#972"> 972: </a><span class="php-comment">     * @return bool
-</span></span><span id="973" class="l"><a href="#973"> 973: </a><span class="php-comment">     */</span>
-</span><span id="974" class="l"><a href="#974"> 974: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
-</span><span id="975" class="l"><a href="#975"> 975: </a>    {
-</span><span id="976" class="l"><a href="#976"> 976: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
-</span><span id="977" class="l"><a href="#977"> 977: </a>        <span class="php-var">$this</span>-&gt;overrides_array = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
-</span><span id="978" class="l"><a href="#978"> 978: </a>
-</span><span id="979" class="l"><a href="#979"> 979: </a>        <span class="php-comment">// Check to see if the override array is even populated, otherwise return FALSE</span>
-</span><span id="980" class="l"><a href="#980"> 980: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array))
-</span><span id="981" class="l"><a href="#981"> 981: </a>        {
-</span><span id="982" class="l"><a href="#982"> 982: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="983" class="l"><a href="#983"> 983: </a>        }
-</span><span id="984" class="l"><a href="#984"> 984: </a>
-</span><span id="985" class="l"><a href="#985"> 985: </a>        <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="986" class="l"><a href="#986"> 986: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>]) === <span class="php-keyword1">FALSE</span>) <span class="php-comment">// Check for class overrides</span>
-</span><span id="987" class="l"><a href="#987"> 987: </a>        {
-</span><span id="988" class="l"><a href="#988"> 988: </a>            <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="989" class="l"><a href="#989"> 989: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'none'</span>)
-</span><span id="990" class="l"><a href="#990"> 990: </a>            {
-</span><span id="991" class="l"><a href="#991"> 991: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="992" class="l"><a href="#992"> 992: </a>            }
-</span><span id="993" class="l"><a href="#993"> 993: </a>
-</span><span id="994" class="l"><a href="#994"> 994: </a>            <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="995" class="l"><a href="#995"> 995: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'basic'</span>)
-</span><span id="996" class="l"><a href="#996"> 996: </a>            {
-</span><span id="997" class="l"><a href="#997"> 997: </a>                <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="998" class="l"><a href="#998"> 998: </a>
-</span><span id="999" class="l"><a href="#999"> 999: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1000" class="l"><a href="#1000">1000: </a>            }
-</span><span id="1001" class="l"><a href="#1001">1001: </a>
-</span><span id="1002" class="l"><a href="#1002">1002: </a>            <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1003" class="l"><a href="#1003">1003: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'digest'</span>)
-</span><span id="1004" class="l"><a href="#1004">1004: </a>            {
-</span><span id="1005" class="l"><a href="#1005">1005: </a>                <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1006" class="l"><a href="#1006">1006: </a>
-</span><span id="1007" class="l"><a href="#1007">1007: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1008" class="l"><a href="#1008">1008: </a>            }
-</span><span id="1009" class="l"><a href="#1009">1009: </a>
-</span><span id="1010" class="l"><a href="#1010">1010: </a>            <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1011" class="l"><a href="#1011">1011: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'whitelist'</span>)
-</span><span id="1012" class="l"><a href="#1012">1012: </a>            {
-</span><span id="1013" class="l"><a href="#1013">1013: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1014" class="l"><a href="#1014">1014: </a>
-</span><span id="1015" class="l"><a href="#1015">1015: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1016" class="l"><a href="#1016">1016: </a>            }
-</span><span id="1017" class="l"><a href="#1017">1017: </a>        }
-</span><span id="1018" class="l"><a href="#1018">1018: </a>
-</span><span id="1019" class="l"><a href="#1019">1019: </a>        <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
-</span><span id="1020" class="l"><a href="#1020">1020: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
-</span><span id="1021" class="l"><a href="#1021">1021: </a>        {
-</span><span id="1022" class="l"><a href="#1022">1022: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1023" class="l"><a href="#1023">1023: </a>        }
-</span><span id="1024" class="l"><a href="#1024">1024: </a>
-</span><span id="1025" class="l"><a href="#1025">1025: </a>        <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1026" class="l"><a href="#1026">1026: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'none'</span>)
-</span><span id="1027" class="l"><a href="#1027">1027: </a>        {
-</span><span id="1028" class="l"><a href="#1028">1028: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1029" class="l"><a href="#1029">1029: </a>        }
-</span><span id="1030" class="l"><a href="#1030">1030: </a>
-</span><span id="1031" class="l"><a href="#1031">1031: </a>        <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1032" class="l"><a href="#1032">1032: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'basic'</span>)
-</span><span id="1033" class="l"><a href="#1033">1033: </a>        {
-</span><span id="1034" class="l"><a href="#1034">1034: </a>            <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1035" class="l"><a href="#1035">1035: </a>
-</span><span id="1036" class="l"><a href="#1036">1036: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1037" class="l"><a href="#1037">1037: </a>        }
-</span><span id="1038" class="l"><a href="#1038">1038: </a>
-</span><span id="1039" class="l"><a href="#1039">1039: </a>        <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1040" class="l"><a href="#1040">1040: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'digest'</span>)
-</span><span id="1041" class="l"><a href="#1041">1041: </a>        {
-</span><span id="1042" class="l"><a href="#1042">1042: </a>            <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="966" class="l"><a href="#966"> 966: </a>        <span class="php-comment">// Nope, just return the string</span>
+</span><span id="967" class="l"><a href="#967"> 967: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
+</span><span id="968" class="l"><a href="#968"> 968: </a>    }
+</span><span id="969" class="l"><a href="#969"> 969: </a>
+</span><span id="970" class="l"><a href="#970"> 970: </a>    <span class="php-comment">/**
+</span></span><span id="971" class="l"><a href="#971"> 971: </a><span class="php-comment">     * Add the request to the log table
+</span></span><span id="972" class="l"><a href="#972"> 972: </a><span class="php-comment">     *
+</span></span><span id="973" class="l"><a href="#973"> 973: </a><span class="php-comment">     * @access protected
+</span></span><span id="974" class="l"><a href="#974"> 974: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
+</span></span><span id="975" class="l"><a href="#975"> 975: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
+</span></span><span id="976" class="l"><a href="#976"> 976: </a><span class="php-comment">     */</span>
+</span><span id="977" class="l"><a href="#977"> 977: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="978" class="l"><a href="#978"> 978: </a>    {
+</span><span id="979" class="l"><a href="#979"> 979: </a>        <span class="php-comment">// Insert the request into the log table</span>
+</span><span id="980" class="l"><a href="#980"> 980: </a>        <span class="php-var">$isInserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="981" class="l"><a href="#981"> 981: </a>            -&gt;insert(
+</span><span id="982" class="l"><a href="#982"> 982: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
+</span><span id="983" class="l"><a href="#983"> 983: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
+</span><span id="984" class="l"><a href="#984"> 984: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
+</span><span id="985" class="l"><a href="#985"> 985: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
+</span><span id="986" class="l"><a href="#986"> 986: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="987" class="l"><a href="#987"> 987: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
+</span><span id="988" class="l"><a href="#988"> 988: </a>                <span class="php-quote">'time'</span> =&gt; now(), <span class="php-comment">// Used to be: function_exists('now') ? now() : time()</span>
+</span><span id="989" class="l"><a href="#989"> 989: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
+</span><span id="990" class="l"><a href="#990"> 990: </a>            ]);
+</span><span id="991" class="l"><a href="#991"> 991: </a>
+</span><span id="992" class="l"><a href="#992"> 992: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
+</span><span id="993" class="l"><a href="#993"> 993: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
+</span><span id="994" class="l"><a href="#994"> 994: </a>
+</span><span id="995" class="l"><a href="#995"> 995: </a>        <span class="php-keyword1">return</span> <span class="php-var">$isInserted</span>;
+</span><span id="996" class="l"><a href="#996"> 996: </a>    }
+</span><span id="997" class="l"><a href="#997"> 997: </a>
+</span><span id="998" class="l"><a href="#998"> 998: </a>    <span class="php-comment">/**
+</span></span><span id="999" class="l"><a href="#999"> 999: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
+</span></span><span id="1000" class="l"><a href="#1000">1000: </a><span class="php-comment">     *
+</span></span><span id="1001" class="l"><a href="#1001">1001: </a><span class="php-comment">     * @access protected
+</span></span><span id="1002" class="l"><a href="#1002">1002: </a><span class="php-comment">     * @param  string $controller_method The method being called
+</span></span><span id="1003" class="l"><a href="#1003">1003: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
+</span></span><span id="1004" class="l"><a href="#1004">1004: </a><span class="php-comment">     */</span>
+</span><span id="1005" class="l"><a href="#1005">1005: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
+</span><span id="1006" class="l"><a href="#1006">1006: </a>    {
+</span><span id="1007" class="l"><a href="#1007">1007: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
+</span><span id="1008" class="l"><a href="#1008">1008: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span> || <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1009" class="l"><a href="#1009">1009: </a>        {
+</span><span id="1010" class="l"><a href="#1010">1010: </a>            <span class="php-comment">// Everything is fine</span>
+</span><span id="1011" class="l"><a href="#1011">1011: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1012" class="l"><a href="#1012">1012: </a>        }
+</span><span id="1013" class="l"><a href="#1013">1013: </a>
+</span><span id="1014" class="l"><a href="#1014">1014: </a>        <span class="php-comment">// How many times can you get to this method in a defined timelimit (default: 1hr)?</span>
+</span><span id="1015" class="l"><a href="#1015">1015: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>];
+</span><span id="1016" class="l"><a href="#1016">1016: </a>
+</span><span id="1017" class="l"><a href="#1017">1017: </a>        <span class="php-var">$uri_noext</span> = <span class="php-var">$this</span>-&gt;uri-&gt;uri_string();
+</span><span id="1018" class="l"><a href="#1018">1018: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;uri-&gt;uri_string()), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
+</span><span id="1019" class="l"><a href="#1019">1019: </a>        {
+</span><span id="1020" class="l"><a href="#1020">1020: </a>            <span class="php-var">$uri_noext</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)-<span class="php-num">1</span>);
+</span><span id="1021" class="l"><a href="#1021">1021: </a>        }
+</span><span id="1022" class="l"><a href="#1022">1022: </a>
+</span><span id="1023" class="l"><a href="#1023">1023: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
+</span><span id="1024" class="l"><a href="#1024">1024: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1025" class="l"><a href="#1025">1025: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
+</span><span id="1026" class="l"><a href="#1026">1026: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1027" class="l"><a href="#1027">1027: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
+</span><span id="1028" class="l"><a href="#1028">1028: </a>            -&gt;row();
+</span><span id="1029" class="l"><a href="#1029">1029: </a>
+</span><span id="1030" class="l"><a href="#1030">1030: </a>        <span class="php-var">$timelimit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'time'</span>] : <span class="php-num">60</span> * <span class="php-num">60</span>);
+</span><span id="1031" class="l"><a href="#1031">1031: </a>
+</span><span id="1032" class="l"><a href="#1032">1032: </a>        <span class="php-comment">// No calls have been made for this key</span>
+</span><span id="1033" class="l"><a href="#1033">1033: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1034" class="l"><a href="#1034">1034: </a>        {
+</span><span id="1035" class="l"><a href="#1035">1035: </a>            <span class="php-comment">// Create a new row for the following key</span>
+</span><span id="1036" class="l"><a href="#1036">1036: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
+</span><span id="1037" class="l"><a href="#1037">1037: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
+</span><span id="1038" class="l"><a href="#1038">1038: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="1039" class="l"><a href="#1039">1039: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
+</span><span id="1040" class="l"><a href="#1040">1040: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
+</span><span id="1041" class="l"><a href="#1041">1041: </a>            ]);
+</span><span id="1042" class="l"><a href="#1042">1042: </a>        }
 </span><span id="1043" class="l"><a href="#1043">1043: </a>
-</span><span id="1044" class="l"><a href="#1044">1044: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1045" class="l"><a href="#1045">1045: </a>        }
-</span><span id="1046" class="l"><a href="#1046">1046: </a>
-</span><span id="1047" class="l"><a href="#1047">1047: </a>        <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1048" class="l"><a href="#1048">1048: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'whitelist'</span>)
-</span><span id="1049" class="l"><a href="#1049">1049: </a>        {
-</span><span id="1050" class="l"><a href="#1050">1050: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1051" class="l"><a href="#1051">1051: </a>
-</span><span id="1052" class="l"><a href="#1052">1052: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1053" class="l"><a href="#1053">1053: </a>        }
-</span><span id="1054" class="l"><a href="#1054">1054: </a>
-</span><span id="1055" class="l"><a href="#1055">1055: </a>        <span class="php-comment">// Return FALSE when there is an override value set but it does not match</span>
-</span><span id="1056" class="l"><a href="#1056">1056: </a>        <span class="php-comment">// 'basic', 'digest', or 'none'. (the value was misspelled)</span>
-</span><span id="1057" class="l"><a href="#1057">1057: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1058" class="l"><a href="#1058">1058: </a>    }
-</span><span id="1059" class="l"><a href="#1059">1059: </a>
-</span><span id="1060" class="l"><a href="#1060">1060: </a>    <span class="php-comment">/**
-</span></span><span id="1061" class="l"><a href="#1061">1061: </a><span class="php-comment">     * Parse the GET request arguments
-</span></span><span id="1062" class="l"><a href="#1062">1062: </a><span class="php-comment">     *
-</span></span><span id="1063" class="l"><a href="#1063">1063: </a><span class="php-comment">     * @access protected
-</span></span><span id="1064" class="l"><a href="#1064">1064: </a><span class="php-comment">     * @return void
-</span></span><span id="1065" class="l"><a href="#1065">1065: </a><span class="php-comment">     */</span>
-</span><span id="1066" class="l"><a href="#1066">1066: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
-</span><span id="1067" class="l"><a href="#1067">1067: </a>    {
-</span><span id="1068" class="l"><a href="#1068">1068: </a>        <span class="php-comment">// Declare a variable that will hold the REQUEST_URI</span>
-</span><span id="1069" class="l"><a href="#1069">1069: </a>        <span class="php-var">$request_uri</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1070" class="l"><a href="#1070">1070: </a>
-</span><span id="1071" class="l"><a href="#1071">1071: </a>        <span class="php-comment">// Fix for Issue #247</span>
-</span><span id="1072" class="l"><a href="#1072">1072: </a>        <span class="php-keyword1">if</span> (is_cli())
-</span><span id="1073" class="l"><a href="#1073">1073: </a>        {
-</span><span id="1074" class="l"><a href="#1074">1074: </a>            <span class="php-var">$args</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'argv'</span>);
-</span><span id="1075" class="l"><a href="#1075">1075: </a>            <span class="php-keyword1">unset</span>(<span class="php-var">$args</span>[<span class="php-num">0</span>]);
-</span><span id="1076" class="l"><a href="#1076">1076: </a>            <span class="php-comment">// Combine the arguments using '/' as the delimiter</span>
-</span><span id="1077" class="l"><a href="#1077">1077: </a>            <span class="php-var">$request_uri</span> = <span class="php-quote">'/'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'/'</span>, <span class="php-var">$args</span>) . <span class="php-quote">'/'</span>;
-</span><span id="1078" class="l"><a href="#1078">1078: </a>
-</span><span id="1079" class="l"><a href="#1079">1079: </a>            <span class="php-comment">// Set the following server variables</span>
-</span><span id="1080" class="l"><a href="#1080">1080: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1081" class="l"><a href="#1081">1081: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'PATH_INFO'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1082" class="l"><a href="#1082">1082: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'QUERY_STRING'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1083" class="l"><a href="#1083">1083: </a>        }
-</span><span id="1084" class="l"><a href="#1084">1084: </a>        <span class="php-keyword1">else</span>
-</span><span id="1085" class="l"><a href="#1085">1085: </a>        {
-</span><span id="1086" class="l"><a href="#1086">1086: </a>            <span class="php-var">$request_uri</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>);
-</span><span id="1087" class="l"><a href="#1087">1087: </a>        }
-</span><span id="1088" class="l"><a href="#1088">1088: </a>
-</span><span id="1089" class="l"><a href="#1089">1089: </a>        <span class="php-comment">// Declare a variable that will hold the parameters</span>
-</span><span id="1090" class="l"><a href="#1090">1090: </a>        <span class="php-var">$get</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1091" class="l"><a href="#1091">1091: </a>
-</span><span id="1092" class="l"><a href="#1092">1092: </a>        <span class="php-comment">// Grab the GET variables from the query string</span>
-</span><span id="1093" class="l"><a href="#1093">1093: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$request_uri</span>, PHP_URL_QUERY), <span class="php-var">$get</span>);
-</span><span id="1094" class="l"><a href="#1094">1094: </a>
-</span><span id="1095" class="l"><a href="#1095">1095: </a>        <span class="php-comment">// Merge both the URI segments and GET params</span>
-</span><span id="1096" class="l"><a href="#1096">1096: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$get</span>);
-</span><span id="1097" class="l"><a href="#1097">1097: </a>    }
-</span><span id="1098" class="l"><a href="#1098">1098: </a>
-</span><span id="1099" class="l"><a href="#1099">1099: </a>    <span class="php-comment">/**
-</span></span><span id="1100" class="l"><a href="#1100">1100: </a><span class="php-comment">     * Parse the POST request arguments
-</span></span><span id="1101" class="l"><a href="#1101">1101: </a><span class="php-comment">     *
-</span></span><span id="1102" class="l"><a href="#1102">1102: </a><span class="php-comment">     * @access protected
-</span></span><span id="1103" class="l"><a href="#1103">1103: </a><span class="php-comment">     * @return void
-</span></span><span id="1104" class="l"><a href="#1104">1104: </a><span class="php-comment">     */</span>
-</span><span id="1105" class="l"><a href="#1105">1105: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
-</span><span id="1106" class="l"><a href="#1106">1106: </a>    {
-</span><span id="1107" class="l"><a href="#1107">1107: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
-</span><span id="1108" class="l"><a href="#1108">1108: </a>
-</span><span id="1109" class="l"><a href="#1109">1109: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1110" class="l"><a href="#1110">1110: </a>        {
-</span><span id="1111" class="l"><a href="#1111">1111: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1112" class="l"><a href="#1112">1112: </a>        }
-</span><span id="1113" class="l"><a href="#1113">1113: </a>    }
+</span><span id="1044" class="l"><a href="#1044">1044: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
+</span><span id="1045" class="l"><a href="#1045">1045: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$timelimit</span>))
+</span><span id="1046" class="l"><a href="#1046">1046: </a>        {
+</span><span id="1047" class="l"><a href="#1047">1047: </a>            <span class="php-comment">// Reset the started period and count</span>
+</span><span id="1048" class="l"><a href="#1048">1048: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1049" class="l"><a href="#1049">1049: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
+</span><span id="1050" class="l"><a href="#1050">1050: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
+</span><span id="1051" class="l"><a href="#1051">1051: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
+</span><span id="1052" class="l"><a href="#1052">1052: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
+</span><span id="1053" class="l"><a href="#1053">1053: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1054" class="l"><a href="#1054">1054: </a>        }
+</span><span id="1055" class="l"><a href="#1055">1055: </a>
+</span><span id="1056" class="l"><a href="#1056">1056: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
+</span><span id="1057" class="l"><a href="#1057">1057: </a>        <span class="php-keyword1">else</span>
+</span><span id="1058" class="l"><a href="#1058">1058: </a>        {
+</span><span id="1059" class="l"><a href="#1059">1059: </a>            <span class="php-comment">// The limit has been exceeded</span>
+</span><span id="1060" class="l"><a href="#1060">1060: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
+</span><span id="1061" class="l"><a href="#1061">1061: </a>            {
+</span><span id="1062" class="l"><a href="#1062">1062: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1063" class="l"><a href="#1063">1063: </a>            }
+</span><span id="1064" class="l"><a href="#1064">1064: </a>
+</span><span id="1065" class="l"><a href="#1065">1065: </a>            <span class="php-comment">// Increase the count by one</span>
+</span><span id="1066" class="l"><a href="#1066">1066: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1067" class="l"><a href="#1067">1067: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
+</span><span id="1068" class="l"><a href="#1068">1068: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1069" class="l"><a href="#1069">1069: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
+</span><span id="1070" class="l"><a href="#1070">1070: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1071" class="l"><a href="#1071">1071: </a>        }
+</span><span id="1072" class="l"><a href="#1072">1072: </a>
+</span><span id="1073" class="l"><a href="#1073">1073: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1074" class="l"><a href="#1074">1074: </a>    }
+</span><span id="1075" class="l"><a href="#1075">1075: </a>
+</span><span id="1076" class="l"><a href="#1076">1076: </a>    <span class="php-comment">/**
+</span></span><span id="1077" class="l"><a href="#1077">1077: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method being called
+</span></span><span id="1078" class="l"><a href="#1078">1078: </a><span class="php-comment">     *
+</span></span><span id="1079" class="l"><a href="#1079">1079: </a><span class="php-comment">     * @access protected
+</span></span><span id="1080" class="l"><a href="#1080">1080: </a><span class="php-comment">     * @return bool
+</span></span><span id="1081" class="l"><a href="#1081">1081: </a><span class="php-comment">     */</span>
+</span><span id="1082" class="l"><a href="#1082">1082: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
+</span><span id="1083" class="l"><a href="#1083">1083: </a>    {
+</span><span id="1084" class="l"><a href="#1084">1084: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
+</span><span id="1085" class="l"><a href="#1085">1085: </a>        <span class="php-var">$this</span>-&gt;overrides_array = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
+</span><span id="1086" class="l"><a href="#1086">1086: </a>
+</span><span id="1087" class="l"><a href="#1087">1087: </a>        <span class="php-comment">// Check to see if the override array is even populated, otherwise return FALSE</span>
+</span><span id="1088" class="l"><a href="#1088">1088: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array))
+</span><span id="1089" class="l"><a href="#1089">1089: </a>        {
+</span><span id="1090" class="l"><a href="#1090">1090: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1091" class="l"><a href="#1091">1091: </a>        }
+</span><span id="1092" class="l"><a href="#1092">1092: </a>
+</span><span id="1093" class="l"><a href="#1093">1093: </a>        <span class="php-comment">// check for wildcard flag for rules for classes</span>
+</span><span id="1094" class="l"><a href="#1094">1094: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>]) === <span class="php-keyword1">FALSE</span>) <span class="php-comment">// Check for class overrides</span>
+</span><span id="1095" class="l"><a href="#1095">1095: </a>        {
+</span><span id="1096" class="l"><a href="#1096">1096: </a>            <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1097" class="l"><a href="#1097">1097: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'none'</span>)
+</span><span id="1098" class="l"><a href="#1098">1098: </a>            {
+</span><span id="1099" class="l"><a href="#1099">1099: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1100" class="l"><a href="#1100">1100: </a>            }
+</span><span id="1101" class="l"><a href="#1101">1101: </a>
+</span><span id="1102" class="l"><a href="#1102">1102: </a>            <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1103" class="l"><a href="#1103">1103: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'basic'</span>)
+</span><span id="1104" class="l"><a href="#1104">1104: </a>            {
+</span><span id="1105" class="l"><a href="#1105">1105: </a>                <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1106" class="l"><a href="#1106">1106: </a>
+</span><span id="1107" class="l"><a href="#1107">1107: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1108" class="l"><a href="#1108">1108: </a>            }
+</span><span id="1109" class="l"><a href="#1109">1109: </a>
+</span><span id="1110" class="l"><a href="#1110">1110: </a>            <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1111" class="l"><a href="#1111">1111: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'digest'</span>)
+</span><span id="1112" class="l"><a href="#1112">1112: </a>            {
+</span><span id="1113" class="l"><a href="#1113">1113: </a>                <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
 </span><span id="1114" class="l"><a href="#1114">1114: </a>
-</span><span id="1115" class="l"><a href="#1115">1115: </a>    <span class="php-comment">/**
-</span></span><span id="1116" class="l"><a href="#1116">1116: </a><span class="php-comment">     * Parse the PUT request arguments
-</span></span><span id="1117" class="l"><a href="#1117">1117: </a><span class="php-comment">     *
-</span></span><span id="1118" class="l"><a href="#1118">1118: </a><span class="php-comment">     * @access protected
-</span></span><span id="1119" class="l"><a href="#1119">1119: </a><span class="php-comment">     * @return void
-</span></span><span id="1120" class="l"><a href="#1120">1120: </a><span class="php-comment">     */</span>
-</span><span id="1121" class="l"><a href="#1121">1121: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
-</span><span id="1122" class="l"><a href="#1122">1122: </a>    {
-</span><span id="1123" class="l"><a href="#1123">1123: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1124" class="l"><a href="#1124">1124: </a>        {
-</span><span id="1125" class="l"><a href="#1125">1125: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1126" class="l"><a href="#1126">1126: </a>        }
-</span><span id="1127" class="l"><a href="#1127">1127: </a>        <span class="php-keyword1">else</span>
-</span><span id="1128" class="l"><a href="#1128">1128: </a>        {
-</span><span id="1129" class="l"><a href="#1129">1129: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1130" class="l"><a href="#1130">1130: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
-</span><span id="1131" class="l"><a href="#1131">1131: </a>            {
-</span><span id="1132" class="l"><a href="#1132">1132: </a>                <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1133" class="l"><a href="#1133">1133: </a>            }
-</span><span id="1134" class="l"><a href="#1134">1134: </a>        }
-</span><span id="1135" class="l"><a href="#1135">1135: </a>    }
-</span><span id="1136" class="l"><a href="#1136">1136: </a>
-</span><span id="1137" class="l"><a href="#1137">1137: </a>    <span class="php-comment">/**
-</span></span><span id="1138" class="l"><a href="#1138">1138: </a><span class="php-comment">     * Parse the HEAD request arguments
-</span></span><span id="1139" class="l"><a href="#1139">1139: </a><span class="php-comment">     *
-</span></span><span id="1140" class="l"><a href="#1140">1140: </a><span class="php-comment">     * @access protected
-</span></span><span id="1141" class="l"><a href="#1141">1141: </a><span class="php-comment">     * @return void
-</span></span><span id="1142" class="l"><a href="#1142">1142: </a><span class="php-comment">     */</span>
-</span><span id="1143" class="l"><a href="#1143">1143: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
-</span><span id="1144" class="l"><a href="#1144">1144: </a>    {
-</span><span id="1145" class="l"><a href="#1145">1145: </a>        <span class="php-comment">// Parse the HEAD variables</span>
-</span><span id="1146" class="l"><a href="#1146">1146: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
-</span><span id="1147" class="l"><a href="#1147">1147: </a>
-</span><span id="1148" class="l"><a href="#1148">1148: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
-</span><span id="1149" class="l"><a href="#1149">1149: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
-</span><span id="1150" class="l"><a href="#1150">1150: </a>    }
+</span><span id="1115" class="l"><a href="#1115">1115: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1116" class="l"><a href="#1116">1116: </a>            }
+</span><span id="1117" class="l"><a href="#1117">1117: </a>
+</span><span id="1118" class="l"><a href="#1118">1118: </a>            <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1119" class="l"><a href="#1119">1119: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'whitelist'</span>)
+</span><span id="1120" class="l"><a href="#1120">1120: </a>            {
+</span><span id="1121" class="l"><a href="#1121">1121: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1122" class="l"><a href="#1122">1122: </a>
+</span><span id="1123" class="l"><a href="#1123">1123: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1124" class="l"><a href="#1124">1124: </a>            }
+</span><span id="1125" class="l"><a href="#1125">1125: </a>        }
+</span><span id="1126" class="l"><a href="#1126">1126: </a>
+</span><span id="1127" class="l"><a href="#1127">1127: </a>        <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
+</span><span id="1128" class="l"><a href="#1128">1128: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
+</span><span id="1129" class="l"><a href="#1129">1129: </a>        {
+</span><span id="1130" class="l"><a href="#1130">1130: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1131" class="l"><a href="#1131">1131: </a>        }
+</span><span id="1132" class="l"><a href="#1132">1132: </a>
+</span><span id="1133" class="l"><a href="#1133">1133: </a>        <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1134" class="l"><a href="#1134">1134: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'none'</span>)
+</span><span id="1135" class="l"><a href="#1135">1135: </a>        {
+</span><span id="1136" class="l"><a href="#1136">1136: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1137" class="l"><a href="#1137">1137: </a>        }
+</span><span id="1138" class="l"><a href="#1138">1138: </a>
+</span><span id="1139" class="l"><a href="#1139">1139: </a>        <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1140" class="l"><a href="#1140">1140: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'basic'</span>)
+</span><span id="1141" class="l"><a href="#1141">1141: </a>        {
+</span><span id="1142" class="l"><a href="#1142">1142: </a>            <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1143" class="l"><a href="#1143">1143: </a>
+</span><span id="1144" class="l"><a href="#1144">1144: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1145" class="l"><a href="#1145">1145: </a>        }
+</span><span id="1146" class="l"><a href="#1146">1146: </a>
+</span><span id="1147" class="l"><a href="#1147">1147: </a>        <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1148" class="l"><a href="#1148">1148: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'digest'</span>)
+</span><span id="1149" class="l"><a href="#1149">1149: </a>        {
+</span><span id="1150" class="l"><a href="#1150">1150: </a>            <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
 </span><span id="1151" class="l"><a href="#1151">1151: </a>
-</span><span id="1152" class="l"><a href="#1152">1152: </a>    <span class="php-comment">/**
-</span></span><span id="1153" class="l"><a href="#1153">1153: </a><span class="php-comment">     * Parse the OPTIONS request arguments
-</span></span><span id="1154" class="l"><a href="#1154">1154: </a><span class="php-comment">     *
-</span></span><span id="1155" class="l"><a href="#1155">1155: </a><span class="php-comment">     * @access protected
-</span></span><span id="1156" class="l"><a href="#1156">1156: </a><span class="php-comment">     * @return void
-</span></span><span id="1157" class="l"><a href="#1157">1157: </a><span class="php-comment">     */</span>
-</span><span id="1158" class="l"><a href="#1158">1158: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
-</span><span id="1159" class="l"><a href="#1159">1159: </a>    {
-</span><span id="1160" class="l"><a href="#1160">1160: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
-</span><span id="1161" class="l"><a href="#1161">1161: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
+</span><span id="1152" class="l"><a href="#1152">1152: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1153" class="l"><a href="#1153">1153: </a>        }
+</span><span id="1154" class="l"><a href="#1154">1154: </a>
+</span><span id="1155" class="l"><a href="#1155">1155: </a>        <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1156" class="l"><a href="#1156">1156: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'whitelist'</span>)
+</span><span id="1157" class="l"><a href="#1157">1157: </a>        {
+</span><span id="1158" class="l"><a href="#1158">1158: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1159" class="l"><a href="#1159">1159: </a>
+</span><span id="1160" class="l"><a href="#1160">1160: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1161" class="l"><a href="#1161">1161: </a>        }
 </span><span id="1162" class="l"><a href="#1162">1162: </a>
-</span><span id="1163" class="l"><a href="#1163">1163: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
-</span><span id="1164" class="l"><a href="#1164">1164: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
-</span><span id="1165" class="l"><a href="#1165">1165: </a>    }
-</span><span id="1166" class="l"><a href="#1166">1166: </a>
-</span><span id="1167" class="l"><a href="#1167">1167: </a>    <span class="php-comment">/**
-</span></span><span id="1168" class="l"><a href="#1168">1168: </a><span class="php-comment">     * Parse the PATCH request arguments
-</span></span><span id="1169" class="l"><a href="#1169">1169: </a><span class="php-comment">     *
-</span></span><span id="1170" class="l"><a href="#1170">1170: </a><span class="php-comment">     * @access protected
-</span></span><span id="1171" class="l"><a href="#1171">1171: </a><span class="php-comment">     * @return void
-</span></span><span id="1172" class="l"><a href="#1172">1172: </a><span class="php-comment">     */</span>
-</span><span id="1173" class="l"><a href="#1173">1173: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
-</span><span id="1174" class="l"><a href="#1174">1174: </a>    {
-</span><span id="1175" class="l"><a href="#1175">1175: </a>        <span class="php-comment">// It might be a HTTP body</span>
-</span><span id="1176" class="l"><a href="#1176">1176: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1177" class="l"><a href="#1177">1177: </a>        {
-</span><span id="1178" class="l"><a href="#1178">1178: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1179" class="l"><a href="#1179">1179: </a>        }
-</span><span id="1180" class="l"><a href="#1180">1180: </a>        <span class="php-keyword1">else</span>
-</span><span id="1181" class="l"><a href="#1181">1181: </a>        {
-</span><span id="1182" class="l"><a href="#1182">1182: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1183" class="l"><a href="#1183">1183: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
-</span><span id="1184" class="l"><a href="#1184">1184: </a>            {
-</span><span id="1185" class="l"><a href="#1185">1185: </a>                <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1186" class="l"><a href="#1186">1186: </a>            }
-</span><span id="1187" class="l"><a href="#1187">1187: </a>        }
-</span><span id="1188" class="l"><a href="#1188">1188: </a>    }
+</span><span id="1163" class="l"><a href="#1163">1163: </a>        <span class="php-comment">// Return FALSE when there is an override value set but it does not match</span>
+</span><span id="1164" class="l"><a href="#1164">1164: </a>        <span class="php-comment">// 'basic', 'digest', or 'none'. (the value was misspelled)</span>
+</span><span id="1165" class="l"><a href="#1165">1165: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1166" class="l"><a href="#1166">1166: </a>    }
+</span><span id="1167" class="l"><a href="#1167">1167: </a>
+</span><span id="1168" class="l"><a href="#1168">1168: </a>    <span class="php-comment">/**
+</span></span><span id="1169" class="l"><a href="#1169">1169: </a><span class="php-comment">     * Parse the GET request arguments
+</span></span><span id="1170" class="l"><a href="#1170">1170: </a><span class="php-comment">     *
+</span></span><span id="1171" class="l"><a href="#1171">1171: </a><span class="php-comment">     * @access protected
+</span></span><span id="1172" class="l"><a href="#1172">1172: </a><span class="php-comment">     * @return void
+</span></span><span id="1173" class="l"><a href="#1173">1173: </a><span class="php-comment">     */</span>
+</span><span id="1174" class="l"><a href="#1174">1174: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
+</span><span id="1175" class="l"><a href="#1175">1175: </a>    {
+</span><span id="1176" class="l"><a href="#1176">1176: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
+</span><span id="1177" class="l"><a href="#1177">1177: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
+</span><span id="1178" class="l"><a href="#1178">1178: </a>    }
+</span><span id="1179" class="l"><a href="#1179">1179: </a>
+</span><span id="1180" class="l"><a href="#1180">1180: </a>    <span class="php-comment">/**
+</span></span><span id="1181" class="l"><a href="#1181">1181: </a><span class="php-comment">     * Parse the POST request arguments
+</span></span><span id="1182" class="l"><a href="#1182">1182: </a><span class="php-comment">     *
+</span></span><span id="1183" class="l"><a href="#1183">1183: </a><span class="php-comment">     * @access protected
+</span></span><span id="1184" class="l"><a href="#1184">1184: </a><span class="php-comment">     * @return void
+</span></span><span id="1185" class="l"><a href="#1185">1185: </a><span class="php-comment">     */</span>
+</span><span id="1186" class="l"><a href="#1186">1186: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
+</span><span id="1187" class="l"><a href="#1187">1187: </a>    {
+</span><span id="1188" class="l"><a href="#1188">1188: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
 </span><span id="1189" class="l"><a href="#1189">1189: </a>
-</span><span id="1190" class="l"><a href="#1190">1190: </a>    <span class="php-comment">/**
-</span></span><span id="1191" class="l"><a href="#1191">1191: </a><span class="php-comment">     * Parse the DELETE request arguments
-</span></span><span id="1192" class="l"><a href="#1192">1192: </a><span class="php-comment">     *
-</span></span><span id="1193" class="l"><a href="#1193">1193: </a><span class="php-comment">     * @access protected
-</span></span><span id="1194" class="l"><a href="#1194">1194: </a><span class="php-comment">     * @return void
-</span></span><span id="1195" class="l"><a href="#1195">1195: </a><span class="php-comment">     */</span>
-</span><span id="1196" class="l"><a href="#1196">1196: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
-</span><span id="1197" class="l"><a href="#1197">1197: </a>    {
-</span><span id="1198" class="l"><a href="#1198">1198: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
-</span><span id="1199" class="l"><a href="#1199">1199: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
-</span><span id="1200" class="l"><a href="#1200">1200: </a>        {
-</span><span id="1201" class="l"><a href="#1201">1201: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1202" class="l"><a href="#1202">1202: </a>        }
-</span><span id="1203" class="l"><a href="#1203">1203: </a>    }
-</span><span id="1204" class="l"><a href="#1204">1204: </a>
-</span><span id="1205" class="l"><a href="#1205">1205: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
-</span><span id="1206" class="l"><a href="#1206">1206: </a>
-</span><span id="1207" class="l"><a href="#1207">1207: </a>    <span class="php-comment">/**
-</span></span><span id="1208" class="l"><a href="#1208">1208: </a><span class="php-comment">     * Retrieve a value from a GET request
-</span></span><span id="1209" class="l"><a href="#1209">1209: </a><span class="php-comment">     *
-</span></span><span id="1210" class="l"><a href="#1210">1210: </a><span class="php-comment">     * @access public
-</span></span><span id="1211" class="l"><a href="#1211">1211: </a><span class="php-comment">     *
-</span></span><span id="1212" class="l"><a href="#1212">1212: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
-</span></span><span id="1213" class="l"><a href="#1213">1213: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1214" class="l"><a href="#1214">1214: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1215" class="l"><a href="#1215">1215: </a><span class="php-comment">     *
-</span></span><span id="1216" class="l"><a href="#1216">1216: </a><span class="php-comment">     * @return array|string|FALSE Value from the GET request; otherwise, FALSE
-</span></span><span id="1217" class="l"><a href="#1217">1217: </a><span class="php-comment">     */</span>
-</span><span id="1218" class="l"><a href="#1218">1218: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1219" class="l"><a href="#1219">1219: </a>    {
-</span><span id="1220" class="l"><a href="#1220">1220: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1221" class="l"><a href="#1221">1221: </a>        {
-</span><span id="1222" class="l"><a href="#1222">1222: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
-</span><span id="1223" class="l"><a href="#1223">1223: </a>        }
-</span><span id="1224" class="l"><a href="#1224">1224: </a>
-</span><span id="1225" class="l"><a href="#1225">1225: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_get_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1226" class="l"><a href="#1226">1226: </a>    }
-</span><span id="1227" class="l"><a href="#1227">1227: </a>
-</span><span id="1228" class="l"><a href="#1228">1228: </a>    <span class="php-comment">/**
-</span></span><span id="1229" class="l"><a href="#1229">1229: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
-</span></span><span id="1230" class="l"><a href="#1230">1230: </a><span class="php-comment">     *
-</span></span><span id="1231" class="l"><a href="#1231">1231: </a><span class="php-comment">     * @access public
-</span></span><span id="1232" class="l"><a href="#1232">1232: </a><span class="php-comment">     *
-</span></span><span id="1233" class="l"><a href="#1233">1233: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
-</span></span><span id="1234" class="l"><a href="#1234">1234: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1235" class="l"><a href="#1235">1235: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1236" class="l"><a href="#1236">1236: </a><span class="php-comment">     *
-</span></span><span id="1237" class="l"><a href="#1237">1237: </a><span class="php-comment">     * @return array|string|FALSE Value from the OPTIONS request; otherwise, FALSE
+</span><span id="1190" class="l"><a href="#1190">1190: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1191" class="l"><a href="#1191">1191: </a>        {
+</span><span id="1192" class="l"><a href="#1192">1192: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1193" class="l"><a href="#1193">1193: </a>        }
+</span><span id="1194" class="l"><a href="#1194">1194: </a>    }
+</span><span id="1195" class="l"><a href="#1195">1195: </a>
+</span><span id="1196" class="l"><a href="#1196">1196: </a>    <span class="php-comment">/**
+</span></span><span id="1197" class="l"><a href="#1197">1197: </a><span class="php-comment">     * Parse the PUT request arguments
+</span></span><span id="1198" class="l"><a href="#1198">1198: </a><span class="php-comment">     *
+</span></span><span id="1199" class="l"><a href="#1199">1199: </a><span class="php-comment">     * @access protected
+</span></span><span id="1200" class="l"><a href="#1200">1200: </a><span class="php-comment">     * @return void
+</span></span><span id="1201" class="l"><a href="#1201">1201: </a><span class="php-comment">     */</span>
+</span><span id="1202" class="l"><a href="#1202">1202: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
+</span><span id="1203" class="l"><a href="#1203">1203: </a>    {
+</span><span id="1204" class="l"><a href="#1204">1204: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1205" class="l"><a href="#1205">1205: </a>        {
+</span><span id="1206" class="l"><a href="#1206">1206: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1207" class="l"><a href="#1207">1207: </a>        }
+</span><span id="1208" class="l"><a href="#1208">1208: </a>        <span class="php-keyword1">else</span>
+</span><span id="1209" class="l"><a href="#1209">1209: </a>        {
+</span><span id="1210" class="l"><a href="#1210">1210: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1211" class="l"><a href="#1211">1211: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
+</span><span id="1212" class="l"><a href="#1212">1212: </a>            {
+</span><span id="1213" class="l"><a href="#1213">1213: </a>                <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1214" class="l"><a href="#1214">1214: </a>            }
+</span><span id="1215" class="l"><a href="#1215">1215: </a>        }
+</span><span id="1216" class="l"><a href="#1216">1216: </a>    }
+</span><span id="1217" class="l"><a href="#1217">1217: </a>
+</span><span id="1218" class="l"><a href="#1218">1218: </a>    <span class="php-comment">/**
+</span></span><span id="1219" class="l"><a href="#1219">1219: </a><span class="php-comment">     * Parse the HEAD request arguments
+</span></span><span id="1220" class="l"><a href="#1220">1220: </a><span class="php-comment">     *
+</span></span><span id="1221" class="l"><a href="#1221">1221: </a><span class="php-comment">     * @access protected
+</span></span><span id="1222" class="l"><a href="#1222">1222: </a><span class="php-comment">     * @return void
+</span></span><span id="1223" class="l"><a href="#1223">1223: </a><span class="php-comment">     */</span>
+</span><span id="1224" class="l"><a href="#1224">1224: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
+</span><span id="1225" class="l"><a href="#1225">1225: </a>    {
+</span><span id="1226" class="l"><a href="#1226">1226: </a>        <span class="php-comment">// Parse the HEAD variables</span>
+</span><span id="1227" class="l"><a href="#1227">1227: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
+</span><span id="1228" class="l"><a href="#1228">1228: </a>
+</span><span id="1229" class="l"><a href="#1229">1229: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
+</span><span id="1230" class="l"><a href="#1230">1230: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
+</span><span id="1231" class="l"><a href="#1231">1231: </a>    }
+</span><span id="1232" class="l"><a href="#1232">1232: </a>
+</span><span id="1233" class="l"><a href="#1233">1233: </a>    <span class="php-comment">/**
+</span></span><span id="1234" class="l"><a href="#1234">1234: </a><span class="php-comment">     * Parse the OPTIONS request arguments
+</span></span><span id="1235" class="l"><a href="#1235">1235: </a><span class="php-comment">     *
+</span></span><span id="1236" class="l"><a href="#1236">1236: </a><span class="php-comment">     * @access protected
+</span></span><span id="1237" class="l"><a href="#1237">1237: </a><span class="php-comment">     * @return void
 </span></span><span id="1238" class="l"><a href="#1238">1238: </a><span class="php-comment">     */</span>
-</span><span id="1239" class="l"><a href="#1239">1239: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1239" class="l"><a href="#1239">1239: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
 </span><span id="1240" class="l"><a href="#1240">1240: </a>    {
-</span><span id="1241" class="l"><a href="#1241">1241: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1242" class="l"><a href="#1242">1242: </a>        {
-</span><span id="1243" class="l"><a href="#1243">1243: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
-</span><span id="1244" class="l"><a href="#1244">1244: </a>        }
-</span><span id="1245" class="l"><a href="#1245">1245: </a>
-</span><span id="1246" class="l"><a href="#1246">1246: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_options_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1247" class="l"><a href="#1247">1247: </a>    }
-</span><span id="1248" class="l"><a href="#1248">1248: </a>
-</span><span id="1249" class="l"><a href="#1249">1249: </a>    <span class="php-comment">/**
-</span></span><span id="1250" class="l"><a href="#1250">1250: </a><span class="php-comment">     * Retrieve a value from a HEAD request
-</span></span><span id="1251" class="l"><a href="#1251">1251: </a><span class="php-comment">     *
-</span></span><span id="1252" class="l"><a href="#1252">1252: </a><span class="php-comment">     * @access public
-</span></span><span id="1253" class="l"><a href="#1253">1253: </a><span class="php-comment">     *
-</span></span><span id="1254" class="l"><a href="#1254">1254: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
-</span></span><span id="1255" class="l"><a href="#1255">1255: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1256" class="l"><a href="#1256">1256: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1257" class="l"><a href="#1257">1257: </a><span class="php-comment">     *
-</span></span><span id="1258" class="l"><a href="#1258">1258: </a><span class="php-comment">     * @return array|string|FALSE Value from the HEAD request; otherwise, FALSE
-</span></span><span id="1259" class="l"><a href="#1259">1259: </a><span class="php-comment">     */</span>
-</span><span id="1260" class="l"><a href="#1260">1260: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1261" class="l"><a href="#1261">1261: </a>    {
-</span><span id="1262" class="l"><a href="#1262">1262: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1263" class="l"><a href="#1263">1263: </a>        {
-</span><span id="1264" class="l"><a href="#1264">1264: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;head_args;
-</span><span id="1265" class="l"><a href="#1265">1265: </a>        }
-</span><span id="1266" class="l"><a href="#1266">1266: </a>
-</span><span id="1267" class="l"><a href="#1267">1267: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;head_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1268" class="l"><a href="#1268">1268: </a>    }
-</span><span id="1269" class="l"><a href="#1269">1269: </a>
-</span><span id="1270" class="l"><a href="#1270">1270: </a>    <span class="php-comment">/**
-</span></span><span id="1271" class="l"><a href="#1271">1271: </a><span class="php-comment">     * Retrieve a value from a POST request
-</span></span><span id="1272" class="l"><a href="#1272">1272: </a><span class="php-comment">     *
-</span></span><span id="1273" class="l"><a href="#1273">1273: </a><span class="php-comment">     * @access public
-</span></span><span id="1274" class="l"><a href="#1274">1274: </a><span class="php-comment">     *
-</span></span><span id="1275" class="l"><a href="#1275">1275: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
-</span></span><span id="1276" class="l"><a href="#1276">1276: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1277" class="l"><a href="#1277">1277: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1278" class="l"><a href="#1278">1278: </a><span class="php-comment">     *
-</span></span><span id="1279" class="l"><a href="#1279">1279: </a><span class="php-comment">     * @return array|string|FALSE Value from the POST request; otherwise, FALSE
-</span></span><span id="1280" class="l"><a href="#1280">1280: </a><span class="php-comment">     */</span>
-</span><span id="1281" class="l"><a href="#1281">1281: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1282" class="l"><a href="#1282">1282: </a>    {
-</span><span id="1283" class="l"><a href="#1283">1283: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1284" class="l"><a href="#1284">1284: </a>        {
-</span><span id="1285" class="l"><a href="#1285">1285: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
-</span><span id="1286" class="l"><a href="#1286">1286: </a>        }
-</span><span id="1287" class="l"><a href="#1287">1287: </a>
-</span><span id="1288" class="l"><a href="#1288">1288: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_post_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1289" class="l"><a href="#1289">1289: </a>    }
-</span><span id="1290" class="l"><a href="#1290">1290: </a>
-</span><span id="1291" class="l"><a href="#1291">1291: </a>    <span class="php-comment">/**
-</span></span><span id="1292" class="l"><a href="#1292">1292: </a><span class="php-comment">     * Retrieve a value from a PUT request
-</span></span><span id="1293" class="l"><a href="#1293">1293: </a><span class="php-comment">     *
-</span></span><span id="1294" class="l"><a href="#1294">1294: </a><span class="php-comment">     * @access public
-</span></span><span id="1295" class="l"><a href="#1295">1295: </a><span class="php-comment">     *
-</span></span><span id="1296" class="l"><a href="#1296">1296: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
-</span></span><span id="1297" class="l"><a href="#1297">1297: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1298" class="l"><a href="#1298">1298: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1299" class="l"><a href="#1299">1299: </a><span class="php-comment">     *
-</span></span><span id="1300" class="l"><a href="#1300">1300: </a><span class="php-comment">     * @return array|string|FALSE Value from the PUT request; otherwise, FALSE
-</span></span><span id="1301" class="l"><a href="#1301">1301: </a><span class="php-comment">     */</span>
-</span><span id="1302" class="l"><a href="#1302">1302: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1303" class="l"><a href="#1303">1303: </a>    {
-</span><span id="1304" class="l"><a href="#1304">1304: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1305" class="l"><a href="#1305">1305: </a>        {
-</span><span id="1306" class="l"><a href="#1306">1306: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
-</span><span id="1307" class="l"><a href="#1307">1307: </a>        }
-</span><span id="1308" class="l"><a href="#1308">1308: </a>
-</span><span id="1309" class="l"><a href="#1309">1309: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_put_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1310" class="l"><a href="#1310">1310: </a>    }
-</span><span id="1311" class="l"><a href="#1311">1311: </a>
-</span><span id="1312" class="l"><a href="#1312">1312: </a>    <span class="php-comment">/**
-</span></span><span id="1313" class="l"><a href="#1313">1313: </a><span class="php-comment">     * Retrieve a value from a DELETE request
-</span></span><span id="1314" class="l"><a href="#1314">1314: </a><span class="php-comment">     *
-</span></span><span id="1315" class="l"><a href="#1315">1315: </a><span class="php-comment">     * @access public
-</span></span><span id="1316" class="l"><a href="#1316">1316: </a><span class="php-comment">     *
-</span></span><span id="1317" class="l"><a href="#1317">1317: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
-</span></span><span id="1318" class="l"><a href="#1318">1318: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1319" class="l"><a href="#1319">1319: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1320" class="l"><a href="#1320">1320: </a><span class="php-comment">     *
-</span></span><span id="1321" class="l"><a href="#1321">1321: </a><span class="php-comment">     * @return array|string|FALSE Value from the DELETE request; otherwise, FALSE
-</span></span><span id="1322" class="l"><a href="#1322">1322: </a><span class="php-comment">     */</span>
-</span><span id="1323" class="l"><a href="#1323">1323: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1324" class="l"><a href="#1324">1324: </a>    {
-</span><span id="1325" class="l"><a href="#1325">1325: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1326" class="l"><a href="#1326">1326: </a>        {
-</span><span id="1327" class="l"><a href="#1327">1327: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
-</span><span id="1328" class="l"><a href="#1328">1328: </a>        }
-</span><span id="1329" class="l"><a href="#1329">1329: </a>
-</span><span id="1330" class="l"><a href="#1330">1330: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_delete_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1331" class="l"><a href="#1331">1331: </a>    }
-</span><span id="1332" class="l"><a href="#1332">1332: </a>
-</span><span id="1333" class="l"><a href="#1333">1333: </a>    <span class="php-comment">/**
-</span></span><span id="1334" class="l"><a href="#1334">1334: </a><span class="php-comment">     * Retrieve a value from a PATCH request
-</span></span><span id="1335" class="l"><a href="#1335">1335: </a><span class="php-comment">     *
-</span></span><span id="1336" class="l"><a href="#1336">1336: </a><span class="php-comment">     * @access public
-</span></span><span id="1337" class="l"><a href="#1337">1337: </a><span class="php-comment">     *
-</span></span><span id="1338" class="l"><a href="#1338">1338: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
-</span></span><span id="1339" class="l"><a href="#1339">1339: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1340" class="l"><a href="#1340">1340: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1341" class="l"><a href="#1341">1341: </a><span class="php-comment">     *
-</span></span><span id="1342" class="l"><a href="#1342">1342: </a><span class="php-comment">     * @return array|string|FALSE Value from the PATCH request; otherwise, FALSE
-</span></span><span id="1343" class="l"><a href="#1343">1343: </a><span class="php-comment">     */</span>
-</span><span id="1344" class="l"><a href="#1344">1344: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1345" class="l"><a href="#1345">1345: </a>    {
-</span><span id="1346" class="l"><a href="#1346">1346: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1347" class="l"><a href="#1347">1347: </a>        {
-</span><span id="1348" class="l"><a href="#1348">1348: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
-</span><span id="1349" class="l"><a href="#1349">1349: </a>        }
-</span><span id="1350" class="l"><a href="#1350">1350: </a>
-</span><span id="1351" class="l"><a href="#1351">1351: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_patch_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1352" class="l"><a href="#1352">1352: </a>    }
-</span><span id="1353" class="l"><a href="#1353">1353: </a>
-</span><span id="1354" class="l"><a href="#1354">1354: </a>    <span class="php-comment">/**
-</span></span><span id="1355" class="l"><a href="#1355">1355: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
-</span></span><span id="1356" class="l"><a href="#1356">1356: </a><span class="php-comment">     * prevented.
-</span></span><span id="1357" class="l"><a href="#1357">1357: </a><span class="php-comment">     *
-</span></span><span id="1358" class="l"><a href="#1358">1358: </a><span class="php-comment">     * @access protected
-</span></span><span id="1359" class="l"><a href="#1359">1359: </a><span class="php-comment">     *
-</span></span><span id="1360" class="l"><a href="#1360">1360: </a><span class="php-comment">     * @param  string $value Input data
-</span></span><span id="1361" class="l"><a href="#1361">1361: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
+</span><span id="1241" class="l"><a href="#1241">1241: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
+</span><span id="1242" class="l"><a href="#1242">1242: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
+</span><span id="1243" class="l"><a href="#1243">1243: </a>
+</span><span id="1244" class="l"><a href="#1244">1244: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
+</span><span id="1245" class="l"><a href="#1245">1245: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
+</span><span id="1246" class="l"><a href="#1246">1246: </a>    }
+</span><span id="1247" class="l"><a href="#1247">1247: </a>
+</span><span id="1248" class="l"><a href="#1248">1248: </a>    <span class="php-comment">/**
+</span></span><span id="1249" class="l"><a href="#1249">1249: </a><span class="php-comment">     * Parse the PATCH request arguments
+</span></span><span id="1250" class="l"><a href="#1250">1250: </a><span class="php-comment">     *
+</span></span><span id="1251" class="l"><a href="#1251">1251: </a><span class="php-comment">     * @access protected
+</span></span><span id="1252" class="l"><a href="#1252">1252: </a><span class="php-comment">     * @return void
+</span></span><span id="1253" class="l"><a href="#1253">1253: </a><span class="php-comment">     */</span>
+</span><span id="1254" class="l"><a href="#1254">1254: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
+</span><span id="1255" class="l"><a href="#1255">1255: </a>    {
+</span><span id="1256" class="l"><a href="#1256">1256: </a>        <span class="php-comment">// It might be a HTTP body</span>
+</span><span id="1257" class="l"><a href="#1257">1257: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1258" class="l"><a href="#1258">1258: </a>        {
+</span><span id="1259" class="l"><a href="#1259">1259: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1260" class="l"><a href="#1260">1260: </a>        }
+</span><span id="1261" class="l"><a href="#1261">1261: </a>        <span class="php-keyword1">else</span>
+</span><span id="1262" class="l"><a href="#1262">1262: </a>        {
+</span><span id="1263" class="l"><a href="#1263">1263: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1264" class="l"><a href="#1264">1264: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
+</span><span id="1265" class="l"><a href="#1265">1265: </a>            {
+</span><span id="1266" class="l"><a href="#1266">1266: </a>                <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1267" class="l"><a href="#1267">1267: </a>            }
+</span><span id="1268" class="l"><a href="#1268">1268: </a>        }
+</span><span id="1269" class="l"><a href="#1269">1269: </a>    }
+</span><span id="1270" class="l"><a href="#1270">1270: </a>
+</span><span id="1271" class="l"><a href="#1271">1271: </a>    <span class="php-comment">/**
+</span></span><span id="1272" class="l"><a href="#1272">1272: </a><span class="php-comment">     * Parse the DELETE request arguments
+</span></span><span id="1273" class="l"><a href="#1273">1273: </a><span class="php-comment">     *
+</span></span><span id="1274" class="l"><a href="#1274">1274: </a><span class="php-comment">     * @access protected
+</span></span><span id="1275" class="l"><a href="#1275">1275: </a><span class="php-comment">     * @return void
+</span></span><span id="1276" class="l"><a href="#1276">1276: </a><span class="php-comment">     */</span>
+</span><span id="1277" class="l"><a href="#1277">1277: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
+</span><span id="1278" class="l"><a href="#1278">1278: </a>    {
+</span><span id="1279" class="l"><a href="#1279">1279: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
+</span><span id="1280" class="l"><a href="#1280">1280: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
+</span><span id="1281" class="l"><a href="#1281">1281: </a>        {
+</span><span id="1282" class="l"><a href="#1282">1282: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1283" class="l"><a href="#1283">1283: </a>        }
+</span><span id="1284" class="l"><a href="#1284">1284: </a>    }
+</span><span id="1285" class="l"><a href="#1285">1285: </a>
+</span><span id="1286" class="l"><a href="#1286">1286: </a>    <span class="php-comment">/**
+</span></span><span id="1287" class="l"><a href="#1287">1287: </a><span class="php-comment">     * Parse the query parameters
+</span></span><span id="1288" class="l"><a href="#1288">1288: </a><span class="php-comment">     *
+</span></span><span id="1289" class="l"><a href="#1289">1289: </a><span class="php-comment">     * @access protected
+</span></span><span id="1290" class="l"><a href="#1290">1290: </a><span class="php-comment">     * @return void
+</span></span><span id="1291" class="l"><a href="#1291">1291: </a><span class="php-comment">     */</span>
+</span><span id="1292" class="l"><a href="#1292">1292: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
+</span><span id="1293" class="l"><a href="#1293">1293: </a>    {
+</span><span id="1294" class="l"><a href="#1294">1294: </a>        <span class="php-comment">// Declare a variable that will hold the REQUEST_URI</span>
+</span><span id="1295" class="l"><a href="#1295">1295: </a>        <span class="php-var">$request_uri</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1296" class="l"><a href="#1296">1296: </a>
+</span><span id="1297" class="l"><a href="#1297">1297: </a>        <span class="php-comment">// If using the commandline version</span>
+</span><span id="1298" class="l"><a href="#1298">1298: </a>        <span class="php-keyword1">if</span> (is_cli())
+</span><span id="1299" class="l"><a href="#1299">1299: </a>        {
+</span><span id="1300" class="l"><a href="#1300">1300: </a>            <span class="php-var">$args</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'argv'</span>);
+</span><span id="1301" class="l"><a href="#1301">1301: </a>            <span class="php-keyword1">unset</span>(<span class="php-var">$args</span>[<span class="php-num">0</span>]);
+</span><span id="1302" class="l"><a href="#1302">1302: </a>
+</span><span id="1303" class="l"><a href="#1303">1303: </a>            <span class="php-comment">// Combine the arguments using '/' as the delimiter</span>
+</span><span id="1304" class="l"><a href="#1304">1304: </a>            <span class="php-var">$request_uri</span> = <span class="php-quote">'/'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'/'</span>, <span class="php-var">$args</span>) . <span class="php-quote">'/'</span>;
+</span><span id="1305" class="l"><a href="#1305">1305: </a>
+</span><span id="1306" class="l"><a href="#1306">1306: </a>            <span class="php-comment">// Set the following server variables (perhaps not required anymore?)</span>
+</span><span id="1307" class="l"><a href="#1307">1307: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1308" class="l"><a href="#1308">1308: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'PATH_INFO'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1309" class="l"><a href="#1309">1309: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'QUERY_STRING'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1310" class="l"><a href="#1310">1310: </a>        }
+</span><span id="1311" class="l"><a href="#1311">1311: </a>        <span class="php-keyword1">else</span>
+</span><span id="1312" class="l"><a href="#1312">1312: </a>        {
+</span><span id="1313" class="l"><a href="#1313">1313: </a>            <span class="php-var">$request_uri</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>);
+</span><span id="1314" class="l"><a href="#1314">1314: </a>        }
+</span><span id="1315" class="l"><a href="#1315">1315: </a>
+</span><span id="1316" class="l"><a href="#1316">1316: </a>        <span class="php-comment">// Parse the query parameters from the query string</span>
+</span><span id="1317" class="l"><a href="#1317">1317: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$request_uri</span>, PHP_URL_QUERY), <span class="php-var">$this</span>-&gt;_query_args);
+</span><span id="1318" class="l"><a href="#1318">1318: </a>    }
+</span><span id="1319" class="l"><a href="#1319">1319: </a>
+</span><span id="1320" class="l"><a href="#1320">1320: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
+</span><span id="1321" class="l"><a href="#1321">1321: </a>
+</span><span id="1322" class="l"><a href="#1322">1322: </a>    <span class="php-comment">/**
+</span></span><span id="1323" class="l"><a href="#1323">1323: </a><span class="php-comment">     * Retrieve a value from a GET request
+</span></span><span id="1324" class="l"><a href="#1324">1324: </a><span class="php-comment">     *
+</span></span><span id="1325" class="l"><a href="#1325">1325: </a><span class="php-comment">     * @access public
+</span></span><span id="1326" class="l"><a href="#1326">1326: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
+</span></span><span id="1327" class="l"><a href="#1327">1327: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1328" class="l"><a href="#1328">1328: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1329" class="l"><a href="#1329">1329: </a><span class="php-comment">     * @return array|string|FALSE Value from the GET request; otherwise, FALSE
+</span></span><span id="1330" class="l"><a href="#1330">1330: </a><span class="php-comment">     */</span>
+</span><span id="1331" class="l"><a href="#1331">1331: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1332" class="l"><a href="#1332">1332: </a>    {
+</span><span id="1333" class="l"><a href="#1333">1333: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1334" class="l"><a href="#1334">1334: </a>        {
+</span><span id="1335" class="l"><a href="#1335">1335: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
+</span><span id="1336" class="l"><a href="#1336">1336: </a>        }
+</span><span id="1337" class="l"><a href="#1337">1337: </a>
+</span><span id="1338" class="l"><a href="#1338">1338: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_get_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1339" class="l"><a href="#1339">1339: </a>    }
+</span><span id="1340" class="l"><a href="#1340">1340: </a>
+</span><span id="1341" class="l"><a href="#1341">1341: </a>    <span class="php-comment">/**
+</span></span><span id="1342" class="l"><a href="#1342">1342: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
+</span></span><span id="1343" class="l"><a href="#1343">1343: </a><span class="php-comment">     *
+</span></span><span id="1344" class="l"><a href="#1344">1344: </a><span class="php-comment">     * @access public
+</span></span><span id="1345" class="l"><a href="#1345">1345: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
+</span></span><span id="1346" class="l"><a href="#1346">1346: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1347" class="l"><a href="#1347">1347: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1348" class="l"><a href="#1348">1348: </a><span class="php-comment">     * @return array|string|FALSE Value from the OPTIONS request; otherwise, FALSE
+</span></span><span id="1349" class="l"><a href="#1349">1349: </a><span class="php-comment">     */</span>
+</span><span id="1350" class="l"><a href="#1350">1350: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1351" class="l"><a href="#1351">1351: </a>    {
+</span><span id="1352" class="l"><a href="#1352">1352: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1353" class="l"><a href="#1353">1353: </a>        {
+</span><span id="1354" class="l"><a href="#1354">1354: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
+</span><span id="1355" class="l"><a href="#1355">1355: </a>        }
+</span><span id="1356" class="l"><a href="#1356">1356: </a>
+</span><span id="1357" class="l"><a href="#1357">1357: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_options_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1358" class="l"><a href="#1358">1358: </a>    }
+</span><span id="1359" class="l"><a href="#1359">1359: </a>
+</span><span id="1360" class="l"><a href="#1360">1360: </a>    <span class="php-comment">/**
+</span></span><span id="1361" class="l"><a href="#1361">1361: </a><span class="php-comment">     * Retrieve a value from a HEAD request
 </span></span><span id="1362" class="l"><a href="#1362">1362: </a><span class="php-comment">     *
-</span></span><span id="1363" class="l"><a href="#1363">1363: </a><span class="php-comment">     * @return string
-</span></span><span id="1364" class="l"><a href="#1364">1364: </a><span class="php-comment">     */</span>
-</span><span id="1365" class="l"><a href="#1365">1365: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
-</span><span id="1366" class="l"><a href="#1366">1366: </a>    {
-</span><span id="1367" class="l"><a href="#1367">1367: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) <span class="php-keyword1">OR</span> <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
-</span><span id="1368" class="l"><a href="#1368">1368: </a>
-</span><span id="1369" class="l"><a href="#1369">1369: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
-</span><span id="1370" class="l"><a href="#1370">1370: </a>    }
-</span><span id="1371" class="l"><a href="#1371">1371: </a>
-</span><span id="1372" class="l"><a href="#1372">1372: </a>    <span class="php-comment">/**
-</span></span><span id="1373" class="l"><a href="#1373">1373: </a><span class="php-comment">     * Retrieve the validation errors
-</span></span><span id="1374" class="l"><a href="#1374">1374: </a><span class="php-comment">     *
-</span></span><span id="1375" class="l"><a href="#1375">1375: </a><span class="php-comment">     * @access public
-</span></span><span id="1376" class="l"><a href="#1376">1376: </a><span class="php-comment">     * @return array
-</span></span><span id="1377" class="l"><a href="#1377">1377: </a><span class="php-comment">     */</span>
-</span><span id="1378" class="l"><a href="#1378">1378: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
-</span><span id="1379" class="l"><a href="#1379">1379: </a>    {
-</span><span id="1380" class="l"><a href="#1380">1380: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
-</span><span id="1381" class="l"><a href="#1381">1381: </a>
-</span><span id="1382" class="l"><a href="#1382">1382: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(<span class="php-quote">&quot;\n&quot;</span>, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, <span class="php-quote">&quot;\n&quot;</span>));
-</span><span id="1383" class="l"><a href="#1383">1383: </a>    }
-</span><span id="1384" class="l"><a href="#1384">1384: </a>
-</span><span id="1385" class="l"><a href="#1385">1385: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
-</span><span id="1386" class="l"><a href="#1386">1386: </a>
-</span><span id="1387" class="l"><a href="#1387">1387: </a>    <span class="php-comment">/**
-</span></span><span id="1388" class="l"><a href="#1388">1388: </a><span class="php-comment">     * Perform LDAP Authentication
-</span></span><span id="1389" class="l"><a href="#1389">1389: </a><span class="php-comment">     *
-</span></span><span id="1390" class="l"><a href="#1390">1390: </a><span class="php-comment">     * @access protected
-</span></span><span id="1391" class="l"><a href="#1391">1391: </a><span class="php-comment">     *
-</span></span><span id="1392" class="l"><a href="#1392">1392: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1393" class="l"><a href="#1393">1393: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1394" class="l"><a href="#1394">1394: </a><span class="php-comment">     *
-</span></span><span id="1395" class="l"><a href="#1395">1395: </a><span class="php-comment">     * @return bool
-</span></span><span id="1396" class="l"><a href="#1396">1396: </a><span class="php-comment">     */</span>
-</span><span id="1397" class="l"><a href="#1397">1397: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1398" class="l"><a href="#1398">1398: </a>    {
-</span><span id="1399" class="l"><a href="#1399">1399: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1400" class="l"><a href="#1400">1400: </a>        {
-</span><span id="1401" class="l"><a href="#1401">1401: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
-</span><span id="1402" class="l"><a href="#1402">1402: </a>
-</span><span id="1403" class="l"><a href="#1403">1403: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1404" class="l"><a href="#1404">1404: </a>        }
-</span><span id="1405" class="l"><a href="#1405">1405: </a>
-</span><span id="1406" class="l"><a href="#1406">1406: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading Config'</span>);
-</span><span id="1407" class="l"><a href="#1407">1407: </a>
-</span><span id="1408" class="l"><a href="#1408">1408: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="1409" class="l"><a href="#1409">1409: </a>
-</span><span id="1410" class="l"><a href="#1410">1410: </a>        <span class="php-var">$ldap</span> = [
-</span><span id="1411" class="l"><a href="#1411">1411: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1412" class="l"><a href="#1412">1412: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1413" class="l"><a href="#1413">1413: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1414" class="l"><a href="#1414">1414: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1415" class="l"><a href="#1415">1415: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1416" class="l"><a href="#1416">1416: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1417" class="l"><a href="#1417">1417: </a>        ];
-</span><span id="1418" class="l"><a href="#1418">1418: </a>
-</span><span id="1419" class="l"><a href="#1419">1419: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
-</span><span id="1420" class="l"><a href="#1420">1420: </a>
-</span><span id="1421" class="l"><a href="#1421">1421: </a>        <span class="php-comment">// Appears to be unused</span>
-</span><span id="1422" class="l"><a href="#1422">1422: </a>        <span class="php-comment">// $ldapconfig['authrealm'] = $this-&gt;config-&gt;item('domain', 'ldap');</span>
-</span><span id="1423" class="l"><a href="#1423">1423: </a>
-</span><span id="1424" class="l"><a href="#1424">1424: </a>        <span class="php-comment">// connect to ldap server</span>
-</span><span id="1425" class="l"><a href="#1425">1425: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
-</span><span id="1426" class="l"><a href="#1426">1426: </a>
-</span><span id="1427" class="l"><a href="#1427">1427: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
-</span><span id="1428" class="l"><a href="#1428">1428: </a>        {
-</span><span id="1429" class="l"><a href="#1429">1429: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>] . <span class="php-quote">' seconds'</span>);
-</span><span id="1430" class="l"><a href="#1430">1430: </a>
-</span><span id="1431" class="l"><a href="#1431">1431: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
+</span></span><span id="1363" class="l"><a href="#1363">1363: </a><span class="php-comment">     * @access public
+</span></span><span id="1364" class="l"><a href="#1364">1364: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
+</span></span><span id="1365" class="l"><a href="#1365">1365: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1366" class="l"><a href="#1366">1366: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1367" class="l"><a href="#1367">1367: </a><span class="php-comment">     * @return array|string|FALSE Value from the HEAD request; otherwise, FALSE
+</span></span><span id="1368" class="l"><a href="#1368">1368: </a><span class="php-comment">     */</span>
+</span><span id="1369" class="l"><a href="#1369">1369: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1370" class="l"><a href="#1370">1370: </a>    {
+</span><span id="1371" class="l"><a href="#1371">1371: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1372" class="l"><a href="#1372">1372: </a>        {
+</span><span id="1373" class="l"><a href="#1373">1373: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;head_args;
+</span><span id="1374" class="l"><a href="#1374">1374: </a>        }
+</span><span id="1375" class="l"><a href="#1375">1375: </a>
+</span><span id="1376" class="l"><a href="#1376">1376: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;head_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1377" class="l"><a href="#1377">1377: </a>    }
+</span><span id="1378" class="l"><a href="#1378">1378: </a>
+</span><span id="1379" class="l"><a href="#1379">1379: </a>    <span class="php-comment">/**
+</span></span><span id="1380" class="l"><a href="#1380">1380: </a><span class="php-comment">     * Retrieve a value from a POST request
+</span></span><span id="1381" class="l"><a href="#1381">1381: </a><span class="php-comment">     *
+</span></span><span id="1382" class="l"><a href="#1382">1382: </a><span class="php-comment">     * @access public
+</span></span><span id="1383" class="l"><a href="#1383">1383: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
+</span></span><span id="1384" class="l"><a href="#1384">1384: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1385" class="l"><a href="#1385">1385: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1386" class="l"><a href="#1386">1386: </a><span class="php-comment">     * @return array|string|FALSE Value from the POST request; otherwise, FALSE
+</span></span><span id="1387" class="l"><a href="#1387">1387: </a><span class="php-comment">     */</span>
+</span><span id="1388" class="l"><a href="#1388">1388: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1389" class="l"><a href="#1389">1389: </a>    {
+</span><span id="1390" class="l"><a href="#1390">1390: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1391" class="l"><a href="#1391">1391: </a>        {
+</span><span id="1392" class="l"><a href="#1392">1392: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
+</span><span id="1393" class="l"><a href="#1393">1393: </a>        }
+</span><span id="1394" class="l"><a href="#1394">1394: </a>
+</span><span id="1395" class="l"><a href="#1395">1395: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_post_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1396" class="l"><a href="#1396">1396: </a>    }
+</span><span id="1397" class="l"><a href="#1397">1397: </a>
+</span><span id="1398" class="l"><a href="#1398">1398: </a>    <span class="php-comment">/**
+</span></span><span id="1399" class="l"><a href="#1399">1399: </a><span class="php-comment">     * Retrieve a value from a PUT request
+</span></span><span id="1400" class="l"><a href="#1400">1400: </a><span class="php-comment">     *
+</span></span><span id="1401" class="l"><a href="#1401">1401: </a><span class="php-comment">     * @access public
+</span></span><span id="1402" class="l"><a href="#1402">1402: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
+</span></span><span id="1403" class="l"><a href="#1403">1403: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1404" class="l"><a href="#1404">1404: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1405" class="l"><a href="#1405">1405: </a><span class="php-comment">     * @return array|string|FALSE Value from the PUT request; otherwise, FALSE
+</span></span><span id="1406" class="l"><a href="#1406">1406: </a><span class="php-comment">     */</span>
+</span><span id="1407" class="l"><a href="#1407">1407: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1408" class="l"><a href="#1408">1408: </a>    {
+</span><span id="1409" class="l"><a href="#1409">1409: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1410" class="l"><a href="#1410">1410: </a>        {
+</span><span id="1411" class="l"><a href="#1411">1411: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
+</span><span id="1412" class="l"><a href="#1412">1412: </a>        }
+</span><span id="1413" class="l"><a href="#1413">1413: </a>
+</span><span id="1414" class="l"><a href="#1414">1414: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_put_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1415" class="l"><a href="#1415">1415: </a>    }
+</span><span id="1416" class="l"><a href="#1416">1416: </a>
+</span><span id="1417" class="l"><a href="#1417">1417: </a>    <span class="php-comment">/**
+</span></span><span id="1418" class="l"><a href="#1418">1418: </a><span class="php-comment">     * Retrieve a value from a DELETE request
+</span></span><span id="1419" class="l"><a href="#1419">1419: </a><span class="php-comment">     *
+</span></span><span id="1420" class="l"><a href="#1420">1420: </a><span class="php-comment">     * @access public
+</span></span><span id="1421" class="l"><a href="#1421">1421: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
+</span></span><span id="1422" class="l"><a href="#1422">1422: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1423" class="l"><a href="#1423">1423: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1424" class="l"><a href="#1424">1424: </a><span class="php-comment">     * @return array|string|FALSE Value from the DELETE request; otherwise, FALSE
+</span></span><span id="1425" class="l"><a href="#1425">1425: </a><span class="php-comment">     */</span>
+</span><span id="1426" class="l"><a href="#1426">1426: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1427" class="l"><a href="#1427">1427: </a>    {
+</span><span id="1428" class="l"><a href="#1428">1428: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1429" class="l"><a href="#1429">1429: </a>        {
+</span><span id="1430" class="l"><a href="#1430">1430: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
+</span><span id="1431" class="l"><a href="#1431">1431: </a>        }
 </span><span id="1432" class="l"><a href="#1432">1432: </a>
-</span><span id="1433" class="l"><a href="#1433">1433: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>] . <span class="php-quote">' with dn '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
-</span><span id="1434" class="l"><a href="#1434">1434: </a>
-</span><span id="1435" class="l"><a href="#1435">1435: </a>            <span class="php-comment">// binding to ldap server</span>
-</span><span id="1436" class="l"><a href="#1436">1436: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
-</span><span id="1437" class="l"><a href="#1437">1437: </a>
-</span><span id="1438" class="l"><a href="#1438">1438: </a>            <span class="php-comment">// verify binding</span>
-</span><span id="1439" class="l"><a href="#1439">1439: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span>)
-</span><span id="1440" class="l"><a href="#1440">1440: </a>            {
-</span><span id="1441" class="l"><a href="#1441">1441: </a>                log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
-</span><span id="1442" class="l"><a href="#1442">1442: </a>            }
-</span><span id="1443" class="l"><a href="#1443">1443: </a>            <span class="php-keyword1">else</span>
-</span><span id="1444" class="l"><a href="#1444">1444: </a>            {
-</span><span id="1445" class="l"><a href="#1445">1445: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind unsuccessful'</span>);
-</span><span id="1446" class="l"><a href="#1446">1446: </a>
-</span><span id="1447" class="l"><a href="#1447">1447: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1448" class="l"><a href="#1448">1448: </a>            }
-</span><span id="1449" class="l"><a href="#1449">1449: </a>        }
-</span><span id="1450" class="l"><a href="#1450">1450: </a>
-</span><span id="1451" class="l"><a href="#1451">1451: </a>        <span class="php-comment">// search for user</span>
-</span><span id="1452" class="l"><a href="#1452">1452: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) == <span class="php-keyword1">FALSE</span>)
-</span><span id="1453" class="l"><a href="#1453">1453: </a>        {
-</span><span id="1454" class="l"><a href="#1454">1454: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span> . <span class="php-var">$username</span> . <span class="php-quote">' not found in search'</span>);
-</span><span id="1455" class="l"><a href="#1455">1455: </a>
-</span><span id="1456" class="l"><a href="#1456">1456: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1457" class="l"><a href="#1457">1457: </a>        }
-</span><span id="1458" class="l"><a href="#1458">1458: </a>
-</span><span id="1459" class="l"><a href="#1459">1459: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
-</span><span id="1460" class="l"><a href="#1460">1460: </a>        {
-</span><span id="1461" class="l"><a href="#1461">1461: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username '</span> . <span class="php-var">$username</span> . <span class="php-quote">'found more than once'</span>);
-</span><span id="1462" class="l"><a href="#1462">1462: </a>
-</span><span id="1463" class="l"><a href="#1463">1463: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1464" class="l"><a href="#1464">1464: </a>        }
-</span><span id="1465" class="l"><a href="#1465">1465: </a>
-</span><span id="1466" class="l"><a href="#1466">1466: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) == <span class="php-keyword1">FALSE</span>)
+</span><span id="1433" class="l"><a href="#1433">1433: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_delete_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1434" class="l"><a href="#1434">1434: </a>    }
+</span><span id="1435" class="l"><a href="#1435">1435: </a>
+</span><span id="1436" class="l"><a href="#1436">1436: </a>    <span class="php-comment">/**
+</span></span><span id="1437" class="l"><a href="#1437">1437: </a><span class="php-comment">     * Retrieve a value from a PATCH request
+</span></span><span id="1438" class="l"><a href="#1438">1438: </a><span class="php-comment">     *
+</span></span><span id="1439" class="l"><a href="#1439">1439: </a><span class="php-comment">     * @access public
+</span></span><span id="1440" class="l"><a href="#1440">1440: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
+</span></span><span id="1441" class="l"><a href="#1441">1441: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1442" class="l"><a href="#1442">1442: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1443" class="l"><a href="#1443">1443: </a><span class="php-comment">     * @return array|string|FALSE Value from the PATCH request; otherwise, FALSE
+</span></span><span id="1444" class="l"><a href="#1444">1444: </a><span class="php-comment">     */</span>
+</span><span id="1445" class="l"><a href="#1445">1445: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1446" class="l"><a href="#1446">1446: </a>    {
+</span><span id="1447" class="l"><a href="#1447">1447: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1448" class="l"><a href="#1448">1448: </a>        {
+</span><span id="1449" class="l"><a href="#1449">1449: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
+</span><span id="1450" class="l"><a href="#1450">1450: </a>        }
+</span><span id="1451" class="l"><a href="#1451">1451: </a>
+</span><span id="1452" class="l"><a href="#1452">1452: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_patch_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1453" class="l"><a href="#1453">1453: </a>    }
+</span><span id="1454" class="l"><a href="#1454">1454: </a>
+</span><span id="1455" class="l"><a href="#1455">1455: </a>    <span class="php-comment">/**
+</span></span><span id="1456" class="l"><a href="#1456">1456: </a><span class="php-comment">     * Retrieve a value from the query parameters
+</span></span><span id="1457" class="l"><a href="#1457">1457: </a><span class="php-comment">     *
+</span></span><span id="1458" class="l"><a href="#1458">1458: </a><span class="php-comment">     * @access public
+</span></span><span id="1459" class="l"><a href="#1459">1459: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
+</span></span><span id="1460" class="l"><a href="#1460">1460: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1461" class="l"><a href="#1461">1461: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1462" class="l"><a href="#1462">1462: </a><span class="php-comment">     * @return array|string|FALSE Value from the query parameters; otherwise, FALSE
+</span></span><span id="1463" class="l"><a href="#1463">1463: </a><span class="php-comment">     */</span>
+</span><span id="1464" class="l"><a href="#1464">1464: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1465" class="l"><a href="#1465">1465: </a>    {
+</span><span id="1466" class="l"><a href="#1466">1466: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
 </span><span id="1467" class="l"><a href="#1467">1467: </a>        {
-</span><span id="1468" class="l"><a href="#1468">1468: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, entry of searchresult could not be fetched'</span>);
-</span><span id="1469" class="l"><a href="#1469">1469: </a>
-</span><span id="1470" class="l"><a href="#1470">1470: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1471" class="l"><a href="#1471">1471: </a>        }
-</span><span id="1472" class="l"><a href="#1472">1472: </a>
-</span><span id="1473" class="l"><a href="#1473">1473: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) == <span class="php-keyword1">FALSE</span>)
-</span><span id="1474" class="l"><a href="#1474">1474: </a>        {
-</span><span id="1475" class="l"><a href="#1475">1475: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, user-dn could not be fetched'</span>);
-</span><span id="1476" class="l"><a href="#1476">1476: </a>
-</span><span id="1477" class="l"><a href="#1477">1477: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1478" class="l"><a href="#1478">1478: </a>        }
-</span><span id="1479" class="l"><a href="#1479">1479: </a>
-</span><span id="1480" class="l"><a href="#1480">1480: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
-</span><span id="1481" class="l"><a href="#1481">1481: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) == <span class="php-keyword1">FALSE</span>)
-</span><span id="1482" class="l"><a href="#1482">1482: </a>        {
-</span><span id="1483" class="l"><a href="#1483">1483: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
-</span><span id="1484" class="l"><a href="#1484">1484: </a>
-</span><span id="1485" class="l"><a href="#1485">1485: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1486" class="l"><a href="#1486">1486: </a>        }
-</span><span id="1487" class="l"><a href="#1487">1487: </a>
-</span><span id="1488" class="l"><a href="#1488">1488: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span> . <span class="php-var">$user_dn</span> . <span class="php-quote">' authenticated successfully'</span>);
+</span><span id="1468" class="l"><a href="#1468">1468: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
+</span><span id="1469" class="l"><a href="#1469">1469: </a>        }
+</span><span id="1470" class="l"><a href="#1470">1470: </a>
+</span><span id="1471" class="l"><a href="#1471">1471: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_query_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1472" class="l"><a href="#1472">1472: </a>    }
+</span><span id="1473" class="l"><a href="#1473">1473: </a>
+</span><span id="1474" class="l"><a href="#1474">1474: </a>    <span class="php-comment">/**
+</span></span><span id="1475" class="l"><a href="#1475">1475: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
+</span></span><span id="1476" class="l"><a href="#1476">1476: </a><span class="php-comment">     * prevented.
+</span></span><span id="1477" class="l"><a href="#1477">1477: </a><span class="php-comment">     *
+</span></span><span id="1478" class="l"><a href="#1478">1478: </a><span class="php-comment">     * @access protected
+</span></span><span id="1479" class="l"><a href="#1479">1479: </a><span class="php-comment">     * @param  string $value Input data
+</span></span><span id="1480" class="l"><a href="#1480">1480: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
+</span></span><span id="1481" class="l"><a href="#1481">1481: </a><span class="php-comment">     * @return string
+</span></span><span id="1482" class="l"><a href="#1482">1482: </a><span class="php-comment">     */</span>
+</span><span id="1483" class="l"><a href="#1483">1483: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
+</span><span id="1484" class="l"><a href="#1484">1484: </a>    {
+</span><span id="1485" class="l"><a href="#1485">1485: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) <span class="php-keyword1">OR</span> <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
+</span><span id="1486" class="l"><a href="#1486">1486: </a>
+</span><span id="1487" class="l"><a href="#1487">1487: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
+</span><span id="1488" class="l"><a href="#1488">1488: </a>    }
 </span><span id="1489" class="l"><a href="#1489">1489: </a>
-</span><span id="1490" class="l"><a href="#1490">1490: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
-</span><span id="1491" class="l"><a href="#1491">1491: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
-</span><span id="1492" class="l"><a href="#1492">1492: </a>
-</span><span id="1493" class="l"><a href="#1493">1493: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1494" class="l"><a href="#1494">1494: </a>    }
-</span><span id="1495" class="l"><a href="#1495">1495: </a>
-</span><span id="1496" class="l"><a href="#1496">1496: </a>    <span class="php-comment">/**
-</span></span><span id="1497" class="l"><a href="#1497">1497: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
-</span></span><span id="1498" class="l"><a href="#1498">1498: </a><span class="php-comment">     *
-</span></span><span id="1499" class="l"><a href="#1499">1499: </a><span class="php-comment">     * @access protected
-</span></span><span id="1500" class="l"><a href="#1500">1500: </a><span class="php-comment">     *
-</span></span><span id="1501" class="l"><a href="#1501">1501: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1502" class="l"><a href="#1502">1502: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1503" class="l"><a href="#1503">1503: </a><span class="php-comment">     *
-</span></span><span id="1504" class="l"><a href="#1504">1504: </a><span class="php-comment">     * @return bool
-</span></span><span id="1505" class="l"><a href="#1505">1505: </a><span class="php-comment">     */</span>
-</span><span id="1506" class="l"><a href="#1506">1506: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1507" class="l"><a href="#1507">1507: </a>    {
-</span><span id="1508" class="l"><a href="#1508">1508: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1509" class="l"><a href="#1509">1509: </a>        {
-</span><span id="1510" class="l"><a href="#1510">1510: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: failure, empty username'</span>);
-</span><span id="1511" class="l"><a href="#1511">1511: </a>
-</span><span id="1512" class="l"><a href="#1512">1512: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1513" class="l"><a href="#1513">1513: </a>        }
-</span><span id="1514" class="l"><a href="#1514">1514: </a>
-</span><span id="1515" class="l"><a href="#1515">1515: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
-</span><span id="1516" class="l"><a href="#1516">1516: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
-</span><span id="1517" class="l"><a href="#1517">1517: </a>
-</span><span id="1518" class="l"><a href="#1518">1518: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
-</span><span id="1519" class="l"><a href="#1519">1519: </a>        {
-</span><span id="1520" class="l"><a href="#1520">1520: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_class'</span>);
+</span><span id="1490" class="l"><a href="#1490">1490: </a>    <span class="php-comment">/**
+</span></span><span id="1491" class="l"><a href="#1491">1491: </a><span class="php-comment">     * Retrieve the validation errors
+</span></span><span id="1492" class="l"><a href="#1492">1492: </a><span class="php-comment">     *
+</span></span><span id="1493" class="l"><a href="#1493">1493: </a><span class="php-comment">     * @access public
+</span></span><span id="1494" class="l"><a href="#1494">1494: </a><span class="php-comment">     * @return array
+</span></span><span id="1495" class="l"><a href="#1495">1495: </a><span class="php-comment">     */</span>
+</span><span id="1496" class="l"><a href="#1496">1496: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
+</span><span id="1497" class="l"><a href="#1497">1497: </a>    {
+</span><span id="1498" class="l"><a href="#1498">1498: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
+</span><span id="1499" class="l"><a href="#1499">1499: </a>
+</span><span id="1500" class="l"><a href="#1500">1500: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
+</span><span id="1501" class="l"><a href="#1501">1501: </a>    }
+</span><span id="1502" class="l"><a href="#1502">1502: </a>
+</span><span id="1503" class="l"><a href="#1503">1503: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
+</span><span id="1504" class="l"><a href="#1504">1504: </a>
+</span><span id="1505" class="l"><a href="#1505">1505: </a>    <span class="php-comment">/**
+</span></span><span id="1506" class="l"><a href="#1506">1506: </a><span class="php-comment">     * Perform LDAP Authentication
+</span></span><span id="1507" class="l"><a href="#1507">1507: </a><span class="php-comment">     *
+</span></span><span id="1508" class="l"><a href="#1508">1508: </a><span class="php-comment">     * @access protected
+</span></span><span id="1509" class="l"><a href="#1509">1509: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1510" class="l"><a href="#1510">1510: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1511" class="l"><a href="#1511">1511: </a><span class="php-comment">     * @return bool
+</span></span><span id="1512" class="l"><a href="#1512">1512: </a><span class="php-comment">     */</span>
+</span><span id="1513" class="l"><a href="#1513">1513: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1514" class="l"><a href="#1514">1514: </a>    {
+</span><span id="1515" class="l"><a href="#1515">1515: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1516" class="l"><a href="#1516">1516: </a>        {
+</span><span id="1517" class="l"><a href="#1517">1517: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
+</span><span id="1518" class="l"><a href="#1518">1518: </a>
+</span><span id="1519" class="l"><a href="#1519">1519: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1520" class="l"><a href="#1520">1520: </a>        }
 </span><span id="1521" class="l"><a href="#1521">1521: </a>
-</span><span id="1522" class="l"><a href="#1522">1522: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1523" class="l"><a href="#1523">1523: </a>        }
-</span><span id="1524" class="l"><a href="#1524">1524: </a>
-</span><span id="1525" class="l"><a href="#1525">1525: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
-</span><span id="1526" class="l"><a href="#1526">1526: </a>        {
-</span><span id="1527" class="l"><a href="#1527">1527: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_function'</span>);
-</span><span id="1528" class="l"><a href="#1528">1528: </a>
-</span><span id="1529" class="l"><a href="#1529">1529: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1530" class="l"><a href="#1530">1530: </a>        }
-</span><span id="1531" class="l"><a href="#1531">1531: </a>
-</span><span id="1532" class="l"><a href="#1532">1532: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1533" class="l"><a href="#1533">1533: </a>        {
-</span><span id="1534" class="l"><a href="#1534">1534: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
-</span><span id="1535" class="l"><a href="#1535">1535: </a>        }
+</span><span id="1522" class="l"><a href="#1522">1522: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading Config'</span>);
+</span><span id="1523" class="l"><a href="#1523">1523: </a>
+</span><span id="1524" class="l"><a href="#1524">1524: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="1525" class="l"><a href="#1525">1525: </a>
+</span><span id="1526" class="l"><a href="#1526">1526: </a>        <span class="php-var">$ldap</span> = [
+</span><span id="1527" class="l"><a href="#1527">1527: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1528" class="l"><a href="#1528">1528: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1529" class="l"><a href="#1529">1529: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1530" class="l"><a href="#1530">1530: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1531" class="l"><a href="#1531">1531: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1532" class="l"><a href="#1532">1532: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1533" class="l"><a href="#1533">1533: </a>        ];
+</span><span id="1534" class="l"><a href="#1534">1534: </a>
+</span><span id="1535" class="l"><a href="#1535">1535: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
 </span><span id="1536" class="l"><a href="#1536">1536: </a>
-</span><span id="1537" class="l"><a href="#1537">1537: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1538" class="l"><a href="#1538">1538: </a>    }
+</span><span id="1537" class="l"><a href="#1537">1537: </a>        <span class="php-comment">// Appears to be unused</span>
+</span><span id="1538" class="l"><a href="#1538">1538: </a>        <span class="php-comment">// $ldapconfig['authrealm'] = $this-&gt;config-&gt;item('domain', 'ldap');</span>
 </span><span id="1539" class="l"><a href="#1539">1539: </a>
-</span><span id="1540" class="l"><a href="#1540">1540: </a>    <span class="php-comment">/**
-</span></span><span id="1541" class="l"><a href="#1541">1541: </a><span class="php-comment">     * Check if the user is logged in
-</span></span><span id="1542" class="l"><a href="#1542">1542: </a><span class="php-comment">     *
-</span></span><span id="1543" class="l"><a href="#1543">1543: </a><span class="php-comment">     * @access protected
-</span></span><span id="1544" class="l"><a href="#1544">1544: </a><span class="php-comment">     *
-</span></span><span id="1545" class="l"><a href="#1545">1545: </a><span class="php-comment">     * @param  string $username The user's name
-</span></span><span id="1546" class="l"><a href="#1546">1546: </a><span class="php-comment">     * @param  bool|string $password The user's password
-</span></span><span id="1547" class="l"><a href="#1547">1547: </a><span class="php-comment">     *
-</span></span><span id="1548" class="l"><a href="#1548">1548: </a><span class="php-comment">     * @return bool
-</span></span><span id="1549" class="l"><a href="#1549">1549: </a><span class="php-comment">     */</span>
-</span><span id="1550" class="l"><a href="#1550">1550: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1551" class="l"><a href="#1551">1551: </a>    {
-</span><span id="1552" class="l"><a href="#1552">1552: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1553" class="l"><a href="#1553">1553: </a>        {
-</span><span id="1554" class="l"><a href="#1554">1554: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1555" class="l"><a href="#1555">1555: </a>        }
-</span><span id="1556" class="l"><a href="#1556">1556: </a>
-</span><span id="1557" class="l"><a href="#1557">1557: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
-</span><span id="1558" class="l"><a href="#1558">1558: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="1559" class="l"><a href="#1559">1559: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
-</span><span id="1560" class="l"><a href="#1560">1560: </a>
-</span><span id="1561" class="l"><a href="#1561">1561: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
-</span><span id="1562" class="l"><a href="#1562">1562: </a>        {
-</span><span id="1563" class="l"><a href="#1563">1563: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
-</span><span id="1564" class="l"><a href="#1564">1564: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>) . <span class="php-quote">':'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
+</span><span id="1540" class="l"><a href="#1540">1540: </a>        <span class="php-comment">// connect to ldap server</span>
+</span><span id="1541" class="l"><a href="#1541">1541: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
+</span><span id="1542" class="l"><a href="#1542">1542: </a>
+</span><span id="1543" class="l"><a href="#1543">1543: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
+</span><span id="1544" class="l"><a href="#1544">1544: </a>        {
+</span><span id="1545" class="l"><a href="#1545">1545: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>] . <span class="php-quote">' seconds'</span>);
+</span><span id="1546" class="l"><a href="#1546">1546: </a>
+</span><span id="1547" class="l"><a href="#1547">1547: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
+</span><span id="1548" class="l"><a href="#1548">1548: </a>
+</span><span id="1549" class="l"><a href="#1549">1549: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>] . <span class="php-quote">' with dn '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
+</span><span id="1550" class="l"><a href="#1550">1550: </a>
+</span><span id="1551" class="l"><a href="#1551">1551: </a>            <span class="php-comment">// binding to ldap server</span>
+</span><span id="1552" class="l"><a href="#1552">1552: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
+</span><span id="1553" class="l"><a href="#1553">1553: </a>
+</span><span id="1554" class="l"><a href="#1554">1554: </a>            <span class="php-comment">// verify binding</span>
+</span><span id="1555" class="l"><a href="#1555">1555: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span>)
+</span><span id="1556" class="l"><a href="#1556">1556: </a>            {
+</span><span id="1557" class="l"><a href="#1557">1557: </a>                log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
+</span><span id="1558" class="l"><a href="#1558">1558: </a>            }
+</span><span id="1559" class="l"><a href="#1559">1559: </a>            <span class="php-keyword1">else</span>
+</span><span id="1560" class="l"><a href="#1560">1560: </a>            {
+</span><span id="1561" class="l"><a href="#1561">1561: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind unsuccessful'</span>);
+</span><span id="1562" class="l"><a href="#1562">1562: </a>
+</span><span id="1563" class="l"><a href="#1563">1563: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1564" class="l"><a href="#1564">1564: </a>            }
 </span><span id="1565" class="l"><a href="#1565">1565: </a>        }
 </span><span id="1566" class="l"><a href="#1566">1566: </a>
-</span><span id="1567" class="l"><a href="#1567">1567: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1568" class="l"><a href="#1568">1568: </a>        {
-</span><span id="1569" class="l"><a href="#1569">1569: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1570" class="l"><a href="#1570">1570: </a>        }
+</span><span id="1567" class="l"><a href="#1567">1567: </a>        <span class="php-comment">// search for user</span>
+</span><span id="1568" class="l"><a href="#1568">1568: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) == <span class="php-keyword1">FALSE</span>)
+</span><span id="1569" class="l"><a href="#1569">1569: </a>        {
+</span><span id="1570" class="l"><a href="#1570">1570: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span> . <span class="php-var">$username</span> . <span class="php-quote">' not found in search'</span>);
 </span><span id="1571" class="l"><a href="#1571">1571: </a>
-</span><span id="1572" class="l"><a href="#1572">1572: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
-</span><span id="1573" class="l"><a href="#1573">1573: </a>        {
-</span><span id="1574" class="l"><a href="#1574">1574: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
-</span><span id="1575" class="l"><a href="#1575">1575: </a>
-</span><span id="1576" class="l"><a href="#1576">1576: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1577" class="l"><a href="#1577">1577: </a>        }
+</span><span id="1572" class="l"><a href="#1572">1572: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1573" class="l"><a href="#1573">1573: </a>        }
+</span><span id="1574" class="l"><a href="#1574">1574: </a>
+</span><span id="1575" class="l"><a href="#1575">1575: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
+</span><span id="1576" class="l"><a href="#1576">1576: </a>        {
+</span><span id="1577" class="l"><a href="#1577">1577: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username '</span> . <span class="php-var">$username</span> . <span class="php-quote">'found more than once'</span>);
 </span><span id="1578" class="l"><a href="#1578">1578: </a>
-</span><span id="1579" class="l"><a href="#1579">1579: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
-</span><span id="1580" class="l"><a href="#1580">1580: </a>        {
-</span><span id="1581" class="l"><a href="#1581">1581: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
-</span><span id="1582" class="l"><a href="#1582">1582: </a>
-</span><span id="1583" class="l"><a href="#1583">1583: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1584" class="l"><a href="#1584">1584: </a>        }
+</span><span id="1579" class="l"><a href="#1579">1579: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1580" class="l"><a href="#1580">1580: </a>        }
+</span><span id="1581" class="l"><a href="#1581">1581: </a>
+</span><span id="1582" class="l"><a href="#1582">1582: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) == <span class="php-keyword1">FALSE</span>)
+</span><span id="1583" class="l"><a href="#1583">1583: </a>        {
+</span><span id="1584" class="l"><a href="#1584">1584: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, entry of searchresult could not be fetched'</span>);
 </span><span id="1585" class="l"><a href="#1585">1585: </a>
-</span><span id="1586" class="l"><a href="#1586">1586: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1587" class="l"><a href="#1587">1587: </a>        {
-</span><span id="1588" class="l"><a href="#1588">1588: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1589" class="l"><a href="#1589">1589: </a>        }
-</span><span id="1590" class="l"><a href="#1590">1590: </a>
-</span><span id="1591" class="l"><a href="#1591">1591: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
-</span><span id="1592" class="l"><a href="#1592">1592: </a>        {
+</span><span id="1586" class="l"><a href="#1586">1586: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1587" class="l"><a href="#1587">1587: </a>        }
+</span><span id="1588" class="l"><a href="#1588">1588: </a>
+</span><span id="1589" class="l"><a href="#1589">1589: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) == <span class="php-keyword1">FALSE</span>)
+</span><span id="1590" class="l"><a href="#1590">1590: </a>        {
+</span><span id="1591" class="l"><a href="#1591">1591: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, user-dn could not be fetched'</span>);
+</span><span id="1592" class="l"><a href="#1592">1592: </a>
 </span><span id="1593" class="l"><a href="#1593">1593: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
 </span><span id="1594" class="l"><a href="#1594">1594: </a>        }
 </span><span id="1595" class="l"><a href="#1595">1595: </a>
-</span><span id="1596" class="l"><a href="#1596">1596: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1597" class="l"><a href="#1597">1597: </a>    }
-</span><span id="1598" class="l"><a href="#1598">1598: </a>
-</span><span id="1599" class="l"><a href="#1599">1599: </a>    <span class="php-comment">/**
-</span></span><span id="1600" class="l"><a href="#1600">1600: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
-</span></span><span id="1601" class="l"><a href="#1601">1601: </a><span class="php-comment">     *
-</span></span><span id="1602" class="l"><a href="#1602">1602: </a><span class="php-comment">     * @access protected
-</span></span><span id="1603" class="l"><a href="#1603">1603: </a><span class="php-comment">     */</span>
-</span><span id="1604" class="l"><a href="#1604">1604: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
-</span><span id="1605" class="l"><a href="#1605">1605: </a>    {
-</span><span id="1606" class="l"><a href="#1606">1606: </a>        <span class="php-comment">// Get the auth_source config item</span>
-</span><span id="1607" class="l"><a href="#1607">1607: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
+</span><span id="1596" class="l"><a href="#1596">1596: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
+</span><span id="1597" class="l"><a href="#1597">1597: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) == <span class="php-keyword1">FALSE</span>)
+</span><span id="1598" class="l"><a href="#1598">1598: </a>        {
+</span><span id="1599" class="l"><a href="#1599">1599: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
+</span><span id="1600" class="l"><a href="#1600">1600: </a>
+</span><span id="1601" class="l"><a href="#1601">1601: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1602" class="l"><a href="#1602">1602: </a>        }
+</span><span id="1603" class="l"><a href="#1603">1603: </a>
+</span><span id="1604" class="l"><a href="#1604">1604: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span> . <span class="php-var">$user_dn</span> . <span class="php-quote">' authenticated successfully'</span>);
+</span><span id="1605" class="l"><a href="#1605">1605: </a>
+</span><span id="1606" class="l"><a href="#1606">1606: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
+</span><span id="1607" class="l"><a href="#1607">1607: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
 </span><span id="1608" class="l"><a href="#1608">1608: </a>
-</span><span id="1609" class="l"><a href="#1609">1609: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
-</span><span id="1610" class="l"><a href="#1610">1610: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
-</span><span id="1611" class="l"><a href="#1611">1611: </a>        {
-</span><span id="1612" class="l"><a href="#1612">1612: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1613" class="l"><a href="#1613">1613: </a>            <span class="php-var">$this</span>-&gt;response(
-</span><span id="1614" class="l"><a href="#1614">1614: </a>                [
-</span><span id="1615" class="l"><a href="#1615">1615: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1616" class="l"><a href="#1616">1616: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not Authorized'</span>
-</span><span id="1617" class="l"><a href="#1617">1617: </a>                ], <span class="php-num">401</span>);
-</span><span id="1618" class="l"><a href="#1618">1618: </a>        }
-</span><span id="1619" class="l"><a href="#1619">1619: </a>    }
-</span><span id="1620" class="l"><a href="#1620">1620: </a>
-</span><span id="1621" class="l"><a href="#1621">1621: </a>    <span class="php-comment">/**
-</span></span><span id="1622" class="l"><a href="#1622">1622: </a><span class="php-comment">     * Prepares for basic authentication
-</span></span><span id="1623" class="l"><a href="#1623">1623: </a><span class="php-comment">     *
-</span></span><span id="1624" class="l"><a href="#1624">1624: </a><span class="php-comment">     * @access protected
-</span></span><span id="1625" class="l"><a href="#1625">1625: </a><span class="php-comment">     */</span>
-</span><span id="1626" class="l"><a href="#1626">1626: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
-</span><span id="1627" class="l"><a href="#1627">1627: </a>    {
-</span><span id="1628" class="l"><a href="#1628">1628: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1629" class="l"><a href="#1629">1629: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
-</span><span id="1630" class="l"><a href="#1630">1630: </a>        {
-</span><span id="1631" class="l"><a href="#1631">1631: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1632" class="l"><a href="#1632">1632: </a>        }
-</span><span id="1633" class="l"><a href="#1633">1633: </a>
-</span><span id="1634" class="l"><a href="#1634">1634: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
-</span><span id="1635" class="l"><a href="#1635">1635: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
-</span><span id="1636" class="l"><a href="#1636">1636: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
-</span><span id="1637" class="l"><a href="#1637">1637: </a>
-</span><span id="1638" class="l"><a href="#1638">1638: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1639" class="l"><a href="#1639">1639: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1609" class="l"><a href="#1609">1609: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1610" class="l"><a href="#1610">1610: </a>    }
+</span><span id="1611" class="l"><a href="#1611">1611: </a>
+</span><span id="1612" class="l"><a href="#1612">1612: </a>    <span class="php-comment">/**
+</span></span><span id="1613" class="l"><a href="#1613">1613: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
+</span></span><span id="1614" class="l"><a href="#1614">1614: </a><span class="php-comment">     *
+</span></span><span id="1615" class="l"><a href="#1615">1615: </a><span class="php-comment">     * @access protected
+</span></span><span id="1616" class="l"><a href="#1616">1616: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1617" class="l"><a href="#1617">1617: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1618" class="l"><a href="#1618">1618: </a><span class="php-comment">     * @return bool
+</span></span><span id="1619" class="l"><a href="#1619">1619: </a><span class="php-comment">     */</span>
+</span><span id="1620" class="l"><a href="#1620">1620: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1621" class="l"><a href="#1621">1621: </a>    {
+</span><span id="1622" class="l"><a href="#1622">1622: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1623" class="l"><a href="#1623">1623: </a>        {
+</span><span id="1624" class="l"><a href="#1624">1624: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: failure, empty username'</span>);
+</span><span id="1625" class="l"><a href="#1625">1625: </a>
+</span><span id="1626" class="l"><a href="#1626">1626: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1627" class="l"><a href="#1627">1627: </a>        }
+</span><span id="1628" class="l"><a href="#1628">1628: </a>
+</span><span id="1629" class="l"><a href="#1629">1629: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
+</span><span id="1630" class="l"><a href="#1630">1630: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
+</span><span id="1631" class="l"><a href="#1631">1631: </a>
+</span><span id="1632" class="l"><a href="#1632">1632: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
+</span><span id="1633" class="l"><a href="#1633">1633: </a>        {
+</span><span id="1634" class="l"><a href="#1634">1634: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_class'</span>);
+</span><span id="1635" class="l"><a href="#1635">1635: </a>
+</span><span id="1636" class="l"><a href="#1636">1636: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1637" class="l"><a href="#1637">1637: </a>        }
+</span><span id="1638" class="l"><a href="#1638">1638: </a>
+</span><span id="1639" class="l"><a href="#1639">1639: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
 </span><span id="1640" class="l"><a href="#1640">1640: </a>        {
-</span><span id="1641" class="l"><a href="#1641">1641: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
-</span><span id="1642" class="l"><a href="#1642">1642: </a>        }
-</span><span id="1643" class="l"><a href="#1643">1643: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1644" class="l"><a href="#1644">1644: </a>        {
-</span><span id="1645" class="l"><a href="#1645">1645: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
-</span><span id="1646" class="l"><a href="#1646">1646: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
-</span><span id="1647" class="l"><a href="#1647">1647: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
-</span><span id="1648" class="l"><a href="#1648">1648: </a>            {
-</span><span id="1649" class="l"><a href="#1649">1649: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
-</span><span id="1650" class="l"><a href="#1650">1650: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
-</span><span id="1651" class="l"><a href="#1651">1651: </a>            }
-</span><span id="1652" class="l"><a href="#1652">1652: </a>        }
+</span><span id="1641" class="l"><a href="#1641">1641: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_function'</span>);
+</span><span id="1642" class="l"><a href="#1642">1642: </a>
+</span><span id="1643" class="l"><a href="#1643">1643: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1644" class="l"><a href="#1644">1644: </a>        }
+</span><span id="1645" class="l"><a href="#1645">1645: </a>
+</span><span id="1646" class="l"><a href="#1646">1646: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1647" class="l"><a href="#1647">1647: </a>        {
+</span><span id="1648" class="l"><a href="#1648">1648: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
+</span><span id="1649" class="l"><a href="#1649">1649: </a>        }
+</span><span id="1650" class="l"><a href="#1650">1650: </a>
+</span><span id="1651" class="l"><a href="#1651">1651: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1652" class="l"><a href="#1652">1652: </a>    }
 </span><span id="1653" class="l"><a href="#1653">1653: </a>
-</span><span id="1654" class="l"><a href="#1654">1654: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
-</span><span id="1655" class="l"><a href="#1655">1655: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1656" class="l"><a href="#1656">1656: </a>        {
-</span><span id="1657" class="l"><a href="#1657">1657: </a>            <span class="php-var">$this</span>-&gt;_force_login();
-</span><span id="1658" class="l"><a href="#1658">1658: </a>        }
-</span><span id="1659" class="l"><a href="#1659">1659: </a>    }
-</span><span id="1660" class="l"><a href="#1660">1660: </a>
-</span><span id="1661" class="l"><a href="#1661">1661: </a>    <span class="php-comment">/**
-</span></span><span id="1662" class="l"><a href="#1662">1662: </a><span class="php-comment">     * Prepares for digest authentication
-</span></span><span id="1663" class="l"><a href="#1663">1663: </a><span class="php-comment">     *
-</span></span><span id="1664" class="l"><a href="#1664">1664: </a><span class="php-comment">     * @access protected
-</span></span><span id="1665" class="l"><a href="#1665">1665: </a><span class="php-comment">     */</span>
-</span><span id="1666" class="l"><a href="#1666">1666: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
-</span><span id="1667" class="l"><a href="#1667">1667: </a>    {
-</span><span id="1668" class="l"><a href="#1668">1668: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1669" class="l"><a href="#1669">1669: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
-</span><span id="1670" class="l"><a href="#1670">1670: </a>        {
-</span><span id="1671" class="l"><a href="#1671">1671: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1672" class="l"><a href="#1672">1672: </a>        }
-</span><span id="1673" class="l"><a href="#1673">1673: </a>
-</span><span id="1674" class="l"><a href="#1674">1674: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
-</span><span id="1675" class="l"><a href="#1675">1675: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
-</span><span id="1676" class="l"><a href="#1676">1676: </a>        <span class="php-var">$digest_string</span> = <span class="php-quote">''</span>;
-</span><span id="1677" class="l"><a href="#1677">1677: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>))
-</span><span id="1678" class="l"><a href="#1678">1678: </a>        {
-</span><span id="1679" class="l"><a href="#1679">1679: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
-</span><span id="1680" class="l"><a href="#1680">1680: </a>        }
-</span><span id="1681" class="l"><a href="#1681">1681: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>))
-</span><span id="1682" class="l"><a href="#1682">1682: </a>        {
-</span><span id="1683" class="l"><a href="#1683">1683: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
-</span><span id="1684" class="l"><a href="#1684">1684: </a>        }
-</span><span id="1685" class="l"><a href="#1685">1685: </a>
-</span><span id="1686" class="l"><a href="#1686">1686: </a>        <span class="php-var">$uniqueId</span> = <span class="php-keyword2">uniqid</span>();
+</span><span id="1654" class="l"><a href="#1654">1654: </a>    <span class="php-comment">/**
+</span></span><span id="1655" class="l"><a href="#1655">1655: </a><span class="php-comment">     * Check if the user is logged in
+</span></span><span id="1656" class="l"><a href="#1656">1656: </a><span class="php-comment">     *
+</span></span><span id="1657" class="l"><a href="#1657">1657: </a><span class="php-comment">     * @access protected
+</span></span><span id="1658" class="l"><a href="#1658">1658: </a><span class="php-comment">     * @param  string $username The user's name
+</span></span><span id="1659" class="l"><a href="#1659">1659: </a><span class="php-comment">     * @param  bool|string $password The user's password
+</span></span><span id="1660" class="l"><a href="#1660">1660: </a><span class="php-comment">     * @return bool
+</span></span><span id="1661" class="l"><a href="#1661">1661: </a><span class="php-comment">     */</span>
+</span><span id="1662" class="l"><a href="#1662">1662: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="1663" class="l"><a href="#1663">1663: </a>    {
+</span><span id="1664" class="l"><a href="#1664">1664: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1665" class="l"><a href="#1665">1665: </a>        {
+</span><span id="1666" class="l"><a href="#1666">1666: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1667" class="l"><a href="#1667">1667: </a>        }
+</span><span id="1668" class="l"><a href="#1668">1668: </a>
+</span><span id="1669" class="l"><a href="#1669">1669: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
+</span><span id="1670" class="l"><a href="#1670">1670: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="1671" class="l"><a href="#1671">1671: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
+</span><span id="1672" class="l"><a href="#1672">1672: </a>
+</span><span id="1673" class="l"><a href="#1673">1673: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
+</span><span id="1674" class="l"><a href="#1674">1674: </a>        {
+</span><span id="1675" class="l"><a href="#1675">1675: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
+</span><span id="1676" class="l"><a href="#1676">1676: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>) . <span class="php-quote">':'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
+</span><span id="1677" class="l"><a href="#1677">1677: </a>        }
+</span><span id="1678" class="l"><a href="#1678">1678: </a>
+</span><span id="1679" class="l"><a href="#1679">1679: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1680" class="l"><a href="#1680">1680: </a>        {
+</span><span id="1681" class="l"><a href="#1681">1681: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1682" class="l"><a href="#1682">1682: </a>        }
+</span><span id="1683" class="l"><a href="#1683">1683: </a>
+</span><span id="1684" class="l"><a href="#1684">1684: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
+</span><span id="1685" class="l"><a href="#1685">1685: </a>        {
+</span><span id="1686" class="l"><a href="#1686">1686: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
 </span><span id="1687" class="l"><a href="#1687">1687: </a>
-</span><span id="1688" class="l"><a href="#1688">1688: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
-</span><span id="1689" class="l"><a href="#1689">1689: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
-</span><span id="1690" class="l"><a href="#1690">1690: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
-</span><span id="1691" class="l"><a href="#1691">1691: </a>        {
-</span><span id="1692" class="l"><a href="#1692">1692: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqueId</span>);
-</span><span id="1693" class="l"><a href="#1693">1693: </a>        }
+</span><span id="1688" class="l"><a href="#1688">1688: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1689" class="l"><a href="#1689">1689: </a>        }
+</span><span id="1690" class="l"><a href="#1690">1690: </a>
+</span><span id="1691" class="l"><a href="#1691">1691: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
+</span><span id="1692" class="l"><a href="#1692">1692: </a>        {
+</span><span id="1693" class="l"><a href="#1693">1693: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
 </span><span id="1694" class="l"><a href="#1694">1694: </a>
-</span><span id="1695" class="l"><a href="#1695">1695: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
-</span><span id="1696" class="l"><a href="#1696">1696: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="1697" class="l"><a href="#1697">1697: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
-</span><span id="1698" class="l"><a href="#1698">1698: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
-</span><span id="1699" class="l"><a href="#1699">1699: </a>
-</span><span id="1700" class="l"><a href="#1700">1700: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config</span>
-</span><span id="1701" class="l"><a href="#1701">1701: </a>        <span class="php-var">$A1</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
-</span><span id="1702" class="l"><a href="#1702">1702: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$A1</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1703" class="l"><a href="#1703">1703: </a>        {
-</span><span id="1704" class="l"><a href="#1704">1704: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqueId</span>);
-</span><span id="1705" class="l"><a href="#1705">1705: </a>        }
-</span><span id="1706" class="l"><a href="#1706">1706: </a>
-</span><span id="1707" class="l"><a href="#1707">1707: </a>        <span class="php-var">$A2</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method) . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
-</span><span id="1708" class="l"><a href="#1708">1708: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$A1</span> . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$A2</span>);
-</span><span id="1709" class="l"><a href="#1709">1709: </a>
-</span><span id="1710" class="l"><a href="#1710">1710: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
-</span><span id="1711" class="l"><a href="#1711">1711: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
-</span><span id="1712" class="l"><a href="#1712">1712: </a>        {
-</span><span id="1713" class="l"><a href="#1713">1713: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1714" class="l"><a href="#1714">1714: </a>            <span class="php-var">$this</span>-&gt;response(
-</span><span id="1715" class="l"><a href="#1715">1715: </a>                [
-</span><span id="1716" class="l"><a href="#1716">1716: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-num">0</span>,
-</span><span id="1717" class="l"><a href="#1717">1717: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid credentials'</span>
-</span><span id="1718" class="l"><a href="#1718">1718: </a>                ], <span class="php-num">401</span>);
-</span><span id="1719" class="l"><a href="#1719">1719: </a>        }
-</span><span id="1720" class="l"><a href="#1720">1720: </a>    }
+</span><span id="1695" class="l"><a href="#1695">1695: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1696" class="l"><a href="#1696">1696: </a>        }
+</span><span id="1697" class="l"><a href="#1697">1697: </a>
+</span><span id="1698" class="l"><a href="#1698">1698: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1699" class="l"><a href="#1699">1699: </a>        {
+</span><span id="1700" class="l"><a href="#1700">1700: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1701" class="l"><a href="#1701">1701: </a>        }
+</span><span id="1702" class="l"><a href="#1702">1702: </a>
+</span><span id="1703" class="l"><a href="#1703">1703: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
+</span><span id="1704" class="l"><a href="#1704">1704: </a>        {
+</span><span id="1705" class="l"><a href="#1705">1705: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1706" class="l"><a href="#1706">1706: </a>        }
+</span><span id="1707" class="l"><a href="#1707">1707: </a>
+</span><span id="1708" class="l"><a href="#1708">1708: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1709" class="l"><a href="#1709">1709: </a>    }
+</span><span id="1710" class="l"><a href="#1710">1710: </a>
+</span><span id="1711" class="l"><a href="#1711">1711: </a>    <span class="php-comment">/**
+</span></span><span id="1712" class="l"><a href="#1712">1712: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
+</span></span><span id="1713" class="l"><a href="#1713">1713: </a><span class="php-comment">     *
+</span></span><span id="1714" class="l"><a href="#1714">1714: </a><span class="php-comment">     * @access protected
+</span></span><span id="1715" class="l"><a href="#1715">1715: </a><span class="php-comment">     * @return void
+</span></span><span id="1716" class="l"><a href="#1716">1716: </a><span class="php-comment">     */</span>
+</span><span id="1717" class="l"><a href="#1717">1717: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
+</span><span id="1718" class="l"><a href="#1718">1718: </a>    {
+</span><span id="1719" class="l"><a href="#1719">1719: </a>        <span class="php-comment">// Get the auth_source config item</span>
+</span><span id="1720" class="l"><a href="#1720">1720: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
 </span><span id="1721" class="l"><a href="#1721">1721: </a>
-</span><span id="1722" class="l"><a href="#1722">1722: </a>    <span class="php-comment">/**
-</span></span><span id="1723" class="l"><a href="#1723">1723: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
-</span></span><span id="1724" class="l"><a href="#1724">1724: </a><span class="php-comment">     *
-</span></span><span id="1725" class="l"><a href="#1725">1725: </a><span class="php-comment">     * @access protected
-</span></span><span id="1726" class="l"><a href="#1726">1726: </a><span class="php-comment">     */</span>
-</span><span id="1727" class="l"><a href="#1727">1727: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
-</span><span id="1728" class="l"><a href="#1728">1728: </a>    {
-</span><span id="1729" class="l"><a href="#1729">1729: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
-</span><span id="1730" class="l"><a href="#1730">1730: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
-</span><span id="1731" class="l"><a href="#1731">1731: </a>
-</span><span id="1732" class="l"><a href="#1732">1732: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
-</span><span id="1733" class="l"><a href="#1733">1733: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
-</span><span id="1734" class="l"><a href="#1734">1734: </a>        {
-</span><span id="1735" class="l"><a href="#1735">1735: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1736" class="l"><a href="#1736">1736: </a>            <span class="php-var">$this</span>-&gt;response(
-</span><span id="1737" class="l"><a href="#1737">1737: </a>                [
-</span><span id="1738" class="l"><a href="#1738">1738: </a>                    <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1739" class="l"><a href="#1739">1739: </a>                    <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'IP Denied'</span>
-</span><span id="1740" class="l"><a href="#1740">1740: </a>                ],
-</span><span id="1741" class="l"><a href="#1741">1741: </a>                <span class="php-num">401</span>);
-</span><span id="1742" class="l"><a href="#1742">1742: </a>        }
-</span><span id="1743" class="l"><a href="#1743">1743: </a>    }
-</span><span id="1744" class="l"><a href="#1744">1744: </a>
-</span><span id="1745" class="l"><a href="#1745">1745: </a>    <span class="php-comment">/**
-</span></span><span id="1746" class="l"><a href="#1746">1746: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
-</span></span><span id="1747" class="l"><a href="#1747">1747: </a><span class="php-comment">     *
-</span></span><span id="1748" class="l"><a href="#1748">1748: </a><span class="php-comment">     * @access protected
-</span></span><span id="1749" class="l"><a href="#1749">1749: </a><span class="php-comment">     */</span>
-</span><span id="1750" class="l"><a href="#1750">1750: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
-</span><span id="1751" class="l"><a href="#1751">1751: </a>    {
-</span><span id="1752" class="l"><a href="#1752">1752: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
-</span><span id="1753" class="l"><a href="#1753">1753: </a>
-</span><span id="1754" class="l"><a href="#1754">1754: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
-</span><span id="1755" class="l"><a href="#1755">1755: </a>
-</span><span id="1756" class="l"><a href="#1756">1756: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">AS</span> &amp;<span class="php-var">$ip</span>)
+</span><span id="1722" class="l"><a href="#1722">1722: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
+</span><span id="1723" class="l"><a href="#1723">1723: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
+</span><span id="1724" class="l"><a href="#1724">1724: </a>        {
+</span><span id="1725" class="l"><a href="#1725">1725: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1726" class="l"><a href="#1726">1726: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1727" class="l"><a href="#1727">1727: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1728" class="l"><a href="#1728">1728: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not Authorized'</span>
+</span><span id="1729" class="l"><a href="#1729">1729: </a>                ], self::UNAUTHORIZED);
+</span><span id="1730" class="l"><a href="#1730">1730: </a>        }
+</span><span id="1731" class="l"><a href="#1731">1731: </a>    }
+</span><span id="1732" class="l"><a href="#1732">1732: </a>
+</span><span id="1733" class="l"><a href="#1733">1733: </a>    <span class="php-comment">/**
+</span></span><span id="1734" class="l"><a href="#1734">1734: </a><span class="php-comment">     * Prepares for basic authentication
+</span></span><span id="1735" class="l"><a href="#1735">1735: </a><span class="php-comment">     *
+</span></span><span id="1736" class="l"><a href="#1736">1736: </a><span class="php-comment">     * @access protected
+</span></span><span id="1737" class="l"><a href="#1737">1737: </a><span class="php-comment">     * @return void
+</span></span><span id="1738" class="l"><a href="#1738">1738: </a><span class="php-comment">     */</span>
+</span><span id="1739" class="l"><a href="#1739">1739: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
+</span><span id="1740" class="l"><a href="#1740">1740: </a>    {
+</span><span id="1741" class="l"><a href="#1741">1741: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1742" class="l"><a href="#1742">1742: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1743" class="l"><a href="#1743">1743: </a>        {
+</span><span id="1744" class="l"><a href="#1744">1744: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1745" class="l"><a href="#1745">1745: </a>        }
+</span><span id="1746" class="l"><a href="#1746">1746: </a>
+</span><span id="1747" class="l"><a href="#1747">1747: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
+</span><span id="1748" class="l"><a href="#1748">1748: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
+</span><span id="1749" class="l"><a href="#1749">1749: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
+</span><span id="1750" class="l"><a href="#1750">1750: </a>
+</span><span id="1751" class="l"><a href="#1751">1751: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1752" class="l"><a href="#1752">1752: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1753" class="l"><a href="#1753">1753: </a>        {
+</span><span id="1754" class="l"><a href="#1754">1754: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
+</span><span id="1755" class="l"><a href="#1755">1755: </a>        }
+</span><span id="1756" class="l"><a href="#1756">1756: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
 </span><span id="1757" class="l"><a href="#1757">1757: </a>        {
-</span><span id="1758" class="l"><a href="#1758">1758: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
-</span><span id="1759" class="l"><a href="#1759">1759: </a>        }
-</span><span id="1760" class="l"><a href="#1760">1760: </a>
-</span><span id="1761" class="l"><a href="#1761">1761: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1762" class="l"><a href="#1762">1762: </a>        {
-</span><span id="1763" class="l"><a href="#1763">1763: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'IP not authorized'</span>], <span class="php-num">401</span>);
-</span><span id="1764" class="l"><a href="#1764">1764: </a>        }
-</span><span id="1765" class="l"><a href="#1765">1765: </a>    }
+</span><span id="1758" class="l"><a href="#1758">1758: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
+</span><span id="1759" class="l"><a href="#1759">1759: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
+</span><span id="1760" class="l"><a href="#1760">1760: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
+</span><span id="1761" class="l"><a href="#1761">1761: </a>            {
+</span><span id="1762" class="l"><a href="#1762">1762: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
+</span><span id="1763" class="l"><a href="#1763">1763: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
+</span><span id="1764" class="l"><a href="#1764">1764: </a>            }
+</span><span id="1765" class="l"><a href="#1765">1765: </a>        }
 </span><span id="1766" class="l"><a href="#1766">1766: </a>
-</span><span id="1767" class="l"><a href="#1767">1767: </a>    <span class="php-comment">/**
-</span></span><span id="1768" class="l"><a href="#1768">1768: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
-</span></span><span id="1769" class="l"><a href="#1769">1769: </a><span class="php-comment">     *
-</span></span><span id="1770" class="l"><a href="#1770">1770: </a><span class="php-comment">     * @access protected
-</span></span><span id="1771" class="l"><a href="#1771">1771: </a><span class="php-comment">     *
-</span></span><span id="1772" class="l"><a href="#1772">1772: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
-</span></span><span id="1773" class="l"><a href="#1773">1773: </a><span class="php-comment">     * each time
-</span></span><span id="1774" class="l"><a href="#1774">1774: </a><span class="php-comment">     */</span>
-</span><span id="1775" class="l"><a href="#1775">1775: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
-</span><span id="1776" class="l"><a href="#1776">1776: </a>    {
-</span><span id="1777" class="l"><a href="#1777">1777: </a>        <span class="php-var">$restAuth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
-</span><span id="1778" class="l"><a href="#1778">1778: </a>        <span class="php-var">$restRealm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
-</span><span id="1779" class="l"><a href="#1779">1779: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'basic'</span>)
-</span><span id="1780" class="l"><a href="#1780">1780: </a>        {
-</span><span id="1781" class="l"><a href="#1781">1781: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
-</span><span id="1782" class="l"><a href="#1782">1782: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span> . <span class="php-var">$restRealm</span> . <span class="php-quote">'&quot;'</span>);
-</span><span id="1783" class="l"><a href="#1783">1783: </a>        }
-</span><span id="1784" class="l"><a href="#1784">1784: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'digest'</span>)
-</span><span id="1785" class="l"><a href="#1785">1785: </a>        {
-</span><span id="1786" class="l"><a href="#1786">1786: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
-</span><span id="1787" class="l"><a href="#1787">1787: </a>            <span class="php-keyword2">header</span>(
-</span><span id="1788" class="l"><a href="#1788">1788: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span> . <span class="php-var">$restRealm</span>
-</span><span id="1789" class="l"><a href="#1789">1789: </a>                . <span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span> . <span class="php-var">$nonce</span>
-</span><span id="1790" class="l"><a href="#1790">1790: </a>                . <span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$restRealm</span>) . <span class="php-quote">'&quot;'</span>);
-</span><span id="1791" class="l"><a href="#1791">1791: </a>        }
-</span><span id="1792" class="l"><a href="#1792">1792: </a>
-</span><span id="1793" class="l"><a href="#1793">1793: </a>        <span class="php-comment">// Display an error response</span>
-</span><span id="1794" class="l"><a href="#1794">1794: </a>        <span class="php-var">$this</span>-&gt;response(
-</span><span id="1795" class="l"><a href="#1795">1795: </a>            [
-</span><span id="1796" class="l"><a href="#1796">1796: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1797" class="l"><a href="#1797">1797: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not authorized'</span>
-</span><span id="1798" class="l"><a href="#1798">1798: </a>            ], <span class="php-num">401</span>);
-</span><span id="1799" class="l"><a href="#1799">1799: </a>    }
-</span><span id="1800" class="l"><a href="#1800">1800: </a>
-</span><span id="1801" class="l"><a href="#1801">1801: </a>    <span class="php-comment">/**
-</span></span><span id="1802" class="l"><a href="#1802">1802: </a><span class="php-comment">     * Updates the log table with the total access time
-</span></span><span id="1803" class="l"><a href="#1803">1803: </a><span class="php-comment">     *
-</span></span><span id="1804" class="l"><a href="#1804">1804: </a><span class="php-comment">     * @access protected
-</span></span><span id="1805" class="l"><a href="#1805">1805: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="1806" class="l"><a href="#1806">1806: </a><span class="php-comment">     *
-</span></span><span id="1807" class="l"><a href="#1807">1807: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="1808" class="l"><a href="#1808">1808: </a><span class="php-comment">     */</span>
-</span><span id="1809" class="l"><a href="#1809">1809: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
-</span><span id="1810" class="l"><a href="#1810">1810: </a>    {
-</span><span id="1811" class="l"><a href="#1811">1811: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
-</span><span id="1812" class="l"><a href="#1812">1812: </a>
-</span><span id="1813" class="l"><a href="#1813">1813: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1814" class="l"><a href="#1814">1814: </a>            -&gt;update(
-</span><span id="1815" class="l"><a href="#1815">1815: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="1816" class="l"><a href="#1816">1816: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="1817" class="l"><a href="#1817">1817: </a>            ]);
-</span><span id="1818" class="l"><a href="#1818">1818: </a>    }
-</span><span id="1819" class="l"><a href="#1819">1819: </a>
-</span><span id="1820" class="l"><a href="#1820">1820: </a>    <span class="php-comment">/**
-</span></span><span id="1821" class="l"><a href="#1821">1821: </a><span class="php-comment">     * Updates the log table with HTTP response code
-</span></span><span id="1822" class="l"><a href="#1822">1822: </a><span class="php-comment">     *
-</span></span><span id="1823" class="l"><a href="#1823">1823: </a><span class="php-comment">     * @access protected
-</span></span><span id="1824" class="l"><a href="#1824">1824: </a><span class="php-comment">     * @author Justin Chen
-</span></span><span id="1825" class="l"><a href="#1825">1825: </a><span class="php-comment">     *
-</span></span><span id="1826" class="l"><a href="#1826">1826: </a><span class="php-comment">     * @param $http_code int HTTP status code
-</span></span><span id="1827" class="l"><a href="#1827">1827: </a><span class="php-comment">     *
-</span></span><span id="1828" class="l"><a href="#1828">1828: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="1829" class="l"><a href="#1829">1829: </a><span class="php-comment">     */</span>
-</span><span id="1830" class="l"><a href="#1830">1830: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
-</span><span id="1831" class="l"><a href="#1831">1831: </a>    {
-</span><span id="1832" class="l"><a href="#1832">1832: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
-</span><span id="1833" class="l"><a href="#1833">1833: </a>
-</span><span id="1834" class="l"><a href="#1834">1834: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
-</span><span id="1835" class="l"><a href="#1835">1835: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="1836" class="l"><a href="#1836">1836: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="1837" class="l"><a href="#1837">1837: </a>        ]);
-</span><span id="1838" class="l"><a href="#1838">1838: </a>    }
-</span><span id="1839" class="l"><a href="#1839">1839: </a>
-</span><span id="1840" class="l"><a href="#1840">1840: </a>    <span class="php-comment">/**
-</span></span><span id="1841" class="l"><a href="#1841">1841: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
-</span></span><span id="1842" class="l"><a href="#1842">1842: </a><span class="php-comment">     *
-</span></span><span id="1843" class="l"><a href="#1843">1843: </a><span class="php-comment">     * @access protected
-</span></span><span id="1844" class="l"><a href="#1844">1844: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
-</span></span><span id="1845" class="l"><a href="#1845">1845: </a><span class="php-comment">     */</span>
-</span><span id="1846" class="l"><a href="#1846">1846: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
-</span><span id="1847" class="l"><a href="#1847">1847: </a>    {
-</span><span id="1848" class="l"><a href="#1848">1848: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
-</span><span id="1849" class="l"><a href="#1849">1849: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1850" class="l"><a href="#1850">1850: </a>        {
-</span><span id="1851" class="l"><a href="#1851">1851: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1852" class="l"><a href="#1852">1852: </a>        }
-</span><span id="1853" class="l"><a href="#1853">1853: </a>
-</span><span id="1854" class="l"><a href="#1854">1854: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
-</span><span id="1855" class="l"><a href="#1855">1855: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
-</span><span id="1856" class="l"><a href="#1856">1856: </a>            <span class="php-quote">'/'</span>, [
-</span><span id="1857" class="l"><a href="#1857">1857: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
-</span><span id="1858" class="l"><a href="#1858">1858: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
-</span><span id="1859" class="l"><a href="#1859">1859: </a>        ]);
-</span><span id="1860" class="l"><a href="#1860">1860: </a>
-</span><span id="1861" class="l"><a href="#1861">1861: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
-</span><span id="1862" class="l"><a href="#1862">1862: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
-</span><span id="1863" class="l"><a href="#1863">1863: </a>
-</span><span id="1864" class="l"><a href="#1864">1864: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
-</span><span id="1865" class="l"><a href="#1865">1865: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1866" class="l"><a href="#1866">1866: </a>                   -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1867" class="l"><a href="#1867">1867: </a>                   -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
-</span><span id="1868" class="l"><a href="#1868">1868: </a>                   -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
-</span><span id="1869" class="l"><a href="#1869">1869: </a>                   -&gt;num_rows() &gt; <span class="php-num">0</span>;
-</span><span id="1870" class="l"><a href="#1870">1870: </a>    }
-</span><span id="1871" class="l"><a href="#1871">1871: </a>
-</span><span id="1872" class="l"><a href="#1872">1872: </a>}
-</span><span id="1873" class="l"><a href="#1873">1873: </a></span></code></pre>
+</span><span id="1767" class="l"><a href="#1767">1767: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
+</span><span id="1768" class="l"><a href="#1768">1768: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1769" class="l"><a href="#1769">1769: </a>        {
+</span><span id="1770" class="l"><a href="#1770">1770: </a>            <span class="php-var">$this</span>-&gt;_force_login();
+</span><span id="1771" class="l"><a href="#1771">1771: </a>        }
+</span><span id="1772" class="l"><a href="#1772">1772: </a>    }
+</span><span id="1773" class="l"><a href="#1773">1773: </a>
+</span><span id="1774" class="l"><a href="#1774">1774: </a>    <span class="php-comment">/**
+</span></span><span id="1775" class="l"><a href="#1775">1775: </a><span class="php-comment">     * Prepares for digest authentication
+</span></span><span id="1776" class="l"><a href="#1776">1776: </a><span class="php-comment">     *
+</span></span><span id="1777" class="l"><a href="#1777">1777: </a><span class="php-comment">     * @access protected
+</span></span><span id="1778" class="l"><a href="#1778">1778: </a><span class="php-comment">     * @return void
+</span></span><span id="1779" class="l"><a href="#1779">1779: </a><span class="php-comment">     */</span>
+</span><span id="1780" class="l"><a href="#1780">1780: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
+</span><span id="1781" class="l"><a href="#1781">1781: </a>    {
+</span><span id="1782" class="l"><a href="#1782">1782: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1783" class="l"><a href="#1783">1783: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1784" class="l"><a href="#1784">1784: </a>        {
+</span><span id="1785" class="l"><a href="#1785">1785: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1786" class="l"><a href="#1786">1786: </a>        }
+</span><span id="1787" class="l"><a href="#1787">1787: </a>
+</span><span id="1788" class="l"><a href="#1788">1788: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
+</span><span id="1789" class="l"><a href="#1789">1789: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
+</span><span id="1790" class="l"><a href="#1790">1790: </a>        <span class="php-var">$digest_string</span> = <span class="php-quote">''</span>;
+</span><span id="1791" class="l"><a href="#1791">1791: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>))
+</span><span id="1792" class="l"><a href="#1792">1792: </a>        {
+</span><span id="1793" class="l"><a href="#1793">1793: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
+</span><span id="1794" class="l"><a href="#1794">1794: </a>        }
+</span><span id="1795" class="l"><a href="#1795">1795: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>))
+</span><span id="1796" class="l"><a href="#1796">1796: </a>        {
+</span><span id="1797" class="l"><a href="#1797">1797: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
+</span><span id="1798" class="l"><a href="#1798">1798: </a>        }
+</span><span id="1799" class="l"><a href="#1799">1799: </a>
+</span><span id="1800" class="l"><a href="#1800">1800: </a>        <span class="php-var">$uniqueId</span> = <span class="php-keyword2">uniqid</span>();
+</span><span id="1801" class="l"><a href="#1801">1801: </a>
+</span><span id="1802" class="l"><a href="#1802">1802: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
+</span><span id="1803" class="l"><a href="#1803">1803: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
+</span><span id="1804" class="l"><a href="#1804">1804: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
+</span><span id="1805" class="l"><a href="#1805">1805: </a>        {
+</span><span id="1806" class="l"><a href="#1806">1806: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqueId</span>);
+</span><span id="1807" class="l"><a href="#1807">1807: </a>        }
+</span><span id="1808" class="l"><a href="#1808">1808: </a>
+</span><span id="1809" class="l"><a href="#1809">1809: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
+</span><span id="1810" class="l"><a href="#1810">1810: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="1811" class="l"><a href="#1811">1811: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
+</span><span id="1812" class="l"><a href="#1812">1812: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
+</span><span id="1813" class="l"><a href="#1813">1813: </a>
+</span><span id="1814" class="l"><a href="#1814">1814: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config</span>
+</span><span id="1815" class="l"><a href="#1815">1815: </a>        <span class="php-var">$A1</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
+</span><span id="1816" class="l"><a href="#1816">1816: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$A1</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1817" class="l"><a href="#1817">1817: </a>        {
+</span><span id="1818" class="l"><a href="#1818">1818: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqueId</span>);
+</span><span id="1819" class="l"><a href="#1819">1819: </a>        }
+</span><span id="1820" class="l"><a href="#1820">1820: </a>
+</span><span id="1821" class="l"><a href="#1821">1821: </a>        <span class="php-var">$A2</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method) . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
+</span><span id="1822" class="l"><a href="#1822">1822: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$A1</span> . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$A2</span>);
+</span><span id="1823" class="l"><a href="#1823">1823: </a>
+</span><span id="1824" class="l"><a href="#1824">1824: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
+</span><span id="1825" class="l"><a href="#1825">1825: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
+</span><span id="1826" class="l"><a href="#1826">1826: </a>        {
+</span><span id="1827" class="l"><a href="#1827">1827: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1828" class="l"><a href="#1828">1828: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1829" class="l"><a href="#1829">1829: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-num">0</span>,
+</span><span id="1830" class="l"><a href="#1830">1830: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid credentials'</span>
+</span><span id="1831" class="l"><a href="#1831">1831: </a>                ], self::UNAUTHORIZED);
+</span><span id="1832" class="l"><a href="#1832">1832: </a>        }
+</span><span id="1833" class="l"><a href="#1833">1833: </a>    }
+</span><span id="1834" class="l"><a href="#1834">1834: </a>
+</span><span id="1835" class="l"><a href="#1835">1835: </a>    <span class="php-comment">/**
+</span></span><span id="1836" class="l"><a href="#1836">1836: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
+</span></span><span id="1837" class="l"><a href="#1837">1837: </a><span class="php-comment">     *
+</span></span><span id="1838" class="l"><a href="#1838">1838: </a><span class="php-comment">     * @access protected
+</span></span><span id="1839" class="l"><a href="#1839">1839: </a><span class="php-comment">     * @return void
+</span></span><span id="1840" class="l"><a href="#1840">1840: </a><span class="php-comment">     */</span>
+</span><span id="1841" class="l"><a href="#1841">1841: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
+</span><span id="1842" class="l"><a href="#1842">1842: </a>    {
+</span><span id="1843" class="l"><a href="#1843">1843: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
+</span><span id="1844" class="l"><a href="#1844">1844: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
+</span><span id="1845" class="l"><a href="#1845">1845: </a>
+</span><span id="1846" class="l"><a href="#1846">1846: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
+</span><span id="1847" class="l"><a href="#1847">1847: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
+</span><span id="1848" class="l"><a href="#1848">1848: </a>        {
+</span><span id="1849" class="l"><a href="#1849">1849: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1850" class="l"><a href="#1850">1850: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1851" class="l"><a href="#1851">1851: </a>                    <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1852" class="l"><a href="#1852">1852: </a>                    <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'IP Denied'</span>
+</span><span id="1853" class="l"><a href="#1853">1853: </a>                ],
+</span><span id="1854" class="l"><a href="#1854">1854: </a>                self::UNAUTHORIZED);
+</span><span id="1855" class="l"><a href="#1855">1855: </a>        }
+</span><span id="1856" class="l"><a href="#1856">1856: </a>    }
+</span><span id="1857" class="l"><a href="#1857">1857: </a>
+</span><span id="1858" class="l"><a href="#1858">1858: </a>    <span class="php-comment">/**
+</span></span><span id="1859" class="l"><a href="#1859">1859: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
+</span></span><span id="1860" class="l"><a href="#1860">1860: </a><span class="php-comment">     *
+</span></span><span id="1861" class="l"><a href="#1861">1861: </a><span class="php-comment">     * @access protected
+</span></span><span id="1862" class="l"><a href="#1862">1862: </a><span class="php-comment">     * @return void
+</span></span><span id="1863" class="l"><a href="#1863">1863: </a><span class="php-comment">     */</span>
+</span><span id="1864" class="l"><a href="#1864">1864: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
+</span><span id="1865" class="l"><a href="#1865">1865: </a>    {
+</span><span id="1866" class="l"><a href="#1866">1866: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
+</span><span id="1867" class="l"><a href="#1867">1867: </a>
+</span><span id="1868" class="l"><a href="#1868">1868: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
+</span><span id="1869" class="l"><a href="#1869">1869: </a>
+</span><span id="1870" class="l"><a href="#1870">1870: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">AS</span> &amp;<span class="php-var">$ip</span>)
+</span><span id="1871" class="l"><a href="#1871">1871: </a>        {
+</span><span id="1872" class="l"><a href="#1872">1872: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
+</span><span id="1873" class="l"><a href="#1873">1873: </a>        }
+</span><span id="1874" class="l"><a href="#1874">1874: </a>
+</span><span id="1875" class="l"><a href="#1875">1875: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1876" class="l"><a href="#1876">1876: </a>        {
+</span><span id="1877" class="l"><a href="#1877">1877: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'IP not authorized'</span>], self::UNAUTHORIZED);
+</span><span id="1878" class="l"><a href="#1878">1878: </a>        }
+</span><span id="1879" class="l"><a href="#1879">1879: </a>    }
+</span><span id="1880" class="l"><a href="#1880">1880: </a>
+</span><span id="1881" class="l"><a href="#1881">1881: </a>    <span class="php-comment">/**
+</span></span><span id="1882" class="l"><a href="#1882">1882: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
+</span></span><span id="1883" class="l"><a href="#1883">1883: </a><span class="php-comment">     *
+</span></span><span id="1884" class="l"><a href="#1884">1884: </a><span class="php-comment">     * @access protected
+</span></span><span id="1885" class="l"><a href="#1885">1885: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
+</span></span><span id="1886" class="l"><a href="#1886">1886: </a><span class="php-comment">     * each time
+</span></span><span id="1887" class="l"><a href="#1887">1887: </a><span class="php-comment">     * @return void
+</span></span><span id="1888" class="l"><a href="#1888">1888: </a><span class="php-comment">     */</span>
+</span><span id="1889" class="l"><a href="#1889">1889: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
+</span><span id="1890" class="l"><a href="#1890">1890: </a>    {
+</span><span id="1891" class="l"><a href="#1891">1891: </a>        <span class="php-var">$restAuth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
+</span><span id="1892" class="l"><a href="#1892">1892: </a>        <span class="php-var">$restRealm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
+</span><span id="1893" class="l"><a href="#1893">1893: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'basic'</span>)
+</span><span id="1894" class="l"><a href="#1894">1894: </a>        {
+</span><span id="1895" class="l"><a href="#1895">1895: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
+</span><span id="1896" class="l"><a href="#1896">1896: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span> . <span class="php-var">$restRealm</span> . <span class="php-quote">'&quot;'</span>);
+</span><span id="1897" class="l"><a href="#1897">1897: </a>        }
+</span><span id="1898" class="l"><a href="#1898">1898: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'digest'</span>)
+</span><span id="1899" class="l"><a href="#1899">1899: </a>        {
+</span><span id="1900" class="l"><a href="#1900">1900: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
+</span><span id="1901" class="l"><a href="#1901">1901: </a>            <span class="php-keyword2">header</span>(
+</span><span id="1902" class="l"><a href="#1902">1902: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span> . <span class="php-var">$restRealm</span>
+</span><span id="1903" class="l"><a href="#1903">1903: </a>                . <span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span> . <span class="php-var">$nonce</span>
+</span><span id="1904" class="l"><a href="#1904">1904: </a>                . <span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$restRealm</span>) . <span class="php-quote">'&quot;'</span>);
+</span><span id="1905" class="l"><a href="#1905">1905: </a>        }
+</span><span id="1906" class="l"><a href="#1906">1906: </a>
+</span><span id="1907" class="l"><a href="#1907">1907: </a>        <span class="php-comment">// Display an error response</span>
+</span><span id="1908" class="l"><a href="#1908">1908: </a>        <span class="php-var">$this</span>-&gt;response([
+</span><span id="1909" class="l"><a href="#1909">1909: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1910" class="l"><a href="#1910">1910: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not authorized'</span>
+</span><span id="1911" class="l"><a href="#1911">1911: </a>            ], self::UNAUTHORIZED);
+</span><span id="1912" class="l"><a href="#1912">1912: </a>    }
+</span><span id="1913" class="l"><a href="#1913">1913: </a>
+</span><span id="1914" class="l"><a href="#1914">1914: </a>    <span class="php-comment">/**
+</span></span><span id="1915" class="l"><a href="#1915">1915: </a><span class="php-comment">     * Updates the log table with the total access time
+</span></span><span id="1916" class="l"><a href="#1916">1916: </a><span class="php-comment">     *
+</span></span><span id="1917" class="l"><a href="#1917">1917: </a><span class="php-comment">     * @access protected
+</span></span><span id="1918" class="l"><a href="#1918">1918: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="1919" class="l"><a href="#1919">1919: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="1920" class="l"><a href="#1920">1920: </a><span class="php-comment">     */</span>
+</span><span id="1921" class="l"><a href="#1921">1921: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
+</span><span id="1922" class="l"><a href="#1922">1922: </a>    {
+</span><span id="1923" class="l"><a href="#1923">1923: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
+</span><span id="1924" class="l"><a href="#1924">1924: </a>
+</span><span id="1925" class="l"><a href="#1925">1925: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1926" class="l"><a href="#1926">1926: </a>            -&gt;update(
+</span><span id="1927" class="l"><a href="#1927">1927: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="1928" class="l"><a href="#1928">1928: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="1929" class="l"><a href="#1929">1929: </a>            ]);
+</span><span id="1930" class="l"><a href="#1930">1930: </a>    }
+</span><span id="1931" class="l"><a href="#1931">1931: </a>
+</span><span id="1932" class="l"><a href="#1932">1932: </a>    <span class="php-comment">/**
+</span></span><span id="1933" class="l"><a href="#1933">1933: </a><span class="php-comment">     * Updates the log table with HTTP response code
+</span></span><span id="1934" class="l"><a href="#1934">1934: </a><span class="php-comment">     *
+</span></span><span id="1935" class="l"><a href="#1935">1935: </a><span class="php-comment">     * @access protected
+</span></span><span id="1936" class="l"><a href="#1936">1936: </a><span class="php-comment">     * @author Justin Chen
+</span></span><span id="1937" class="l"><a href="#1937">1937: </a><span class="php-comment">     * @param $http_code int HTTP status code
+</span></span><span id="1938" class="l"><a href="#1938">1938: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="1939" class="l"><a href="#1939">1939: </a><span class="php-comment">     */</span>
+</span><span id="1940" class="l"><a href="#1940">1940: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
+</span><span id="1941" class="l"><a href="#1941">1941: </a>    {
+</span><span id="1942" class="l"><a href="#1942">1942: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
+</span><span id="1943" class="l"><a href="#1943">1943: </a>
+</span><span id="1944" class="l"><a href="#1944">1944: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
+</span><span id="1945" class="l"><a href="#1945">1945: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="1946" class="l"><a href="#1946">1946: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="1947" class="l"><a href="#1947">1947: </a>        ]);
+</span><span id="1948" class="l"><a href="#1948">1948: </a>    }
+</span><span id="1949" class="l"><a href="#1949">1949: </a>
+</span><span id="1950" class="l"><a href="#1950">1950: </a>    <span class="php-comment">/**
+</span></span><span id="1951" class="l"><a href="#1951">1951: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
+</span></span><span id="1952" class="l"><a href="#1952">1952: </a><span class="php-comment">     *
+</span></span><span id="1953" class="l"><a href="#1953">1953: </a><span class="php-comment">     * @access protected
+</span></span><span id="1954" class="l"><a href="#1954">1954: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
+</span></span><span id="1955" class="l"><a href="#1955">1955: </a><span class="php-comment">     */</span>
+</span><span id="1956" class="l"><a href="#1956">1956: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
+</span><span id="1957" class="l"><a href="#1957">1957: </a>    {
+</span><span id="1958" class="l"><a href="#1958">1958: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
+</span><span id="1959" class="l"><a href="#1959">1959: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1960" class="l"><a href="#1960">1960: </a>        {
+</span><span id="1961" class="l"><a href="#1961">1961: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1962" class="l"><a href="#1962">1962: </a>        }
+</span><span id="1963" class="l"><a href="#1963">1963: </a>
+</span><span id="1964" class="l"><a href="#1964">1964: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
+</span><span id="1965" class="l"><a href="#1965">1965: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
+</span><span id="1966" class="l"><a href="#1966">1966: </a>            <span class="php-quote">'/'</span>, [
+</span><span id="1967" class="l"><a href="#1967">1967: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
+</span><span id="1968" class="l"><a href="#1968">1968: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
+</span><span id="1969" class="l"><a href="#1969">1969: </a>        ]);
+</span><span id="1970" class="l"><a href="#1970">1970: </a>
+</span><span id="1971" class="l"><a href="#1971">1971: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
+</span><span id="1972" class="l"><a href="#1972">1972: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
+</span><span id="1973" class="l"><a href="#1973">1973: </a>
+</span><span id="1974" class="l"><a href="#1974">1974: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
+</span><span id="1975" class="l"><a href="#1975">1975: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1976" class="l"><a href="#1976">1976: </a>                   -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1977" class="l"><a href="#1977">1977: </a>                   -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
+</span><span id="1978" class="l"><a href="#1978">1978: </a>                   -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
+</span><span id="1979" class="l"><a href="#1979">1979: </a>                   -&gt;num_rows() &gt; <span class="php-num">0</span>;
+</span><span id="1980" class="l"><a href="#1980">1980: </a>    }
+</span><span id="1981" class="l"><a href="#1981">1981: </a>
+</span><span id="1982" class="l"><a href="#1982">1982: </a>}
+</span><span id="1983" class="l"><a href="#1983">1983: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?44e93de8fc3b749f55d0fae2da59a38c45b15f0b"></script>
+<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>

From 74839ccdfbcf4aede3d6d31c07650047e755e787 Mon Sep 17 00:00:00 2001
From: Tjoosten <Tjoosten3@gmail.com>
Date: Thu, 16 Jul 2015 15:01:20 +0200
Subject: [PATCH 045/354] implement http codes

---
 application/controllers/api/Example.php   |  2 +-
 application/libraries/REST_Controller.php | 67 ++++++++++++++++++++++-
 2 files changed, 65 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 570a2a57..5f939857 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -49,7 +49,7 @@ function user_get()
 
         if ($user)
         {
-            $this->response($user, 200); // 200 being the HTTP response code
+            $this->response($user, self::HTTP_OK); // 200 being the HTTP response code
         }
 
         else
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index f9314bb3..132b1945 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -15,6 +15,67 @@
  * @version         3.0.0
  */
 abstract class REST_Controller extends CI_Controller {
+
+    const HTTP_CONTINUE = 100;
+    const HTTP_SWITCHING_PROTOCOLS = 101;
+    const HTTP_PROCESSING = 102;            // RFC2518
+    const HTTP_OK = 200;
+    const HTTP_CREATED = 201;
+    const HTTP_ACCEPTED = 202;
+    const HTTP_NON_AUTHORITATIVE_INFORMATION = 203;
+    const HTTP_NO_CONTENT = 204;
+    const HTTP_RESET_CONTENT = 205;
+    const HTTP_PARTIAL_CONTENT = 206;
+    const HTTP_MULTI_STATUS = 207;          // RFC4918
+    const HTTP_ALREADY_REPORTED = 208;      // RFC5842
+    const HTTP_IM_USED = 226;               // RFC3229
+    const HTTP_MULTIPLE_CHOICES = 300;
+    const HTTP_MOVED_PERMANENTLY = 301;
+    const HTTP_FOUND = 302;
+    const HTTP_SEE_OTHER = 303;
+    const HTTP_NOT_MODIFIED = 304;
+    const HTTP_USE_PROXY = 305;
+    const HTTP_RESERVED = 306;
+    const HTTP_TEMPORARY_REDIRECT = 307;
+    const HTTP_PERMANENTLY_REDIRECT = 308;  // RFC7238
+    const HTTP_BAD_REQUEST = 400;
+    const HTTP_UNAUTHORIZED = 401;
+    const HTTP_PAYMENT_REQUIRED = 402;
+    const HTTP_FORBIDDEN = 403;
+    const HTTP_NOT_FOUND = 404;
+    const HTTP_METHOD_NOT_ALLOWED = 405;
+    const HTTP_NOT_ACCEPTABLE = 406;
+    const HTTP_PROXY_AUTHENTICATION_REQUIRED = 407;
+    const HTTP_REQUEST_TIMEOUT = 408;
+    const HTTP_CONFLICT = 409;
+    const HTTP_GONE = 410;
+    const HTTP_LENGTH_REQUIRED = 411;
+    const HTTP_PRECONDITION_FAILED = 412;
+    const HTTP_REQUEST_ENTITY_TOO_LARGE = 413;
+    const HTTP_REQUEST_URI_TOO_LONG = 414;
+    const HTTP_UNSUPPORTED_MEDIA_TYPE = 415;
+    const HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
+    const HTTP_EXPECTATION_FAILED = 417;
+    const HTTP_I_AM_A_TEAPOT = 418;                                               // RFC2324
+    const HTTP_UNPROCESSABLE_ENTITY = 422;                                        // RFC4918
+    const HTTP_LOCKED = 423;                                                      // RFC4918
+    const HTTP_FAILED_DEPENDENCY = 424;                                           // RFC4918
+    const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425;   // RFC2817
+    const HTTP_UPGRADE_REQUIRED = 426;                                            // RFC2817
+    const HTTP_PRECONDITION_REQUIRED = 428;                                       // RFC6585
+    const HTTP_TOO_MANY_REQUESTS = 429;                                           // RFC6585
+    const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;                             // RFC6585
+    const HTTP_INTERNAL_SERVER_ERROR = 500;
+    const HTTP_NOT_IMPLEMENTED = 501;
+    const HTTP_BAD_GATEWAY = 502;
+    const HTTP_SERVICE_UNAVAILABLE = 503;
+    const HTTP_GATEWAY_TIMEOUT = 504;
+    const HTTP_VERSION_NOT_SUPPORTED = 505;
+    const HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL = 506;                        // RFC2295
+    const HTTP_INSUFFICIENT_STORAGE = 507;                                        // RFC4918
+    const HTTP_LOOP_DETECTED = 508;                                               // RFC5842
+    const HTTP_NOT_EXTENDED = 510;                                                // RFC2774
+    const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511;
     /**
      * This defines the rest format.
      * Must be overridden it in a controller so that it is set.
@@ -569,7 +630,7 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
         // If not greater than zero, then set the HTTP status code as 200 by default
         // Though perhaps 500 should be set instead, for the developer not passing a
         // correct HTTP status code
-        $http_code > 0 || $http_code = 200;
+        $http_code > 0 || $http_code = self::HTTP_OK;
 
         set_status_header($http_code);
 
@@ -905,8 +966,8 @@ protected function _check_limit($controller_method)
         $limit = $this->methods[$controller_method]['limit'];
 
         $uri_noext = $this->uri->uri_string();
-        if (strpos(strrev($this->uri->uri_string()), strrev($this->response->format)) === 0) 
-        { 
+        if (strpos(strrev($this->uri->uri_string()), strrev($this->response->format)) === 0)
+        {
             $uri_noext = substr($this->uri->uri_string(),0, -strlen($this->response->format)-1);
         }
 

From 4ca2c8aa6a60c64cc128211f9f8524f25c237e70 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 16 Jul 2015 16:09:28 +0300
Subject: [PATCH 046/354] Fixing a variable name typo.

---
 application/libraries/Format.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 6ec4a224..fe36e7f8 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -354,7 +354,7 @@ public function to_csv($data = NULL, $delimiter = ',', $enclosure = '"')
         }
 
         // Apply the headings
-        fputcsv($handle, $headers, $delimiter, $enclosure);
+        fputcsv($handle, $headings, $delimiter, $enclosure);
 
         foreach ($data as $record)
         {

From 7fa4f00474f5b81b082f46b271026f60f3065f98 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 08:50:49 +0300
Subject: [PATCH 047/354] Unified status codes

---
 application/controllers/api/Example.php   | 12 ++---
 application/controllers/api/Key.php       | 28 ++++++------
 application/libraries/REST_Controller.php | 54 +++++++++++------------
 3 files changed, 47 insertions(+), 47 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 570a2a57..33f0149f 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -49,12 +49,12 @@ function user_get()
 
         if ($user)
         {
-            $this->response($user, 200); // 200 being the HTTP response code
+            $this->response($user, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
 
         else
         {
-            $this->response(['error' => 'User could not be found'], 404);
+            $this->response(['error' => 'User could not be found'], REST_Controller::NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
         }
     }
 
@@ -68,7 +68,7 @@ function user_post()
             'message' => 'Added a resource'
         ];
 
-        $this->response($message, 201); // 201 being the HTTP response code
+        $this->response($message, REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
     }
 
     function user_delete()
@@ -79,7 +79,7 @@ function user_delete()
             'message' => 'Deleted the resource'
         ];
 
-        $this->response($message, 204); // 204 being the HTTP response code
+        $this->response($message, REST_Controller::HTTP_NO_CONTENT); // NO_CONTENT (204) being the HTTP response code
     }
 
     function users_get()
@@ -93,12 +93,12 @@ function users_get()
 
         if ($users)
         {
-            $this->response($users, 200); // 200 being the HTTP response code
+            $this->response($users, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
 
         else
         {
-            $this->response(['error' => 'Couldn\'t find any users!'], 404);
+            $this->response(['error' => 'Couldn\'t find any users!'], REST_Controller::NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
         }
     }
 
diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
index 7577c4d8..0127cab5 100644
--- a/application/controllers/api/Key.php
+++ b/application/controllers/api/Key.php
@@ -47,14 +47,14 @@ public function index_put()
             $this->response([
                 'status' => 1,
                 'key' => $key
-            ], REST_Controller::CREATED); // CREATED (201) being the HTTP response code
+            ], REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
         }
         else
         {
             $this->response([
                 'status' => 0,
                 'error' => 'Could not save the key'
-            ], REST_Controller::INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
+            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
     }
 
@@ -77,7 +77,7 @@ public function index_delete()
             // It doesn't appear the key exists
             $this->response([
                 'error' => 'Invalid API Key'
-            ], REST_Controller::BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
+            ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
         // Destroy it
@@ -87,7 +87,7 @@ public function index_delete()
         $this->response([
             'status' => 1,
             'success' => 'API Key was deleted'
-            ], REST_Controller::NO_CONTENT); // NO_CONTENT (204) being the HTTP response code
+            ], REST_Controller::HTTP_NO_CONTENT); // NO_CONTENT (204) being the HTTP response code
     }
 
     // --------------------------------------------------------------------
@@ -110,7 +110,7 @@ public function level_post()
             // It doesn't appear the key exists
             $this->response([
                 'error' => 'Invalid API Key'
-            ], REST_Controller::BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
+            ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
         // Update the key level
@@ -119,14 +119,14 @@ public function level_post()
             $this->response([
                 'status' => 1,
                 'success' => 'API Key was updated'
-            ], REST_Controller::OK); // OK (200) being the HTTP response code
+            ], REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
         else
         {
             $this->response([
                 'status' => 0,
                 'error' => 'Could not update the key level'
-            ], REST_Controller::INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
+            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
     }
 
@@ -149,7 +149,7 @@ public function suspend_post()
             // It doesn't appear the key exists
             $this->response([
                 'error' => 'Invalid API Key'
-            ], REST_Controller::BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
+            ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
         // Update the key level
@@ -158,14 +158,14 @@ public function suspend_post()
             $this->response([
                 'status' => 1,
                 'success' => 'Key was suspended'
-            ], REST_Controller::OK); // OK (200) being the HTTP response code
+            ], REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
         else
         {
             $this->response([
                 'status' => 0,
                 'error' => 'Could not suspend the user'
-            ], REST_Controller::INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
+            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
     }
 
@@ -189,7 +189,7 @@ public function regenerate_post()
             // It doesn't appear the key exists
             $this->response([
                 'error' => 'Invalid API Key'
-            ], REST_Controller::BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
+            ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
         // Build a new key
@@ -204,14 +204,14 @@ public function regenerate_post()
             $this->response([
                 'status' => 1,
                 'key' => $new_key
-            ], REST_Controller::CREATED); // CREATED (201) being the HTTP response code
+            ], REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
         }
         else
         {
             $this->response([
                 'status' => 0,
                 'error' => 'Could not save the key'
-            ], REST_Controller::INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
+            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
     }
 
@@ -225,7 +225,7 @@ private function _generate_key()
         {
             // Generate a random salt
             $salt = $this->security->get_random_bytes(64);
-            
+
             // If an error occurred, then fall back to the previous method
             if ($salt === FALSE)
             {
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 0cbd28b9..1b6638d8 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -350,19 +350,19 @@ abstract class REST_Controller extends CI_Controller {
      * @link http://www.restapitutorial.com/httpstatuscodes.html
      */
     protected $http_status_codes = [
-        self::OK => 'OK',
-        self::CREATED => 'CREATED',
-        self::NO_CONTENT => 'NO CONTENT',
-        self::NOT_MODIFIED => 'NOT MODIFIED',
-        self::BAD_REQUEST => 'BAD REQUEST',
-        self::UNAUTHORIZED => 'UNAUTHORIZED',
-        self::FORBIDDEN => 'FORBIDDEN',
-        self::NOT_FOUND => 'NOT FOUND',
-        self::METHOD_NOT_ALLOWED => 'METHOD NOT ALLOWED',
-        self::NOT_ACCEPTABLE => 'NOT ACCEPTABLE',
-        self::CONFLICT => 'CONFLICT',
-        self::INTERNAL_SERVER_ERROR => 'INTERNAL SERVER ERROR',
-        self::NOT_IMPLEMENTED => 'NOT IMPLEMENTED'
+        self::HTTP_OK => 'OK',
+        self::HTTP_CREATED => 'CREATED',
+        self::HTTP_NO_CONTENT => 'NO CONTENT',
+        self::HTTP_NOT_MODIFIED => 'NOT MODIFIED',
+        self::HTTP_BAD_REQUEST => 'BAD REQUEST',
+        self::HTTP_UNAUTHORIZED => 'UNAUTHORIZED',
+        self::HTTP_FORBIDDEN => 'FORBIDDEN',
+        self::HTTP_NOT_FOUND => 'NOT FOUND',
+        self::HTTP_METHOD_NOT_ALLOWED => 'METHOD NOT ALLOWED',
+        self::HTTP_NOT_ACCEPTABLE => 'NOT ACCEPTABLE',
+        self::HTTP_CONFLICT => 'CONFLICT',
+        self::HTTP_INTERNAL_SERVER_ERROR => 'INTERNAL SERVER ERROR',
+        self::HTTP_NOT_IMPLEMENTED => 'NOT IMPLEMENTED'
     ];
 
     /**
@@ -513,7 +513,7 @@ public function __construct($config = 'rest')
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
                     $this->config->item('rest_message_field_name') => 'Only AJAX requests are acceptable'
-                ], self::NOT_ACCEPTABLE);
+                ], self::HTTP_NOT_ACCEPTABLE);
         }
 
         // When there is no specific override for the current class/method, use the default auth value set in the config
@@ -572,7 +572,7 @@ public function _remap($object_called, $arguments)
         // Should we answer if not over SSL?
         if ($this->config->item('force_https') && $this->request->ssl === FALSE)
         {
-            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Unsupported protocol'], self::FORBIDDEN);
+            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Unsupported protocol'], self::HTTP_FORBIDDEN);
         }
 
         // Remove the supported format from the function name e.g. index.json => index
@@ -594,7 +594,7 @@ public function _remap($object_called, $arguments)
                 $this->_log_request();
             }
 
-            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Invalid API Key ' . $this->rest->key], self::FORBIDDEN);
+            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Invalid API Key ' . $this->rest->key], self::HTTP_FORBIDDEN);
         }
 
         // Check to see if this key has access to the requested controller.
@@ -605,13 +605,13 @@ public function _remap($object_called, $arguments)
                 $this->_log_request();
             }
 
-            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key does not have access to the requested controller.'], self::UNAUTHORIZED);
+            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key does not have access to the requested controller.'], self::HTTP_UNAUTHORIZED);
         }
 
         // Sure it exists, but can they do anything with it?
         if (method_exists($this, $controller_method) === FALSE)
         {
-            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Unknown method.'], self::NOT_FOUND);
+            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Unknown method.'], self::HTTP_NOT_FOUND);
         }
 
         // Doing key related stuff? Can only do it if they have a key right?
@@ -621,7 +621,7 @@ public function _remap($object_called, $arguments)
             if ($this->config->item('rest_enable_limits') && $this->_check_limit($controller_method) === FALSE)
             {
                 $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key has reached the time limit for this method.'];
-                $this->response($response, self::UNAUTHORIZED);
+                $this->response($response, self::HTTP_UNAUTHORIZED);
             }
 
             // If no level is set use 0, they probably aren't using permissions
@@ -638,7 +638,7 @@ public function _remap($object_called, $arguments)
 
             // They don't have good enough perms
             $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key does not have enough permissions.'];
-            $authorized || $this->response($response, self::UNAUTHORIZED);
+            $authorized || $this->response($response, self::HTTP_UNAUTHORIZED);
         }
 
         // No key stuff, but record that stuff is happening
@@ -661,7 +661,7 @@ public function _remap($object_called, $arguments)
                         'classname' => get_class($ex),
                         'message' => $ex->getMessage()
                     ]
-                ], self::INTERNAL_SERVER_ERROR);
+                ], self::HTTP_INTERNAL_SERVER_ERROR);
         }
     }
 
@@ -689,7 +689,7 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
         // If data is NULL and no HTTP status code provided, then display, error and exit
         if ($data === NULL && $http_code === NULL)
         {
-            $http_code = self::NOT_FOUND;
+            $http_code = self::HTTP_NOT_FOUND;
         }
 
         // If data is not NULL and a HTTP status code provided, then continue
@@ -1787,7 +1787,7 @@ protected function _check_php_session()
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
                     $this->config->item('rest_message_field_name') => 'Not Authorized'
-                ], self::UNAUTHORIZED);
+                ], self::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -1889,7 +1889,7 @@ protected function _prepare_digest_auth()
             $this->response([
                     $this->config->item('rest_status_field_name') => 0,
                     $this->config->item('rest_message_field_name') => 'Invalid credentials'
-                ], self::UNAUTHORIZED);
+                ], self::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -1912,7 +1912,7 @@ protected function _check_blacklist_auth()
                     'status' => FALSE,
                     'error' => 'IP Denied'
                 ],
-                self::UNAUTHORIZED);
+                self::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -1935,7 +1935,7 @@ protected function _check_whitelist_auth()
 
         if (in_array($this->input->ip_address(), $whitelist) === FALSE)
         {
-            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'IP not authorized'], self::UNAUTHORIZED);
+            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'IP not authorized'], self::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -1969,7 +1969,7 @@ protected function _force_login($nonce = '')
         $this->response([
                 $this->config->item('rest_status_field_name') => FALSE,
                 $this->config->item('rest_message_field_name') => 'Not authorized'
-            ], self::UNAUTHORIZED);
+            ], self::HTTP_UNAUTHORIZED);
     }
 
     /**

From c42d60754f9676e8d1cbd25771d66a2ea116c40e Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 08:57:25 +0300
Subject: [PATCH 048/354] Tidied comments

---
 application/controllers/api/Example.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 33f0149f..9d6dcf62 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -24,11 +24,10 @@ function __construct()
         parent::__construct();
 
         // Configure limits on our controller methods
-        // Ensure you have created the 'limits' table and enabled 'limits'
-        // within application/config/rest.php
-        $this->methods['user_get']['limit'] = 500; //500 requests per hour per user/key
-        $this->methods['user_post']['limit'] = 100; //100 requests per hour per user/key
-        $this->methods['user_delete']['limit'] = 50; //50 requests per hour per user/key
+        // Ensure you have created the 'limits' table and enabled 'limits' within application/config/rest.php
+        $this->methods['user_get']['limit'] = 500; // 500 requests per hour per user/key
+        $this->methods['user_post']['limit'] = 100; // 100 requests per hour per user/key
+        $this->methods['user_delete']['limit'] = 50; // 50 requests per hour per user/key
     }
 
     function user_get()

From 6bae80f77ab1ab7940e8d487aa437ad1aaaf15c7 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 08:59:33 +0300
Subject: [PATCH 049/354] Added documentation for popular status codes and
 removed duplicates

---
 application/libraries/REST_Controller.php | 154 +++++++++++-----------
 1 file changed, 74 insertions(+), 80 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 1b6638d8..6d4d8862 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -16,37 +16,96 @@
  */
 abstract class REST_Controller extends CI_Controller {
 
+    // Note: Only the widley used HTTP status codes are documented
+
+    // Informational
+
     const HTTP_CONTINUE = 100;
     const HTTP_SWITCHING_PROTOCOLS = 101;
     const HTTP_PROCESSING = 102;            // RFC2518
+
+    // Success
+
+    /**
+     * The request has succeeded
+     */
     const HTTP_OK = 200;
+
+    /**
+     * The server successfully created a new resource
+     */
     const HTTP_CREATED = 201;
     const HTTP_ACCEPTED = 202;
     const HTTP_NON_AUTHORITATIVE_INFORMATION = 203;
+
+    /**
+     * The server successfully processed the request, though no content is returned
+     */
     const HTTP_NO_CONTENT = 204;
     const HTTP_RESET_CONTENT = 205;
     const HTTP_PARTIAL_CONTENT = 206;
     const HTTP_MULTI_STATUS = 207;          // RFC4918
     const HTTP_ALREADY_REPORTED = 208;      // RFC5842
     const HTTP_IM_USED = 226;               // RFC3229
+
+    // Redirection
+
     const HTTP_MULTIPLE_CHOICES = 300;
     const HTTP_MOVED_PERMANENTLY = 301;
     const HTTP_FOUND = 302;
     const HTTP_SEE_OTHER = 303;
+
+    /**
+     * The resource has not been modified since the last request
+     */
     const HTTP_NOT_MODIFIED = 304;
     const HTTP_USE_PROXY = 305;
     const HTTP_RESERVED = 306;
     const HTTP_TEMPORARY_REDIRECT = 307;
     const HTTP_PERMANENTLY_REDIRECT = 308;  // RFC7238
+
+    // Client Error
+
+    /**
+     * The request cannot be fulfilled due to multiple errors
+     */
     const HTTP_BAD_REQUEST = 400;
+
+    /**
+     * The user is unauthorized to access the requested resource
+     */
     const HTTP_UNAUTHORIZED = 401;
     const HTTP_PAYMENT_REQUIRED = 402;
+
+    /**
+     * The requested resource is unavailable at this present time
+     */
     const HTTP_FORBIDDEN = 403;
+
+    /**
+     * The requested resource could not be found
+     *
+     * Note: This is sometimes used to mask if there was an UNAUTHORIZED (401) or
+     * FORBIDDEN (403) error, for security reasons
+     */
     const HTTP_NOT_FOUND = 404;
+
+    /**
+     * The request method is not supported by the following resource
+     */
     const HTTP_METHOD_NOT_ALLOWED = 405;
+
+    /**
+     * The request was not acceptable
+     */
     const HTTP_NOT_ACCEPTABLE = 406;
     const HTTP_PROXY_AUTHENTICATION_REQUIRED = 407;
     const HTTP_REQUEST_TIMEOUT = 408;
+
+    /**
+     * The request could not be completed due to a conflict with the current state
+     * of the resource
+     */
     const HTTP_CONFLICT = 409;
     const HTTP_GONE = 410;
     const HTTP_LENGTH_REQUIRED = 411;
@@ -65,7 +124,20 @@ abstract class REST_Controller extends CI_Controller {
     const HTTP_PRECONDITION_REQUIRED = 428;                                       // RFC6585
     const HTTP_TOO_MANY_REQUESTS = 429;                                           // RFC6585
     const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;                             // RFC6585
+
+    // Server Error
+
+    /**
+     * The server encountered an unexpected error
+     *
+     * Note: This is a generic error message when no specific message
+     * is suitable
+     */
     const HTTP_INTERNAL_SERVER_ERROR = 500;
+
+    /**
+     * The server does not recognised the request method
+     */
     const HTTP_NOT_IMPLEMENTED = 501;
     const HTTP_BAD_GATEWAY = 502;
     const HTTP_SERVICE_UNAVAILABLE = 503;
@@ -76,6 +148,7 @@ abstract class REST_Controller extends CI_Controller {
     const HTTP_LOOP_DETECTED = 508;                                               // RFC5842
     const HTTP_NOT_EXTENDED = 510;                                                // RFC2774
     const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511;
+
     /**
      * This defines the rest format.
      * Must be overridden it in a controller so that it is set.
@@ -263,88 +336,9 @@ abstract class REST_Controller extends CI_Controller {
      */
     protected $_enable_xss = FALSE;
 
-    // Success
-
-    /**
-     * The request has succeeded
-     */
-    const OK = 200;
-
-    /**
-     * The server successfully created a new resource
-     */
-    const CREATED = 201;
-
-    /**
-     * The server successfully processed the request, though no content is returned
-     */
-    const NO_CONTENT = 204;
-
-    // Redirection
-
-    /**
-     * The resource has not been modified since the last request
-     */
-    const NOT_MODIFIED = 304;
-
-    // Client Error
-
-    /**
-     * The request cannot be fulfilled due to multiple errors
-     */
-    const BAD_REQUEST = 400;
-
-    /**
-     * The user is unauthorized to access the requested resource
-     */
-    const UNAUTHORIZED = 401;
-
-    /**
-     * The requested resource is unavailable at this present time
-     */
-    const FORBIDDEN = 403;
-
-    /**
-     * The requested resource could not be found
-     *
-     * Note: This is sometimes used to mask if there was an UNAUTHORIZED (401) or
-     * FORBIDDEN (403) error, for security reasons
-     */
-    const NOT_FOUND = 404;
-
-    /**
-     * The request method is not supported by the following resource
-     */
-    const METHOD_NOT_ALLOWED = 405;
-
-    /**
-     * The request was not acceptable
-     */
-    const NOT_ACCEPTABLE = 406;
-
-    /**
-     * The request could not be completed due to a conflict with the current state
-     * of the resource
-     */
-    const CONFLICT = 409;
-
-    // Server Error
-
-    /**
-     * The server encountered an unexpected error
-     *
-     * Note: This is a generic error message when no specific message
-     * is suitable
-     */
-    const INTERNAL_SERVER_ERROR = 500;
-
-    /**
-     * The server does not recognised the request method
-     */
-    const NOT_IMPLEMENTED = 501;
-
     /**
      * HTTP status codes and their respective description
+     * Note: Only the widley used HTTP status codes are used
      *
      * @var array
      * @link http://www.restapitutorial.com/httpstatuscodes.html

From fe434d624b4cfd9a2195a177a38555e4001ce129 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 09:24:34 +0300
Subject: [PATCH 050/354] Updated documentation with apigen to show the latest
 changes

---
 documentation/class-Example.html              |   89 +-
 documentation/class-Key.html                  |   73 +-
 documentation/class-REST_Controller.html      | 1448 ++++++-
 documentation/resources/combined.js           |    2 +-
 documentation/source-class-Example.html       |  177 +-
 documentation/source-class-Format.html        |    2 +-
 documentation/source-class-Key.html           |   28 +-
 .../source-class-REST_Controller.html         | 3841 +++++++++--------
 8 files changed, 3469 insertions(+), 2191 deletions(-)

diff --git a/documentation/class-Example.html b/documentation/class-Example.html
index 21f1d336..0ea5f635 100644
--- a/documentation/class-Example.html
+++ b/documentation/class-Example.html
@@ -138,7 +138,7 @@ <h1>Class Example</h1>
 				Phil Sturgeon, Chris Kacerguis<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-Example.html#8-114" title="Go to source code">controllers/api/Example.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-Example.html#8-113" title="Go to source code">controllers/api/Example.php</a>
 		<br>
 	</div>
 
@@ -158,7 +158,7 @@ <h1>Class Example</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___construct">#</a>
-		<code><a href="http://github.com/source-class-Example.html#21-32" title="Go to source code">__construct</a>( <span>string <var>$config</var>,…</span> )</code>
+		<code><a href="http://github.com/source-class-Example.html#21-31" title="Go to source code">__construct</a>( <span>string <var>$config</var>,…</span> )</code>
 
 		<div class="description short">
 			<p>Constructor for the REST API</p>
@@ -196,7 +196,7 @@ <h4>Overrides</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_user_get">#</a>
-		<code><a href="http://github.com/source-class-Example.html#34-59" title="Go to source code">user_get</a>( )</code>
+		<code><a href="http://github.com/source-class-Example.html#33-58" title="Go to source code">user_get</a>( )</code>
 
 		<div class="description short">
 			
@@ -226,7 +226,7 @@ <h4>Overrides</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_user_post">#</a>
-		<code><a href="http://github.com/source-class-Example.html#61-72" title="Go to source code">user_post</a>( )</code>
+		<code><a href="http://github.com/source-class-Example.html#60-71" title="Go to source code">user_post</a>( )</code>
 
 		<div class="description short">
 			
@@ -256,7 +256,7 @@ <h4>Overrides</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_user_delete">#</a>
-		<code><a href="http://github.com/source-class-Example.html#74-83" title="Go to source code">user_delete</a>( )</code>
+		<code><a href="http://github.com/source-class-Example.html#73-82" title="Go to source code">user_delete</a>( )</code>
 
 		<div class="description short">
 			
@@ -286,7 +286,7 @@ <h4>Overrides</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_users_get">#</a>
-		<code><a href="http://github.com/source-class-Example.html#85-103" title="Go to source code">users_get</a>( )</code>
+		<code><a href="http://github.com/source-class-Example.html#84-102" title="Go to source code">users_get</a>( )</code>
 
 		<div class="description short">
 			
@@ -316,7 +316,7 @@ <h4>Overrides</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_send_post">#</a>
-		<code><a href="http://github.com/source-class-Example.html#105-108" title="Go to source code">send_post</a>( )</code>
+		<code><a href="http://github.com/source-class-Example.html#104-107" title="Go to source code">send_post</a>( )</code>
 
 		<div class="description short">
 			
@@ -346,7 +346,7 @@ <h4>Overrides</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_send_put">#</a>
-		<code><a href="http://github.com/source-class-Example.html#110-113" title="Go to source code">send_put</a>( )</code>
+		<code><a href="http://github.com/source-class-Example.html#109-112" title="Go to source code">send_put</a>( )</code>
 
 		<div class="description short">
 			
@@ -427,19 +427,66 @@ <h4>Overrides</h4>
 	<caption>Constants inherited from <a href="http://github.com/class-REST_Controller.html#constants">REST_Controller</a></caption>
 	<tr>
 		<td><code>
-			<a href="http://github.com/class-REST_Controller.html#BAD_REQUEST"><b>BAD_REQUEST</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#CONFLICT"><b>CONFLICT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#CREATED"><b>CREATED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#FORBIDDEN"><b>FORBIDDEN</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#INTERNAL_SERVER_ERROR"><b>INTERNAL_SERVER_ERROR</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#METHOD_NOT_ALLOWED"><b>METHOD_NOT_ALLOWED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#NOT_ACCEPTABLE"><b>NOT_ACCEPTABLE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#NOT_FOUND"><b>NOT_FOUND</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#NOT_IMPLEMENTED"><b>NOT_IMPLEMENTED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#NOT_MODIFIED"><b>NOT_MODIFIED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#NO_CONTENT"><b>NO_CONTENT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#OK"><b>OK</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#UNAUTHORIZED"><b>UNAUTHORIZED</b></a>
+			<a href="http://github.com/class-REST_Controller.html#HTTP_ACCEPTED"><b>HTTP_ACCEPTED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_ALREADY_REPORTED"><b>HTTP_ALREADY_REPORTED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_BAD_GATEWAY"><b>HTTP_BAD_GATEWAY</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_BAD_REQUEST"><b>HTTP_BAD_REQUEST</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_CONFLICT"><b>HTTP_CONFLICT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_CONTINUE"><b>HTTP_CONTINUE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_CREATED"><b>HTTP_CREATED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_EXPECTATION_FAILED"><b>HTTP_EXPECTATION_FAILED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_FAILED_DEPENDENCY"><b>HTTP_FAILED_DEPENDENCY</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_FORBIDDEN"><b>HTTP_FORBIDDEN</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_FOUND"><b>HTTP_FOUND</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_GATEWAY_TIMEOUT"><b>HTTP_GATEWAY_TIMEOUT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_GONE"><b>HTTP_GONE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_IM_USED"><b>HTTP_IM_USED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_INSUFFICIENT_STORAGE"><b>HTTP_INSUFFICIENT_STORAGE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_INTERNAL_SERVER_ERROR"><b>HTTP_INTERNAL_SERVER_ERROR</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_I_AM_A_TEAPOT"><b>HTTP_I_AM_A_TEAPOT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_LENGTH_REQUIRED"><b>HTTP_LENGTH_REQUIRED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_LOCKED"><b>HTTP_LOCKED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_LOOP_DETECTED"><b>HTTP_LOOP_DETECTED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_METHOD_NOT_ALLOWED"><b>HTTP_METHOD_NOT_ALLOWED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_MOVED_PERMANENTLY"><b>HTTP_MOVED_PERMANENTLY</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_MULTIPLE_CHOICES"><b>HTTP_MULTIPLE_CHOICES</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_MULTI_STATUS"><b>HTTP_MULTI_STATUS</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_NETWORK_AUTHENTICATION_REQUIRED"><b>HTTP_NETWORK_AUTHENTICATION_REQUIRED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_NON_AUTHORITATIVE_INFORMATION"><b>HTTP_NON_AUTHORITATIVE_INFORMATION</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_ACCEPTABLE"><b>HTTP_NOT_ACCEPTABLE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_EXTENDED"><b>HTTP_NOT_EXTENDED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_FOUND"><b>HTTP_NOT_FOUND</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_IMPLEMENTED"><b>HTTP_NOT_IMPLEMENTED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_MODIFIED"><b>HTTP_NOT_MODIFIED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_NO_CONTENT"><b>HTTP_NO_CONTENT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_OK"><b>HTTP_OK</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_PARTIAL_CONTENT"><b>HTTP_PARTIAL_CONTENT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_PAYMENT_REQUIRED"><b>HTTP_PAYMENT_REQUIRED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_PERMANENTLY_REDIRECT"><b>HTTP_PERMANENTLY_REDIRECT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_PRECONDITION_FAILED"><b>HTTP_PRECONDITION_FAILED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_PRECONDITION_REQUIRED"><b>HTTP_PRECONDITION_REQUIRED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_PROCESSING"><b>HTTP_PROCESSING</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_PROXY_AUTHENTICATION_REQUIRED"><b>HTTP_PROXY_AUTHENTICATION_REQUIRED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUESTED_RANGE_NOT_SATISFIABLE"><b>HTTP_REQUESTED_RANGE_NOT_SATISFIABLE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUEST_ENTITY_TOO_LARGE"><b>HTTP_REQUEST_ENTITY_TOO_LARGE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE"><b>HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUEST_TIMEOUT"><b>HTTP_REQUEST_TIMEOUT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUEST_URI_TOO_LONG"><b>HTTP_REQUEST_URI_TOO_LONG</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_RESERVED"><b>HTTP_RESERVED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL"><b>HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_RESET_CONTENT"><b>HTTP_RESET_CONTENT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_SEE_OTHER"><b>HTTP_SEE_OTHER</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_SERVICE_UNAVAILABLE"><b>HTTP_SERVICE_UNAVAILABLE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_SWITCHING_PROTOCOLS"><b>HTTP_SWITCHING_PROTOCOLS</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_TEMPORARY_REDIRECT"><b>HTTP_TEMPORARY_REDIRECT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_TOO_MANY_REQUESTS"><b>HTTP_TOO_MANY_REQUESTS</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_UNAUTHORIZED"><b>HTTP_UNAUTHORIZED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_UNPROCESSABLE_ENTITY"><b>HTTP_UNPROCESSABLE_ENTITY</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_UNSUPPORTED_MEDIA_TYPE"><b>HTTP_UNSUPPORTED_MEDIA_TYPE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_UPGRADE_REQUIRED"><b>HTTP_UPGRADE_REQUIRED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_USE_PROXY"><b>HTTP_USE_PROXY</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL"><b>HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_VERSION_NOT_SUPPORTED"><b>HTTP_VERSION_NOT_SUPPORTED</b></a>
 		</code></td>
 	</tr>
 	</table>
diff --git a/documentation/class-Key.html b/documentation/class-Key.html
index 6de485a6..ca24db79 100644
--- a/documentation/class-Key.html
+++ b/documentation/class-Key.html
@@ -370,19 +370,66 @@ <h1>Class Key</h1>
 	<caption>Constants inherited from <a href="http://github.com/class-REST_Controller.html#constants">REST_Controller</a></caption>
 	<tr>
 		<td><code>
-			<a href="http://github.com/class-REST_Controller.html#BAD_REQUEST"><b>BAD_REQUEST</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#CONFLICT"><b>CONFLICT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#CREATED"><b>CREATED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#FORBIDDEN"><b>FORBIDDEN</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#INTERNAL_SERVER_ERROR"><b>INTERNAL_SERVER_ERROR</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#METHOD_NOT_ALLOWED"><b>METHOD_NOT_ALLOWED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#NOT_ACCEPTABLE"><b>NOT_ACCEPTABLE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#NOT_FOUND"><b>NOT_FOUND</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#NOT_IMPLEMENTED"><b>NOT_IMPLEMENTED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#NOT_MODIFIED"><b>NOT_MODIFIED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#NO_CONTENT"><b>NO_CONTENT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#OK"><b>OK</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#UNAUTHORIZED"><b>UNAUTHORIZED</b></a>
+			<a href="http://github.com/class-REST_Controller.html#HTTP_ACCEPTED"><b>HTTP_ACCEPTED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_ALREADY_REPORTED"><b>HTTP_ALREADY_REPORTED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_BAD_GATEWAY"><b>HTTP_BAD_GATEWAY</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_BAD_REQUEST"><b>HTTP_BAD_REQUEST</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_CONFLICT"><b>HTTP_CONFLICT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_CONTINUE"><b>HTTP_CONTINUE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_CREATED"><b>HTTP_CREATED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_EXPECTATION_FAILED"><b>HTTP_EXPECTATION_FAILED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_FAILED_DEPENDENCY"><b>HTTP_FAILED_DEPENDENCY</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_FORBIDDEN"><b>HTTP_FORBIDDEN</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_FOUND"><b>HTTP_FOUND</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_GATEWAY_TIMEOUT"><b>HTTP_GATEWAY_TIMEOUT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_GONE"><b>HTTP_GONE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_IM_USED"><b>HTTP_IM_USED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_INSUFFICIENT_STORAGE"><b>HTTP_INSUFFICIENT_STORAGE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_INTERNAL_SERVER_ERROR"><b>HTTP_INTERNAL_SERVER_ERROR</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_I_AM_A_TEAPOT"><b>HTTP_I_AM_A_TEAPOT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_LENGTH_REQUIRED"><b>HTTP_LENGTH_REQUIRED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_LOCKED"><b>HTTP_LOCKED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_LOOP_DETECTED"><b>HTTP_LOOP_DETECTED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_METHOD_NOT_ALLOWED"><b>HTTP_METHOD_NOT_ALLOWED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_MOVED_PERMANENTLY"><b>HTTP_MOVED_PERMANENTLY</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_MULTIPLE_CHOICES"><b>HTTP_MULTIPLE_CHOICES</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_MULTI_STATUS"><b>HTTP_MULTI_STATUS</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_NETWORK_AUTHENTICATION_REQUIRED"><b>HTTP_NETWORK_AUTHENTICATION_REQUIRED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_NON_AUTHORITATIVE_INFORMATION"><b>HTTP_NON_AUTHORITATIVE_INFORMATION</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_ACCEPTABLE"><b>HTTP_NOT_ACCEPTABLE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_EXTENDED"><b>HTTP_NOT_EXTENDED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_FOUND"><b>HTTP_NOT_FOUND</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_IMPLEMENTED"><b>HTTP_NOT_IMPLEMENTED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_MODIFIED"><b>HTTP_NOT_MODIFIED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_NO_CONTENT"><b>HTTP_NO_CONTENT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_OK"><b>HTTP_OK</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_PARTIAL_CONTENT"><b>HTTP_PARTIAL_CONTENT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_PAYMENT_REQUIRED"><b>HTTP_PAYMENT_REQUIRED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_PERMANENTLY_REDIRECT"><b>HTTP_PERMANENTLY_REDIRECT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_PRECONDITION_FAILED"><b>HTTP_PRECONDITION_FAILED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_PRECONDITION_REQUIRED"><b>HTTP_PRECONDITION_REQUIRED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_PROCESSING"><b>HTTP_PROCESSING</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_PROXY_AUTHENTICATION_REQUIRED"><b>HTTP_PROXY_AUTHENTICATION_REQUIRED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUESTED_RANGE_NOT_SATISFIABLE"><b>HTTP_REQUESTED_RANGE_NOT_SATISFIABLE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUEST_ENTITY_TOO_LARGE"><b>HTTP_REQUEST_ENTITY_TOO_LARGE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE"><b>HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUEST_TIMEOUT"><b>HTTP_REQUEST_TIMEOUT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUEST_URI_TOO_LONG"><b>HTTP_REQUEST_URI_TOO_LONG</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_RESERVED"><b>HTTP_RESERVED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL"><b>HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_RESET_CONTENT"><b>HTTP_RESET_CONTENT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_SEE_OTHER"><b>HTTP_SEE_OTHER</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_SERVICE_UNAVAILABLE"><b>HTTP_SERVICE_UNAVAILABLE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_SWITCHING_PROTOCOLS"><b>HTTP_SWITCHING_PROTOCOLS</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_TEMPORARY_REDIRECT"><b>HTTP_TEMPORARY_REDIRECT</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_TOO_MANY_REQUESTS"><b>HTTP_TOO_MANY_REQUESTS</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_UNAUTHORIZED"><b>HTTP_UNAUTHORIZED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_UNPROCESSABLE_ENTITY"><b>HTTP_UNPROCESSABLE_ENTITY</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_UNSUPPORTED_MEDIA_TYPE"><b>HTTP_UNSUPPORTED_MEDIA_TYPE</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_UPGRADE_REQUIRED"><b>HTTP_UPGRADE_REQUIRED</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_USE_PROXY"><b>HTTP_USE_PROXY</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL"><b>HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL</b></a>, 
+			<a href="http://github.com/class-REST_Controller.html#HTTP_VERSION_NOT_SUPPORTED"><b>HTTP_VERSION_NOT_SUPPORTED</b></a>
 		</code></td>
 	</tr>
 	</table>
diff --git a/documentation/class-REST_Controller.html b/documentation/class-REST_Controller.html
index 84a6ae64..42e5c034 100644
--- a/documentation/class-REST_Controller.html
+++ b/documentation/class-REST_Controller.html
@@ -137,7 +137,7 @@ <h4>Direct known subclasses</h4>
 				3.0.0<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-1982" title="Go to source code">libraries/REST_Controller.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-2037" title="Go to source code">libraries/REST_Controller.php</a>
 		<br>
 	</div>
 
@@ -157,7 +157,7 @@ <h4>Direct known subclasses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_early_checks">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#307-315" title="Go to source code">early_checks</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#362-370" title="Go to source code">early_checks</a>( )</code>
 
 		<div class="description short">
 			<p>Extend this function to apply additional checking early on in the process</p>
@@ -187,7 +187,7 @@ <h4>Direct known subclasses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___construct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#317-479" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#372-534" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
 
 		<div class="description short">
 			<p>Constructor for the REST API</p>
@@ -223,7 +223,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___destruct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#481-498" title="Go to source code">__destruct</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#536-553" title="Go to source code">__destruct</a>( )</code>
 
 		<div class="description short">
 			<p>Deconstructor</p>
@@ -257,7 +257,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__remap">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#500-605" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#555-660" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var></span> )</code>
 
 		<div class="description short">
 			<p>Requests are not made to methods directly, the request will be for
@@ -298,7 +298,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#607-710" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#662-765" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Takes mixed data and optionally a status code, then creates the response</p>
@@ -338,7 +338,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_input_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#712-744" title="Go to source code">_detect_input_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#767-799" title="Go to source code">_detect_input_format</a>( )</code>
 
 		<div class="description short">
 			<p>Get the input format e.g. json or xml</p>
@@ -372,7 +372,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_output_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#746-829" title="Go to source code">_detect_output_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#801-884" title="Go to source code">_detect_output_format</a>( )</code>
 
 		<div class="description short">
 			<p>Detect which format should be used to output the data</p>
@@ -406,7 +406,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_method">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#831-861" title="Go to source code">_detect_method</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#886-916" title="Go to source code">_detect_method</a>( )</code>
 
 		<div class="description short">
 			<p>Get the HTTP request string e.g. get or post</p>
@@ -440,7 +440,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_api_key">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#863-935" title="Go to source code">_detect_api_key</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#918-990" title="Go to source code">_detect_api_key</a>( )</code>
 
 		<div class="description short">
 			<p>See if the user has provided an API key</p>
@@ -474,7 +474,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_lang">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#937-968" title="Go to source code">_detect_lang</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#992-1023" title="Go to source code">_detect_lang</a>( )</code>
 
 		<div class="description short">
 			<p>What language do they want it in?</p>
@@ -508,7 +508,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_request">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#970-996" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1025-1051" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Add the request to the log table</p>
@@ -547,7 +547,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_limit">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#998-1074" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1053-1129" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
 
 		<div class="description short">
 			<p>Check if the requests to a controller method exceed a limit</p>
@@ -586,7 +586,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__auth_override_check">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1076-1166" title="Go to source code">_auth_override_check</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1131-1221" title="Go to source code">_auth_override_check</a>( )</code>
 
 		<div class="description short">
 			<p>Check if there is a specific auth type set for the current class/method being called</p>
@@ -620,7 +620,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1168-1178" title="Go to source code">_parse_get</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1223-1233" title="Go to source code">_parse_get</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the GET request arguments</p>
@@ -650,7 +650,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1180-1194" title="Go to source code">_parse_post</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1235-1249" title="Go to source code">_parse_post</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the POST request arguments</p>
@@ -680,7 +680,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1196-1216" title="Go to source code">_parse_put</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1251-1271" title="Go to source code">_parse_put</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PUT request arguments</p>
@@ -710,7 +710,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1218-1231" title="Go to source code">_parse_head</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1273-1286" title="Go to source code">_parse_head</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the HEAD request arguments</p>
@@ -740,7 +740,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1233-1246" title="Go to source code">_parse_options</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1288-1301" title="Go to source code">_parse_options</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the OPTIONS request arguments</p>
@@ -770,7 +770,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1248-1269" title="Go to source code">_parse_patch</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1303-1324" title="Go to source code">_parse_patch</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PATCH request arguments</p>
@@ -800,7 +800,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1271-1284" title="Go to source code">_parse_delete</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1326-1339" title="Go to source code">_parse_delete</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the DELETE request arguments</p>
@@ -830,7 +830,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1286-1318" title="Go to source code">_parse_query</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1341-1373" title="Go to source code">_parse_query</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the query parameters</p>
@@ -860,7 +860,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1322-1339" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1377-1394" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a GET request</p>
@@ -902,7 +902,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1341-1358" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1396-1413" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a OPTIONS request</p>
@@ -944,7 +944,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1360-1377" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1415-1432" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a HEAD request</p>
@@ -986,7 +986,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1379-1396" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1434-1451" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a POST request</p>
@@ -1028,7 +1028,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1398-1415" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1453-1470" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PUT request</p>
@@ -1070,7 +1070,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1417-1434" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1472-1489" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a DELETE request</p>
@@ -1112,7 +1112,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1436-1453" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1491-1508" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PATCH request</p>
@@ -1154,7 +1154,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1455-1472" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1510-1527" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from the query parameters</p>
@@ -1196,7 +1196,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__xss_clean">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1474-1488" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1529-1543" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
 
 		<div class="description short">
 			<p>Sanitizes data so that Cross Site Scripting Hacks can be
@@ -1239,7 +1239,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_validation_errors">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1490-1501" title="Go to source code">validation_errors</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1545-1556" title="Go to source code">validation_errors</a>( )</code>
 
 		<div class="description short">
 			<p>Retrieve the validation errors</p>
@@ -1273,7 +1273,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_ldap_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1505-1610" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1560-1665" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform LDAP Authentication</p>
@@ -1314,7 +1314,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_library_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1612-1652" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1667-1707" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform Library Authentication - Override this function to change the way the library is called</p>
@@ -1355,7 +1355,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1654-1709" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1709-1764" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Check if the user is logged in</p>
@@ -1396,7 +1396,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_php_session">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1711-1731" title="Go to source code">_check_php_session</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1766-1786" title="Go to source code">_check_php_session</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the user is logged in with a PHP session key</p>
@@ -1426,7 +1426,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_basic_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1733-1772" title="Go to source code">_prepare_basic_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1788-1827" title="Go to source code">_prepare_basic_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for basic authentication</p>
@@ -1456,7 +1456,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_digest_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1774-1833" title="Go to source code">_prepare_digest_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1829-1888" title="Go to source code">_prepare_digest_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for digest authentication</p>
@@ -1486,7 +1486,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_blacklist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1835-1856" title="Go to source code">_check_blacklist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1890-1911" title="Go to source code">_check_blacklist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response</p>
@@ -1516,7 +1516,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_whitelist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1858-1879" title="Go to source code">_check_whitelist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1913-1934" title="Go to source code">_check_whitelist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response</p>
@@ -1546,7 +1546,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__force_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1881-1912" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1936-1967" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
 
 		<div class="description short">
 			<p>Force logging in by setting the WWW-Authenticate header</p>
@@ -1582,7 +1582,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_access_time">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1914-1930" title="Go to source code">_log_access_time</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1969-1985" title="Go to source code">_log_access_time</a>( )</code>
 
 		<div class="description short">
 			<p>Updates the log table with the total access time</p>
@@ -1620,7 +1620,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_response_code">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1932-1948" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1987-2003" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
 
 		<div class="description short">
 			<p>Updates the log table with HTTP response code</p>
@@ -1663,7 +1663,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_access">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1950-1980" title="Go to source code">_check_access</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2005-2035" title="Go to source code">_check_access</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the API key has access to the controller and methods</p>
@@ -1696,12 +1696,84 @@ <h4>Returns</h4>
 
 	<table class="summary constants" id="constants">
 	<caption>Constants summary</caption>
-	<tr data-order="OK" id="OK">
+	<tr data-order="HTTP_CONTINUE" id="HTTP_CONTINUE">
 
 		<td class="attributes"><code>integer</code></td>
 		<td class="name">
 			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#207-210" title="Go to source code"><b>OK</b></a>
+				<a href="http://github.com/source-class-REST_Controller.html#23" title="Go to source code"><b>HTTP_CONTINUE</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_CONTINUE" class="anchor">#</a>
+				<code><span class="php-num">100</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_SWITCHING_PROTOCOLS" id="HTTP_SWITCHING_PROTOCOLS">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#24" title="Go to source code"><b>HTTP_SWITCHING_PROTOCOLS</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_SWITCHING_PROTOCOLS" class="anchor">#</a>
+				<code><span class="php-num">101</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_PROCESSING" id="HTTP_PROCESSING">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#25" title="Go to source code"><b>HTTP_PROCESSING</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_PROCESSING" class="anchor">#</a>
+				<code><span class="php-num">102</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_OK" id="HTTP_OK">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#29-32" title="Go to source code"><b>HTTP_OK</b></a>
 			</code>
 
 			<div class="description short">
@@ -1715,17 +1787,17 @@ <h4>Returns</h4>
 		</td>
 		<td class="value">
 			<div>
-				<a href="#OK" class="anchor">#</a>
+				<a href="#HTTP_OK" class="anchor">#</a>
 				<code><span class="php-num">200</span></code>
 			</div>
 		</td>
 	</tr>
-	<tr data-order="CREATED" id="CREATED">
+	<tr data-order="HTTP_CREATED" id="HTTP_CREATED">
 
 		<td class="attributes"><code>integer</code></td>
 		<td class="name">
 			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#212-215" title="Go to source code"><b>CREATED</b></a>
+				<a href="http://github.com/source-class-REST_Controller.html#34-37" title="Go to source code"><b>HTTP_CREATED</b></a>
 			</code>
 
 			<div class="description short">
@@ -1739,17 +1811,65 @@ <h4>Returns</h4>
 		</td>
 		<td class="value">
 			<div>
-				<a href="#CREATED" class="anchor">#</a>
+				<a href="#HTTP_CREATED" class="anchor">#</a>
 				<code><span class="php-num">201</span></code>
 			</div>
 		</td>
 	</tr>
-	<tr data-order="NO_CONTENT" id="NO_CONTENT">
+	<tr data-order="HTTP_ACCEPTED" id="HTTP_ACCEPTED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#38" title="Go to source code"><b>HTTP_ACCEPTED</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_ACCEPTED" class="anchor">#</a>
+				<code><span class="php-num">202</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_NON_AUTHORITATIVE_INFORMATION" id="HTTP_NON_AUTHORITATIVE_INFORMATION">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#39" title="Go to source code"><b>HTTP_NON_AUTHORITATIVE_INFORMATION</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_NON_AUTHORITATIVE_INFORMATION" class="anchor">#</a>
+				<code><span class="php-num">203</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_NO_CONTENT" id="HTTP_NO_CONTENT">
 
 		<td class="attributes"><code>integer</code></td>
 		<td class="name">
 			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#217-220" title="Go to source code"><b>NO_CONTENT</b></a>
+				<a href="http://github.com/source-class-REST_Controller.html#41-44" title="Go to source code"><b>HTTP_NO_CONTENT</b></a>
 			</code>
 
 			<div class="description short">
@@ -1763,256 +1883,1264 @@ <h4>Returns</h4>
 		</td>
 		<td class="value">
 			<div>
-				<a href="#NO_CONTENT" class="anchor">#</a>
+				<a href="#HTTP_NO_CONTENT" class="anchor">#</a>
 				<code><span class="php-num">204</span></code>
 			</div>
 		</td>
 	</tr>
-	<tr data-order="NOT_MODIFIED" id="NOT_MODIFIED">
+	<tr data-order="HTTP_RESET_CONTENT" id="HTTP_RESET_CONTENT">
 
 		<td class="attributes"><code>integer</code></td>
 		<td class="name">
 			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#224-227" title="Go to source code"><b>NOT_MODIFIED</b></a>
+				<a href="http://github.com/source-class-REST_Controller.html#45" title="Go to source code"><b>HTTP_RESET_CONTENT</b></a>
 			</code>
 
 			<div class="description short">
-				<p>The resource has not been modified since the last request</p>
+				
 			</div>
 
 			<div class="description detailed hidden">
-				<p>The resource has not been modified since the last request</p>
+				
 
 			</div>
 		</td>
 		<td class="value">
 			<div>
-				<a href="#NOT_MODIFIED" class="anchor">#</a>
-				<code><span class="php-num">304</span></code>
+				<a href="#HTTP_RESET_CONTENT" class="anchor">#</a>
+				<code><span class="php-num">205</span></code>
 			</div>
 		</td>
 	</tr>
-	<tr data-order="BAD_REQUEST" id="BAD_REQUEST">
+	<tr data-order="HTTP_PARTIAL_CONTENT" id="HTTP_PARTIAL_CONTENT">
 
 		<td class="attributes"><code>integer</code></td>
 		<td class="name">
 			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#231-234" title="Go to source code"><b>BAD_REQUEST</b></a>
+				<a href="http://github.com/source-class-REST_Controller.html#46" title="Go to source code"><b>HTTP_PARTIAL_CONTENT</b></a>
 			</code>
 
 			<div class="description short">
-				<p>The request cannot be fulfilled due to multiple errors</p>
+				
 			</div>
 
 			<div class="description detailed hidden">
-				<p>The request cannot be fulfilled due to multiple errors</p>
+				
 
 			</div>
 		</td>
 		<td class="value">
 			<div>
-				<a href="#BAD_REQUEST" class="anchor">#</a>
-				<code><span class="php-num">400</span></code>
+				<a href="#HTTP_PARTIAL_CONTENT" class="anchor">#</a>
+				<code><span class="php-num">206</span></code>
 			</div>
 		</td>
 	</tr>
-	<tr data-order="UNAUTHORIZED" id="UNAUTHORIZED">
+	<tr data-order="HTTP_MULTI_STATUS" id="HTTP_MULTI_STATUS">
 
 		<td class="attributes"><code>integer</code></td>
 		<td class="name">
 			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#236-239" title="Go to source code"><b>UNAUTHORIZED</b></a>
+				<a href="http://github.com/source-class-REST_Controller.html#47" title="Go to source code"><b>HTTP_MULTI_STATUS</b></a>
 			</code>
 
 			<div class="description short">
-				<p>The user is unauthorized to access the requested resource</p>
+				
 			</div>
 
 			<div class="description detailed hidden">
-				<p>The user is unauthorized to access the requested resource</p>
+				
 
 			</div>
 		</td>
 		<td class="value">
 			<div>
-				<a href="#UNAUTHORIZED" class="anchor">#</a>
-				<code><span class="php-num">401</span></code>
+				<a href="#HTTP_MULTI_STATUS" class="anchor">#</a>
+				<code><span class="php-num">207</span></code>
 			</div>
 		</td>
 	</tr>
-	<tr data-order="FORBIDDEN" id="FORBIDDEN">
+	<tr data-order="HTTP_ALREADY_REPORTED" id="HTTP_ALREADY_REPORTED">
 
 		<td class="attributes"><code>integer</code></td>
 		<td class="name">
 			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#241-244" title="Go to source code"><b>FORBIDDEN</b></a>
+				<a href="http://github.com/source-class-REST_Controller.html#48" title="Go to source code"><b>HTTP_ALREADY_REPORTED</b></a>
 			</code>
 
 			<div class="description short">
-				<p>The requested resource is unavailable at this present time</p>
+				
 			</div>
 
 			<div class="description detailed hidden">
-				<p>The requested resource is unavailable at this present time</p>
+				
 
 			</div>
 		</td>
 		<td class="value">
 			<div>
-				<a href="#FORBIDDEN" class="anchor">#</a>
-				<code><span class="php-num">403</span></code>
+				<a href="#HTTP_ALREADY_REPORTED" class="anchor">#</a>
+				<code><span class="php-num">208</span></code>
 			</div>
 		</td>
 	</tr>
-	<tr data-order="NOT_FOUND" id="NOT_FOUND">
+	<tr data-order="HTTP_IM_USED" id="HTTP_IM_USED">
 
 		<td class="attributes"><code>integer</code></td>
 		<td class="name">
 			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#246-252" title="Go to source code"><b>NOT_FOUND</b></a>
+				<a href="http://github.com/source-class-REST_Controller.html#49" title="Go to source code"><b>HTTP_IM_USED</b></a>
 			</code>
 
 			<div class="description short">
-				<p>The requested resource could not be found</p>
+				
 			</div>
 
 			<div class="description detailed hidden">
-				<p>The requested resource could not be found</p>
+				
 
-<p>Note: This is sometimes used to mask if there was an UNAUTHORIZED (401) or
-FORBIDDEN (403) error, for security reasons</p>
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_IM_USED" class="anchor">#</a>
+				<code><span class="php-num">226</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_MULTIPLE_CHOICES" id="HTTP_MULTIPLE_CHOICES">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#53" title="Go to source code"><b>HTTP_MULTIPLE_CHOICES</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
 
 			</div>
 		</td>
 		<td class="value">
 			<div>
-				<a href="#NOT_FOUND" class="anchor">#</a>
-				<code><span class="php-num">404</span></code>
+				<a href="#HTTP_MULTIPLE_CHOICES" class="anchor">#</a>
+				<code><span class="php-num">300</span></code>
 			</div>
 		</td>
 	</tr>
-	<tr data-order="METHOD_NOT_ALLOWED" id="METHOD_NOT_ALLOWED">
+	<tr data-order="HTTP_MOVED_PERMANENTLY" id="HTTP_MOVED_PERMANENTLY">
 
 		<td class="attributes"><code>integer</code></td>
 		<td class="name">
 			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#254-257" title="Go to source code"><b>METHOD_NOT_ALLOWED</b></a>
+				<a href="http://github.com/source-class-REST_Controller.html#54" title="Go to source code"><b>HTTP_MOVED_PERMANENTLY</b></a>
 			</code>
 
 			<div class="description short">
-				<p>The request method is not supported by the following resource</p>
+				
 			</div>
 
 			<div class="description detailed hidden">
-				<p>The request method is not supported by the following resource</p>
+				
 
 			</div>
 		</td>
 		<td class="value">
 			<div>
-				<a href="#METHOD_NOT_ALLOWED" class="anchor">#</a>
-				<code><span class="php-num">405</span></code>
+				<a href="#HTTP_MOVED_PERMANENTLY" class="anchor">#</a>
+				<code><span class="php-num">301</span></code>
 			</div>
 		</td>
 	</tr>
-	<tr data-order="NOT_ACCEPTABLE" id="NOT_ACCEPTABLE">
+	<tr data-order="HTTP_FOUND" id="HTTP_FOUND">
 
 		<td class="attributes"><code>integer</code></td>
 		<td class="name">
 			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#259-262" title="Go to source code"><b>NOT_ACCEPTABLE</b></a>
+				<a href="http://github.com/source-class-REST_Controller.html#55" title="Go to source code"><b>HTTP_FOUND</b></a>
 			</code>
 
 			<div class="description short">
-				<p>The request was not acceptable</p>
+				
 			</div>
 
 			<div class="description detailed hidden">
-				<p>The request was not acceptable</p>
+				
 
 			</div>
 		</td>
 		<td class="value">
 			<div>
-				<a href="#NOT_ACCEPTABLE" class="anchor">#</a>
-				<code><span class="php-num">406</span></code>
+				<a href="#HTTP_FOUND" class="anchor">#</a>
+				<code><span class="php-num">302</span></code>
 			</div>
 		</td>
 	</tr>
-	<tr data-order="CONFLICT" id="CONFLICT">
+	<tr data-order="HTTP_SEE_OTHER" id="HTTP_SEE_OTHER">
 
 		<td class="attributes"><code>integer</code></td>
 		<td class="name">
 			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#264-268" title="Go to source code"><b>CONFLICT</b></a>
+				<a href="http://github.com/source-class-REST_Controller.html#56" title="Go to source code"><b>HTTP_SEE_OTHER</b></a>
 			</code>
 
 			<div class="description short">
-				<p>The request could not be completed due to a conflict with the current state
-of the resource</p>
+				
 			</div>
 
 			<div class="description detailed hidden">
-				<p>The request could not be completed due to a conflict with the current state
-of the resource</p>
+				
 
 			</div>
 		</td>
 		<td class="value">
 			<div>
-				<a href="#CONFLICT" class="anchor">#</a>
-				<code><span class="php-num">409</span></code>
+				<a href="#HTTP_SEE_OTHER" class="anchor">#</a>
+				<code><span class="php-num">303</span></code>
 			</div>
 		</td>
 	</tr>
-	<tr data-order="INTERNAL_SERVER_ERROR" id="INTERNAL_SERVER_ERROR">
+	<tr data-order="HTTP_NOT_MODIFIED" id="HTTP_NOT_MODIFIED">
 
 		<td class="attributes"><code>integer</code></td>
 		<td class="name">
 			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#272-278" title="Go to source code"><b>INTERNAL_SERVER_ERROR</b></a>
+				<a href="http://github.com/source-class-REST_Controller.html#58-61" title="Go to source code"><b>HTTP_NOT_MODIFIED</b></a>
 			</code>
 
 			<div class="description short">
-				<p>The server encountered an unexpected error</p>
+				<p>The resource has not been modified since the last request</p>
 			</div>
 
 			<div class="description detailed hidden">
-				<p>The server encountered an unexpected error</p>
+				<p>The resource has not been modified since the last request</p>
 
-<p>Note: This is a generic error message when no specific message
-is suitable</p>
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_NOT_MODIFIED" class="anchor">#</a>
+				<code><span class="php-num">304</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_USE_PROXY" id="HTTP_USE_PROXY">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#62" title="Go to source code"><b>HTTP_USE_PROXY</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
 
 			</div>
 		</td>
 		<td class="value">
 			<div>
-				<a href="#INTERNAL_SERVER_ERROR" class="anchor">#</a>
-				<code><span class="php-num">500</span></code>
+				<a href="#HTTP_USE_PROXY" class="anchor">#</a>
+				<code><span class="php-num">305</span></code>
 			</div>
 		</td>
 	</tr>
-	<tr data-order="NOT_IMPLEMENTED" id="NOT_IMPLEMENTED">
+	<tr data-order="HTTP_RESERVED" id="HTTP_RESERVED">
 
 		<td class="attributes"><code>integer</code></td>
 		<td class="name">
 			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#280-283" title="Go to source code"><b>NOT_IMPLEMENTED</b></a>
+				<a href="http://github.com/source-class-REST_Controller.html#63" title="Go to source code"><b>HTTP_RESERVED</b></a>
 			</code>
 
 			<div class="description short">
-				<p>The server does not recognised the request method</p>
+				
 			</div>
 
 			<div class="description detailed hidden">
-				<p>The server does not recognised the request method</p>
+				
 
 			</div>
 		</td>
 		<td class="value">
 			<div>
-				<a href="#NOT_IMPLEMENTED" class="anchor">#</a>
-				<code><span class="php-num">501</span></code>
+				<a href="#HTTP_RESERVED" class="anchor">#</a>
+				<code><span class="php-num">306</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_TEMPORARY_REDIRECT" id="HTTP_TEMPORARY_REDIRECT">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#64" title="Go to source code"><b>HTTP_TEMPORARY_REDIRECT</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_TEMPORARY_REDIRECT" class="anchor">#</a>
+				<code><span class="php-num">307</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_PERMANENTLY_REDIRECT" id="HTTP_PERMANENTLY_REDIRECT">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#65" title="Go to source code"><b>HTTP_PERMANENTLY_REDIRECT</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_PERMANENTLY_REDIRECT" class="anchor">#</a>
+				<code><span class="php-num">308</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_BAD_REQUEST" id="HTTP_BAD_REQUEST">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#69-72" title="Go to source code"><b>HTTP_BAD_REQUEST</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The request cannot be fulfilled due to multiple errors</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The request cannot be fulfilled due to multiple errors</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_BAD_REQUEST" class="anchor">#</a>
+				<code><span class="php-num">400</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_UNAUTHORIZED" id="HTTP_UNAUTHORIZED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#74-77" title="Go to source code"><b>HTTP_UNAUTHORIZED</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The user is unauthorized to access the requested resource</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The user is unauthorized to access the requested resource</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_UNAUTHORIZED" class="anchor">#</a>
+				<code><span class="php-num">401</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_PAYMENT_REQUIRED" id="HTTP_PAYMENT_REQUIRED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#78" title="Go to source code"><b>HTTP_PAYMENT_REQUIRED</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_PAYMENT_REQUIRED" class="anchor">#</a>
+				<code><span class="php-num">402</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_FORBIDDEN" id="HTTP_FORBIDDEN">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#80-83" title="Go to source code"><b>HTTP_FORBIDDEN</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The requested resource is unavailable at this present time</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The requested resource is unavailable at this present time</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_FORBIDDEN" class="anchor">#</a>
+				<code><span class="php-num">403</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_NOT_FOUND" id="HTTP_NOT_FOUND">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#85-91" title="Go to source code"><b>HTTP_NOT_FOUND</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The requested resource could not be found</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The requested resource could not be found</p>
+
+<p>Note: This is sometimes used to mask if there was an UNAUTHORIZED (401) or
+FORBIDDEN (403) error, for security reasons</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_NOT_FOUND" class="anchor">#</a>
+				<code><span class="php-num">404</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_METHOD_NOT_ALLOWED" id="HTTP_METHOD_NOT_ALLOWED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#93-96" title="Go to source code"><b>HTTP_METHOD_NOT_ALLOWED</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The request method is not supported by the following resource</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The request method is not supported by the following resource</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_METHOD_NOT_ALLOWED" class="anchor">#</a>
+				<code><span class="php-num">405</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_NOT_ACCEPTABLE" id="HTTP_NOT_ACCEPTABLE">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#98-101" title="Go to source code"><b>HTTP_NOT_ACCEPTABLE</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The request was not acceptable</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The request was not acceptable</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_NOT_ACCEPTABLE" class="anchor">#</a>
+				<code><span class="php-num">406</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_PROXY_AUTHENTICATION_REQUIRED" id="HTTP_PROXY_AUTHENTICATION_REQUIRED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#102" title="Go to source code"><b>HTTP_PROXY_AUTHENTICATION_REQUIRED</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_PROXY_AUTHENTICATION_REQUIRED" class="anchor">#</a>
+				<code><span class="php-num">407</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_REQUEST_TIMEOUT" id="HTTP_REQUEST_TIMEOUT">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#103" title="Go to source code"><b>HTTP_REQUEST_TIMEOUT</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_REQUEST_TIMEOUT" class="anchor">#</a>
+				<code><span class="php-num">408</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_CONFLICT" id="HTTP_CONFLICT">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#105-109" title="Go to source code"><b>HTTP_CONFLICT</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The request could not be completed due to a conflict with the current state
+of the resource</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The request could not be completed due to a conflict with the current state
+of the resource</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_CONFLICT" class="anchor">#</a>
+				<code><span class="php-num">409</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_GONE" id="HTTP_GONE">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#110" title="Go to source code"><b>HTTP_GONE</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_GONE" class="anchor">#</a>
+				<code><span class="php-num">410</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_LENGTH_REQUIRED" id="HTTP_LENGTH_REQUIRED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#111" title="Go to source code"><b>HTTP_LENGTH_REQUIRED</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_LENGTH_REQUIRED" class="anchor">#</a>
+				<code><span class="php-num">411</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_PRECONDITION_FAILED" id="HTTP_PRECONDITION_FAILED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#112" title="Go to source code"><b>HTTP_PRECONDITION_FAILED</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_PRECONDITION_FAILED" class="anchor">#</a>
+				<code><span class="php-num">412</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_REQUEST_ENTITY_TOO_LARGE" id="HTTP_REQUEST_ENTITY_TOO_LARGE">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#113" title="Go to source code"><b>HTTP_REQUEST_ENTITY_TOO_LARGE</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_REQUEST_ENTITY_TOO_LARGE" class="anchor">#</a>
+				<code><span class="php-num">413</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_REQUEST_URI_TOO_LONG" id="HTTP_REQUEST_URI_TOO_LONG">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#114" title="Go to source code"><b>HTTP_REQUEST_URI_TOO_LONG</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_REQUEST_URI_TOO_LONG" class="anchor">#</a>
+				<code><span class="php-num">414</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_UNSUPPORTED_MEDIA_TYPE" id="HTTP_UNSUPPORTED_MEDIA_TYPE">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#115" title="Go to source code"><b>HTTP_UNSUPPORTED_MEDIA_TYPE</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_UNSUPPORTED_MEDIA_TYPE" class="anchor">#</a>
+				<code><span class="php-num">415</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_REQUESTED_RANGE_NOT_SATISFIABLE" id="HTTP_REQUESTED_RANGE_NOT_SATISFIABLE">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#116" title="Go to source code"><b>HTTP_REQUESTED_RANGE_NOT_SATISFIABLE</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_REQUESTED_RANGE_NOT_SATISFIABLE" class="anchor">#</a>
+				<code><span class="php-num">416</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_EXPECTATION_FAILED" id="HTTP_EXPECTATION_FAILED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#117" title="Go to source code"><b>HTTP_EXPECTATION_FAILED</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_EXPECTATION_FAILED" class="anchor">#</a>
+				<code><span class="php-num">417</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_I_AM_A_TEAPOT" id="HTTP_I_AM_A_TEAPOT">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#118" title="Go to source code"><b>HTTP_I_AM_A_TEAPOT</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_I_AM_A_TEAPOT" class="anchor">#</a>
+				<code><span class="php-num">418</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_UNPROCESSABLE_ENTITY" id="HTTP_UNPROCESSABLE_ENTITY">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#119" title="Go to source code"><b>HTTP_UNPROCESSABLE_ENTITY</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_UNPROCESSABLE_ENTITY" class="anchor">#</a>
+				<code><span class="php-num">422</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_LOCKED" id="HTTP_LOCKED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#120" title="Go to source code"><b>HTTP_LOCKED</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_LOCKED" class="anchor">#</a>
+				<code><span class="php-num">423</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_FAILED_DEPENDENCY" id="HTTP_FAILED_DEPENDENCY">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#121" title="Go to source code"><b>HTTP_FAILED_DEPENDENCY</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_FAILED_DEPENDENCY" class="anchor">#</a>
+				<code><span class="php-num">424</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL" id="HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#122" title="Go to source code"><b>HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL" class="anchor">#</a>
+				<code><span class="php-num">425</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_UPGRADE_REQUIRED" id="HTTP_UPGRADE_REQUIRED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#123" title="Go to source code"><b>HTTP_UPGRADE_REQUIRED</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_UPGRADE_REQUIRED" class="anchor">#</a>
+				<code><span class="php-num">426</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_PRECONDITION_REQUIRED" id="HTTP_PRECONDITION_REQUIRED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#124" title="Go to source code"><b>HTTP_PRECONDITION_REQUIRED</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_PRECONDITION_REQUIRED" class="anchor">#</a>
+				<code><span class="php-num">428</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_TOO_MANY_REQUESTS" id="HTTP_TOO_MANY_REQUESTS">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#125" title="Go to source code"><b>HTTP_TOO_MANY_REQUESTS</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_TOO_MANY_REQUESTS" class="anchor">#</a>
+				<code><span class="php-num">429</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE" id="HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#126" title="Go to source code"><b>HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE" class="anchor">#</a>
+				<code><span class="php-num">431</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_INTERNAL_SERVER_ERROR" id="HTTP_INTERNAL_SERVER_ERROR">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#130-136" title="Go to source code"><b>HTTP_INTERNAL_SERVER_ERROR</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The server encountered an unexpected error</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The server encountered an unexpected error</p>
+
+<p>Note: This is a generic error message when no specific message
+is suitable</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_INTERNAL_SERVER_ERROR" class="anchor">#</a>
+				<code><span class="php-num">500</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_NOT_IMPLEMENTED" id="HTTP_NOT_IMPLEMENTED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#138-141" title="Go to source code"><b>HTTP_NOT_IMPLEMENTED</b></a>
+			</code>
+
+			<div class="description short">
+				<p>The server does not recognised the request method</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The server does not recognised the request method</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_NOT_IMPLEMENTED" class="anchor">#</a>
+				<code><span class="php-num">501</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_BAD_GATEWAY" id="HTTP_BAD_GATEWAY">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#142" title="Go to source code"><b>HTTP_BAD_GATEWAY</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_BAD_GATEWAY" class="anchor">#</a>
+				<code><span class="php-num">502</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_SERVICE_UNAVAILABLE" id="HTTP_SERVICE_UNAVAILABLE">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#143" title="Go to source code"><b>HTTP_SERVICE_UNAVAILABLE</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_SERVICE_UNAVAILABLE" class="anchor">#</a>
+				<code><span class="php-num">503</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_GATEWAY_TIMEOUT" id="HTTP_GATEWAY_TIMEOUT">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#144" title="Go to source code"><b>HTTP_GATEWAY_TIMEOUT</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_GATEWAY_TIMEOUT" class="anchor">#</a>
+				<code><span class="php-num">504</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_VERSION_NOT_SUPPORTED" id="HTTP_VERSION_NOT_SUPPORTED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#145" title="Go to source code"><b>HTTP_VERSION_NOT_SUPPORTED</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_VERSION_NOT_SUPPORTED" class="anchor">#</a>
+				<code><span class="php-num">505</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL" id="HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#146" title="Go to source code"><b>HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL" class="anchor">#</a>
+				<code><span class="php-num">506</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_INSUFFICIENT_STORAGE" id="HTTP_INSUFFICIENT_STORAGE">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#147" title="Go to source code"><b>HTTP_INSUFFICIENT_STORAGE</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_INSUFFICIENT_STORAGE" class="anchor">#</a>
+				<code><span class="php-num">507</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_LOOP_DETECTED" id="HTTP_LOOP_DETECTED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#148" title="Go to source code"><b>HTTP_LOOP_DETECTED</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_LOOP_DETECTED" class="anchor">#</a>
+				<code><span class="php-num">508</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_NOT_EXTENDED" id="HTTP_NOT_EXTENDED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#149" title="Go to source code"><b>HTTP_NOT_EXTENDED</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_NOT_EXTENDED" class="anchor">#</a>
+				<code><span class="php-num">510</span></code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="HTTP_NETWORK_AUTHENTICATION_REQUIRED" id="HTTP_NETWORK_AUTHENTICATION_REQUIRED">
+
+		<td class="attributes"><code>integer</code></td>
+		<td class="name">
+			<code>
+				<a href="http://github.com/source-class-REST_Controller.html#150" title="Go to source code"><b>HTTP_NETWORK_AUTHENTICATION_REQUIRED</b></a>
+			</code>
+
+			<div class="description short">
+				
+			</div>
+
+			<div class="description detailed hidden">
+				
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#HTTP_NETWORK_AUTHENTICATION_REQUIRED" class="anchor">#</a>
+				<code><span class="php-num">511</span></code>
 			</div>
 		</td>
 	</tr>
@@ -2030,7 +3158,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#18-24" title="Go to source code"><var>$rest_format</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#152-158" title="Go to source code"><var>$rest_format</var></a>
 
 			<div class="description short">
 				<p>This defines the rest format.
@@ -2057,7 +3185,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#26-31" title="Go to source code"><var>$methods</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#160-165" title="Go to source code"><var>$methods</var></a>
 
 			<div class="description short">
 				<p>Defines the list of method properties such as limit, log and level</p>
@@ -2082,7 +3210,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#33-38" title="Go to source code"><var>$allowed_http_methods</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#167-172" title="Go to source code"><var>$allowed_http_methods</var></a>
 
 			<div class="description short">
 				<p>List of allowed HTTP methods</p>
@@ -2107,7 +3235,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#40-47" title="Go to source code"><var>$request</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#174-181" title="Go to source code"><var>$request</var></a>
 
 			<div class="description short">
 				<p>Contains details about the request
@@ -2136,7 +3264,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#49-56" title="Go to source code"><var>$response</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#183-190" title="Go to source code"><var>$response</var></a>
 
 			<div class="description short">
 				<p>Contains details about the response
@@ -2165,7 +3293,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#58-65" title="Go to source code"><var>$rest</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#192-199" title="Go to source code"><var>$rest</var></a>
 
 			<div class="description short">
 				<p>Contains details about the REST API
@@ -2194,7 +3322,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#67-72" title="Go to source code"><var>$_get_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#201-206" title="Go to source code"><var>$_get_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the GET request method</p>
@@ -2219,7 +3347,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#74-79" title="Go to source code"><var>$_post_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#208-213" title="Go to source code"><var>$_post_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the POST request method</p>
@@ -2244,7 +3372,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#81-86" title="Go to source code"><var>$_insert_id</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#215-220" title="Go to source code"><var>$_insert_id</var></a>
 
 			<div class="description short">
 				<p>The insert_id of the log entry (if we have one)</p>
@@ -2269,7 +3397,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#88-93" title="Go to source code"><var>$_put_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#222-227" title="Go to source code"><var>$_put_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the PUT request method</p>
@@ -2294,7 +3422,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#95-100" title="Go to source code"><var>$_delete_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#229-234" title="Go to source code"><var>$_delete_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the DELETE request method</p>
@@ -2319,7 +3447,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#102-107" title="Go to source code"><var>$_patch_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#236-241" title="Go to source code"><var>$_patch_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the PATCH request method</p>
@@ -2344,7 +3472,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#109-114" title="Go to source code"><var>$_head_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#243-248" title="Go to source code"><var>$_head_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the HEAD request method</p>
@@ -2369,7 +3497,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#116-121" title="Go to source code"><var>$_options_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#250-255" title="Go to source code"><var>$_options_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the OPTIONS request method</p>
@@ -2394,7 +3522,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#123-128" title="Go to source code"><var>$_query_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#257-262" title="Go to source code"><var>$_query_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the query parameters</p>
@@ -2419,7 +3547,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#130-135" title="Go to source code"><var>$_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#264-269" title="Go to source code"><var>$_args</var></a>
 
 			<div class="description short">
 				<p>The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined</p>
@@ -2444,7 +3572,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#137-142" title="Go to source code"><var>$_allow</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#271-276" title="Go to source code"><var>$_allow</var></a>
 
 			<div class="description short">
 				<p>If the request is allowed based on the API key provided.</p>
@@ -2469,7 +3597,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#144-149" title="Go to source code"><var>$_zlib_oc</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#278-283" title="Go to source code"><var>$_zlib_oc</var></a>
 
 			<div class="description short">
 				<p>Determines if output compression is enabled</p>
@@ -2494,7 +3622,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#151-156" title="Go to source code"><var>$_user_ldap_dn</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#285-290" title="Go to source code"><var>$_user_ldap_dn</var></a>
 
 			<div class="description short">
 				<p>The LDAP Distinguished Name of the User post authentication</p>
@@ -2519,7 +3647,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#158-163" title="Go to source code"><var>$_start_rtime</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#292-297" title="Go to source code"><var>$_start_rtime</var></a>
 
 			<div class="description short">
 				<p>The start of the response time from the server</p>
@@ -2544,7 +3672,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#165-170" title="Go to source code"><var>$_end_rtime</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#299-304" title="Go to source code"><var>$_end_rtime</var></a>
 
 			<div class="description short">
 				<p>The end of the response time from the server</p>
@@ -2569,7 +3697,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#172-186" title="Go to source code"><var>$_supported_formats</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#306-320" title="Go to source code"><var>$_supported_formats</var></a>
 
 			<div class="description short">
 				<p>List all supported methods, the first will be the default format</p>
@@ -2603,7 +3731,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#188-193" title="Go to source code"><var>$_apiuser</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#322-327" title="Go to source code"><var>$_apiuser</var></a>
 
 			<div class="description short">
 				<p>Information about the current API user</p>
@@ -2628,7 +3756,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#195-203" title="Go to source code"><var>$_enable_xss</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#329-337" title="Go to source code"><var>$_enable_xss</var></a>
 
 			<div class="description short">
 				<p>Enable XSS flag
@@ -2659,14 +3787,16 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#285-305" title="Go to source code"><var>$http_status_codes</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#339-360" title="Go to source code"><var>$http_status_codes</var></a>
 
 			<div class="description short">
-				<p>HTTP status codes and their respective description</p>
+				<p>HTTP status codes and their respective description
+Note: Only the widley used HTTP status codes are used</p>
 			</div>
 
 			<div class="description detailed hidden">
-				<p>HTTP status codes and their respective description</p>
+				<p>HTTP status codes and their respective description
+Note: Only the widley used HTTP status codes are used</p>
 
 					<h4>Link</h4>
 					<div class="list">
@@ -2678,19 +3808,19 @@ <h4>Link</h4>
 			<div>
 				<a href="#$http_status_codes" class="anchor">#</a>
 				<code>[
-    self::OK =&gt; <span class="php-quote">'OK'</span>,
-    self::CREATED =&gt; <span class="php-quote">'CREATED'</span>,
-    self::NO_CONTENT =&gt; <span class="php-quote">'NO CONTENT'</span>,
-    self::NOT_MODIFIED =&gt; <span class="php-quote">'NOT MODIFIED'</span>,
-    self::BAD_REQUEST =&gt; <span class="php-quote">'BAD REQUEST'</span>,
-    self::UNAUTHORIZED =&gt; <span class="php-quote">'UNAUTHORIZED'</span>,
-    self::FORBIDDEN =&gt; <span class="php-quote">'FORBIDDEN'</span>,
-    self::NOT_FOUND =&gt; <span class="php-quote">'NOT FOUND'</span>,
-    self::METHOD_NOT_ALLOWED =&gt; <span class="php-quote">'METHOD NOT ALLOWED'</span>,
-    self::NOT_ACCEPTABLE =&gt; <span class="php-quote">'NOT ACCEPTABLE'</span>,
-    self::CONFLICT =&gt; <span class="php-quote">'CONFLICT'</span>,
-    self::INTERNAL_SERVER_ERROR =&gt; <span class="php-quote">'INTERNAL SERVER ERROR'</span>,
-    self::NOT_IMPLEMENTED =&gt; <span class="php-quote">'NOT IMPLEMENTED'</span>
+    self::HTTP_OK =&gt; <span class="php-quote">'OK'</span>,
+    self::HTTP_CREATED =&gt; <span class="php-quote">'CREATED'</span>,
+    self::HTTP_NO_CONTENT =&gt; <span class="php-quote">'NO CONTENT'</span>,
+    self::HTTP_NOT_MODIFIED =&gt; <span class="php-quote">'NOT MODIFIED'</span>,
+    self::HTTP_BAD_REQUEST =&gt; <span class="php-quote">'BAD REQUEST'</span>,
+    self::HTTP_UNAUTHORIZED =&gt; <span class="php-quote">'UNAUTHORIZED'</span>,
+    self::HTTP_FORBIDDEN =&gt; <span class="php-quote">'FORBIDDEN'</span>,
+    self::HTTP_NOT_FOUND =&gt; <span class="php-quote">'NOT FOUND'</span>,
+    self::HTTP_METHOD_NOT_ALLOWED =&gt; <span class="php-quote">'METHOD NOT ALLOWED'</span>,
+    self::HTTP_NOT_ACCEPTABLE =&gt; <span class="php-quote">'NOT ACCEPTABLE'</span>,
+    self::HTTP_CONFLICT =&gt; <span class="php-quote">'CONFLICT'</span>,
+    self::HTTP_INTERNAL_SERVER_ERROR =&gt; <span class="php-quote">'INTERNAL SERVER ERROR'</span>,
+    self::HTTP_NOT_IMPLEMENTED =&gt; <span class="php-quote">'NOT IMPLEMENTED'</span>
 ]</code>
 			</div>
 		</td>
diff --git a/documentation/resources/combined.js b/documentation/resources/combined.js
index 45cd2fe1..489234d5 100644
--- a/documentation/resources/combined.js
+++ b/documentation/resources/combined.js
@@ -1,6 +1,6 @@
 
 var ApiGen = ApiGen || {};
-ApiGen.config = {"options":{"elementDetailsCollapsed":true,"elementsOrder":"natural"},"name":"ApiGen theme","templatesPath":"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default","resources":{"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default\/resources":"resources"},"templates":{"overview":{"filename":"index.html","template":"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default\/overview.latte"},"combined":{"filename":"resources\/combined.js","template":"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default\/combined.js.latte"},"elementlist":{"filename":"elementlist.js","template":"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default\/elementlist.js.latte"},"404":{"filename":"404.html","template":"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default\/404.latte"},"package":{"filename":"package-%s.html","template":"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default\/package.latte"},"namespace":{"filename":"namespace-%s.html","template":"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default\/namespace.latte"},"class":{"filename":"class-%s.html","template":"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default\/class.latte"},"constant":{"filename":"constant-%s.html","template":"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default\/constant.latte"},"function":{"filename":"function-%s.html","template":"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default\/function.latte"},"source":{"filename":"source-%s.html","template":"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default\/source.latte"},"tree":{"filename":"tree.html","template":"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default\/tree.latte"},"deprecated":{"filename":"deprecated.html","template":"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default\/deprecated.latte"},"todo":{"filename":"todo.html","template":"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default\/todo.latte"},"sitemap":{"filename":"sitemap.xml","template":"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default\/sitemap.xml.latte"},"opensearch":{"filename":"opensearch.xml","template":"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default\/opensearch.xml.latte"},"robots":{"filename":"robots.txt","template":"phar:\/\/\/usr\/local\/bin\/apigen\/src\/templates\/default\/robots.txt.latte"}}};
+ApiGen.config = {"options":{"elementDetailsCollapsed":true,"elementsOrder":"natural"},"name":"ApiGen theme","templatesPath":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src","resources":{"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/resources":"resources"},"templates":{"overview":{"filename":"index.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/overview.latte"},"combined":{"filename":"resources\/combined.js","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/combined.js.latte"},"elementlist":{"filename":"elementlist.js","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/elementlist.js.latte"},"404":{"filename":"404.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/404.latte"},"package":{"filename":"package-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/package.latte"},"namespace":{"filename":"namespace-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/namespace.latte"},"class":{"filename":"class-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/class.latte"},"constant":{"filename":"constant-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/constant.latte"},"function":{"filename":"function-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/function.latte"},"annotationGroup":{"filename":"annotation-group-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/annotation-group.latte"},"source":{"filename":"source-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/source.latte"},"tree":{"filename":"tree.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/tree.latte"},"sitemap":{"filename":"sitemap.xml","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/sitemap.xml.latte"},"opensearch":{"filename":"opensearch.xml","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/opensearch.xml.latte"},"robots":{"filename":"robots.txt","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/robots.txt.latte"}}};
 
 
 	/*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
diff --git a/documentation/source-class-Example.html b/documentation/source-class-Example.html
index 5523d790..e37b50cd 100644
--- a/documentation/source-class-Example.html
+++ b/documentation/source-class-Example.html
@@ -116,95 +116,94 @@ <h3>Classes</h3>
 </span><span id="24" class="l"><a href="#24"> 24: </a>        parent::__construct();
 </span><span id="25" class="l"><a href="#25"> 25: </a>
 </span><span id="26" class="l"><a href="#26"> 26: </a>        <span class="php-comment">// Configure limits on our controller methods</span>
-</span><span id="27" class="l"><a href="#27"> 27: </a>        <span class="php-comment">// Ensure you have created the 'limits' table and enabled 'limits'</span>
-</span><span id="28" class="l"><a href="#28"> 28: </a>        <span class="php-comment">// within application/config/rest.php</span>
-</span><span id="29" class="l"><a href="#29"> 29: </a>        <span class="php-var">$this</span>-&gt;methods[<span class="php-quote">'user_get'</span>][<span class="php-quote">'limit'</span>] = <span class="php-num">500</span>; <span class="php-comment">//500 requests per hour per user/key</span>
-</span><span id="30" class="l"><a href="#30"> 30: </a>        <span class="php-var">$this</span>-&gt;methods[<span class="php-quote">'user_post'</span>][<span class="php-quote">'limit'</span>] = <span class="php-num">100</span>; <span class="php-comment">//100 requests per hour per user/key</span>
-</span><span id="31" class="l"><a href="#31"> 31: </a>        <span class="php-var">$this</span>-&gt;methods[<span class="php-quote">'user_delete'</span>][<span class="php-quote">'limit'</span>] = <span class="php-num">50</span>; <span class="php-comment">//50 requests per hour per user/key</span>
-</span><span id="32" class="l"><a href="#32"> 32: </a>    }
-</span><span id="33" class="l"><a href="#33"> 33: </a>
-</span><span id="34" class="l"><a href="#34"> 34: </a>    <span class="php-keyword1">function</span> user_get()
-</span><span id="35" class="l"><a href="#35"> 35: </a>    {
-</span><span id="36" class="l"><a href="#36"> 36: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>))
-</span><span id="37" class="l"><a href="#37"> 37: </a>        {
-</span><span id="38" class="l"><a href="#38"> 38: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">NULL</span>, REST_Controller::BAD_REQUEST);
-</span><span id="39" class="l"><a href="#39"> 39: </a>        }
-</span><span id="40" class="l"><a href="#40"> 40: </a>
-</span><span id="41" class="l"><a href="#41"> 41: </a>        <span class="php-comment">// $user = $this-&gt;some_model-&gt;getSomething( $this-&gt;get('id') );</span>
-</span><span id="42" class="l"><a href="#42"> 42: </a>        <span class="php-var">$users</span> = [
-</span><span id="43" class="l"><a href="#43"> 43: </a>            <span class="php-num">1</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'John'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'john@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Loves coding'</span>],
-</span><span id="44" class="l"><a href="#44"> 44: </a>            <span class="php-num">2</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">2</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jim'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jim@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Developed on CodeIgniter'</span>],
-</span><span id="45" class="l"><a href="#45"> 45: </a>            <span class="php-num">3</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">3</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jane'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jane@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Lives in the USA'</span>, [<span class="php-quote">'hobbies'</span> =&gt; [<span class="php-quote">'guitar'</span>, <span class="php-quote">'cycling'</span>]]],
-</span><span id="46" class="l"><a href="#46"> 46: </a>        ];
-</span><span id="47" class="l"><a href="#47"> 47: </a>
-</span><span id="48" class="l"><a href="#48"> 48: </a>        <span class="php-var">$user</span> = @<span class="php-var">$users</span>[<span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>)];
-</span><span id="49" class="l"><a href="#49"> 49: </a>
-</span><span id="50" class="l"><a href="#50"> 50: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$user</span>)
-</span><span id="51" class="l"><a href="#51"> 51: </a>        {
-</span><span id="52" class="l"><a href="#52"> 52: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-var">$user</span>, REST_Controller::OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
-</span><span id="53" class="l"><a href="#53"> 53: </a>        }
-</span><span id="54" class="l"><a href="#54"> 54: </a>
-</span><span id="55" class="l"><a href="#55"> 55: </a>        <span class="php-keyword1">else</span>
-</span><span id="56" class="l"><a href="#56"> 56: </a>        {
-</span><span id="57" class="l"><a href="#57"> 57: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-quote">'error'</span> =&gt; <span class="php-quote">'User could not be found'</span>], REST_Controller::NOT_FOUND);
-</span><span id="58" class="l"><a href="#58"> 58: </a>        }
-</span><span id="59" class="l"><a href="#59"> 59: </a>    }
-</span><span id="60" class="l"><a href="#60"> 60: </a>
-</span><span id="61" class="l"><a href="#61"> 61: </a>    <span class="php-keyword1">function</span> user_post()
-</span><span id="62" class="l"><a href="#62"> 62: </a>    {
-</span><span id="63" class="l"><a href="#63"> 63: </a>        <span class="php-comment">// $this-&gt;some_model-&gt;update_user($this-&gt;get('id'));</span>
-</span><span id="64" class="l"><a href="#64"> 64: </a>        <span class="php-var">$message</span> = [
-</span><span id="65" class="l"><a href="#65"> 65: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>),
-</span><span id="66" class="l"><a href="#66"> 66: </a>            <span class="php-quote">'name'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'name'</span>),
-</span><span id="67" class="l"><a href="#67"> 67: </a>            <span class="php-quote">'email'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'email'</span>),
-</span><span id="68" class="l"><a href="#68"> 68: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Added a resource'</span>
-</span><span id="69" class="l"><a href="#69"> 69: </a>        ];
-</span><span id="70" class="l"><a href="#70"> 70: </a>
-</span><span id="71" class="l"><a href="#71"> 71: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$message</span>, REST_Controller::CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
-</span><span id="72" class="l"><a href="#72"> 72: </a>    }
-</span><span id="73" class="l"><a href="#73"> 73: </a>
-</span><span id="74" class="l"><a href="#74"> 74: </a>    <span class="php-keyword1">function</span> user_delete()
-</span><span id="75" class="l"><a href="#75"> 75: </a>    {
-</span><span id="76" class="l"><a href="#76"> 76: </a>        <span class="php-comment">// $this-&gt;some_model-&gt;delete_something($this-&gt;get();</span>
-</span><span id="77" class="l"><a href="#77"> 77: </a>        <span class="php-var">$message</span> = [
-</span><span id="78" class="l"><a href="#78"> 78: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>),
-</span><span id="79" class="l"><a href="#79"> 79: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Deleted the resource'</span>
-</span><span id="80" class="l"><a href="#80"> 80: </a>        ];
-</span><span id="81" class="l"><a href="#81"> 81: </a>
-</span><span id="82" class="l"><a href="#82"> 82: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$message</span>, REST_Controller::NO_CONTENT); <span class="php-comment">// NO_CONTENT (204) being the HTTP response code</span>
-</span><span id="83" class="l"><a href="#83"> 83: </a>    }
-</span><span id="84" class="l"><a href="#84"> 84: </a>
-</span><span id="85" class="l"><a href="#85"> 85: </a>    <span class="php-keyword1">function</span> users_get()
-</span><span id="86" class="l"><a href="#86"> 86: </a>    {
-</span><span id="87" class="l"><a href="#87"> 87: </a>        <span class="php-comment">// $users = $this-&gt;some_model-&gt;get_something($this-&gt;get('limit'));</span>
-</span><span id="88" class="l"><a href="#88"> 88: </a>        <span class="php-var">$users</span> = [
-</span><span id="89" class="l"><a href="#89"> 89: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'John'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'john@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Loves coding'</span>],
-</span><span id="90" class="l"><a href="#90"> 90: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">2</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jim'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jim@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Developed on CodeIgniter'</span>],
-</span><span id="91" class="l"><a href="#91"> 91: </a>            <span class="php-num">3</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">3</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jane'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jane@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Lives in the USA'</span>, [<span class="php-quote">'hobbies'</span> =&gt; [<span class="php-quote">'guitar'</span>, <span class="php-quote">'cycling'</span>]]],
-</span><span id="92" class="l"><a href="#92"> 92: </a>        ];
-</span><span id="93" class="l"><a href="#93"> 93: </a>
-</span><span id="94" class="l"><a href="#94"> 94: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$users</span>)
-</span><span id="95" class="l"><a href="#95"> 95: </a>        {
-</span><span id="96" class="l"><a href="#96"> 96: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-var">$users</span>, REST_Controller::OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
-</span><span id="97" class="l"><a href="#97"> 97: </a>        }
-</span><span id="98" class="l"><a href="#98"> 98: </a>
-</span><span id="99" class="l"><a href="#99"> 99: </a>        <span class="php-keyword1">else</span>
-</span><span id="100" class="l"><a href="#100">100: </a>        {
-</span><span id="101" class="l"><a href="#101">101: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Couldn\'t find any users!'</span>], REST_Controller::NOT_FOUND);
-</span><span id="102" class="l"><a href="#102">102: </a>        }
-</span><span id="103" class="l"><a href="#103">103: </a>    }
-</span><span id="104" class="l"><a href="#104">104: </a>
-</span><span id="105" class="l"><a href="#105">105: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> send_post()
-</span><span id="106" class="l"><a href="#106">106: </a>    {
-</span><span id="107" class="l"><a href="#107">107: </a>        <span class="php-keyword2">var_dump</span>(<span class="php-var">$this</span>-&gt;request-&gt;body);
-</span><span id="108" class="l"><a href="#108">108: </a>    }
-</span><span id="109" class="l"><a href="#109">109: </a>
-</span><span id="110" class="l"><a href="#110">110: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> send_put()
-</span><span id="111" class="l"><a href="#111">111: </a>    {
-</span><span id="112" class="l"><a href="#112">112: </a>        <span class="php-keyword2">var_dump</span>(<span class="php-var">$this</span>-&gt;put(<span class="php-quote">'foo'</span>));
-</span><span id="113" class="l"><a href="#113">113: </a>    }
-</span><span id="114" class="l"><a href="#114">114: </a>}
-</span><span id="115" class="l"><a href="#115">115: </a></span></code></pre>
+</span><span id="27" class="l"><a href="#27"> 27: </a>        <span class="php-comment">// Ensure you have created the 'limits' table and enabled 'limits' within application/config/rest.php</span>
+</span><span id="28" class="l"><a href="#28"> 28: </a>        <span class="php-var">$this</span>-&gt;methods[<span class="php-quote">'user_get'</span>][<span class="php-quote">'limit'</span>] = <span class="php-num">500</span>; <span class="php-comment">// 500 requests per hour per user/key</span>
+</span><span id="29" class="l"><a href="#29"> 29: </a>        <span class="php-var">$this</span>-&gt;methods[<span class="php-quote">'user_post'</span>][<span class="php-quote">'limit'</span>] = <span class="php-num">100</span>; <span class="php-comment">// 100 requests per hour per user/key</span>
+</span><span id="30" class="l"><a href="#30"> 30: </a>        <span class="php-var">$this</span>-&gt;methods[<span class="php-quote">'user_delete'</span>][<span class="php-quote">'limit'</span>] = <span class="php-num">50</span>; <span class="php-comment">// 50 requests per hour per user/key</span>
+</span><span id="31" class="l"><a href="#31"> 31: </a>    }
+</span><span id="32" class="l"><a href="#32"> 32: </a>
+</span><span id="33" class="l"><a href="#33"> 33: </a>    <span class="php-keyword1">function</span> user_get()
+</span><span id="34" class="l"><a href="#34"> 34: </a>    {
+</span><span id="35" class="l"><a href="#35"> 35: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>))
+</span><span id="36" class="l"><a href="#36"> 36: </a>        {
+</span><span id="37" class="l"><a href="#37"> 37: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">NULL</span>, <span class="php-num">400</span>);
+</span><span id="38" class="l"><a href="#38"> 38: </a>        }
+</span><span id="39" class="l"><a href="#39"> 39: </a>
+</span><span id="40" class="l"><a href="#40"> 40: </a>        <span class="php-comment">// $user = $this-&gt;some_model-&gt;getSomething( $this-&gt;get('id') );</span>
+</span><span id="41" class="l"><a href="#41"> 41: </a>        <span class="php-var">$users</span> = [
+</span><span id="42" class="l"><a href="#42"> 42: </a>            <span class="php-num">1</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'John'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'john@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Loves coding'</span>],
+</span><span id="43" class="l"><a href="#43"> 43: </a>            <span class="php-num">2</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">2</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jim'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jim@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Developed on CodeIgniter'</span>],
+</span><span id="44" class="l"><a href="#44"> 44: </a>            <span class="php-num">3</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">3</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jane'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jane@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Lives in the USA'</span>, [<span class="php-quote">'hobbies'</span> =&gt; [<span class="php-quote">'guitar'</span>, <span class="php-quote">'cycling'</span>]]],
+</span><span id="45" class="l"><a href="#45"> 45: </a>        ];
+</span><span id="46" class="l"><a href="#46"> 46: </a>
+</span><span id="47" class="l"><a href="#47"> 47: </a>        <span class="php-var">$user</span> = @<span class="php-var">$users</span>[<span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>)];
+</span><span id="48" class="l"><a href="#48"> 48: </a>
+</span><span id="49" class="l"><a href="#49"> 49: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$user</span>)
+</span><span id="50" class="l"><a href="#50"> 50: </a>        {
+</span><span id="51" class="l"><a href="#51"> 51: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-var">$user</span>, REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
+</span><span id="52" class="l"><a href="#52"> 52: </a>        }
+</span><span id="53" class="l"><a href="#53"> 53: </a>
+</span><span id="54" class="l"><a href="#54"> 54: </a>        <span class="php-keyword1">else</span>
+</span><span id="55" class="l"><a href="#55"> 55: </a>        {
+</span><span id="56" class="l"><a href="#56"> 56: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-quote">'error'</span> =&gt; <span class="php-quote">'User could not be found'</span>], REST_Controller::NOT_FOUND); <span class="php-comment">// NOT_FOUND (404) being the HTTP response code</span>
+</span><span id="57" class="l"><a href="#57"> 57: </a>        }
+</span><span id="58" class="l"><a href="#58"> 58: </a>    }
+</span><span id="59" class="l"><a href="#59"> 59: </a>
+</span><span id="60" class="l"><a href="#60"> 60: </a>    <span class="php-keyword1">function</span> user_post()
+</span><span id="61" class="l"><a href="#61"> 61: </a>    {
+</span><span id="62" class="l"><a href="#62"> 62: </a>        <span class="php-comment">// $this-&gt;some_model-&gt;update_user($this-&gt;get('id'));</span>
+</span><span id="63" class="l"><a href="#63"> 63: </a>        <span class="php-var">$message</span> = [
+</span><span id="64" class="l"><a href="#64"> 64: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>),
+</span><span id="65" class="l"><a href="#65"> 65: </a>            <span class="php-quote">'name'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'name'</span>),
+</span><span id="66" class="l"><a href="#66"> 66: </a>            <span class="php-quote">'email'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'email'</span>),
+</span><span id="67" class="l"><a href="#67"> 67: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Added a resource'</span>
+</span><span id="68" class="l"><a href="#68"> 68: </a>        ];
+</span><span id="69" class="l"><a href="#69"> 69: </a>
+</span><span id="70" class="l"><a href="#70"> 70: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$message</span>, REST_Controller::HTTP_CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
+</span><span id="71" class="l"><a href="#71"> 71: </a>    }
+</span><span id="72" class="l"><a href="#72"> 72: </a>
+</span><span id="73" class="l"><a href="#73"> 73: </a>    <span class="php-keyword1">function</span> user_delete()
+</span><span id="74" class="l"><a href="#74"> 74: </a>    {
+</span><span id="75" class="l"><a href="#75"> 75: </a>        <span class="php-comment">// $this-&gt;some_model-&gt;delete_something($this-&gt;get();</span>
+</span><span id="76" class="l"><a href="#76"> 76: </a>        <span class="php-var">$message</span> = [
+</span><span id="77" class="l"><a href="#77"> 77: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>),
+</span><span id="78" class="l"><a href="#78"> 78: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Deleted the resource'</span>
+</span><span id="79" class="l"><a href="#79"> 79: </a>        ];
+</span><span id="80" class="l"><a href="#80"> 80: </a>
+</span><span id="81" class="l"><a href="#81"> 81: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$message</span>, REST_Controller::HTTP_NO_CONTENT); <span class="php-comment">// NO_CONTENT (204) being the HTTP response code</span>
+</span><span id="82" class="l"><a href="#82"> 82: </a>    }
+</span><span id="83" class="l"><a href="#83"> 83: </a>
+</span><span id="84" class="l"><a href="#84"> 84: </a>    <span class="php-keyword1">function</span> users_get()
+</span><span id="85" class="l"><a href="#85"> 85: </a>    {
+</span><span id="86" class="l"><a href="#86"> 86: </a>        <span class="php-comment">// $users = $this-&gt;some_model-&gt;get_something($this-&gt;get('limit'));</span>
+</span><span id="87" class="l"><a href="#87"> 87: </a>        <span class="php-var">$users</span> = [
+</span><span id="88" class="l"><a href="#88"> 88: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'John'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'john@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Loves coding'</span>],
+</span><span id="89" class="l"><a href="#89"> 89: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">2</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jim'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jim@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Developed on CodeIgniter'</span>],
+</span><span id="90" class="l"><a href="#90"> 90: </a>            <span class="php-num">3</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">3</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jane'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jane@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Lives in the USA'</span>, [<span class="php-quote">'hobbies'</span> =&gt; [<span class="php-quote">'guitar'</span>, <span class="php-quote">'cycling'</span>]]],
+</span><span id="91" class="l"><a href="#91"> 91: </a>        ];
+</span><span id="92" class="l"><a href="#92"> 92: </a>
+</span><span id="93" class="l"><a href="#93"> 93: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$users</span>)
+</span><span id="94" class="l"><a href="#94"> 94: </a>        {
+</span><span id="95" class="l"><a href="#95"> 95: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-var">$users</span>, REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
+</span><span id="96" class="l"><a href="#96"> 96: </a>        }
+</span><span id="97" class="l"><a href="#97"> 97: </a>
+</span><span id="98" class="l"><a href="#98"> 98: </a>        <span class="php-keyword1">else</span>
+</span><span id="99" class="l"><a href="#99"> 99: </a>        {
+</span><span id="100" class="l"><a href="#100">100: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Couldn\'t find any users!'</span>], REST_Controller::NOT_FOUND); <span class="php-comment">// NOT_FOUND (404) being the HTTP response code</span>
+</span><span id="101" class="l"><a href="#101">101: </a>        }
+</span><span id="102" class="l"><a href="#102">102: </a>    }
+</span><span id="103" class="l"><a href="#103">103: </a>
+</span><span id="104" class="l"><a href="#104">104: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> send_post()
+</span><span id="105" class="l"><a href="#105">105: </a>    {
+</span><span id="106" class="l"><a href="#106">106: </a>        <span class="php-keyword2">var_dump</span>(<span class="php-var">$this</span>-&gt;request-&gt;body);
+</span><span id="107" class="l"><a href="#107">107: </a>    }
+</span><span id="108" class="l"><a href="#108">108: </a>
+</span><span id="109" class="l"><a href="#109">109: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> send_put()
+</span><span id="110" class="l"><a href="#110">110: </a>    {
+</span><span id="111" class="l"><a href="#111">111: </a>        <span class="php-keyword2">var_dump</span>(<span class="php-var">$this</span>-&gt;put(<span class="php-quote">'foo'</span>));
+</span><span id="112" class="l"><a href="#112">112: </a>    }
+</span><span id="113" class="l"><a href="#113">113: </a>}
+</span><span id="114" class="l"><a href="#114">114: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
diff --git a/documentation/source-class-Format.html b/documentation/source-class-Format.html
index e57443cf..2a81d996 100644
--- a/documentation/source-class-Format.html
+++ b/documentation/source-class-Format.html
@@ -446,7 +446,7 @@ <h3>Classes</h3>
 </span><span id="354" class="l"><a href="#354">354: </a>        }
 </span><span id="355" class="l"><a href="#355">355: </a>
 </span><span id="356" class="l"><a href="#356">356: </a>        <span class="php-comment">// Apply the headings</span>
-</span><span id="357" class="l"><a href="#357">357: </a>        <span class="php-keyword2">fputcsv</span>(<span class="php-var">$handle</span>, <span class="php-var">$headers</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
+</span><span id="357" class="l"><a href="#357">357: </a>        <span class="php-keyword2">fputcsv</span>(<span class="php-var">$handle</span>, <span class="php-var">$headings</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
 </span><span id="358" class="l"><a href="#358">358: </a>
 </span><span id="359" class="l"><a href="#359">359: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$record</span>)
 </span><span id="360" class="l"><a href="#360">360: </a>        {
diff --git a/documentation/source-class-Key.html b/documentation/source-class-Key.html
index 8894a880..96eaa8a7 100644
--- a/documentation/source-class-Key.html
+++ b/documentation/source-class-Key.html
@@ -139,14 +139,14 @@ <h3>Classes</h3>
 </span><span id="47" class="l"><a href="#47"> 47: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="48" class="l"><a href="#48"> 48: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
 </span><span id="49" class="l"><a href="#49"> 49: </a>                <span class="php-quote">'key'</span> =&gt; <span class="php-var">$key</span>
-</span><span id="50" class="l"><a href="#50"> 50: </a>            ], REST_Controller::CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
+</span><span id="50" class="l"><a href="#50"> 50: </a>            ], REST_Controller::HTTP_CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
 </span><span id="51" class="l"><a href="#51"> 51: </a>        }
 </span><span id="52" class="l"><a href="#52"> 52: </a>        <span class="php-keyword1">else</span>
 </span><span id="53" class="l"><a href="#53"> 53: </a>        {
 </span><span id="54" class="l"><a href="#54"> 54: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="55" class="l"><a href="#55"> 55: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>,
 </span><span id="56" class="l"><a href="#56"> 56: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
-</span><span id="57" class="l"><a href="#57"> 57: </a>            ], REST_Controller::INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
+</span><span id="57" class="l"><a href="#57"> 57: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
 </span><span id="58" class="l"><a href="#58"> 58: </a>        }
 </span><span id="59" class="l"><a href="#59"> 59: </a>    }
 </span><span id="60" class="l"><a href="#60"> 60: </a>
@@ -169,7 +169,7 @@ <h3>Classes</h3>
 </span><span id="77" class="l"><a href="#77"> 77: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
 </span><span id="78" class="l"><a href="#78"> 78: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="79" class="l"><a href="#79"> 79: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key'</span>
-</span><span id="80" class="l"><a href="#80"> 80: </a>            ], REST_Controller::BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
+</span><span id="80" class="l"><a href="#80"> 80: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
 </span><span id="81" class="l"><a href="#81"> 81: </a>        }
 </span><span id="82" class="l"><a href="#82"> 82: </a>
 </span><span id="83" class="l"><a href="#83"> 83: </a>        <span class="php-comment">// Destroy it</span>
@@ -179,7 +179,7 @@ <h3>Classes</h3>
 </span><span id="87" class="l"><a href="#87"> 87: </a>        <span class="php-var">$this</span>-&gt;response([
 </span><span id="88" class="l"><a href="#88"> 88: </a>            <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
 </span><span id="89" class="l"><a href="#89"> 89: </a>            <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API Key was deleted'</span>
-</span><span id="90" class="l"><a href="#90"> 90: </a>            ], REST_Controller::NO_CONTENT); <span class="php-comment">// NO_CONTENT (204) being the HTTP response code</span>
+</span><span id="90" class="l"><a href="#90"> 90: </a>            ], REST_Controller::HTTP_NO_CONTENT); <span class="php-comment">// NO_CONTENT (204) being the HTTP response code</span>
 </span><span id="91" class="l"><a href="#91"> 91: </a>    }
 </span><span id="92" class="l"><a href="#92"> 92: </a>
 </span><span id="93" class="l"><a href="#93"> 93: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
@@ -202,7 +202,7 @@ <h3>Classes</h3>
 </span><span id="110" class="l"><a href="#110">110: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
 </span><span id="111" class="l"><a href="#111">111: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="112" class="l"><a href="#112">112: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key'</span>
-</span><span id="113" class="l"><a href="#113">113: </a>            ], REST_Controller::BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
+</span><span id="113" class="l"><a href="#113">113: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
 </span><span id="114" class="l"><a href="#114">114: </a>        }
 </span><span id="115" class="l"><a href="#115">115: </a>
 </span><span id="116" class="l"><a href="#116">116: </a>        <span class="php-comment">// Update the key level</span>
@@ -211,14 +211,14 @@ <h3>Classes</h3>
 </span><span id="119" class="l"><a href="#119">119: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="120" class="l"><a href="#120">120: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
 </span><span id="121" class="l"><a href="#121">121: </a>                <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API Key was updated'</span>
-</span><span id="122" class="l"><a href="#122">122: </a>            ], REST_Controller::OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
+</span><span id="122" class="l"><a href="#122">122: </a>            ], REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
 </span><span id="123" class="l"><a href="#123">123: </a>        }
 </span><span id="124" class="l"><a href="#124">124: </a>        <span class="php-keyword1">else</span>
 </span><span id="125" class="l"><a href="#125">125: </a>        {
 </span><span id="126" class="l"><a href="#126">126: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="127" class="l"><a href="#127">127: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>,
 </span><span id="128" class="l"><a href="#128">128: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not update the key level'</span>
-</span><span id="129" class="l"><a href="#129">129: </a>            ], REST_Controller::INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
+</span><span id="129" class="l"><a href="#129">129: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
 </span><span id="130" class="l"><a href="#130">130: </a>        }
 </span><span id="131" class="l"><a href="#131">131: </a>    }
 </span><span id="132" class="l"><a href="#132">132: </a>
@@ -241,7 +241,7 @@ <h3>Classes</h3>
 </span><span id="149" class="l"><a href="#149">149: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
 </span><span id="150" class="l"><a href="#150">150: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="151" class="l"><a href="#151">151: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key'</span>
-</span><span id="152" class="l"><a href="#152">152: </a>            ], REST_Controller::BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
+</span><span id="152" class="l"><a href="#152">152: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
 </span><span id="153" class="l"><a href="#153">153: </a>        }
 </span><span id="154" class="l"><a href="#154">154: </a>
 </span><span id="155" class="l"><a href="#155">155: </a>        <span class="php-comment">// Update the key level</span>
@@ -250,14 +250,14 @@ <h3>Classes</h3>
 </span><span id="158" class="l"><a href="#158">158: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="159" class="l"><a href="#159">159: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
 </span><span id="160" class="l"><a href="#160">160: </a>                <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'Key was suspended'</span>
-</span><span id="161" class="l"><a href="#161">161: </a>            ], REST_Controller::OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
+</span><span id="161" class="l"><a href="#161">161: </a>            ], REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
 </span><span id="162" class="l"><a href="#162">162: </a>        }
 </span><span id="163" class="l"><a href="#163">163: </a>        <span class="php-keyword1">else</span>
 </span><span id="164" class="l"><a href="#164">164: </a>        {
 </span><span id="165" class="l"><a href="#165">165: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="166" class="l"><a href="#166">166: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>,
 </span><span id="167" class="l"><a href="#167">167: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not suspend the user'</span>
-</span><span id="168" class="l"><a href="#168">168: </a>            ], REST_Controller::INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
+</span><span id="168" class="l"><a href="#168">168: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
 </span><span id="169" class="l"><a href="#169">169: </a>        }
 </span><span id="170" class="l"><a href="#170">170: </a>    }
 </span><span id="171" class="l"><a href="#171">171: </a>
@@ -281,7 +281,7 @@ <h3>Classes</h3>
 </span><span id="189" class="l"><a href="#189">189: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
 </span><span id="190" class="l"><a href="#190">190: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="191" class="l"><a href="#191">191: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key'</span>
-</span><span id="192" class="l"><a href="#192">192: </a>            ], REST_Controller::BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
+</span><span id="192" class="l"><a href="#192">192: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
 </span><span id="193" class="l"><a href="#193">193: </a>        }
 </span><span id="194" class="l"><a href="#194">194: </a>
 </span><span id="195" class="l"><a href="#195">195: </a>        <span class="php-comment">// Build a new key</span>
@@ -296,14 +296,14 @@ <h3>Classes</h3>
 </span><span id="204" class="l"><a href="#204">204: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="205" class="l"><a href="#205">205: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
 </span><span id="206" class="l"><a href="#206">206: </a>                <span class="php-quote">'key'</span> =&gt; <span class="php-var">$new_key</span>
-</span><span id="207" class="l"><a href="#207">207: </a>            ], REST_Controller::CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
+</span><span id="207" class="l"><a href="#207">207: </a>            ], REST_Controller::HTTP_CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
 </span><span id="208" class="l"><a href="#208">208: </a>        }
 </span><span id="209" class="l"><a href="#209">209: </a>        <span class="php-keyword1">else</span>
 </span><span id="210" class="l"><a href="#210">210: </a>        {
 </span><span id="211" class="l"><a href="#211">211: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="212" class="l"><a href="#212">212: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>,
 </span><span id="213" class="l"><a href="#213">213: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
-</span><span id="214" class="l"><a href="#214">214: </a>            ], REST_Controller::INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
+</span><span id="214" class="l"><a href="#214">214: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
 </span><span id="215" class="l"><a href="#215">215: </a>        }
 </span><span id="216" class="l"><a href="#216">216: </a>    }
 </span><span id="217" class="l"><a href="#217">217: </a>
@@ -317,7 +317,7 @@ <h3>Classes</h3>
 </span><span id="225" class="l"><a href="#225">225: </a>        {
 </span><span id="226" class="l"><a href="#226">226: </a>            <span class="php-comment">// Generate a random salt</span>
 </span><span id="227" class="l"><a href="#227">227: </a>            <span class="php-var">$salt</span> = <span class="php-var">$this</span>-&gt;security-&gt;get_random_bytes(<span class="php-num">64</span>);
-</span><span id="228" class="l"><a href="#228">228: </a>            
+</span><span id="228" class="l"><a href="#228">228: </a>
 </span><span id="229" class="l"><a href="#229">229: </a>            <span class="php-comment">// If an error occurred, then fall back to the previous method</span>
 </span><span id="230" class="l"><a href="#230">230: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$salt</span> === <span class="php-keyword1">FALSE</span>)
 </span><span id="231" class="l"><a href="#231">231: </a>            {
diff --git a/documentation/source-class-REST_Controller.html b/documentation/source-class-REST_Controller.html
index d4e8cae4..f5794794 100644
--- a/documentation/source-class-REST_Controller.html
+++ b/documentation/source-class-REST_Controller.html
@@ -107,1972 +107,2027 @@ <h3>Classes</h3>
 </span></span><span id="15" class="l"><a href="#15">  15: </a><span class="php-comment"> * @version         3.0.0
 </span></span><span id="16" class="l"><a href="#16">  16: </a><span class="php-comment"> */</span>
 </span><span id="17" class="l"><a href="#17">  17: </a><span class="php-keyword1">abstract</span> <span class="php-keyword1">class</span> REST_Controller <span class="php-keyword1">extends</span> CI_Controller {
-</span><span id="18" class="l"><a href="#18">  18: </a>    <span class="php-comment">/**
-</span></span><span id="19" class="l"><a href="#19">  19: </a><span class="php-comment">     * This defines the rest format.
-</span></span><span id="20" class="l"><a href="#20">  20: </a><span class="php-comment">     * Must be overridden it in a controller so that it is set.
-</span></span><span id="21" class="l"><a href="#21">  21: </a><span class="php-comment">     *
-</span></span><span id="22" class="l"><a href="#22">  22: </a><span class="php-comment">     * @var string|NULL
-</span></span><span id="23" class="l"><a href="#23">  23: </a><span class="php-comment">     */</span>
-</span><span id="24" class="l"><a href="#24">  24: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$rest_format</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="25" class="l"><a href="#25">  25: </a>
-</span><span id="26" class="l"><a href="#26">  26: </a>    <span class="php-comment">/**
-</span></span><span id="27" class="l"><a href="#27">  27: </a><span class="php-comment">     * Defines the list of method properties such as limit, log and level
-</span></span><span id="28" class="l"><a href="#28">  28: </a><span class="php-comment">     *
-</span></span><span id="29" class="l"><a href="#29">  29: </a><span class="php-comment">     * @var array
-</span></span><span id="30" class="l"><a href="#30">  30: </a><span class="php-comment">     */</span>
-</span><span id="31" class="l"><a href="#31">  31: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$methods</span> = [];
-</span><span id="32" class="l"><a href="#32">  32: </a>
-</span><span id="33" class="l"><a href="#33">  33: </a>    <span class="php-comment">/**
-</span></span><span id="34" class="l"><a href="#34">  34: </a><span class="php-comment">     * List of allowed HTTP methods
-</span></span><span id="35" class="l"><a href="#35">  35: </a><span class="php-comment">     *
-</span></span><span id="36" class="l"><a href="#36">  36: </a><span class="php-comment">     * @var array
-</span></span><span id="37" class="l"><a href="#37">  37: </a><span class="php-comment">     */</span>
-</span><span id="38" class="l"><a href="#38">  38: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$allowed_http_methods</span> = [<span class="php-quote">'get'</span>, <span class="php-quote">'delete'</span>, <span class="php-quote">'post'</span>, <span class="php-quote">'put'</span>, <span class="php-quote">'options'</span>, <span class="php-quote">'patch'</span>, <span class="php-quote">'head'</span>];
-</span><span id="39" class="l"><a href="#39">  39: </a>
-</span><span id="40" class="l"><a href="#40">  40: </a>    <span class="php-comment">/**
-</span></span><span id="41" class="l"><a href="#41">  41: </a><span class="php-comment">     * Contains details about the request
-</span></span><span id="42" class="l"><a href="#42">  42: </a><span class="php-comment">     * Fields: body, format, method, ssl
-</span></span><span id="43" class="l"><a href="#43">  43: </a><span class="php-comment">     * Note: This is a dynamic object (stdClass)
-</span></span><span id="44" class="l"><a href="#44">  44: </a><span class="php-comment">     *
-</span></span><span id="45" class="l"><a href="#45">  45: </a><span class="php-comment">     * @var object
-</span></span><span id="46" class="l"><a href="#46">  46: </a><span class="php-comment">     */</span>
-</span><span id="47" class="l"><a href="#47">  47: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$request</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="48" class="l"><a href="#48">  48: </a>
-</span><span id="49" class="l"><a href="#49">  49: </a>        <span class="php-comment">/**
-</span></span><span id="50" class="l"><a href="#50">  50: </a><span class="php-comment">     * Contains details about the response
-</span></span><span id="51" class="l"><a href="#51">  51: </a><span class="php-comment">     * Fields: format, lang
-</span></span><span id="52" class="l"><a href="#52">  52: </a><span class="php-comment">     * Note: This is a dynamic object (stdClass)
-</span></span><span id="53" class="l"><a href="#53">  53: </a><span class="php-comment">     *
-</span></span><span id="54" class="l"><a href="#54">  54: </a><span class="php-comment">     * @var object
-</span></span><span id="55" class="l"><a href="#55">  55: </a><span class="php-comment">     */</span>
-</span><span id="56" class="l"><a href="#56">  56: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$response</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="18" class="l"><a href="#18">  18: </a>
+</span><span id="19" class="l"><a href="#19">  19: </a>    <span class="php-comment">// Note: Only the widley used HTTP status codes are documented</span>
+</span><span id="20" class="l"><a href="#20">  20: </a>
+</span><span id="21" class="l"><a href="#21">  21: </a>    <span class="php-comment">// Informational</span>
+</span><span id="22" class="l"><a href="#22">  22: </a>
+</span><span id="23" class="l"><a href="#23">  23: </a>    <span class="php-keyword1">const</span> HTTP_CONTINUE = <span class="php-num">100</span>;
+</span><span id="24" class="l"><a href="#24">  24: </a>    <span class="php-keyword1">const</span> HTTP_SWITCHING_PROTOCOLS = <span class="php-num">101</span>;
+</span><span id="25" class="l"><a href="#25">  25: </a>    <span class="php-keyword1">const</span> HTTP_PROCESSING = <span class="php-num">102</span>;            <span class="php-comment">// RFC2518</span>
+</span><span id="26" class="l"><a href="#26">  26: </a>
+</span><span id="27" class="l"><a href="#27">  27: </a>    <span class="php-comment">// Success</span>
+</span><span id="28" class="l"><a href="#28">  28: </a>
+</span><span id="29" class="l"><a href="#29">  29: </a>    <span class="php-comment">/**
+</span></span><span id="30" class="l"><a href="#30">  30: </a><span class="php-comment">     * The request has succeeded
+</span></span><span id="31" class="l"><a href="#31">  31: </a><span class="php-comment">     */</span>
+</span><span id="32" class="l"><a href="#32">  32: </a>    <span class="php-keyword1">const</span> HTTP_OK = <span class="php-num">200</span>;
+</span><span id="33" class="l"><a href="#33">  33: </a>
+</span><span id="34" class="l"><a href="#34">  34: </a>    <span class="php-comment">/**
+</span></span><span id="35" class="l"><a href="#35">  35: </a><span class="php-comment">     * The server successfully created a new resource
+</span></span><span id="36" class="l"><a href="#36">  36: </a><span class="php-comment">     */</span>
+</span><span id="37" class="l"><a href="#37">  37: </a>    <span class="php-keyword1">const</span> HTTP_CREATED = <span class="php-num">201</span>;
+</span><span id="38" class="l"><a href="#38">  38: </a>    <span class="php-keyword1">const</span> HTTP_ACCEPTED = <span class="php-num">202</span>;
+</span><span id="39" class="l"><a href="#39">  39: </a>    <span class="php-keyword1">const</span> HTTP_NON_AUTHORITATIVE_INFORMATION = <span class="php-num">203</span>;
+</span><span id="40" class="l"><a href="#40">  40: </a>
+</span><span id="41" class="l"><a href="#41">  41: </a>    <span class="php-comment">/**
+</span></span><span id="42" class="l"><a href="#42">  42: </a><span class="php-comment">     * The server successfully processed the request, though no content is returned
+</span></span><span id="43" class="l"><a href="#43">  43: </a><span class="php-comment">     */</span>
+</span><span id="44" class="l"><a href="#44">  44: </a>    <span class="php-keyword1">const</span> HTTP_NO_CONTENT = <span class="php-num">204</span>;
+</span><span id="45" class="l"><a href="#45">  45: </a>    <span class="php-keyword1">const</span> HTTP_RESET_CONTENT = <span class="php-num">205</span>;
+</span><span id="46" class="l"><a href="#46">  46: </a>    <span class="php-keyword1">const</span> HTTP_PARTIAL_CONTENT = <span class="php-num">206</span>;
+</span><span id="47" class="l"><a href="#47">  47: </a>    <span class="php-keyword1">const</span> HTTP_MULTI_STATUS = <span class="php-num">207</span>;          <span class="php-comment">// RFC4918</span>
+</span><span id="48" class="l"><a href="#48">  48: </a>    <span class="php-keyword1">const</span> HTTP_ALREADY_REPORTED = <span class="php-num">208</span>;      <span class="php-comment">// RFC5842</span>
+</span><span id="49" class="l"><a href="#49">  49: </a>    <span class="php-keyword1">const</span> HTTP_IM_USED = <span class="php-num">226</span>;               <span class="php-comment">// RFC3229</span>
+</span><span id="50" class="l"><a href="#50">  50: </a>
+</span><span id="51" class="l"><a href="#51">  51: </a>    <span class="php-comment">// Redirection</span>
+</span><span id="52" class="l"><a href="#52">  52: </a>
+</span><span id="53" class="l"><a href="#53">  53: </a>    <span class="php-keyword1">const</span> HTTP_MULTIPLE_CHOICES = <span class="php-num">300</span>;
+</span><span id="54" class="l"><a href="#54">  54: </a>    <span class="php-keyword1">const</span> HTTP_MOVED_PERMANENTLY = <span class="php-num">301</span>;
+</span><span id="55" class="l"><a href="#55">  55: </a>    <span class="php-keyword1">const</span> HTTP_FOUND = <span class="php-num">302</span>;
+</span><span id="56" class="l"><a href="#56">  56: </a>    <span class="php-keyword1">const</span> HTTP_SEE_OTHER = <span class="php-num">303</span>;
 </span><span id="57" class="l"><a href="#57">  57: </a>
 </span><span id="58" class="l"><a href="#58">  58: </a>    <span class="php-comment">/**
-</span></span><span id="59" class="l"><a href="#59">  59: </a><span class="php-comment">     * Contains details about the REST API
-</span></span><span id="60" class="l"><a href="#60">  60: </a><span class="php-comment">     * Fields: db, ignore_limits, key, level, user_id
-</span></span><span id="61" class="l"><a href="#61">  61: </a><span class="php-comment">     * Note: This is a dynamic object (stdClass)
-</span></span><span id="62" class="l"><a href="#62">  62: </a><span class="php-comment">     *
-</span></span><span id="63" class="l"><a href="#63">  63: </a><span class="php-comment">     * @var object
-</span></span><span id="64" class="l"><a href="#64">  64: </a><span class="php-comment">     */</span>
-</span><span id="65" class="l"><a href="#65">  65: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$rest</span> = <span class="php-keyword1">NULL</span>;
+</span></span><span id="59" class="l"><a href="#59">  59: </a><span class="php-comment">     * The resource has not been modified since the last request
+</span></span><span id="60" class="l"><a href="#60">  60: </a><span class="php-comment">     */</span>
+</span><span id="61" class="l"><a href="#61">  61: </a>    <span class="php-keyword1">const</span> HTTP_NOT_MODIFIED = <span class="php-num">304</span>;
+</span><span id="62" class="l"><a href="#62">  62: </a>    <span class="php-keyword1">const</span> HTTP_USE_PROXY = <span class="php-num">305</span>;
+</span><span id="63" class="l"><a href="#63">  63: </a>    <span class="php-keyword1">const</span> HTTP_RESERVED = <span class="php-num">306</span>;
+</span><span id="64" class="l"><a href="#64">  64: </a>    <span class="php-keyword1">const</span> HTTP_TEMPORARY_REDIRECT = <span class="php-num">307</span>;
+</span><span id="65" class="l"><a href="#65">  65: </a>    <span class="php-keyword1">const</span> HTTP_PERMANENTLY_REDIRECT = <span class="php-num">308</span>;  <span class="php-comment">// RFC7238</span>
 </span><span id="66" class="l"><a href="#66">  66: </a>
-</span><span id="67" class="l"><a href="#67">  67: </a>    <span class="php-comment">/**
-</span></span><span id="68" class="l"><a href="#68">  68: </a><span class="php-comment">     * The arguments for the GET request method
-</span></span><span id="69" class="l"><a href="#69">  69: </a><span class="php-comment">     *
-</span></span><span id="70" class="l"><a href="#70">  70: </a><span class="php-comment">     * @var array
+</span><span id="67" class="l"><a href="#67">  67: </a>    <span class="php-comment">// Client Error</span>
+</span><span id="68" class="l"><a href="#68">  68: </a>
+</span><span id="69" class="l"><a href="#69">  69: </a>    <span class="php-comment">/**
+</span></span><span id="70" class="l"><a href="#70">  70: </a><span class="php-comment">     * The request cannot be fulfilled due to multiple errors
 </span></span><span id="71" class="l"><a href="#71">  71: </a><span class="php-comment">     */</span>
-</span><span id="72" class="l"><a href="#72">  72: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_get_args</span> = [];
+</span><span id="72" class="l"><a href="#72">  72: </a>    <span class="php-keyword1">const</span> HTTP_BAD_REQUEST = <span class="php-num">400</span>;
 </span><span id="73" class="l"><a href="#73">  73: </a>
 </span><span id="74" class="l"><a href="#74">  74: </a>    <span class="php-comment">/**
-</span></span><span id="75" class="l"><a href="#75">  75: </a><span class="php-comment">     * The arguments for the POST request method
-</span></span><span id="76" class="l"><a href="#76">  76: </a><span class="php-comment">     *
-</span></span><span id="77" class="l"><a href="#77">  77: </a><span class="php-comment">     * @var array
-</span></span><span id="78" class="l"><a href="#78">  78: </a><span class="php-comment">     */</span>
-</span><span id="79" class="l"><a href="#79">  79: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_post_args</span> = [];
-</span><span id="80" class="l"><a href="#80">  80: </a>
-</span><span id="81" class="l"><a href="#81">  81: </a>    <span class="php-comment">/**
-</span></span><span id="82" class="l"><a href="#82">  82: </a><span class="php-comment">     * The insert_id of the log entry (if we have one)
-</span></span><span id="83" class="l"><a href="#83">  83: </a><span class="php-comment">     *
-</span></span><span id="84" class="l"><a href="#84">  84: </a><span class="php-comment">     * @var string
-</span></span><span id="85" class="l"><a href="#85">  85: </a><span class="php-comment">     */</span>
-</span><span id="86" class="l"><a href="#86">  86: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_insert_id</span> = <span class="php-quote">''</span>;
-</span><span id="87" class="l"><a href="#87">  87: </a>
-</span><span id="88" class="l"><a href="#88">  88: </a>    <span class="php-comment">/**
-</span></span><span id="89" class="l"><a href="#89">  89: </a><span class="php-comment">     * The arguments for the PUT request method
-</span></span><span id="90" class="l"><a href="#90">  90: </a><span class="php-comment">     *
-</span></span><span id="91" class="l"><a href="#91">  91: </a><span class="php-comment">     * @var array
-</span></span><span id="92" class="l"><a href="#92">  92: </a><span class="php-comment">     */</span>
-</span><span id="93" class="l"><a href="#93">  93: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_put_args</span> = [];
-</span><span id="94" class="l"><a href="#94">  94: </a>
-</span><span id="95" class="l"><a href="#95">  95: </a>    <span class="php-comment">/**
-</span></span><span id="96" class="l"><a href="#96">  96: </a><span class="php-comment">     * The arguments for the DELETE request method
-</span></span><span id="97" class="l"><a href="#97">  97: </a><span class="php-comment">     *
-</span></span><span id="98" class="l"><a href="#98">  98: </a><span class="php-comment">     * @var array
-</span></span><span id="99" class="l"><a href="#99">  99: </a><span class="php-comment">     */</span>
-</span><span id="100" class="l"><a href="#100"> 100: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_delete_args</span> = [];
-</span><span id="101" class="l"><a href="#101"> 101: </a>
-</span><span id="102" class="l"><a href="#102"> 102: </a>    <span class="php-comment">/**
-</span></span><span id="103" class="l"><a href="#103"> 103: </a><span class="php-comment">     * The arguments for the PATCH request method
-</span></span><span id="104" class="l"><a href="#104"> 104: </a><span class="php-comment">     *
-</span></span><span id="105" class="l"><a href="#105"> 105: </a><span class="php-comment">     * @var array
-</span></span><span id="106" class="l"><a href="#106"> 106: </a><span class="php-comment">     */</span>
-</span><span id="107" class="l"><a href="#107"> 107: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_patch_args</span> = [];
-</span><span id="108" class="l"><a href="#108"> 108: </a>
-</span><span id="109" class="l"><a href="#109"> 109: </a>    <span class="php-comment">/**
-</span></span><span id="110" class="l"><a href="#110"> 110: </a><span class="php-comment">     * The arguments for the HEAD request method
-</span></span><span id="111" class="l"><a href="#111"> 111: </a><span class="php-comment">     *
-</span></span><span id="112" class="l"><a href="#112"> 112: </a><span class="php-comment">     * @var array
-</span></span><span id="113" class="l"><a href="#113"> 113: </a><span class="php-comment">     */</span>
-</span><span id="114" class="l"><a href="#114"> 114: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_head_args</span> = [];
-</span><span id="115" class="l"><a href="#115"> 115: </a>
-</span><span id="116" class="l"><a href="#116"> 116: </a>    <span class="php-comment">/**
-</span></span><span id="117" class="l"><a href="#117"> 117: </a><span class="php-comment">     * The arguments for the OPTIONS request method
-</span></span><span id="118" class="l"><a href="#118"> 118: </a><span class="php-comment">     *
-</span></span><span id="119" class="l"><a href="#119"> 119: </a><span class="php-comment">     * @var array
-</span></span><span id="120" class="l"><a href="#120"> 120: </a><span class="php-comment">     */</span>
-</span><span id="121" class="l"><a href="#121"> 121: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_options_args</span> = [];
-</span><span id="122" class="l"><a href="#122"> 122: </a>
-</span><span id="123" class="l"><a href="#123"> 123: </a>    <span class="php-comment">/**
-</span></span><span id="124" class="l"><a href="#124"> 124: </a><span class="php-comment">     * The arguments for the query parameters
-</span></span><span id="125" class="l"><a href="#125"> 125: </a><span class="php-comment">     *
-</span></span><span id="126" class="l"><a href="#126"> 126: </a><span class="php-comment">     * @var array
-</span></span><span id="127" class="l"><a href="#127"> 127: </a><span class="php-comment">     */</span>
-</span><span id="128" class="l"><a href="#128"> 128: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_query_args</span> = [];
+</span></span><span id="75" class="l"><a href="#75">  75: </a><span class="php-comment">     * The user is unauthorized to access the requested resource
+</span></span><span id="76" class="l"><a href="#76">  76: </a><span class="php-comment">     */</span>
+</span><span id="77" class="l"><a href="#77">  77: </a>    <span class="php-keyword1">const</span> HTTP_UNAUTHORIZED = <span class="php-num">401</span>;
+</span><span id="78" class="l"><a href="#78">  78: </a>    <span class="php-keyword1">const</span> HTTP_PAYMENT_REQUIRED = <span class="php-num">402</span>;
+</span><span id="79" class="l"><a href="#79">  79: </a>
+</span><span id="80" class="l"><a href="#80">  80: </a>    <span class="php-comment">/**
+</span></span><span id="81" class="l"><a href="#81">  81: </a><span class="php-comment">     * The requested resource is unavailable at this present time
+</span></span><span id="82" class="l"><a href="#82">  82: </a><span class="php-comment">     */</span>
+</span><span id="83" class="l"><a href="#83">  83: </a>    <span class="php-keyword1">const</span> HTTP_FORBIDDEN = <span class="php-num">403</span>;
+</span><span id="84" class="l"><a href="#84">  84: </a>
+</span><span id="85" class="l"><a href="#85">  85: </a>    <span class="php-comment">/**
+</span></span><span id="86" class="l"><a href="#86">  86: </a><span class="php-comment">     * The requested resource could not be found
+</span></span><span id="87" class="l"><a href="#87">  87: </a><span class="php-comment">     *
+</span></span><span id="88" class="l"><a href="#88">  88: </a><span class="php-comment">     * Note: This is sometimes used to mask if there was an UNAUTHORIZED (401) or
+</span></span><span id="89" class="l"><a href="#89">  89: </a><span class="php-comment">     * FORBIDDEN (403) error, for security reasons
+</span></span><span id="90" class="l"><a href="#90">  90: </a><span class="php-comment">     */</span>
+</span><span id="91" class="l"><a href="#91">  91: </a>    <span class="php-keyword1">const</span> HTTP_NOT_FOUND = <span class="php-num">404</span>;
+</span><span id="92" class="l"><a href="#92">  92: </a>
+</span><span id="93" class="l"><a href="#93">  93: </a>    <span class="php-comment">/**
+</span></span><span id="94" class="l"><a href="#94">  94: </a><span class="php-comment">     * The request method is not supported by the following resource
+</span></span><span id="95" class="l"><a href="#95">  95: </a><span class="php-comment">     */</span>
+</span><span id="96" class="l"><a href="#96">  96: </a>    <span class="php-keyword1">const</span> HTTP_METHOD_NOT_ALLOWED = <span class="php-num">405</span>;
+</span><span id="97" class="l"><a href="#97">  97: </a>
+</span><span id="98" class="l"><a href="#98">  98: </a>    <span class="php-comment">/**
+</span></span><span id="99" class="l"><a href="#99">  99: </a><span class="php-comment">     * The request was not acceptable
+</span></span><span id="100" class="l"><a href="#100"> 100: </a><span class="php-comment">     */</span>
+</span><span id="101" class="l"><a href="#101"> 101: </a>    <span class="php-keyword1">const</span> HTTP_NOT_ACCEPTABLE = <span class="php-num">406</span>;
+</span><span id="102" class="l"><a href="#102"> 102: </a>    <span class="php-keyword1">const</span> HTTP_PROXY_AUTHENTICATION_REQUIRED = <span class="php-num">407</span>;
+</span><span id="103" class="l"><a href="#103"> 103: </a>    <span class="php-keyword1">const</span> HTTP_REQUEST_TIMEOUT = <span class="php-num">408</span>;
+</span><span id="104" class="l"><a href="#104"> 104: </a>
+</span><span id="105" class="l"><a href="#105"> 105: </a>    <span class="php-comment">/**
+</span></span><span id="106" class="l"><a href="#106"> 106: </a><span class="php-comment">     * The request could not be completed due to a conflict with the current state
+</span></span><span id="107" class="l"><a href="#107"> 107: </a><span class="php-comment">     * of the resource
+</span></span><span id="108" class="l"><a href="#108"> 108: </a><span class="php-comment">     */</span>
+</span><span id="109" class="l"><a href="#109"> 109: </a>    <span class="php-keyword1">const</span> HTTP_CONFLICT = <span class="php-num">409</span>;
+</span><span id="110" class="l"><a href="#110"> 110: </a>    <span class="php-keyword1">const</span> HTTP_GONE = <span class="php-num">410</span>;
+</span><span id="111" class="l"><a href="#111"> 111: </a>    <span class="php-keyword1">const</span> HTTP_LENGTH_REQUIRED = <span class="php-num">411</span>;
+</span><span id="112" class="l"><a href="#112"> 112: </a>    <span class="php-keyword1">const</span> HTTP_PRECONDITION_FAILED = <span class="php-num">412</span>;
+</span><span id="113" class="l"><a href="#113"> 113: </a>    <span class="php-keyword1">const</span> HTTP_REQUEST_ENTITY_TOO_LARGE = <span class="php-num">413</span>;
+</span><span id="114" class="l"><a href="#114"> 114: </a>    <span class="php-keyword1">const</span> HTTP_REQUEST_URI_TOO_LONG = <span class="php-num">414</span>;
+</span><span id="115" class="l"><a href="#115"> 115: </a>    <span class="php-keyword1">const</span> HTTP_UNSUPPORTED_MEDIA_TYPE = <span class="php-num">415</span>;
+</span><span id="116" class="l"><a href="#116"> 116: </a>    <span class="php-keyword1">const</span> HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = <span class="php-num">416</span>;
+</span><span id="117" class="l"><a href="#117"> 117: </a>    <span class="php-keyword1">const</span> HTTP_EXPECTATION_FAILED = <span class="php-num">417</span>;
+</span><span id="118" class="l"><a href="#118"> 118: </a>    <span class="php-keyword1">const</span> HTTP_I_AM_A_TEAPOT = <span class="php-num">418</span>;                                               <span class="php-comment">// RFC2324</span>
+</span><span id="119" class="l"><a href="#119"> 119: </a>    <span class="php-keyword1">const</span> HTTP_UNPROCESSABLE_ENTITY = <span class="php-num">422</span>;                                        <span class="php-comment">// RFC4918</span>
+</span><span id="120" class="l"><a href="#120"> 120: </a>    <span class="php-keyword1">const</span> HTTP_LOCKED = <span class="php-num">423</span>;                                                      <span class="php-comment">// RFC4918</span>
+</span><span id="121" class="l"><a href="#121"> 121: </a>    <span class="php-keyword1">const</span> HTTP_FAILED_DEPENDENCY = <span class="php-num">424</span>;                                           <span class="php-comment">// RFC4918</span>
+</span><span id="122" class="l"><a href="#122"> 122: </a>    <span class="php-keyword1">const</span> HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = <span class="php-num">425</span>;   <span class="php-comment">// RFC2817</span>
+</span><span id="123" class="l"><a href="#123"> 123: </a>    <span class="php-keyword1">const</span> HTTP_UPGRADE_REQUIRED = <span class="php-num">426</span>;                                            <span class="php-comment">// RFC2817</span>
+</span><span id="124" class="l"><a href="#124"> 124: </a>    <span class="php-keyword1">const</span> HTTP_PRECONDITION_REQUIRED = <span class="php-num">428</span>;                                       <span class="php-comment">// RFC6585</span>
+</span><span id="125" class="l"><a href="#125"> 125: </a>    <span class="php-keyword1">const</span> HTTP_TOO_MANY_REQUESTS = <span class="php-num">429</span>;                                           <span class="php-comment">// RFC6585</span>
+</span><span id="126" class="l"><a href="#126"> 126: </a>    <span class="php-keyword1">const</span> HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = <span class="php-num">431</span>;                             <span class="php-comment">// RFC6585</span>
+</span><span id="127" class="l"><a href="#127"> 127: </a>
+</span><span id="128" class="l"><a href="#128"> 128: </a>    <span class="php-comment">// Server Error</span>
 </span><span id="129" class="l"><a href="#129"> 129: </a>
 </span><span id="130" class="l"><a href="#130"> 130: </a>    <span class="php-comment">/**
-</span></span><span id="131" class="l"><a href="#131"> 131: </a><span class="php-comment">     * The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined
+</span></span><span id="131" class="l"><a href="#131"> 131: </a><span class="php-comment">     * The server encountered an unexpected error
 </span></span><span id="132" class="l"><a href="#132"> 132: </a><span class="php-comment">     *
-</span></span><span id="133" class="l"><a href="#133"> 133: </a><span class="php-comment">     * @var array
-</span></span><span id="134" class="l"><a href="#134"> 134: </a><span class="php-comment">     */</span>
-</span><span id="135" class="l"><a href="#135"> 135: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_args</span> = [];
-</span><span id="136" class="l"><a href="#136"> 136: </a>
-</span><span id="137" class="l"><a href="#137"> 137: </a>    <span class="php-comment">/**
-</span></span><span id="138" class="l"><a href="#138"> 138: </a><span class="php-comment">     * If the request is allowed based on the API key provided.
-</span></span><span id="139" class="l"><a href="#139"> 139: </a><span class="php-comment">     *
-</span></span><span id="140" class="l"><a href="#140"> 140: </a><span class="php-comment">     * @var bool
-</span></span><span id="141" class="l"><a href="#141"> 141: </a><span class="php-comment">     */</span>
-</span><span id="142" class="l"><a href="#142"> 142: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_allow</span> = <span class="php-keyword1">TRUE</span>;
-</span><span id="143" class="l"><a href="#143"> 143: </a>
-</span><span id="144" class="l"><a href="#144"> 144: </a>    <span class="php-comment">/**
-</span></span><span id="145" class="l"><a href="#145"> 145: </a><span class="php-comment">     * Determines if output compression is enabled
-</span></span><span id="146" class="l"><a href="#146"> 146: </a><span class="php-comment">     *
-</span></span><span id="147" class="l"><a href="#147"> 147: </a><span class="php-comment">     * @var bool
-</span></span><span id="148" class="l"><a href="#148"> 148: </a><span class="php-comment">     */</span>
-</span><span id="149" class="l"><a href="#149"> 149: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_zlib_oc</span> = <span class="php-keyword1">FALSE</span>;
-</span><span id="150" class="l"><a href="#150"> 150: </a>
-</span><span id="151" class="l"><a href="#151"> 151: </a>    <span class="php-comment">/**
-</span></span><span id="152" class="l"><a href="#152"> 152: </a><span class="php-comment">     * The LDAP Distinguished Name of the User post authentication
-</span></span><span id="153" class="l"><a href="#153"> 153: </a><span class="php-comment">     *
-</span></span><span id="154" class="l"><a href="#154"> 154: </a><span class="php-comment">     * @var string
-</span></span><span id="155" class="l"><a href="#155"> 155: </a><span class="php-comment">     */</span>
-</span><span id="156" class="l"><a href="#156"> 156: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_user_ldap_dn</span> = <span class="php-quote">''</span>;
-</span><span id="157" class="l"><a href="#157"> 157: </a>
-</span><span id="158" class="l"><a href="#158"> 158: </a>    <span class="php-comment">/**
-</span></span><span id="159" class="l"><a href="#159"> 159: </a><span class="php-comment">     * The start of the response time from the server
-</span></span><span id="160" class="l"><a href="#160"> 160: </a><span class="php-comment">     *
-</span></span><span id="161" class="l"><a href="#161"> 161: </a><span class="php-comment">     * @var string
-</span></span><span id="162" class="l"><a href="#162"> 162: </a><span class="php-comment">     */</span>
-</span><span id="163" class="l"><a href="#163"> 163: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_start_rtime</span> = <span class="php-quote">''</span>;
-</span><span id="164" class="l"><a href="#164"> 164: </a>
-</span><span id="165" class="l"><a href="#165"> 165: </a>    <span class="php-comment">/**
-</span></span><span id="166" class="l"><a href="#166"> 166: </a><span class="php-comment">     * The end of the response time from the server
-</span></span><span id="167" class="l"><a href="#167"> 167: </a><span class="php-comment">     *
-</span></span><span id="168" class="l"><a href="#168"> 168: </a><span class="php-comment">     * @var string
-</span></span><span id="169" class="l"><a href="#169"> 169: </a><span class="php-comment">     */</span>
-</span><span id="170" class="l"><a href="#170"> 170: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_end_rtime</span> = <span class="php-quote">''</span>;
-</span><span id="171" class="l"><a href="#171"> 171: </a>
-</span><span id="172" class="l"><a href="#172"> 172: </a>    <span class="php-comment">/**
-</span></span><span id="173" class="l"><a href="#173"> 173: </a><span class="php-comment">     * List all supported methods, the first will be the default format
-</span></span><span id="174" class="l"><a href="#174"> 174: </a><span class="php-comment">     *
-</span></span><span id="175" class="l"><a href="#175"> 175: </a><span class="php-comment">     * @var array
-</span></span><span id="176" class="l"><a href="#176"> 176: </a><span class="php-comment">     */</span>
-</span><span id="177" class="l"><a href="#177"> 177: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_supported_formats</span> = [
-</span><span id="178" class="l"><a href="#178"> 178: </a>            <span class="php-quote">'json'</span> =&gt; <span class="php-quote">'application/json'</span>,
-</span><span id="179" class="l"><a href="#179"> 179: </a>            <span class="php-quote">'array'</span> =&gt; <span class="php-quote">'application/json'</span>,
-</span><span id="180" class="l"><a href="#180"> 180: </a>            <span class="php-quote">'csv'</span> =&gt; <span class="php-quote">'application/csv'</span>,
-</span><span id="181" class="l"><a href="#181"> 181: </a>            <span class="php-quote">'html'</span> =&gt; <span class="php-quote">'text/html'</span>,
-</span><span id="182" class="l"><a href="#182"> 182: </a>            <span class="php-quote">'jsonp'</span> =&gt; <span class="php-quote">'application/javascript'</span>,
-</span><span id="183" class="l"><a href="#183"> 183: </a>            <span class="php-quote">'php'</span> =&gt; <span class="php-quote">'text/plain'</span>,
-</span><span id="184" class="l"><a href="#184"> 184: </a>            <span class="php-quote">'serialized'</span> =&gt; <span class="php-quote">'application/vnd.php.serialized'</span>,
-</span><span id="185" class="l"><a href="#185"> 185: </a>            <span class="php-quote">'xml'</span> =&gt; <span class="php-quote">'application/xml'</span>
-</span><span id="186" class="l"><a href="#186"> 186: </a>        ];
-</span><span id="187" class="l"><a href="#187"> 187: </a>
-</span><span id="188" class="l"><a href="#188"> 188: </a>    <span class="php-comment">/**
-</span></span><span id="189" class="l"><a href="#189"> 189: </a><span class="php-comment">     * Information about the current API user
-</span></span><span id="190" class="l"><a href="#190"> 190: </a><span class="php-comment">     *
-</span></span><span id="191" class="l"><a href="#191"> 191: </a><span class="php-comment">     * @var object
-</span></span><span id="192" class="l"><a href="#192"> 192: </a><span class="php-comment">     */</span>
-</span><span id="193" class="l"><a href="#193"> 193: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_apiuser</span>;
-</span><span id="194" class="l"><a href="#194"> 194: </a>
-</span><span id="195" class="l"><a href="#195"> 195: </a>    <span class="php-comment">/**
-</span></span><span id="196" class="l"><a href="#196"> 196: </a><span class="php-comment">     * Enable XSS flag
-</span></span><span id="197" class="l"><a href="#197"> 197: </a><span class="php-comment">     * Determines whether the XSS filter is always active when
-</span></span><span id="198" class="l"><a href="#198"> 198: </a><span class="php-comment">     * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered.
-</span></span><span id="199" class="l"><a href="#199"> 199: </a><span class="php-comment">     * Set automatically based on config setting.
-</span></span><span id="200" class="l"><a href="#200"> 200: </a><span class="php-comment">     *
-</span></span><span id="201" class="l"><a href="#201"> 201: </a><span class="php-comment">     * @var bool
-</span></span><span id="202" class="l"><a href="#202"> 202: </a><span class="php-comment">     */</span>
-</span><span id="203" class="l"><a href="#203"> 203: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_enable_xss</span> = <span class="php-keyword1">FALSE</span>;
-</span><span id="204" class="l"><a href="#204"> 204: </a>
-</span><span id="205" class="l"><a href="#205"> 205: </a>    <span class="php-comment">// Success</span>
-</span><span id="206" class="l"><a href="#206"> 206: </a>
-</span><span id="207" class="l"><a href="#207"> 207: </a>    <span class="php-comment">/**
-</span></span><span id="208" class="l"><a href="#208"> 208: </a><span class="php-comment">     * The request has succeeded
-</span></span><span id="209" class="l"><a href="#209"> 209: </a><span class="php-comment">     */</span>
-</span><span id="210" class="l"><a href="#210"> 210: </a>    <span class="php-keyword1">const</span> OK = <span class="php-num">200</span>;
-</span><span id="211" class="l"><a href="#211"> 211: </a>
-</span><span id="212" class="l"><a href="#212"> 212: </a>    <span class="php-comment">/**
-</span></span><span id="213" class="l"><a href="#213"> 213: </a><span class="php-comment">     * The server successfully created a new resource
-</span></span><span id="214" class="l"><a href="#214"> 214: </a><span class="php-comment">     */</span>
-</span><span id="215" class="l"><a href="#215"> 215: </a>    <span class="php-keyword1">const</span> CREATED = <span class="php-num">201</span>;
-</span><span id="216" class="l"><a href="#216"> 216: </a>
-</span><span id="217" class="l"><a href="#217"> 217: </a>    <span class="php-comment">/**
-</span></span><span id="218" class="l"><a href="#218"> 218: </a><span class="php-comment">     * The server successfully processed the request, though no content is returned
+</span></span><span id="133" class="l"><a href="#133"> 133: </a><span class="php-comment">     * Note: This is a generic error message when no specific message
+</span></span><span id="134" class="l"><a href="#134"> 134: </a><span class="php-comment">     * is suitable
+</span></span><span id="135" class="l"><a href="#135"> 135: </a><span class="php-comment">     */</span>
+</span><span id="136" class="l"><a href="#136"> 136: </a>    <span class="php-keyword1">const</span> HTTP_INTERNAL_SERVER_ERROR = <span class="php-num">500</span>;
+</span><span id="137" class="l"><a href="#137"> 137: </a>
+</span><span id="138" class="l"><a href="#138"> 138: </a>    <span class="php-comment">/**
+</span></span><span id="139" class="l"><a href="#139"> 139: </a><span class="php-comment">     * The server does not recognised the request method
+</span></span><span id="140" class="l"><a href="#140"> 140: </a><span class="php-comment">     */</span>
+</span><span id="141" class="l"><a href="#141"> 141: </a>    <span class="php-keyword1">const</span> HTTP_NOT_IMPLEMENTED = <span class="php-num">501</span>;
+</span><span id="142" class="l"><a href="#142"> 142: </a>    <span class="php-keyword1">const</span> HTTP_BAD_GATEWAY = <span class="php-num">502</span>;
+</span><span id="143" class="l"><a href="#143"> 143: </a>    <span class="php-keyword1">const</span> HTTP_SERVICE_UNAVAILABLE = <span class="php-num">503</span>;
+</span><span id="144" class="l"><a href="#144"> 144: </a>    <span class="php-keyword1">const</span> HTTP_GATEWAY_TIMEOUT = <span class="php-num">504</span>;
+</span><span id="145" class="l"><a href="#145"> 145: </a>    <span class="php-keyword1">const</span> HTTP_VERSION_NOT_SUPPORTED = <span class="php-num">505</span>;
+</span><span id="146" class="l"><a href="#146"> 146: </a>    <span class="php-keyword1">const</span> HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL = <span class="php-num">506</span>;                        <span class="php-comment">// RFC2295</span>
+</span><span id="147" class="l"><a href="#147"> 147: </a>    <span class="php-keyword1">const</span> HTTP_INSUFFICIENT_STORAGE = <span class="php-num">507</span>;                                        <span class="php-comment">// RFC4918</span>
+</span><span id="148" class="l"><a href="#148"> 148: </a>    <span class="php-keyword1">const</span> HTTP_LOOP_DETECTED = <span class="php-num">508</span>;                                               <span class="php-comment">// RFC5842</span>
+</span><span id="149" class="l"><a href="#149"> 149: </a>    <span class="php-keyword1">const</span> HTTP_NOT_EXTENDED = <span class="php-num">510</span>;                                                <span class="php-comment">// RFC2774</span>
+</span><span id="150" class="l"><a href="#150"> 150: </a>    <span class="php-keyword1">const</span> HTTP_NETWORK_AUTHENTICATION_REQUIRED = <span class="php-num">511</span>;
+</span><span id="151" class="l"><a href="#151"> 151: </a>
+</span><span id="152" class="l"><a href="#152"> 152: </a>    <span class="php-comment">/**
+</span></span><span id="153" class="l"><a href="#153"> 153: </a><span class="php-comment">     * This defines the rest format.
+</span></span><span id="154" class="l"><a href="#154"> 154: </a><span class="php-comment">     * Must be overridden it in a controller so that it is set.
+</span></span><span id="155" class="l"><a href="#155"> 155: </a><span class="php-comment">     *
+</span></span><span id="156" class="l"><a href="#156"> 156: </a><span class="php-comment">     * @var string|NULL
+</span></span><span id="157" class="l"><a href="#157"> 157: </a><span class="php-comment">     */</span>
+</span><span id="158" class="l"><a href="#158"> 158: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$rest_format</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="159" class="l"><a href="#159"> 159: </a>
+</span><span id="160" class="l"><a href="#160"> 160: </a>    <span class="php-comment">/**
+</span></span><span id="161" class="l"><a href="#161"> 161: </a><span class="php-comment">     * Defines the list of method properties such as limit, log and level
+</span></span><span id="162" class="l"><a href="#162"> 162: </a><span class="php-comment">     *
+</span></span><span id="163" class="l"><a href="#163"> 163: </a><span class="php-comment">     * @var array
+</span></span><span id="164" class="l"><a href="#164"> 164: </a><span class="php-comment">     */</span>
+</span><span id="165" class="l"><a href="#165"> 165: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$methods</span> = [];
+</span><span id="166" class="l"><a href="#166"> 166: </a>
+</span><span id="167" class="l"><a href="#167"> 167: </a>    <span class="php-comment">/**
+</span></span><span id="168" class="l"><a href="#168"> 168: </a><span class="php-comment">     * List of allowed HTTP methods
+</span></span><span id="169" class="l"><a href="#169"> 169: </a><span class="php-comment">     *
+</span></span><span id="170" class="l"><a href="#170"> 170: </a><span class="php-comment">     * @var array
+</span></span><span id="171" class="l"><a href="#171"> 171: </a><span class="php-comment">     */</span>
+</span><span id="172" class="l"><a href="#172"> 172: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$allowed_http_methods</span> = [<span class="php-quote">'get'</span>, <span class="php-quote">'delete'</span>, <span class="php-quote">'post'</span>, <span class="php-quote">'put'</span>, <span class="php-quote">'options'</span>, <span class="php-quote">'patch'</span>, <span class="php-quote">'head'</span>];
+</span><span id="173" class="l"><a href="#173"> 173: </a>
+</span><span id="174" class="l"><a href="#174"> 174: </a>    <span class="php-comment">/**
+</span></span><span id="175" class="l"><a href="#175"> 175: </a><span class="php-comment">     * Contains details about the request
+</span></span><span id="176" class="l"><a href="#176"> 176: </a><span class="php-comment">     * Fields: body, format, method, ssl
+</span></span><span id="177" class="l"><a href="#177"> 177: </a><span class="php-comment">     * Note: This is a dynamic object (stdClass)
+</span></span><span id="178" class="l"><a href="#178"> 178: </a><span class="php-comment">     *
+</span></span><span id="179" class="l"><a href="#179"> 179: </a><span class="php-comment">     * @var object
+</span></span><span id="180" class="l"><a href="#180"> 180: </a><span class="php-comment">     */</span>
+</span><span id="181" class="l"><a href="#181"> 181: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$request</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="182" class="l"><a href="#182"> 182: </a>
+</span><span id="183" class="l"><a href="#183"> 183: </a>        <span class="php-comment">/**
+</span></span><span id="184" class="l"><a href="#184"> 184: </a><span class="php-comment">     * Contains details about the response
+</span></span><span id="185" class="l"><a href="#185"> 185: </a><span class="php-comment">     * Fields: format, lang
+</span></span><span id="186" class="l"><a href="#186"> 186: </a><span class="php-comment">     * Note: This is a dynamic object (stdClass)
+</span></span><span id="187" class="l"><a href="#187"> 187: </a><span class="php-comment">     *
+</span></span><span id="188" class="l"><a href="#188"> 188: </a><span class="php-comment">     * @var object
+</span></span><span id="189" class="l"><a href="#189"> 189: </a><span class="php-comment">     */</span>
+</span><span id="190" class="l"><a href="#190"> 190: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$response</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="191" class="l"><a href="#191"> 191: </a>
+</span><span id="192" class="l"><a href="#192"> 192: </a>    <span class="php-comment">/**
+</span></span><span id="193" class="l"><a href="#193"> 193: </a><span class="php-comment">     * Contains details about the REST API
+</span></span><span id="194" class="l"><a href="#194"> 194: </a><span class="php-comment">     * Fields: db, ignore_limits, key, level, user_id
+</span></span><span id="195" class="l"><a href="#195"> 195: </a><span class="php-comment">     * Note: This is a dynamic object (stdClass)
+</span></span><span id="196" class="l"><a href="#196"> 196: </a><span class="php-comment">     *
+</span></span><span id="197" class="l"><a href="#197"> 197: </a><span class="php-comment">     * @var object
+</span></span><span id="198" class="l"><a href="#198"> 198: </a><span class="php-comment">     */</span>
+</span><span id="199" class="l"><a href="#199"> 199: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$rest</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="200" class="l"><a href="#200"> 200: </a>
+</span><span id="201" class="l"><a href="#201"> 201: </a>    <span class="php-comment">/**
+</span></span><span id="202" class="l"><a href="#202"> 202: </a><span class="php-comment">     * The arguments for the GET request method
+</span></span><span id="203" class="l"><a href="#203"> 203: </a><span class="php-comment">     *
+</span></span><span id="204" class="l"><a href="#204"> 204: </a><span class="php-comment">     * @var array
+</span></span><span id="205" class="l"><a href="#205"> 205: </a><span class="php-comment">     */</span>
+</span><span id="206" class="l"><a href="#206"> 206: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_get_args</span> = [];
+</span><span id="207" class="l"><a href="#207"> 207: </a>
+</span><span id="208" class="l"><a href="#208"> 208: </a>    <span class="php-comment">/**
+</span></span><span id="209" class="l"><a href="#209"> 209: </a><span class="php-comment">     * The arguments for the POST request method
+</span></span><span id="210" class="l"><a href="#210"> 210: </a><span class="php-comment">     *
+</span></span><span id="211" class="l"><a href="#211"> 211: </a><span class="php-comment">     * @var array
+</span></span><span id="212" class="l"><a href="#212"> 212: </a><span class="php-comment">     */</span>
+</span><span id="213" class="l"><a href="#213"> 213: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_post_args</span> = [];
+</span><span id="214" class="l"><a href="#214"> 214: </a>
+</span><span id="215" class="l"><a href="#215"> 215: </a>    <span class="php-comment">/**
+</span></span><span id="216" class="l"><a href="#216"> 216: </a><span class="php-comment">     * The insert_id of the log entry (if we have one)
+</span></span><span id="217" class="l"><a href="#217"> 217: </a><span class="php-comment">     *
+</span></span><span id="218" class="l"><a href="#218"> 218: </a><span class="php-comment">     * @var string
 </span></span><span id="219" class="l"><a href="#219"> 219: </a><span class="php-comment">     */</span>
-</span><span id="220" class="l"><a href="#220"> 220: </a>    <span class="php-keyword1">const</span> NO_CONTENT = <span class="php-num">204</span>;
+</span><span id="220" class="l"><a href="#220"> 220: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_insert_id</span> = <span class="php-quote">''</span>;
 </span><span id="221" class="l"><a href="#221"> 221: </a>
-</span><span id="222" class="l"><a href="#222"> 222: </a>    <span class="php-comment">// Redirection</span>
-</span><span id="223" class="l"><a href="#223"> 223: </a>
-</span><span id="224" class="l"><a href="#224"> 224: </a>    <span class="php-comment">/**
-</span></span><span id="225" class="l"><a href="#225"> 225: </a><span class="php-comment">     * The resource has not been modified since the last request
+</span><span id="222" class="l"><a href="#222"> 222: </a>    <span class="php-comment">/**
+</span></span><span id="223" class="l"><a href="#223"> 223: </a><span class="php-comment">     * The arguments for the PUT request method
+</span></span><span id="224" class="l"><a href="#224"> 224: </a><span class="php-comment">     *
+</span></span><span id="225" class="l"><a href="#225"> 225: </a><span class="php-comment">     * @var array
 </span></span><span id="226" class="l"><a href="#226"> 226: </a><span class="php-comment">     */</span>
-</span><span id="227" class="l"><a href="#227"> 227: </a>    <span class="php-keyword1">const</span> NOT_MODIFIED = <span class="php-num">304</span>;
+</span><span id="227" class="l"><a href="#227"> 227: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_put_args</span> = [];
 </span><span id="228" class="l"><a href="#228"> 228: </a>
-</span><span id="229" class="l"><a href="#229"> 229: </a>    <span class="php-comment">// Client Error</span>
-</span><span id="230" class="l"><a href="#230"> 230: </a>
-</span><span id="231" class="l"><a href="#231"> 231: </a>    <span class="php-comment">/**
-</span></span><span id="232" class="l"><a href="#232"> 232: </a><span class="php-comment">     * The request cannot be fulfilled due to multiple errors
+</span><span id="229" class="l"><a href="#229"> 229: </a>    <span class="php-comment">/**
+</span></span><span id="230" class="l"><a href="#230"> 230: </a><span class="php-comment">     * The arguments for the DELETE request method
+</span></span><span id="231" class="l"><a href="#231"> 231: </a><span class="php-comment">     *
+</span></span><span id="232" class="l"><a href="#232"> 232: </a><span class="php-comment">     * @var array
 </span></span><span id="233" class="l"><a href="#233"> 233: </a><span class="php-comment">     */</span>
-</span><span id="234" class="l"><a href="#234"> 234: </a>    <span class="php-keyword1">const</span> BAD_REQUEST = <span class="php-num">400</span>;
+</span><span id="234" class="l"><a href="#234"> 234: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_delete_args</span> = [];
 </span><span id="235" class="l"><a href="#235"> 235: </a>
 </span><span id="236" class="l"><a href="#236"> 236: </a>    <span class="php-comment">/**
-</span></span><span id="237" class="l"><a href="#237"> 237: </a><span class="php-comment">     * The user is unauthorized to access the requested resource
-</span></span><span id="238" class="l"><a href="#238"> 238: </a><span class="php-comment">     */</span>
-</span><span id="239" class="l"><a href="#239"> 239: </a>    <span class="php-keyword1">const</span> UNAUTHORIZED = <span class="php-num">401</span>;
-</span><span id="240" class="l"><a href="#240"> 240: </a>
-</span><span id="241" class="l"><a href="#241"> 241: </a>    <span class="php-comment">/**
-</span></span><span id="242" class="l"><a href="#242"> 242: </a><span class="php-comment">     * The requested resource is unavailable at this present time
-</span></span><span id="243" class="l"><a href="#243"> 243: </a><span class="php-comment">     */</span>
-</span><span id="244" class="l"><a href="#244"> 244: </a>    <span class="php-keyword1">const</span> FORBIDDEN = <span class="php-num">403</span>;
-</span><span id="245" class="l"><a href="#245"> 245: </a>
-</span><span id="246" class="l"><a href="#246"> 246: </a>    <span class="php-comment">/**
-</span></span><span id="247" class="l"><a href="#247"> 247: </a><span class="php-comment">     * The requested resource could not be found
-</span></span><span id="248" class="l"><a href="#248"> 248: </a><span class="php-comment">     *
-</span></span><span id="249" class="l"><a href="#249"> 249: </a><span class="php-comment">     * Note: This is sometimes used to mask if there was an UNAUTHORIZED (401) or
-</span></span><span id="250" class="l"><a href="#250"> 250: </a><span class="php-comment">     * FORBIDDEN (403) error, for security reasons
-</span></span><span id="251" class="l"><a href="#251"> 251: </a><span class="php-comment">     */</span>
-</span><span id="252" class="l"><a href="#252"> 252: </a>    <span class="php-keyword1">const</span> NOT_FOUND = <span class="php-num">404</span>;
-</span><span id="253" class="l"><a href="#253"> 253: </a>
-</span><span id="254" class="l"><a href="#254"> 254: </a>    <span class="php-comment">/**
-</span></span><span id="255" class="l"><a href="#255"> 255: </a><span class="php-comment">     * The request method is not supported by the following resource
-</span></span><span id="256" class="l"><a href="#256"> 256: </a><span class="php-comment">     */</span>
-</span><span id="257" class="l"><a href="#257"> 257: </a>    <span class="php-keyword1">const</span> METHOD_NOT_ALLOWED = <span class="php-num">405</span>;
-</span><span id="258" class="l"><a href="#258"> 258: </a>
-</span><span id="259" class="l"><a href="#259"> 259: </a>    <span class="php-comment">/**
-</span></span><span id="260" class="l"><a href="#260"> 260: </a><span class="php-comment">     * The request was not acceptable
+</span></span><span id="237" class="l"><a href="#237"> 237: </a><span class="php-comment">     * The arguments for the PATCH request method
+</span></span><span id="238" class="l"><a href="#238"> 238: </a><span class="php-comment">     *
+</span></span><span id="239" class="l"><a href="#239"> 239: </a><span class="php-comment">     * @var array
+</span></span><span id="240" class="l"><a href="#240"> 240: </a><span class="php-comment">     */</span>
+</span><span id="241" class="l"><a href="#241"> 241: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_patch_args</span> = [];
+</span><span id="242" class="l"><a href="#242"> 242: </a>
+</span><span id="243" class="l"><a href="#243"> 243: </a>    <span class="php-comment">/**
+</span></span><span id="244" class="l"><a href="#244"> 244: </a><span class="php-comment">     * The arguments for the HEAD request method
+</span></span><span id="245" class="l"><a href="#245"> 245: </a><span class="php-comment">     *
+</span></span><span id="246" class="l"><a href="#246"> 246: </a><span class="php-comment">     * @var array
+</span></span><span id="247" class="l"><a href="#247"> 247: </a><span class="php-comment">     */</span>
+</span><span id="248" class="l"><a href="#248"> 248: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_head_args</span> = [];
+</span><span id="249" class="l"><a href="#249"> 249: </a>
+</span><span id="250" class="l"><a href="#250"> 250: </a>    <span class="php-comment">/**
+</span></span><span id="251" class="l"><a href="#251"> 251: </a><span class="php-comment">     * The arguments for the OPTIONS request method
+</span></span><span id="252" class="l"><a href="#252"> 252: </a><span class="php-comment">     *
+</span></span><span id="253" class="l"><a href="#253"> 253: </a><span class="php-comment">     * @var array
+</span></span><span id="254" class="l"><a href="#254"> 254: </a><span class="php-comment">     */</span>
+</span><span id="255" class="l"><a href="#255"> 255: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_options_args</span> = [];
+</span><span id="256" class="l"><a href="#256"> 256: </a>
+</span><span id="257" class="l"><a href="#257"> 257: </a>    <span class="php-comment">/**
+</span></span><span id="258" class="l"><a href="#258"> 258: </a><span class="php-comment">     * The arguments for the query parameters
+</span></span><span id="259" class="l"><a href="#259"> 259: </a><span class="php-comment">     *
+</span></span><span id="260" class="l"><a href="#260"> 260: </a><span class="php-comment">     * @var array
 </span></span><span id="261" class="l"><a href="#261"> 261: </a><span class="php-comment">     */</span>
-</span><span id="262" class="l"><a href="#262"> 262: </a>    <span class="php-keyword1">const</span> NOT_ACCEPTABLE = <span class="php-num">406</span>;
+</span><span id="262" class="l"><a href="#262"> 262: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_query_args</span> = [];
 </span><span id="263" class="l"><a href="#263"> 263: </a>
 </span><span id="264" class="l"><a href="#264"> 264: </a>    <span class="php-comment">/**
-</span></span><span id="265" class="l"><a href="#265"> 265: </a><span class="php-comment">     * The request could not be completed due to a conflict with the current state
-</span></span><span id="266" class="l"><a href="#266"> 266: </a><span class="php-comment">     * of the resource
-</span></span><span id="267" class="l"><a href="#267"> 267: </a><span class="php-comment">     */</span>
-</span><span id="268" class="l"><a href="#268"> 268: </a>    <span class="php-keyword1">const</span> CONFLICT = <span class="php-num">409</span>;
-</span><span id="269" class="l"><a href="#269"> 269: </a>
-</span><span id="270" class="l"><a href="#270"> 270: </a>    <span class="php-comment">// Server Error</span>
-</span><span id="271" class="l"><a href="#271"> 271: </a>
-</span><span id="272" class="l"><a href="#272"> 272: </a>    <span class="php-comment">/**
-</span></span><span id="273" class="l"><a href="#273"> 273: </a><span class="php-comment">     * The server encountered an unexpected error
-</span></span><span id="274" class="l"><a href="#274"> 274: </a><span class="php-comment">     *
-</span></span><span id="275" class="l"><a href="#275"> 275: </a><span class="php-comment">     * Note: This is a generic error message when no specific message
-</span></span><span id="276" class="l"><a href="#276"> 276: </a><span class="php-comment">     * is suitable
-</span></span><span id="277" class="l"><a href="#277"> 277: </a><span class="php-comment">     */</span>
-</span><span id="278" class="l"><a href="#278"> 278: </a>    <span class="php-keyword1">const</span> INTERNAL_SERVER_ERROR = <span class="php-num">500</span>;
-</span><span id="279" class="l"><a href="#279"> 279: </a>
-</span><span id="280" class="l"><a href="#280"> 280: </a>    <span class="php-comment">/**
-</span></span><span id="281" class="l"><a href="#281"> 281: </a><span class="php-comment">     * The server does not recognised the request method
+</span></span><span id="265" class="l"><a href="#265"> 265: </a><span class="php-comment">     * The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined
+</span></span><span id="266" class="l"><a href="#266"> 266: </a><span class="php-comment">     *
+</span></span><span id="267" class="l"><a href="#267"> 267: </a><span class="php-comment">     * @var array
+</span></span><span id="268" class="l"><a href="#268"> 268: </a><span class="php-comment">     */</span>
+</span><span id="269" class="l"><a href="#269"> 269: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_args</span> = [];
+</span><span id="270" class="l"><a href="#270"> 270: </a>
+</span><span id="271" class="l"><a href="#271"> 271: </a>    <span class="php-comment">/**
+</span></span><span id="272" class="l"><a href="#272"> 272: </a><span class="php-comment">     * If the request is allowed based on the API key provided.
+</span></span><span id="273" class="l"><a href="#273"> 273: </a><span class="php-comment">     *
+</span></span><span id="274" class="l"><a href="#274"> 274: </a><span class="php-comment">     * @var bool
+</span></span><span id="275" class="l"><a href="#275"> 275: </a><span class="php-comment">     */</span>
+</span><span id="276" class="l"><a href="#276"> 276: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_allow</span> = <span class="php-keyword1">TRUE</span>;
+</span><span id="277" class="l"><a href="#277"> 277: </a>
+</span><span id="278" class="l"><a href="#278"> 278: </a>    <span class="php-comment">/**
+</span></span><span id="279" class="l"><a href="#279"> 279: </a><span class="php-comment">     * Determines if output compression is enabled
+</span></span><span id="280" class="l"><a href="#280"> 280: </a><span class="php-comment">     *
+</span></span><span id="281" class="l"><a href="#281"> 281: </a><span class="php-comment">     * @var bool
 </span></span><span id="282" class="l"><a href="#282"> 282: </a><span class="php-comment">     */</span>
-</span><span id="283" class="l"><a href="#283"> 283: </a>    <span class="php-keyword1">const</span> NOT_IMPLEMENTED = <span class="php-num">501</span>;
+</span><span id="283" class="l"><a href="#283"> 283: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_zlib_oc</span> = <span class="php-keyword1">FALSE</span>;
 </span><span id="284" class="l"><a href="#284"> 284: </a>
 </span><span id="285" class="l"><a href="#285"> 285: </a>    <span class="php-comment">/**
-</span></span><span id="286" class="l"><a href="#286"> 286: </a><span class="php-comment">     * HTTP status codes and their respective description
+</span></span><span id="286" class="l"><a href="#286"> 286: </a><span class="php-comment">     * The LDAP Distinguished Name of the User post authentication
 </span></span><span id="287" class="l"><a href="#287"> 287: </a><span class="php-comment">     *
-</span></span><span id="288" class="l"><a href="#288"> 288: </a><span class="php-comment">     * @var array
-</span></span><span id="289" class="l"><a href="#289"> 289: </a><span class="php-comment">     * @link http://www.restapitutorial.com/httpstatuscodes.html
-</span></span><span id="290" class="l"><a href="#290"> 290: </a><span class="php-comment">     */</span>
-</span><span id="291" class="l"><a href="#291"> 291: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$http_status_codes</span> = [
-</span><span id="292" class="l"><a href="#292"> 292: </a>        self::OK =&gt; <span class="php-quote">'OK'</span>,
-</span><span id="293" class="l"><a href="#293"> 293: </a>        self::CREATED =&gt; <span class="php-quote">'CREATED'</span>,
-</span><span id="294" class="l"><a href="#294"> 294: </a>        self::NO_CONTENT =&gt; <span class="php-quote">'NO CONTENT'</span>,
-</span><span id="295" class="l"><a href="#295"> 295: </a>        self::NOT_MODIFIED =&gt; <span class="php-quote">'NOT MODIFIED'</span>,
-</span><span id="296" class="l"><a href="#296"> 296: </a>        self::BAD_REQUEST =&gt; <span class="php-quote">'BAD REQUEST'</span>,
-</span><span id="297" class="l"><a href="#297"> 297: </a>        self::UNAUTHORIZED =&gt; <span class="php-quote">'UNAUTHORIZED'</span>,
-</span><span id="298" class="l"><a href="#298"> 298: </a>        self::FORBIDDEN =&gt; <span class="php-quote">'FORBIDDEN'</span>,
-</span><span id="299" class="l"><a href="#299"> 299: </a>        self::NOT_FOUND =&gt; <span class="php-quote">'NOT FOUND'</span>,
-</span><span id="300" class="l"><a href="#300"> 300: </a>        self::METHOD_NOT_ALLOWED =&gt; <span class="php-quote">'METHOD NOT ALLOWED'</span>,
-</span><span id="301" class="l"><a href="#301"> 301: </a>        self::NOT_ACCEPTABLE =&gt; <span class="php-quote">'NOT ACCEPTABLE'</span>,
-</span><span id="302" class="l"><a href="#302"> 302: </a>        self::CONFLICT =&gt; <span class="php-quote">'CONFLICT'</span>,
-</span><span id="303" class="l"><a href="#303"> 303: </a>        self::INTERNAL_SERVER_ERROR =&gt; <span class="php-quote">'INTERNAL SERVER ERROR'</span>,
-</span><span id="304" class="l"><a href="#304"> 304: </a>        self::NOT_IMPLEMENTED =&gt; <span class="php-quote">'NOT IMPLEMENTED'</span>
-</span><span id="305" class="l"><a href="#305"> 305: </a>    ];
-</span><span id="306" class="l"><a href="#306"> 306: </a>
-</span><span id="307" class="l"><a href="#307"> 307: </a>    <span class="php-comment">/**
-</span></span><span id="308" class="l"><a href="#308"> 308: </a><span class="php-comment">     * Extend this function to apply additional checking early on in the process
-</span></span><span id="309" class="l"><a href="#309"> 309: </a><span class="php-comment">     *
-</span></span><span id="310" class="l"><a href="#310"> 310: </a><span class="php-comment">     * @access protected
-</span></span><span id="311" class="l"><a href="#311"> 311: </a><span class="php-comment">     * @return void
-</span></span><span id="312" class="l"><a href="#312"> 312: </a><span class="php-comment">     */</span>
-</span><span id="313" class="l"><a href="#313"> 313: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> early_checks()
-</span><span id="314" class="l"><a href="#314"> 314: </a>    {
-</span><span id="315" class="l"><a href="#315"> 315: </a>    }
-</span><span id="316" class="l"><a href="#316"> 316: </a>
-</span><span id="317" class="l"><a href="#317"> 317: </a>    <span class="php-comment">/**
-</span></span><span id="318" class="l"><a href="#318"> 318: </a><span class="php-comment">     * Constructor for the REST API
-</span></span><span id="319" class="l"><a href="#319"> 319: </a><span class="php-comment">     *
-</span></span><span id="320" class="l"><a href="#320"> 320: </a><span class="php-comment">     * @access public
-</span></span><span id="321" class="l"><a href="#321"> 321: </a><span class="php-comment">     * @param string $config Configuration filename minus the file extension
-</span></span><span id="322" class="l"><a href="#322"> 322: </a><span class="php-comment">     * e.g: my_rest.php is passed as 'my_rest'
-</span></span><span id="323" class="l"><a href="#323"> 323: </a><span class="php-comment">     * @return void
-</span></span><span id="324" class="l"><a href="#324"> 324: </a><span class="php-comment">     */</span>
-</span><span id="325" class="l"><a href="#325"> 325: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$config</span> = <span class="php-quote">'rest'</span>)
-</span><span id="326" class="l"><a href="#326"> 326: </a>    {
-</span><span id="327" class="l"><a href="#327"> 327: </a>        parent::__construct();
+</span></span><span id="288" class="l"><a href="#288"> 288: </a><span class="php-comment">     * @var string
+</span></span><span id="289" class="l"><a href="#289"> 289: </a><span class="php-comment">     */</span>
+</span><span id="290" class="l"><a href="#290"> 290: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_user_ldap_dn</span> = <span class="php-quote">''</span>;
+</span><span id="291" class="l"><a href="#291"> 291: </a>
+</span><span id="292" class="l"><a href="#292"> 292: </a>    <span class="php-comment">/**
+</span></span><span id="293" class="l"><a href="#293"> 293: </a><span class="php-comment">     * The start of the response time from the server
+</span></span><span id="294" class="l"><a href="#294"> 294: </a><span class="php-comment">     *
+</span></span><span id="295" class="l"><a href="#295"> 295: </a><span class="php-comment">     * @var string
+</span></span><span id="296" class="l"><a href="#296"> 296: </a><span class="php-comment">     */</span>
+</span><span id="297" class="l"><a href="#297"> 297: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_start_rtime</span> = <span class="php-quote">''</span>;
+</span><span id="298" class="l"><a href="#298"> 298: </a>
+</span><span id="299" class="l"><a href="#299"> 299: </a>    <span class="php-comment">/**
+</span></span><span id="300" class="l"><a href="#300"> 300: </a><span class="php-comment">     * The end of the response time from the server
+</span></span><span id="301" class="l"><a href="#301"> 301: </a><span class="php-comment">     *
+</span></span><span id="302" class="l"><a href="#302"> 302: </a><span class="php-comment">     * @var string
+</span></span><span id="303" class="l"><a href="#303"> 303: </a><span class="php-comment">     */</span>
+</span><span id="304" class="l"><a href="#304"> 304: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_end_rtime</span> = <span class="php-quote">''</span>;
+</span><span id="305" class="l"><a href="#305"> 305: </a>
+</span><span id="306" class="l"><a href="#306"> 306: </a>    <span class="php-comment">/**
+</span></span><span id="307" class="l"><a href="#307"> 307: </a><span class="php-comment">     * List all supported methods, the first will be the default format
+</span></span><span id="308" class="l"><a href="#308"> 308: </a><span class="php-comment">     *
+</span></span><span id="309" class="l"><a href="#309"> 309: </a><span class="php-comment">     * @var array
+</span></span><span id="310" class="l"><a href="#310"> 310: </a><span class="php-comment">     */</span>
+</span><span id="311" class="l"><a href="#311"> 311: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_supported_formats</span> = [
+</span><span id="312" class="l"><a href="#312"> 312: </a>            <span class="php-quote">'json'</span> =&gt; <span class="php-quote">'application/json'</span>,
+</span><span id="313" class="l"><a href="#313"> 313: </a>            <span class="php-quote">'array'</span> =&gt; <span class="php-quote">'application/json'</span>,
+</span><span id="314" class="l"><a href="#314"> 314: </a>            <span class="php-quote">'csv'</span> =&gt; <span class="php-quote">'application/csv'</span>,
+</span><span id="315" class="l"><a href="#315"> 315: </a>            <span class="php-quote">'html'</span> =&gt; <span class="php-quote">'text/html'</span>,
+</span><span id="316" class="l"><a href="#316"> 316: </a>            <span class="php-quote">'jsonp'</span> =&gt; <span class="php-quote">'application/javascript'</span>,
+</span><span id="317" class="l"><a href="#317"> 317: </a>            <span class="php-quote">'php'</span> =&gt; <span class="php-quote">'text/plain'</span>,
+</span><span id="318" class="l"><a href="#318"> 318: </a>            <span class="php-quote">'serialized'</span> =&gt; <span class="php-quote">'application/vnd.php.serialized'</span>,
+</span><span id="319" class="l"><a href="#319"> 319: </a>            <span class="php-quote">'xml'</span> =&gt; <span class="php-quote">'application/xml'</span>
+</span><span id="320" class="l"><a href="#320"> 320: </a>        ];
+</span><span id="321" class="l"><a href="#321"> 321: </a>
+</span><span id="322" class="l"><a href="#322"> 322: </a>    <span class="php-comment">/**
+</span></span><span id="323" class="l"><a href="#323"> 323: </a><span class="php-comment">     * Information about the current API user
+</span></span><span id="324" class="l"><a href="#324"> 324: </a><span class="php-comment">     *
+</span></span><span id="325" class="l"><a href="#325"> 325: </a><span class="php-comment">     * @var object
+</span></span><span id="326" class="l"><a href="#326"> 326: </a><span class="php-comment">     */</span>
+</span><span id="327" class="l"><a href="#327"> 327: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_apiuser</span>;
 </span><span id="328" class="l"><a href="#328"> 328: </a>
-</span><span id="329" class="l"><a href="#329"> 329: </a>        <span class="php-comment">// Disable XML Entity (security vulnerability)</span>
-</span><span id="330" class="l"><a href="#330"> 330: </a>        <span class="php-keyword2">libxml_disable_entity_loader</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="331" class="l"><a href="#331"> 331: </a>
-</span><span id="332" class="l"><a href="#332"> 332: </a>        <span class="php-comment">// Check to see if PHP is equal to or greater than 5.4.x</span>
-</span><span id="333" class="l"><a href="#333"> 333: </a>        <span class="php-keyword1">if</span> (is_php(<span class="php-quote">'5.4'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="334" class="l"><a href="#334"> 334: </a>        {
-</span><span id="335" class="l"><a href="#335"> 335: </a>            <span class="php-comment">// CodeIgniter 3 is recommended for v5.4 or above</span>
-</span><span id="336" class="l"><a href="#336"> 336: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'Using PHP v'</span> . PHP_VERSION . <span class="php-quote">', though PHP v5.4 or greater is required'</span>);
-</span><span id="337" class="l"><a href="#337"> 337: </a>        }
+</span><span id="329" class="l"><a href="#329"> 329: </a>    <span class="php-comment">/**
+</span></span><span id="330" class="l"><a href="#330"> 330: </a><span class="php-comment">     * Enable XSS flag
+</span></span><span id="331" class="l"><a href="#331"> 331: </a><span class="php-comment">     * Determines whether the XSS filter is always active when
+</span></span><span id="332" class="l"><a href="#332"> 332: </a><span class="php-comment">     * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered.
+</span></span><span id="333" class="l"><a href="#333"> 333: </a><span class="php-comment">     * Set automatically based on config setting.
+</span></span><span id="334" class="l"><a href="#334"> 334: </a><span class="php-comment">     *
+</span></span><span id="335" class="l"><a href="#335"> 335: </a><span class="php-comment">     * @var bool
+</span></span><span id="336" class="l"><a href="#336"> 336: </a><span class="php-comment">     */</span>
+</span><span id="337" class="l"><a href="#337"> 337: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_enable_xss</span> = <span class="php-keyword1">FALSE</span>;
 </span><span id="338" class="l"><a href="#338"> 338: </a>
-</span><span id="339" class="l"><a href="#339"> 339: </a>        <span class="php-comment">// Check to see if this is CI 3.x</span>
-</span><span id="340" class="l"><a href="#340"> 340: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">explode</span>(<span class="php-quote">'.'</span>, CI_VERSION, <span class="php-num">2</span>)[<span class="php-num">0</span>] &lt; <span class="php-num">3</span>)
-</span><span id="341" class="l"><a href="#341"> 341: </a>        {
-</span><span id="342" class="l"><a href="#342"> 342: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
-</span><span id="343" class="l"><a href="#343"> 343: </a>        }
-</span><span id="344" class="l"><a href="#344"> 344: </a>
-</span><span id="345" class="l"><a href="#345"> 345: </a>        <span class="php-comment">// Set the default value of global xss filtering. Same approach as CodeIgniter 3</span>
-</span><span id="346" class="l"><a href="#346"> 346: </a>        <span class="php-var">$this</span>-&gt;_enable_xss = (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'global_xss_filtering'</span>) === <span class="php-keyword1">TRUE</span>);
-</span><span id="347" class="l"><a href="#347"> 347: </a>
-</span><span id="348" class="l"><a href="#348"> 348: </a>        <span class="php-comment">// Start the timer for how long the request takes</span>
-</span><span id="349" class="l"><a href="#349"> 349: </a>        <span class="php-var">$this</span>-&gt;_start_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="350" class="l"><a href="#350"> 350: </a>
-</span><span id="351" class="l"><a href="#351"> 351: </a>        <span class="php-comment">// Load the rest.php configuration file</span>
-</span><span id="352" class="l"><a href="#352"> 352: </a>        <span class="php-var">$this</span>-&gt;load-&gt;config(<span class="php-var">$config</span>);
-</span><span id="353" class="l"><a href="#353"> 353: </a>
-</span><span id="354" class="l"><a href="#354"> 354: </a>        <span class="php-comment">// At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)</span>
-</span><span id="355" class="l"><a href="#355"> 355: </a>        <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-quote">'format'</span>);
-</span><span id="356" class="l"><a href="#356"> 356: </a>
-</span><span id="357" class="l"><a href="#357"> 357: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
-</span><span id="358" class="l"><a href="#358"> 358: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
-</span><span id="359" class="l"><a href="#359"> 359: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
-</span><span id="360" class="l"><a href="#360"> 360: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
+</span><span id="339" class="l"><a href="#339"> 339: </a>    <span class="php-comment">/**
+</span></span><span id="340" class="l"><a href="#340"> 340: </a><span class="php-comment">     * HTTP status codes and their respective description
+</span></span><span id="341" class="l"><a href="#341"> 341: </a><span class="php-comment">     * Note: Only the widley used HTTP status codes are used
+</span></span><span id="342" class="l"><a href="#342"> 342: </a><span class="php-comment">     *
+</span></span><span id="343" class="l"><a href="#343"> 343: </a><span class="php-comment">     * @var array
+</span></span><span id="344" class="l"><a href="#344"> 344: </a><span class="php-comment">     * @link http://www.restapitutorial.com/httpstatuscodes.html
+</span></span><span id="345" class="l"><a href="#345"> 345: </a><span class="php-comment">     */</span>
+</span><span id="346" class="l"><a href="#346"> 346: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$http_status_codes</span> = [
+</span><span id="347" class="l"><a href="#347"> 347: </a>        self::HTTP_OK =&gt; <span class="php-quote">'OK'</span>,
+</span><span id="348" class="l"><a href="#348"> 348: </a>        self::HTTP_CREATED =&gt; <span class="php-quote">'CREATED'</span>,
+</span><span id="349" class="l"><a href="#349"> 349: </a>        self::HTTP_NO_CONTENT =&gt; <span class="php-quote">'NO CONTENT'</span>,
+</span><span id="350" class="l"><a href="#350"> 350: </a>        self::HTTP_NOT_MODIFIED =&gt; <span class="php-quote">'NOT MODIFIED'</span>,
+</span><span id="351" class="l"><a href="#351"> 351: </a>        self::HTTP_BAD_REQUEST =&gt; <span class="php-quote">'BAD REQUEST'</span>,
+</span><span id="352" class="l"><a href="#352"> 352: </a>        self::HTTP_UNAUTHORIZED =&gt; <span class="php-quote">'UNAUTHORIZED'</span>,
+</span><span id="353" class="l"><a href="#353"> 353: </a>        self::HTTP_FORBIDDEN =&gt; <span class="php-quote">'FORBIDDEN'</span>,
+</span><span id="354" class="l"><a href="#354"> 354: </a>        self::HTTP_NOT_FOUND =&gt; <span class="php-quote">'NOT FOUND'</span>,
+</span><span id="355" class="l"><a href="#355"> 355: </a>        self::HTTP_METHOD_NOT_ALLOWED =&gt; <span class="php-quote">'METHOD NOT ALLOWED'</span>,
+</span><span id="356" class="l"><a href="#356"> 356: </a>        self::HTTP_NOT_ACCEPTABLE =&gt; <span class="php-quote">'NOT ACCEPTABLE'</span>,
+</span><span id="357" class="l"><a href="#357"> 357: </a>        self::HTTP_CONFLICT =&gt; <span class="php-quote">'CONFLICT'</span>,
+</span><span id="358" class="l"><a href="#358"> 358: </a>        self::HTTP_INTERNAL_SERVER_ERROR =&gt; <span class="php-quote">'INTERNAL SERVER ERROR'</span>,
+</span><span id="359" class="l"><a href="#359"> 359: </a>        self::HTTP_NOT_IMPLEMENTED =&gt; <span class="php-quote">'NOT IMPLEMENTED'</span>
+</span><span id="360" class="l"><a href="#360"> 360: </a>    ];
 </span><span id="361" class="l"><a href="#361"> 361: </a>
-</span><span id="362" class="l"><a href="#362"> 362: </a>        <span class="php-var">$this</span>-&gt;_zlib_oc = @<span class="php-keyword2">ini_get</span>(<span class="php-quote">'zlib.output_compression'</span>);
-</span><span id="363" class="l"><a href="#363"> 363: </a>
-</span><span id="364" class="l"><a href="#364"> 364: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
-</span><span id="365" class="l"><a href="#365"> 365: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="366" class="l"><a href="#366"> 366: </a>        {
-</span><span id="367" class="l"><a href="#367"> 367: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
-</span><span id="368" class="l"><a href="#368"> 368: </a>        }
-</span><span id="369" class="l"><a href="#369"> 369: </a>
-</span><span id="370" class="l"><a href="#370"> 370: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
-</span><span id="371" class="l"><a href="#371"> 371: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
-</span><span id="372" class="l"><a href="#372"> 372: </a>
-</span><span id="373" class="l"><a href="#373"> 373: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
-</span><span id="374" class="l"><a href="#374"> 374: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
-</span><span id="375" class="l"><a href="#375"> 375: </a>
-</span><span id="376" class="l"><a href="#376"> 376: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
-</span><span id="377" class="l"><a href="#377"> 377: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
-</span><span id="378" class="l"><a href="#378"> 378: </a>        {
-</span><span id="379" class="l"><a href="#379"> 379: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = [];
-</span><span id="380" class="l"><a href="#380"> 380: </a>        }
-</span><span id="381" class="l"><a href="#381"> 381: </a>
-</span><span id="382" class="l"><a href="#382"> 382: </a>        <span class="php-comment">// Set up the query parameters</span>
-</span><span id="383" class="l"><a href="#383"> 383: </a>        <span class="php-var">$this</span>-&gt;_parse_query();
-</span><span id="384" class="l"><a href="#384"> 384: </a>
-</span><span id="385" class="l"><a href="#385"> 385: </a>        <span class="php-comment">// Set up the GET variables</span>
-</span><span id="386" class="l"><a href="#386"> 386: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
-</span><span id="387" class="l"><a href="#387"> 387: </a>
-</span><span id="388" class="l"><a href="#388"> 388: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
-</span><span id="389" class="l"><a href="#389"> 389: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
-</span><span id="390" class="l"><a href="#390"> 390: </a>
-</span><span id="391" class="l"><a href="#391"> 391: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
-</span><span id="392" class="l"><a href="#392"> 392: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
+</span><span id="362" class="l"><a href="#362"> 362: </a>    <span class="php-comment">/**
+</span></span><span id="363" class="l"><a href="#363"> 363: </a><span class="php-comment">     * Extend this function to apply additional checking early on in the process
+</span></span><span id="364" class="l"><a href="#364"> 364: </a><span class="php-comment">     *
+</span></span><span id="365" class="l"><a href="#365"> 365: </a><span class="php-comment">     * @access protected
+</span></span><span id="366" class="l"><a href="#366"> 366: </a><span class="php-comment">     * @return void
+</span></span><span id="367" class="l"><a href="#367"> 367: </a><span class="php-comment">     */</span>
+</span><span id="368" class="l"><a href="#368"> 368: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> early_checks()
+</span><span id="369" class="l"><a href="#369"> 369: </a>    {
+</span><span id="370" class="l"><a href="#370"> 370: </a>    }
+</span><span id="371" class="l"><a href="#371"> 371: </a>
+</span><span id="372" class="l"><a href="#372"> 372: </a>    <span class="php-comment">/**
+</span></span><span id="373" class="l"><a href="#373"> 373: </a><span class="php-comment">     * Constructor for the REST API
+</span></span><span id="374" class="l"><a href="#374"> 374: </a><span class="php-comment">     *
+</span></span><span id="375" class="l"><a href="#375"> 375: </a><span class="php-comment">     * @access public
+</span></span><span id="376" class="l"><a href="#376"> 376: </a><span class="php-comment">     * @param string $config Configuration filename minus the file extension
+</span></span><span id="377" class="l"><a href="#377"> 377: </a><span class="php-comment">     * e.g: my_rest.php is passed as 'my_rest'
+</span></span><span id="378" class="l"><a href="#378"> 378: </a><span class="php-comment">     * @return void
+</span></span><span id="379" class="l"><a href="#379"> 379: </a><span class="php-comment">     */</span>
+</span><span id="380" class="l"><a href="#380"> 380: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$config</span> = <span class="php-quote">'rest'</span>)
+</span><span id="381" class="l"><a href="#381"> 381: </a>    {
+</span><span id="382" class="l"><a href="#382"> 382: </a>        parent::__construct();
+</span><span id="383" class="l"><a href="#383"> 383: </a>
+</span><span id="384" class="l"><a href="#384"> 384: </a>        <span class="php-comment">// Disable XML Entity (security vulnerability)</span>
+</span><span id="385" class="l"><a href="#385"> 385: </a>        <span class="php-keyword2">libxml_disable_entity_loader</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="386" class="l"><a href="#386"> 386: </a>
+</span><span id="387" class="l"><a href="#387"> 387: </a>        <span class="php-comment">// Check to see if PHP is equal to or greater than 5.4.x</span>
+</span><span id="388" class="l"><a href="#388"> 388: </a>        <span class="php-keyword1">if</span> (is_php(<span class="php-quote">'5.4'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="389" class="l"><a href="#389"> 389: </a>        {
+</span><span id="390" class="l"><a href="#390"> 390: </a>            <span class="php-comment">// CodeIgniter 3 is recommended for v5.4 or above</span>
+</span><span id="391" class="l"><a href="#391"> 391: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'Using PHP v'</span> . PHP_VERSION . <span class="php-quote">', though PHP v5.4 or greater is required'</span>);
+</span><span id="392" class="l"><a href="#392"> 392: </a>        }
 </span><span id="393" class="l"><a href="#393"> 393: </a>
-</span><span id="394" class="l"><a href="#394"> 394: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
-</span><span id="395" class="l"><a href="#395"> 395: </a>
-</span><span id="396" class="l"><a href="#396"> 396: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
-</span><span id="397" class="l"><a href="#397"> 397: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
-</span><span id="398" class="l"><a href="#398"> 398: </a>        {
-</span><span id="399" class="l"><a href="#399"> 399: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
-</span><span id="400" class="l"><a href="#400"> 400: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
-</span><span id="401" class="l"><a href="#401"> 401: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
-</span><span id="402" class="l"><a href="#402"> 402: </a>        }
-</span><span id="403" class="l"><a href="#403"> 403: </a>
-</span><span id="404" class="l"><a href="#404"> 404: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
-</span><span id="405" class="l"><a href="#405"> 405: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
-</span><span id="406" class="l"><a href="#406"> 406: </a>            <span class="php-var">$this</span>-&gt;_get_args,
-</span><span id="407" class="l"><a href="#407"> 407: </a>            <span class="php-var">$this</span>-&gt;_options_args,
-</span><span id="408" class="l"><a href="#408"> 408: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
-</span><span id="409" class="l"><a href="#409"> 409: </a>            <span class="php-var">$this</span>-&gt;_head_args,
-</span><span id="410" class="l"><a href="#410"> 410: </a>            <span class="php-var">$this</span>-&gt;_put_args,
-</span><span id="411" class="l"><a href="#411"> 411: </a>            <span class="php-var">$this</span>-&gt;_post_args,
-</span><span id="412" class="l"><a href="#412"> 412: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
-</span><span id="413" class="l"><a href="#413"> 413: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}
-</span><span id="414" class="l"><a href="#414"> 414: </a>        );
-</span><span id="415" class="l"><a href="#415"> 415: </a>
-</span><span id="416" class="l"><a href="#416"> 416: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
-</span><span id="417" class="l"><a href="#417"> 417: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
+</span><span id="394" class="l"><a href="#394"> 394: </a>        <span class="php-comment">// Check to see if this is CI 3.x</span>
+</span><span id="395" class="l"><a href="#395"> 395: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">explode</span>(<span class="php-quote">'.'</span>, CI_VERSION, <span class="php-num">2</span>)[<span class="php-num">0</span>] &lt; <span class="php-num">3</span>)
+</span><span id="396" class="l"><a href="#396"> 396: </a>        {
+</span><span id="397" class="l"><a href="#397"> 397: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
+</span><span id="398" class="l"><a href="#398"> 398: </a>        }
+</span><span id="399" class="l"><a href="#399"> 399: </a>
+</span><span id="400" class="l"><a href="#400"> 400: </a>        <span class="php-comment">// Set the default value of global xss filtering. Same approach as CodeIgniter 3</span>
+</span><span id="401" class="l"><a href="#401"> 401: </a>        <span class="php-var">$this</span>-&gt;_enable_xss = (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'global_xss_filtering'</span>) === <span class="php-keyword1">TRUE</span>);
+</span><span id="402" class="l"><a href="#402"> 402: </a>
+</span><span id="403" class="l"><a href="#403"> 403: </a>        <span class="php-comment">// Start the timer for how long the request takes</span>
+</span><span id="404" class="l"><a href="#404"> 404: </a>        <span class="php-var">$this</span>-&gt;_start_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="405" class="l"><a href="#405"> 405: </a>
+</span><span id="406" class="l"><a href="#406"> 406: </a>        <span class="php-comment">// Load the rest.php configuration file</span>
+</span><span id="407" class="l"><a href="#407"> 407: </a>        <span class="php-var">$this</span>-&gt;load-&gt;config(<span class="php-var">$config</span>);
+</span><span id="408" class="l"><a href="#408"> 408: </a>
+</span><span id="409" class="l"><a href="#409"> 409: </a>        <span class="php-comment">// At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)</span>
+</span><span id="410" class="l"><a href="#410"> 410: </a>        <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-quote">'format'</span>);
+</span><span id="411" class="l"><a href="#411"> 411: </a>
+</span><span id="412" class="l"><a href="#412"> 412: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
+</span><span id="413" class="l"><a href="#413"> 413: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
+</span><span id="414" class="l"><a href="#414"> 414: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
+</span><span id="415" class="l"><a href="#415"> 415: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
+</span><span id="416" class="l"><a href="#416"> 416: </a>
+</span><span id="417" class="l"><a href="#417"> 417: </a>        <span class="php-var">$this</span>-&gt;_zlib_oc = @<span class="php-keyword2">ini_get</span>(<span class="php-quote">'zlib.output_compression'</span>);
 </span><span id="418" class="l"><a href="#418"> 418: </a>
-</span><span id="419" class="l"><a href="#419"> 419: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
-</span><span id="420" class="l"><a href="#420"> 420: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
-</span><span id="421" class="l"><a href="#421"> 421: </a>
-</span><span id="422" class="l"><a href="#422"> 422: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
-</span><span id="423" class="l"><a href="#423"> 423: </a>        <span class="php-var">$this</span>-&gt;early_checks();
+</span><span id="419" class="l"><a href="#419"> 419: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
+</span><span id="420" class="l"><a href="#420"> 420: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="421" class="l"><a href="#421"> 421: </a>        {
+</span><span id="422" class="l"><a href="#422"> 422: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
+</span><span id="423" class="l"><a href="#423"> 423: </a>        }
 </span><span id="424" class="l"><a href="#424"> 424: </a>
-</span><span id="425" class="l"><a href="#425"> 425: </a>        <span class="php-comment">// Load DB if its enabled</span>
-</span><span id="426" class="l"><a href="#426"> 426: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
-</span><span id="427" class="l"><a href="#427"> 427: </a>        {
-</span><span id="428" class="l"><a href="#428"> 428: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
-</span><span id="429" class="l"><a href="#429"> 429: </a>        }
+</span><span id="425" class="l"><a href="#425"> 425: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
+</span><span id="426" class="l"><a href="#426"> 426: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
+</span><span id="427" class="l"><a href="#427"> 427: </a>
+</span><span id="428" class="l"><a href="#428"> 428: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
+</span><span id="429" class="l"><a href="#429"> 429: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
 </span><span id="430" class="l"><a href="#430"> 430: </a>
-</span><span id="431" class="l"><a href="#431"> 431: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
-</span><span id="432" class="l"><a href="#432"> 432: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
+</span><span id="431" class="l"><a href="#431"> 431: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
+</span><span id="432" class="l"><a href="#432"> 432: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
 </span><span id="433" class="l"><a href="#433"> 433: </a>        {
-</span><span id="434" class="l"><a href="#434"> 434: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
+</span><span id="434" class="l"><a href="#434"> 434: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = [];
 </span><span id="435" class="l"><a href="#435"> 435: </a>        }
 </span><span id="436" class="l"><a href="#436"> 436: </a>
-</span><span id="437" class="l"><a href="#437"> 437: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
-</span><span id="438" class="l"><a href="#438"> 438: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
-</span><span id="439" class="l"><a href="#439"> 439: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
-</span><span id="440" class="l"><a href="#440"> 440: </a>
-</span><span id="441" class="l"><a href="#441"> 441: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
-</span><span id="442" class="l"><a href="#442"> 442: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
-</span><span id="443" class="l"><a href="#443"> 443: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
-</span><span id="444" class="l"><a href="#444"> 444: </a>        {
-</span><span id="445" class="l"><a href="#445"> 445: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
-</span><span id="446" class="l"><a href="#446"> 446: </a>        }
-</span><span id="447" class="l"><a href="#447"> 447: </a>
-</span><span id="448" class="l"><a href="#448"> 448: </a>        <span class="php-comment">// Only allow ajax requests</span>
-</span><span id="449" class="l"><a href="#449"> 449: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
-</span><span id="450" class="l"><a href="#450"> 450: </a>        {
-</span><span id="451" class="l"><a href="#451"> 451: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="452" class="l"><a href="#452"> 452: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="453" class="l"><a href="#453"> 453: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="454" class="l"><a href="#454"> 454: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Only AJAX requests are acceptable'</span>
-</span><span id="455" class="l"><a href="#455"> 455: </a>                ], self::NOT_ACCEPTABLE);
-</span><span id="456" class="l"><a href="#456"> 456: </a>        }
-</span><span id="457" class="l"><a href="#457"> 457: </a>
-</span><span id="458" class="l"><a href="#458"> 458: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
-</span><span id="459" class="l"><a href="#459"> 459: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; !(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
-</span><span id="460" class="l"><a href="#460"> 460: </a>        {
-</span><span id="461" class="l"><a href="#461"> 461: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="462" class="l"><a href="#462"> 462: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
-</span><span id="463" class="l"><a href="#463"> 463: </a>            {
-</span><span id="464" class="l"><a href="#464"> 464: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
-</span><span id="465" class="l"><a href="#465"> 465: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="466" class="l"><a href="#466"> 466: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="467" class="l"><a href="#467"> 467: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
-</span><span id="468" class="l"><a href="#468"> 468: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="469" class="l"><a href="#469"> 469: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="470" class="l"><a href="#470"> 470: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
-</span><span id="471" class="l"><a href="#471"> 471: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="472" class="l"><a href="#472"> 472: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="473" class="l"><a href="#473"> 473: </a>            }
-</span><span id="474" class="l"><a href="#474"> 474: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="475" class="l"><a href="#475"> 475: </a>            {
-</span><span id="476" class="l"><a href="#476"> 476: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="477" class="l"><a href="#477"> 477: </a>            }
-</span><span id="478" class="l"><a href="#478"> 478: </a>        }
-</span><span id="479" class="l"><a href="#479"> 479: </a>    }
-</span><span id="480" class="l"><a href="#480"> 480: </a>
-</span><span id="481" class="l"><a href="#481"> 481: </a>    <span class="php-comment">/**
-</span></span><span id="482" class="l"><a href="#482"> 482: </a><span class="php-comment">     * Deconstructor
-</span></span><span id="483" class="l"><a href="#483"> 483: </a><span class="php-comment">     *
-</span></span><span id="484" class="l"><a href="#484"> 484: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="485" class="l"><a href="#485"> 485: </a><span class="php-comment">     * @access public
-</span></span><span id="486" class="l"><a href="#486"> 486: </a><span class="php-comment">     * @return void
-</span></span><span id="487" class="l"><a href="#487"> 487: </a><span class="php-comment">     */</span>
-</span><span id="488" class="l"><a href="#488"> 488: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
-</span><span id="489" class="l"><a href="#489"> 489: </a>    {
-</span><span id="490" class="l"><a href="#490"> 490: </a>        <span class="php-comment">// Get the current timestamp</span>
-</span><span id="491" class="l"><a href="#491"> 491: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="492" class="l"><a href="#492"> 492: </a>
-</span><span id="493" class="l"><a href="#493"> 493: </a>        <span class="php-comment">// Log the loading time to the log table</span>
-</span><span id="494" class="l"><a href="#494"> 494: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="495" class="l"><a href="#495"> 495: </a>        {
-</span><span id="496" class="l"><a href="#496"> 496: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
-</span><span id="497" class="l"><a href="#497"> 497: </a>        }
-</span><span id="498" class="l"><a href="#498"> 498: </a>    }
-</span><span id="499" class="l"><a href="#499"> 499: </a>
-</span><span id="500" class="l"><a href="#500"> 500: </a>    <span class="php-comment">/**
-</span></span><span id="501" class="l"><a href="#501"> 501: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
-</span></span><span id="502" class="l"><a href="#502"> 502: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
-</span></span><span id="503" class="l"><a href="#503"> 503: </a><span class="php-comment">     * Controller method.
-</span></span><span id="504" class="l"><a href="#504"> 504: </a><span class="php-comment">     *
-</span></span><span id="505" class="l"><a href="#505"> 505: </a><span class="php-comment">     * @access public
-</span></span><span id="506" class="l"><a href="#506"> 506: </a><span class="php-comment">     * @param  string $object_called
-</span></span><span id="507" class="l"><a href="#507"> 507: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method.
-</span></span><span id="508" class="l"><a href="#508"> 508: </a><span class="php-comment">     */</span>
-</span><span id="509" class="l"><a href="#509"> 509: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span>)
-</span><span id="510" class="l"><a href="#510"> 510: </a>    {
-</span><span id="511" class="l"><a href="#511"> 511: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
-</span><span id="512" class="l"><a href="#512"> 512: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
-</span><span id="513" class="l"><a href="#513"> 513: </a>        {
-</span><span id="514" class="l"><a href="#514"> 514: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unsupported protocol'</span>], self::FORBIDDEN);
-</span><span id="515" class="l"><a href="#515"> 515: </a>        }
-</span><span id="516" class="l"><a href="#516"> 516: </a>
-</span><span id="517" class="l"><a href="#517"> 517: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
-</span><span id="518" class="l"><a href="#518"> 518: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
-</span><span id="519" class="l"><a href="#519"> 519: </a>
-</span><span id="520" class="l"><a href="#520"> 520: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span> . <span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method;
-</span><span id="521" class="l"><a href="#521"> 521: </a>
-</span><span id="522" class="l"><a href="#522"> 522: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
-</span><span id="523" class="l"><a href="#523"> 523: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] == <span class="php-keyword1">FALSE</span>);
-</span><span id="524" class="l"><a href="#524"> 524: </a>
-</span><span id="525" class="l"><a href="#525"> 525: </a>        <span class="php-comment">// Use keys for this method?</span>
-</span><span id="526" class="l"><a href="#526"> 526: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] == <span class="php-keyword1">FALSE</span>);
-</span><span id="527" class="l"><a href="#527"> 527: </a>
-</span><span id="528" class="l"><a href="#528"> 528: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here.</span>
-</span><span id="529" class="l"><a href="#529"> 529: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
-</span><span id="530" class="l"><a href="#530"> 530: </a>        {
-</span><span id="531" class="l"><a href="#531"> 531: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="532" class="l"><a href="#532"> 532: </a>            {
-</span><span id="533" class="l"><a href="#533"> 533: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="534" class="l"><a href="#534"> 534: </a>            }
+</span><span id="437" class="l"><a href="#437"> 437: </a>        <span class="php-comment">// Set up the query parameters</span>
+</span><span id="438" class="l"><a href="#438"> 438: </a>        <span class="php-var">$this</span>-&gt;_parse_query();
+</span><span id="439" class="l"><a href="#439"> 439: </a>
+</span><span id="440" class="l"><a href="#440"> 440: </a>        <span class="php-comment">// Set up the GET variables</span>
+</span><span id="441" class="l"><a href="#441"> 441: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
+</span><span id="442" class="l"><a href="#442"> 442: </a>
+</span><span id="443" class="l"><a href="#443"> 443: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
+</span><span id="444" class="l"><a href="#444"> 444: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
+</span><span id="445" class="l"><a href="#445"> 445: </a>
+</span><span id="446" class="l"><a href="#446"> 446: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
+</span><span id="447" class="l"><a href="#447"> 447: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
+</span><span id="448" class="l"><a href="#448"> 448: </a>
+</span><span id="449" class="l"><a href="#449"> 449: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
+</span><span id="450" class="l"><a href="#450"> 450: </a>
+</span><span id="451" class="l"><a href="#451"> 451: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
+</span><span id="452" class="l"><a href="#452"> 452: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
+</span><span id="453" class="l"><a href="#453"> 453: </a>        {
+</span><span id="454" class="l"><a href="#454"> 454: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
+</span><span id="455" class="l"><a href="#455"> 455: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
+</span><span id="456" class="l"><a href="#456"> 456: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
+</span><span id="457" class="l"><a href="#457"> 457: </a>        }
+</span><span id="458" class="l"><a href="#458"> 458: </a>
+</span><span id="459" class="l"><a href="#459"> 459: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
+</span><span id="460" class="l"><a href="#460"> 460: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
+</span><span id="461" class="l"><a href="#461"> 461: </a>            <span class="php-var">$this</span>-&gt;_get_args,
+</span><span id="462" class="l"><a href="#462"> 462: </a>            <span class="php-var">$this</span>-&gt;_options_args,
+</span><span id="463" class="l"><a href="#463"> 463: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
+</span><span id="464" class="l"><a href="#464"> 464: </a>            <span class="php-var">$this</span>-&gt;_head_args,
+</span><span id="465" class="l"><a href="#465"> 465: </a>            <span class="php-var">$this</span>-&gt;_put_args,
+</span><span id="466" class="l"><a href="#466"> 466: </a>            <span class="php-var">$this</span>-&gt;_post_args,
+</span><span id="467" class="l"><a href="#467"> 467: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
+</span><span id="468" class="l"><a href="#468"> 468: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}
+</span><span id="469" class="l"><a href="#469"> 469: </a>        );
+</span><span id="470" class="l"><a href="#470"> 470: </a>
+</span><span id="471" class="l"><a href="#471"> 471: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
+</span><span id="472" class="l"><a href="#472"> 472: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
+</span><span id="473" class="l"><a href="#473"> 473: </a>
+</span><span id="474" class="l"><a href="#474"> 474: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
+</span><span id="475" class="l"><a href="#475"> 475: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
+</span><span id="476" class="l"><a href="#476"> 476: </a>
+</span><span id="477" class="l"><a href="#477"> 477: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
+</span><span id="478" class="l"><a href="#478"> 478: </a>        <span class="php-var">$this</span>-&gt;early_checks();
+</span><span id="479" class="l"><a href="#479"> 479: </a>
+</span><span id="480" class="l"><a href="#480"> 480: </a>        <span class="php-comment">// Load DB if its enabled</span>
+</span><span id="481" class="l"><a href="#481"> 481: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
+</span><span id="482" class="l"><a href="#482"> 482: </a>        {
+</span><span id="483" class="l"><a href="#483"> 483: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
+</span><span id="484" class="l"><a href="#484"> 484: </a>        }
+</span><span id="485" class="l"><a href="#485"> 485: </a>
+</span><span id="486" class="l"><a href="#486"> 486: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
+</span><span id="487" class="l"><a href="#487"> 487: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
+</span><span id="488" class="l"><a href="#488"> 488: </a>        {
+</span><span id="489" class="l"><a href="#489"> 489: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
+</span><span id="490" class="l"><a href="#490"> 490: </a>        }
+</span><span id="491" class="l"><a href="#491"> 491: </a>
+</span><span id="492" class="l"><a href="#492"> 492: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
+</span><span id="493" class="l"><a href="#493"> 493: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
+</span><span id="494" class="l"><a href="#494"> 494: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
+</span><span id="495" class="l"><a href="#495"> 495: </a>
+</span><span id="496" class="l"><a href="#496"> 496: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
+</span><span id="497" class="l"><a href="#497"> 497: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
+</span><span id="498" class="l"><a href="#498"> 498: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
+</span><span id="499" class="l"><a href="#499"> 499: </a>        {
+</span><span id="500" class="l"><a href="#500"> 500: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
+</span><span id="501" class="l"><a href="#501"> 501: </a>        }
+</span><span id="502" class="l"><a href="#502"> 502: </a>
+</span><span id="503" class="l"><a href="#503"> 503: </a>        <span class="php-comment">// Only allow ajax requests</span>
+</span><span id="504" class="l"><a href="#504"> 504: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
+</span><span id="505" class="l"><a href="#505"> 505: </a>        {
+</span><span id="506" class="l"><a href="#506"> 506: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="507" class="l"><a href="#507"> 507: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="508" class="l"><a href="#508"> 508: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="509" class="l"><a href="#509"> 509: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Only AJAX requests are acceptable'</span>
+</span><span id="510" class="l"><a href="#510"> 510: </a>                ], self::HTTP_NOT_ACCEPTABLE);
+</span><span id="511" class="l"><a href="#511"> 511: </a>        }
+</span><span id="512" class="l"><a href="#512"> 512: </a>
+</span><span id="513" class="l"><a href="#513"> 513: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
+</span><span id="514" class="l"><a href="#514"> 514: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; !(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
+</span><span id="515" class="l"><a href="#515"> 515: </a>        {
+</span><span id="516" class="l"><a href="#516"> 516: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="517" class="l"><a href="#517"> 517: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
+</span><span id="518" class="l"><a href="#518"> 518: </a>            {
+</span><span id="519" class="l"><a href="#519"> 519: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
+</span><span id="520" class="l"><a href="#520"> 520: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="521" class="l"><a href="#521"> 521: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="522" class="l"><a href="#522"> 522: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
+</span><span id="523" class="l"><a href="#523"> 523: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="524" class="l"><a href="#524"> 524: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="525" class="l"><a href="#525"> 525: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
+</span><span id="526" class="l"><a href="#526"> 526: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="527" class="l"><a href="#527"> 527: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="528" class="l"><a href="#528"> 528: </a>            }
+</span><span id="529" class="l"><a href="#529"> 529: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="530" class="l"><a href="#530"> 530: </a>            {
+</span><span id="531" class="l"><a href="#531"> 531: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="532" class="l"><a href="#532"> 532: </a>            }
+</span><span id="533" class="l"><a href="#533"> 533: </a>        }
+</span><span id="534" class="l"><a href="#534"> 534: </a>    }
 </span><span id="535" class="l"><a href="#535"> 535: </a>
-</span><span id="536" class="l"><a href="#536"> 536: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid API Key '</span> . <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>], self::FORBIDDEN);
-</span><span id="537" class="l"><a href="#537"> 537: </a>        }
-</span><span id="538" class="l"><a href="#538"> 538: </a>
-</span><span id="539" class="l"><a href="#539"> 539: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller.</span>
-</span><span id="540" class="l"><a href="#540"> 540: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
-</span><span id="541" class="l"><a href="#541"> 541: </a>        {
-</span><span id="542" class="l"><a href="#542"> 542: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="543" class="l"><a href="#543"> 543: </a>            {
-</span><span id="544" class="l"><a href="#544"> 544: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="545" class="l"><a href="#545"> 545: </a>            }
-</span><span id="546" class="l"><a href="#546"> 546: </a>
-</span><span id="547" class="l"><a href="#547"> 547: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have access to the requested controller.'</span>], self::UNAUTHORIZED);
-</span><span id="548" class="l"><a href="#548"> 548: </a>        }
-</span><span id="549" class="l"><a href="#549"> 549: </a>
-</span><span id="550" class="l"><a href="#550"> 550: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
-</span><span id="551" class="l"><a href="#551"> 551: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="552" class="l"><a href="#552"> 552: </a>        {
-</span><span id="553" class="l"><a href="#553"> 553: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unknown method.'</span>], self::NOT_FOUND);
-</span><span id="554" class="l"><a href="#554"> 554: </a>        }
-</span><span id="555" class="l"><a href="#555"> 555: </a>
-</span><span id="556" class="l"><a href="#556"> 556: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
-</span><span id="557" class="l"><a href="#557"> 557: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="558" class="l"><a href="#558"> 558: </a>        {
-</span><span id="559" class="l"><a href="#559"> 559: </a>            <span class="php-comment">// Check the limit</span>
-</span><span id="560" class="l"><a href="#560"> 560: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="561" class="l"><a href="#561"> 561: </a>            {
-</span><span id="562" class="l"><a href="#562"> 562: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key has reached the time limit for this method.'</span>];
-</span><span id="563" class="l"><a href="#563"> 563: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::UNAUTHORIZED);
-</span><span id="564" class="l"><a href="#564"> 564: </a>            }
-</span><span id="565" class="l"><a href="#565"> 565: </a>
-</span><span id="566" class="l"><a href="#566"> 566: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
-</span><span id="567" class="l"><a href="#567"> 567: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
-</span><span id="568" class="l"><a href="#568"> 568: </a>
-</span><span id="569" class="l"><a href="#569"> 569: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
-</span><span id="570" class="l"><a href="#570"> 570: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
+</span><span id="536" class="l"><a href="#536"> 536: </a>    <span class="php-comment">/**
+</span></span><span id="537" class="l"><a href="#537"> 537: </a><span class="php-comment">     * Deconstructor
+</span></span><span id="538" class="l"><a href="#538"> 538: </a><span class="php-comment">     *
+</span></span><span id="539" class="l"><a href="#539"> 539: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="540" class="l"><a href="#540"> 540: </a><span class="php-comment">     * @access public
+</span></span><span id="541" class="l"><a href="#541"> 541: </a><span class="php-comment">     * @return void
+</span></span><span id="542" class="l"><a href="#542"> 542: </a><span class="php-comment">     */</span>
+</span><span id="543" class="l"><a href="#543"> 543: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
+</span><span id="544" class="l"><a href="#544"> 544: </a>    {
+</span><span id="545" class="l"><a href="#545"> 545: </a>        <span class="php-comment">// Get the current timestamp</span>
+</span><span id="546" class="l"><a href="#546"> 546: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="547" class="l"><a href="#547"> 547: </a>
+</span><span id="548" class="l"><a href="#548"> 548: </a>        <span class="php-comment">// Log the loading time to the log table</span>
+</span><span id="549" class="l"><a href="#549"> 549: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="550" class="l"><a href="#550"> 550: </a>        {
+</span><span id="551" class="l"><a href="#551"> 551: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
+</span><span id="552" class="l"><a href="#552"> 552: </a>        }
+</span><span id="553" class="l"><a href="#553"> 553: </a>    }
+</span><span id="554" class="l"><a href="#554"> 554: </a>
+</span><span id="555" class="l"><a href="#555"> 555: </a>    <span class="php-comment">/**
+</span></span><span id="556" class="l"><a href="#556"> 556: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
+</span></span><span id="557" class="l"><a href="#557"> 557: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
+</span></span><span id="558" class="l"><a href="#558"> 558: </a><span class="php-comment">     * Controller method.
+</span></span><span id="559" class="l"><a href="#559"> 559: </a><span class="php-comment">     *
+</span></span><span id="560" class="l"><a href="#560"> 560: </a><span class="php-comment">     * @access public
+</span></span><span id="561" class="l"><a href="#561"> 561: </a><span class="php-comment">     * @param  string $object_called
+</span></span><span id="562" class="l"><a href="#562"> 562: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method.
+</span></span><span id="563" class="l"><a href="#563"> 563: </a><span class="php-comment">     */</span>
+</span><span id="564" class="l"><a href="#564"> 564: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span>)
+</span><span id="565" class="l"><a href="#565"> 565: </a>    {
+</span><span id="566" class="l"><a href="#566"> 566: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
+</span><span id="567" class="l"><a href="#567"> 567: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
+</span><span id="568" class="l"><a href="#568"> 568: </a>        {
+</span><span id="569" class="l"><a href="#569"> 569: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unsupported protocol'</span>], self::HTTP_FORBIDDEN);
+</span><span id="570" class="l"><a href="#570"> 570: </a>        }
 </span><span id="571" class="l"><a href="#571"> 571: </a>
-</span><span id="572" class="l"><a href="#572"> 572: </a>            <span class="php-comment">// IM TELLIN!</span>
-</span><span id="573" class="l"><a href="#573"> 573: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="574" class="l"><a href="#574"> 574: </a>            {
-</span><span id="575" class="l"><a href="#575"> 575: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
-</span><span id="576" class="l"><a href="#576"> 576: </a>            }
-</span><span id="577" class="l"><a href="#577"> 577: </a>
-</span><span id="578" class="l"><a href="#578"> 578: </a>            <span class="php-comment">// They don't have good enough perms</span>
-</span><span id="579" class="l"><a href="#579"> 579: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have enough permissions.'</span>];
-</span><span id="580" class="l"><a href="#580"> 580: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::UNAUTHORIZED);
-</span><span id="581" class="l"><a href="#581"> 581: </a>        }
+</span><span id="572" class="l"><a href="#572"> 572: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
+</span><span id="573" class="l"><a href="#573"> 573: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
+</span><span id="574" class="l"><a href="#574"> 574: </a>
+</span><span id="575" class="l"><a href="#575"> 575: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span> . <span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method;
+</span><span id="576" class="l"><a href="#576"> 576: </a>
+</span><span id="577" class="l"><a href="#577"> 577: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
+</span><span id="578" class="l"><a href="#578"> 578: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] == <span class="php-keyword1">FALSE</span>);
+</span><span id="579" class="l"><a href="#579"> 579: </a>
+</span><span id="580" class="l"><a href="#580"> 580: </a>        <span class="php-comment">// Use keys for this method?</span>
+</span><span id="581" class="l"><a href="#581"> 581: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] == <span class="php-keyword1">FALSE</span>);
 </span><span id="582" class="l"><a href="#582"> 582: </a>
-</span><span id="583" class="l"><a href="#583"> 583: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
-</span><span id="584" class="l"><a href="#584"> 584: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="583" class="l"><a href="#583"> 583: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here.</span>
+</span><span id="584" class="l"><a href="#584"> 584: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
 </span><span id="585" class="l"><a href="#585"> 585: </a>        {
-</span><span id="586" class="l"><a href="#586"> 586: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
-</span><span id="587" class="l"><a href="#587"> 587: </a>        }
-</span><span id="588" class="l"><a href="#588"> 588: </a>
-</span><span id="589" class="l"><a href="#589"> 589: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
-</span><span id="590" class="l"><a href="#590"> 590: </a>        <span class="php-keyword1">try</span>
-</span><span id="591" class="l"><a href="#591"> 591: </a>        {
-</span><span id="592" class="l"><a href="#592"> 592: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
-</span><span id="593" class="l"><a href="#593"> 593: </a>        }
-</span><span id="594" class="l"><a href="#594"> 594: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
-</span><span id="595" class="l"><a href="#595"> 595: </a>        {
-</span><span id="596" class="l"><a href="#596"> 596: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
-</span><span id="597" class="l"><a href="#597"> 597: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="598" class="l"><a href="#598"> 598: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="599" class="l"><a href="#599"> 599: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
-</span><span id="600" class="l"><a href="#600"> 600: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
-</span><span id="601" class="l"><a href="#601"> 601: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
-</span><span id="602" class="l"><a href="#602"> 602: </a>                    ]
-</span><span id="603" class="l"><a href="#603"> 603: </a>                ], self::INTERNAL_SERVER_ERROR);
-</span><span id="604" class="l"><a href="#604"> 604: </a>        }
-</span><span id="605" class="l"><a href="#605"> 605: </a>    }
-</span><span id="606" class="l"><a href="#606"> 606: </a>
-</span><span id="607" class="l"><a href="#607"> 607: </a>    <span class="php-comment">/**
-</span></span><span id="608" class="l"><a href="#608"> 608: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
-</span></span><span id="609" class="l"><a href="#609"> 609: </a><span class="php-comment">     *
-</span></span><span id="610" class="l"><a href="#610"> 610: </a><span class="php-comment">     * @access public
-</span></span><span id="611" class="l"><a href="#611"> 611: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
-</span></span><span id="612" class="l"><a href="#612"> 612: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
-</span></span><span id="613" class="l"><a href="#613"> 613: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
-</span></span><span id="614" class="l"><a href="#614"> 614: </a><span class="php-comment">     * running the script; otherwise, exit
-</span></span><span id="615" class="l"><a href="#615"> 615: </a><span class="php-comment">     */</span>
-</span><span id="616" class="l"><a href="#616"> 616: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="617" class="l"><a href="#617"> 617: </a>    {
-</span><span id="618" class="l"><a href="#618"> 618: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
-</span><span id="619" class="l"><a href="#619"> 619: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="620" class="l"><a href="#620"> 620: </a>        {
-</span><span id="621" class="l"><a href="#621"> 621: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
-</span><span id="622" class="l"><a href="#622"> 622: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
-</span><span id="623" class="l"><a href="#623"> 623: </a>        }
-</span><span id="624" class="l"><a href="#624"> 624: </a>
-</span><span id="625" class="l"><a href="#625"> 625: </a>        <span class="php-comment">// Set the output as NULL by default</span>
-</span><span id="626" class="l"><a href="#626"> 626: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="627" class="l"><a href="#627"> 627: </a>
-</span><span id="628" class="l"><a href="#628"> 628: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
-</span><span id="629" class="l"><a href="#629"> 629: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="630" class="l"><a href="#630"> 630: </a>        {
-</span><span id="631" class="l"><a href="#631"> 631: </a>            <span class="php-var">$http_code</span> = self::NOT_FOUND;
-</span><span id="632" class="l"><a href="#632"> 632: </a>        }
-</span><span id="633" class="l"><a href="#633"> 633: </a>
-</span><span id="634" class="l"><a href="#634"> 634: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
-</span><span id="635" class="l"><a href="#635"> 635: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="636" class="l"><a href="#636"> 636: </a>        {
-</span><span id="637" class="l"><a href="#637"> 637: </a>            <span class="php-comment">// Is compression enabled and available?</span>
-</span><span id="638" class="l"><a href="#638"> 638: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'compress_output'</span>) === <span class="php-keyword1">TRUE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_zlib_oc == <span class="php-keyword1">FALSE</span>)
-</span><span id="639" class="l"><a href="#639"> 639: </a>            {
-</span><span id="640" class="l"><a href="#640"> 640: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">extension_loaded</span>(<span class="php-quote">'zlib'</span>))
-</span><span id="641" class="l"><a href="#641"> 641: </a>                {
-</span><span id="642" class="l"><a href="#642"> 642: </a>                    <span class="php-var">$http_encoding</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_ENCODING'</span>);
-</span><span id="643" class="l"><a href="#643"> 643: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$http_encoding</span> !== <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_encoding</span>, <span class="php-quote">'gzip'</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="644" class="l"><a href="#644"> 644: </a>                    {
-</span><span id="645" class="l"><a href="#645"> 645: </a>                        <span class="php-keyword2">ob_start</span>(<span class="php-quote">'ob_gzhandler'</span>);
-</span><span id="646" class="l"><a href="#646"> 646: </a>                    }
-</span><span id="647" class="l"><a href="#647"> 647: </a>                }
-</span><span id="648" class="l"><a href="#648"> 648: </a>            }
-</span><span id="649" class="l"><a href="#649"> 649: </a>
-</span><span id="650" class="l"><a href="#650"> 650: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
-</span><span id="651" class="l"><a href="#651"> 651: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
-</span><span id="652" class="l"><a href="#652"> 652: </a>            {
-</span><span id="653" class="l"><a href="#653"> 653: </a>                <span class="php-comment">// Set the format header</span>
-</span><span id="654" class="l"><a href="#654"> 654: </a>                <span class="php-keyword2">header</span>(<span class="php-quote">'Content-Type: '</span> . <span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format]
-</span><span id="655" class="l"><a href="#655"> 655: </a>                       . <span class="php-quote">'; charset='</span> . <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
-</span><span id="656" class="l"><a href="#656"> 656: </a>
-</span><span id="657" class="l"><a href="#657"> 657: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
-</span><span id="658" class="l"><a href="#658"> 658: </a>
-</span><span id="659" class="l"><a href="#659"> 659: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error.</span>
-</span><span id="660" class="l"><a href="#660"> 660: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
-</span><span id="661" class="l"><a href="#661"> 661: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
-</span><span id="662" class="l"><a href="#662"> 662: </a>                {
-</span><span id="663" class="l"><a href="#663"> 663: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="664" class="l"><a href="#664"> 664: </a>                }
-</span><span id="665" class="l"><a href="#665"> 665: </a>            }
-</span><span id="666" class="l"><a href="#666"> 666: </a>            <span class="php-keyword1">else</span>
-</span><span id="667" class="l"><a href="#667"> 667: </a>            {
-</span><span id="668" class="l"><a href="#668"> 668: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
-</span><span id="669" class="l"><a href="#669"> 669: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
-</span><span id="670" class="l"><a href="#670"> 670: </a>                {
-</span><span id="671" class="l"><a href="#671"> 671: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="672" class="l"><a href="#672"> 672: </a>                }
-</span><span id="673" class="l"><a href="#673"> 673: </a>
-</span><span id="674" class="l"><a href="#674"> 674: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
-</span><span id="675" class="l"><a href="#675"> 675: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
-</span><span id="676" class="l"><a href="#676"> 676: </a>            }
-</span><span id="677" class="l"><a href="#677"> 677: </a>        }
-</span><span id="678" class="l"><a href="#678"> 678: </a>
-</span><span id="679" class="l"><a href="#679"> 679: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
-</span><span id="680" class="l"><a href="#680"> 680: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
-</span><span id="681" class="l"><a href="#681"> 681: </a>        <span class="php-comment">// correct HTTP status code</span>
-</span><span id="682" class="l"><a href="#682"> 682: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = <span class="php-num">200</span>;
-</span><span id="683" class="l"><a href="#683"> 683: </a>
-</span><span id="684" class="l"><a href="#684"> 684: </a>        set_status_header(<span class="php-var">$http_code</span>);
-</span><span id="685" class="l"><a href="#685"> 685: </a>
-</span><span id="686" class="l"><a href="#686"> 686: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
-</span><span id="687" class="l"><a href="#687"> 687: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="688" class="l"><a href="#688"> 688: </a>        {
-</span><span id="689" class="l"><a href="#689"> 689: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
-</span><span id="690" class="l"><a href="#690"> 690: </a>        }
-</span><span id="691" class="l"><a href="#691"> 691: </a>
-</span><span id="692" class="l"><a href="#692"> 692: </a>        <span class="php-comment">// If zlib.output_compression is enabled it will compress the output,</span>
-</span><span id="693" class="l"><a href="#693"> 693: </a>        <span class="php-comment">// but it will not modify the content-length header to compensate for</span>
-</span><span id="694" class="l"><a href="#694"> 694: </a>        <span class="php-comment">// the reduction, causing the browser to hang waiting for more data.</span>
-</span><span id="695" class="l"><a href="#695"> 695: </a>        <span class="php-comment">// We'll just skip content-length in those cases</span>
-</span><span id="696" class="l"><a href="#696"> 696: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_zlib_oc &amp;&amp; !<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'compress_output'</span>))
-</span><span id="697" class="l"><a href="#697"> 697: </a>        {
-</span><span id="698" class="l"><a href="#698"> 698: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'Content-Length: '</span> . <span class="php-keyword2">strlen</span>(<span class="php-var">$output</span>));
-</span><span id="699" class="l"><a href="#699"> 699: </a>        }
-</span><span id="700" class="l"><a href="#700"> 700: </a>
-</span><span id="701" class="l"><a href="#701"> 701: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="702" class="l"><a href="#702"> 702: </a>        {
-</span><span id="703" class="l"><a href="#703"> 703: </a>            <span class="php-keyword1">exit</span>(<span class="php-var">$output</span>);
-</span><span id="704" class="l"><a href="#704"> 704: </a>        }
-</span><span id="705" class="l"><a href="#705"> 705: </a>
-</span><span id="706" class="l"><a href="#706"> 706: </a>        <span class="php-keyword1">echo</span>(<span class="php-var">$output</span>);
-</span><span id="707" class="l"><a href="#707"> 707: </a>        <span class="php-keyword2">ob_end_flush</span>();
-</span><span id="708" class="l"><a href="#708"> 708: </a>        <span class="php-keyword2">ob_flush</span>();
-</span><span id="709" class="l"><a href="#709"> 709: </a>        <span class="php-keyword2">flush</span>();
-</span><span id="710" class="l"><a href="#710"> 710: </a>    }
+</span><span id="586" class="l"><a href="#586"> 586: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="587" class="l"><a href="#587"> 587: </a>            {
+</span><span id="588" class="l"><a href="#588"> 588: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="589" class="l"><a href="#589"> 589: </a>            }
+</span><span id="590" class="l"><a href="#590"> 590: </a>
+</span><span id="591" class="l"><a href="#591"> 591: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid API Key '</span> . <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>], self::HTTP_FORBIDDEN);
+</span><span id="592" class="l"><a href="#592"> 592: </a>        }
+</span><span id="593" class="l"><a href="#593"> 593: </a>
+</span><span id="594" class="l"><a href="#594"> 594: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller.</span>
+</span><span id="595" class="l"><a href="#595"> 595: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
+</span><span id="596" class="l"><a href="#596"> 596: </a>        {
+</span><span id="597" class="l"><a href="#597"> 597: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="598" class="l"><a href="#598"> 598: </a>            {
+</span><span id="599" class="l"><a href="#599"> 599: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="600" class="l"><a href="#600"> 600: </a>            }
+</span><span id="601" class="l"><a href="#601"> 601: </a>
+</span><span id="602" class="l"><a href="#602"> 602: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have access to the requested controller.'</span>], self::HTTP_UNAUTHORIZED);
+</span><span id="603" class="l"><a href="#603"> 603: </a>        }
+</span><span id="604" class="l"><a href="#604"> 604: </a>
+</span><span id="605" class="l"><a href="#605"> 605: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
+</span><span id="606" class="l"><a href="#606"> 606: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="607" class="l"><a href="#607"> 607: </a>        {
+</span><span id="608" class="l"><a href="#608"> 608: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unknown method.'</span>], self::HTTP_NOT_FOUND);
+</span><span id="609" class="l"><a href="#609"> 609: </a>        }
+</span><span id="610" class="l"><a href="#610"> 610: </a>
+</span><span id="611" class="l"><a href="#611"> 611: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
+</span><span id="612" class="l"><a href="#612"> 612: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="613" class="l"><a href="#613"> 613: </a>        {
+</span><span id="614" class="l"><a href="#614"> 614: </a>            <span class="php-comment">// Check the limit</span>
+</span><span id="615" class="l"><a href="#615"> 615: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="616" class="l"><a href="#616"> 616: </a>            {
+</span><span id="617" class="l"><a href="#617"> 617: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key has reached the time limit for this method.'</span>];
+</span><span id="618" class="l"><a href="#618"> 618: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
+</span><span id="619" class="l"><a href="#619"> 619: </a>            }
+</span><span id="620" class="l"><a href="#620"> 620: </a>
+</span><span id="621" class="l"><a href="#621"> 621: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
+</span><span id="622" class="l"><a href="#622"> 622: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
+</span><span id="623" class="l"><a href="#623"> 623: </a>
+</span><span id="624" class="l"><a href="#624"> 624: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
+</span><span id="625" class="l"><a href="#625"> 625: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
+</span><span id="626" class="l"><a href="#626"> 626: </a>
+</span><span id="627" class="l"><a href="#627"> 627: </a>            <span class="php-comment">// IM TELLIN!</span>
+</span><span id="628" class="l"><a href="#628"> 628: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="629" class="l"><a href="#629"> 629: </a>            {
+</span><span id="630" class="l"><a href="#630"> 630: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
+</span><span id="631" class="l"><a href="#631"> 631: </a>            }
+</span><span id="632" class="l"><a href="#632"> 632: </a>
+</span><span id="633" class="l"><a href="#633"> 633: </a>            <span class="php-comment">// They don't have good enough perms</span>
+</span><span id="634" class="l"><a href="#634"> 634: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have enough permissions.'</span>];
+</span><span id="635" class="l"><a href="#635"> 635: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
+</span><span id="636" class="l"><a href="#636"> 636: </a>        }
+</span><span id="637" class="l"><a href="#637"> 637: </a>
+</span><span id="638" class="l"><a href="#638"> 638: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
+</span><span id="639" class="l"><a href="#639"> 639: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="640" class="l"><a href="#640"> 640: </a>        {
+</span><span id="641" class="l"><a href="#641"> 641: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
+</span><span id="642" class="l"><a href="#642"> 642: </a>        }
+</span><span id="643" class="l"><a href="#643"> 643: </a>
+</span><span id="644" class="l"><a href="#644"> 644: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
+</span><span id="645" class="l"><a href="#645"> 645: </a>        <span class="php-keyword1">try</span>
+</span><span id="646" class="l"><a href="#646"> 646: </a>        {
+</span><span id="647" class="l"><a href="#647"> 647: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
+</span><span id="648" class="l"><a href="#648"> 648: </a>        }
+</span><span id="649" class="l"><a href="#649"> 649: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
+</span><span id="650" class="l"><a href="#650"> 650: </a>        {
+</span><span id="651" class="l"><a href="#651"> 651: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
+</span><span id="652" class="l"><a href="#652"> 652: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="653" class="l"><a href="#653"> 653: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="654" class="l"><a href="#654"> 654: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
+</span><span id="655" class="l"><a href="#655"> 655: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
+</span><span id="656" class="l"><a href="#656"> 656: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
+</span><span id="657" class="l"><a href="#657"> 657: </a>                    ]
+</span><span id="658" class="l"><a href="#658"> 658: </a>                ], self::HTTP_INTERNAL_SERVER_ERROR);
+</span><span id="659" class="l"><a href="#659"> 659: </a>        }
+</span><span id="660" class="l"><a href="#660"> 660: </a>    }
+</span><span id="661" class="l"><a href="#661"> 661: </a>
+</span><span id="662" class="l"><a href="#662"> 662: </a>    <span class="php-comment">/**
+</span></span><span id="663" class="l"><a href="#663"> 663: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
+</span></span><span id="664" class="l"><a href="#664"> 664: </a><span class="php-comment">     *
+</span></span><span id="665" class="l"><a href="#665"> 665: </a><span class="php-comment">     * @access public
+</span></span><span id="666" class="l"><a href="#666"> 666: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
+</span></span><span id="667" class="l"><a href="#667"> 667: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
+</span></span><span id="668" class="l"><a href="#668"> 668: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
+</span></span><span id="669" class="l"><a href="#669"> 669: </a><span class="php-comment">     * running the script; otherwise, exit
+</span></span><span id="670" class="l"><a href="#670"> 670: </a><span class="php-comment">     */</span>
+</span><span id="671" class="l"><a href="#671"> 671: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="672" class="l"><a href="#672"> 672: </a>    {
+</span><span id="673" class="l"><a href="#673"> 673: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
+</span><span id="674" class="l"><a href="#674"> 674: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="675" class="l"><a href="#675"> 675: </a>        {
+</span><span id="676" class="l"><a href="#676"> 676: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
+</span><span id="677" class="l"><a href="#677"> 677: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
+</span><span id="678" class="l"><a href="#678"> 678: </a>        }
+</span><span id="679" class="l"><a href="#679"> 679: </a>
+</span><span id="680" class="l"><a href="#680"> 680: </a>        <span class="php-comment">// Set the output as NULL by default</span>
+</span><span id="681" class="l"><a href="#681"> 681: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="682" class="l"><a href="#682"> 682: </a>
+</span><span id="683" class="l"><a href="#683"> 683: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
+</span><span id="684" class="l"><a href="#684"> 684: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="685" class="l"><a href="#685"> 685: </a>        {
+</span><span id="686" class="l"><a href="#686"> 686: </a>            <span class="php-var">$http_code</span> = self::HTTP_NOT_FOUND;
+</span><span id="687" class="l"><a href="#687"> 687: </a>        }
+</span><span id="688" class="l"><a href="#688"> 688: </a>
+</span><span id="689" class="l"><a href="#689"> 689: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
+</span><span id="690" class="l"><a href="#690"> 690: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="691" class="l"><a href="#691"> 691: </a>        {
+</span><span id="692" class="l"><a href="#692"> 692: </a>            <span class="php-comment">// Is compression enabled and available?</span>
+</span><span id="693" class="l"><a href="#693"> 693: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'compress_output'</span>) === <span class="php-keyword1">TRUE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_zlib_oc == <span class="php-keyword1">FALSE</span>)
+</span><span id="694" class="l"><a href="#694"> 694: </a>            {
+</span><span id="695" class="l"><a href="#695"> 695: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">extension_loaded</span>(<span class="php-quote">'zlib'</span>))
+</span><span id="696" class="l"><a href="#696"> 696: </a>                {
+</span><span id="697" class="l"><a href="#697"> 697: </a>                    <span class="php-var">$http_encoding</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_ENCODING'</span>);
+</span><span id="698" class="l"><a href="#698"> 698: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$http_encoding</span> !== <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_encoding</span>, <span class="php-quote">'gzip'</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="699" class="l"><a href="#699"> 699: </a>                    {
+</span><span id="700" class="l"><a href="#700"> 700: </a>                        <span class="php-keyword2">ob_start</span>(<span class="php-quote">'ob_gzhandler'</span>);
+</span><span id="701" class="l"><a href="#701"> 701: </a>                    }
+</span><span id="702" class="l"><a href="#702"> 702: </a>                }
+</span><span id="703" class="l"><a href="#703"> 703: </a>            }
+</span><span id="704" class="l"><a href="#704"> 704: </a>
+</span><span id="705" class="l"><a href="#705"> 705: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
+</span><span id="706" class="l"><a href="#706"> 706: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
+</span><span id="707" class="l"><a href="#707"> 707: </a>            {
+</span><span id="708" class="l"><a href="#708"> 708: </a>                <span class="php-comment">// Set the format header</span>
+</span><span id="709" class="l"><a href="#709"> 709: </a>                <span class="php-keyword2">header</span>(<span class="php-quote">'Content-Type: '</span> . <span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format]
+</span><span id="710" class="l"><a href="#710"> 710: </a>                       . <span class="php-quote">'; charset='</span> . <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
 </span><span id="711" class="l"><a href="#711"> 711: </a>
-</span><span id="712" class="l"><a href="#712"> 712: </a>    <span class="php-comment">/**
-</span></span><span id="713" class="l"><a href="#713"> 713: </a><span class="php-comment">     * Get the input format e.g. json or xml
-</span></span><span id="714" class="l"><a href="#714"> 714: </a><span class="php-comment">     *
-</span></span><span id="715" class="l"><a href="#715"> 715: </a><span class="php-comment">     * @access protected
-</span></span><span id="716" class="l"><a href="#716"> 716: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
-</span></span><span id="717" class="l"><a href="#717"> 717: </a><span class="php-comment">     */</span>
-</span><span id="718" class="l"><a href="#718"> 718: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
-</span><span id="719" class="l"><a href="#719"> 719: </a>    {
-</span><span id="720" class="l"><a href="#720"> 720: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
-</span><span id="721" class="l"><a href="#721"> 721: </a>        <span class="php-var">$contentType</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
-</span><span id="722" class="l"><a href="#722"> 722: </a>
-</span><span id="723" class="l"><a href="#723"> 723: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$contentType</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="724" class="l"><a href="#724"> 724: </a>        {
-</span><span id="725" class="l"><a href="#725"> 725: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="726" class="l"><a href="#726"> 726: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
-</span><span id="727" class="l"><a href="#727"> 727: </a>            {
-</span><span id="728" class="l"><a href="#728"> 728: </a>                <span class="php-comment">// $key = format e.g. csv</span>
-</span><span id="729" class="l"><a href="#729"> 729: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
-</span><span id="730" class="l"><a href="#730"> 730: </a>
-</span><span id="731" class="l"><a href="#731"> 731: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
-</span><span id="732" class="l"><a href="#732"> 732: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
-</span><span id="733" class="l"><a href="#733"> 733: </a>                <span class="php-var">$contentType</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$contentType</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$contentType</span>)) : <span class="php-var">$contentType</span>);
-</span><span id="734" class="l"><a href="#734"> 734: </a>
-</span><span id="735" class="l"><a href="#735"> 735: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
-</span><span id="736" class="l"><a href="#736"> 736: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$contentType</span> === <span class="php-var">$value</span>)
-</span><span id="737" class="l"><a href="#737"> 737: </a>                {
-</span><span id="738" class="l"><a href="#738"> 738: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
-</span><span id="739" class="l"><a href="#739"> 739: </a>                }
-</span><span id="740" class="l"><a href="#740"> 740: </a>            }
-</span><span id="741" class="l"><a href="#741"> 741: </a>        }
-</span><span id="742" class="l"><a href="#742"> 742: </a>
-</span><span id="743" class="l"><a href="#743"> 743: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="744" class="l"><a href="#744"> 744: </a>    }
-</span><span id="745" class="l"><a href="#745"> 745: </a>
-</span><span id="746" class="l"><a href="#746"> 746: </a>    <span class="php-comment">/**
-</span></span><span id="747" class="l"><a href="#747"> 747: </a><span class="php-comment">     * Detect which format should be used to output the data
-</span></span><span id="748" class="l"><a href="#748"> 748: </a><span class="php-comment">     *
-</span></span><span id="749" class="l"><a href="#749"> 749: </a><span class="php-comment">     * @access protected
-</span></span><span id="750" class="l"><a href="#750"> 750: </a><span class="php-comment">     * @return mixed|NULL|string Output format
-</span></span><span id="751" class="l"><a href="#751"> 751: </a><span class="php-comment">     */</span>
-</span><span id="752" class="l"><a href="#752"> 752: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
-</span><span id="753" class="l"><a href="#753"> 753: </a>    {
-</span><span id="754" class="l"><a href="#754"> 754: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>;
+</span><span id="712" class="l"><a href="#712"> 712: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
+</span><span id="713" class="l"><a href="#713"> 713: </a>
+</span><span id="714" class="l"><a href="#714"> 714: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error.</span>
+</span><span id="715" class="l"><a href="#715"> 715: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
+</span><span id="716" class="l"><a href="#716"> 716: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
+</span><span id="717" class="l"><a href="#717"> 717: </a>                {
+</span><span id="718" class="l"><a href="#718"> 718: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="719" class="l"><a href="#719"> 719: </a>                }
+</span><span id="720" class="l"><a href="#720"> 720: </a>            }
+</span><span id="721" class="l"><a href="#721"> 721: </a>            <span class="php-keyword1">else</span>
+</span><span id="722" class="l"><a href="#722"> 722: </a>            {
+</span><span id="723" class="l"><a href="#723"> 723: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
+</span><span id="724" class="l"><a href="#724"> 724: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
+</span><span id="725" class="l"><a href="#725"> 725: </a>                {
+</span><span id="726" class="l"><a href="#726"> 726: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="727" class="l"><a href="#727"> 727: </a>                }
+</span><span id="728" class="l"><a href="#728"> 728: </a>
+</span><span id="729" class="l"><a href="#729"> 729: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
+</span><span id="730" class="l"><a href="#730"> 730: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
+</span><span id="731" class="l"><a href="#731"> 731: </a>            }
+</span><span id="732" class="l"><a href="#732"> 732: </a>        }
+</span><span id="733" class="l"><a href="#733"> 733: </a>
+</span><span id="734" class="l"><a href="#734"> 734: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
+</span><span id="735" class="l"><a href="#735"> 735: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
+</span><span id="736" class="l"><a href="#736"> 736: </a>        <span class="php-comment">// correct HTTP status code</span>
+</span><span id="737" class="l"><a href="#737"> 737: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = self::HTTP_OK;
+</span><span id="738" class="l"><a href="#738"> 738: </a>
+</span><span id="739" class="l"><a href="#739"> 739: </a>        set_status_header(<span class="php-var">$http_code</span>);
+</span><span id="740" class="l"><a href="#740"> 740: </a>
+</span><span id="741" class="l"><a href="#741"> 741: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
+</span><span id="742" class="l"><a href="#742"> 742: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="743" class="l"><a href="#743"> 743: </a>        {
+</span><span id="744" class="l"><a href="#744"> 744: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
+</span><span id="745" class="l"><a href="#745"> 745: </a>        }
+</span><span id="746" class="l"><a href="#746"> 746: </a>
+</span><span id="747" class="l"><a href="#747"> 747: </a>        <span class="php-comment">// If zlib.output_compression is enabled it will compress the output,</span>
+</span><span id="748" class="l"><a href="#748"> 748: </a>        <span class="php-comment">// but it will not modify the content-length header to compensate for</span>
+</span><span id="749" class="l"><a href="#749"> 749: </a>        <span class="php-comment">// the reduction, causing the browser to hang waiting for more data.</span>
+</span><span id="750" class="l"><a href="#750"> 750: </a>        <span class="php-comment">// We'll just skip content-length in those cases</span>
+</span><span id="751" class="l"><a href="#751"> 751: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_zlib_oc &amp;&amp; !<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'compress_output'</span>))
+</span><span id="752" class="l"><a href="#752"> 752: </a>        {
+</span><span id="753" class="l"><a href="#753"> 753: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'Content-Length: '</span> . <span class="php-keyword2">strlen</span>(<span class="php-var">$output</span>));
+</span><span id="754" class="l"><a href="#754"> 754: </a>        }
 </span><span id="755" class="l"><a href="#755"> 755: </a>
-</span><span id="756" class="l"><a href="#756"> 756: </a>        <span class="php-comment">// Check if a file extension is used when no get arguments provided</span>
-</span><span id="757" class="l"><a href="#757"> 757: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="758" class="l"><a href="#758"> 758: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
-</span><span id="759" class="l"><a href="#759"> 759: </a>        {
-</span><span id="760" class="l"><a href="#760"> 760: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
-</span><span id="761" class="l"><a href="#761"> 761: </a>        }
-</span><span id="762" class="l"><a href="#762"> 762: </a>
-</span><span id="763" class="l"><a href="#763"> 763: </a>        <span class="php-comment">// Check if a file extension is used</span>
-</span><span id="764" class="l"><a href="#764"> 764: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args)) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args), <span class="php-var">$matches</span>))
-</span><span id="765" class="l"><a href="#765"> 765: </a>        {
-</span><span id="766" class="l"><a href="#766"> 766: </a>            <span class="php-comment">//elseif ($this-&gt;_get_args and is_array(end($this-&gt;_get_args)) === FALSE and preg_match($pattern, end(array_keys($this-&gt;_get_args)), $matches)) {</span>
-</span><span id="767" class="l"><a href="#767"> 767: </a>            <span class="php-comment">// The key of the last argument</span>
-</span><span id="768" class="l"><a href="#768"> 768: </a>            <span class="php-var">$arg_keys</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_get_args);
-</span><span id="769" class="l"><a href="#769"> 769: </a>            <span class="php-var">$last_key</span> = <span class="php-keyword2">end</span>(<span class="php-var">$arg_keys</span>);
-</span><span id="770" class="l"><a href="#770"> 770: </a>
-</span><span id="771" class="l"><a href="#771"> 771: </a>            <span class="php-comment">// Remove the extension from arguments too</span>
-</span><span id="772" class="l"><a href="#772"> 772: </a>            <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>] = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>]);
-</span><span id="773" class="l"><a href="#773"> 773: </a>            <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>] = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>]);
-</span><span id="774" class="l"><a href="#774"> 774: </a>
-</span><span id="775" class="l"><a href="#775"> 775: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
-</span><span id="776" class="l"><a href="#776"> 776: </a>        }
+</span><span id="756" class="l"><a href="#756"> 756: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="757" class="l"><a href="#757"> 757: </a>        {
+</span><span id="758" class="l"><a href="#758"> 758: </a>            <span class="php-keyword1">exit</span>(<span class="php-var">$output</span>);
+</span><span id="759" class="l"><a href="#759"> 759: </a>        }
+</span><span id="760" class="l"><a href="#760"> 760: </a>
+</span><span id="761" class="l"><a href="#761"> 761: </a>        <span class="php-keyword1">echo</span>(<span class="php-var">$output</span>);
+</span><span id="762" class="l"><a href="#762"> 762: </a>        <span class="php-keyword2">ob_end_flush</span>();
+</span><span id="763" class="l"><a href="#763"> 763: </a>        <span class="php-keyword2">ob_flush</span>();
+</span><span id="764" class="l"><a href="#764"> 764: </a>        <span class="php-keyword2">flush</span>();
+</span><span id="765" class="l"><a href="#765"> 765: </a>    }
+</span><span id="766" class="l"><a href="#766"> 766: </a>
+</span><span id="767" class="l"><a href="#767"> 767: </a>    <span class="php-comment">/**
+</span></span><span id="768" class="l"><a href="#768"> 768: </a><span class="php-comment">     * Get the input format e.g. json or xml
+</span></span><span id="769" class="l"><a href="#769"> 769: </a><span class="php-comment">     *
+</span></span><span id="770" class="l"><a href="#770"> 770: </a><span class="php-comment">     * @access protected
+</span></span><span id="771" class="l"><a href="#771"> 771: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
+</span></span><span id="772" class="l"><a href="#772"> 772: </a><span class="php-comment">     */</span>
+</span><span id="773" class="l"><a href="#773"> 773: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
+</span><span id="774" class="l"><a href="#774"> 774: </a>    {
+</span><span id="775" class="l"><a href="#775"> 775: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
+</span><span id="776" class="l"><a href="#776"> 776: </a>        <span class="php-var">$contentType</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
 </span><span id="777" class="l"><a href="#777"> 777: </a>
-</span><span id="778" class="l"><a href="#778"> 778: </a>        <span class="php-comment">// Get the format</span>
-</span><span id="779" class="l"><a href="#779"> 779: </a>        <span class="php-var">$format</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]) ? <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]) : <span class="php-keyword1">NULL</span>;
-</span><span id="780" class="l"><a href="#780"> 780: </a>
-</span><span id="781" class="l"><a href="#781"> 781: </a>        <span class="php-comment">// A format has been passed as an argument in the URL and it is supported</span>
-</span><span id="782" class="l"><a href="#782"> 782: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]))
-</span><span id="783" class="l"><a href="#783"> 783: </a>        {
-</span><span id="784" class="l"><a href="#784"> 784: </a>            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="785" class="l"><a href="#785"> 785: </a>        }
-</span><span id="786" class="l"><a href="#786"> 786: </a>
-</span><span id="787" class="l"><a href="#787"> 787: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT (if it exists and we are allowed)</span>
-</span><span id="788" class="l"><a href="#788"> 788: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>))
-</span><span id="789" class="l"><a href="#789"> 789: </a>        {
-</span><span id="790" class="l"><a href="#790"> 790: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="791" class="l"><a href="#791"> 791: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
-</span><span id="792" class="l"><a href="#792"> 792: </a>            {
-</span><span id="793" class="l"><a href="#793"> 793: </a>                <span class="php-comment">// Has this format been requested?</span>
-</span><span id="794" class="l"><a href="#794"> 794: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="795" class="l"><a href="#795"> 795: </a>                {
-</span><span id="796" class="l"><a href="#796"> 796: </a>                    <span class="php-comment">// If not HTML or XML assume its right and send it on its way</span>
-</span><span id="797" class="l"><a href="#797"> 797: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
-</span><span id="798" class="l"><a href="#798"> 798: </a>                    {
-</span><span id="799" class="l"><a href="#799"> 799: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="800" class="l"><a href="#800"> 800: </a>                    }
-</span><span id="801" class="l"><a href="#801"> 801: </a>
-</span><span id="802" class="l"><a href="#802"> 802: </a>                    <span class="php-comment">// HTML or XML have shown up as a match</span>
-</span><span id="803" class="l"><a href="#803"> 803: </a>                    <span class="php-keyword1">else</span>
-</span><span id="804" class="l"><a href="#804"> 804: </a>                    {
-</span><span id="805" class="l"><a href="#805"> 805: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
-</span><span id="806" class="l"><a href="#806"> 806: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="807" class="l"><a href="#807"> 807: </a>                        {
-</span><span id="808" class="l"><a href="#808"> 808: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="809" class="l"><a href="#809"> 809: </a>                        }
+</span><span id="778" class="l"><a href="#778"> 778: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$contentType</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="779" class="l"><a href="#779"> 779: </a>        {
+</span><span id="780" class="l"><a href="#780"> 780: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="781" class="l"><a href="#781"> 781: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
+</span><span id="782" class="l"><a href="#782"> 782: </a>            {
+</span><span id="783" class="l"><a href="#783"> 783: </a>                <span class="php-comment">// $key = format e.g. csv</span>
+</span><span id="784" class="l"><a href="#784"> 784: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
+</span><span id="785" class="l"><a href="#785"> 785: </a>
+</span><span id="786" class="l"><a href="#786"> 786: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
+</span><span id="787" class="l"><a href="#787"> 787: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
+</span><span id="788" class="l"><a href="#788"> 788: </a>                <span class="php-var">$contentType</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$contentType</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$contentType</span>)) : <span class="php-var">$contentType</span>);
+</span><span id="789" class="l"><a href="#789"> 789: </a>
+</span><span id="790" class="l"><a href="#790"> 790: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
+</span><span id="791" class="l"><a href="#791"> 791: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$contentType</span> === <span class="php-var">$value</span>)
+</span><span id="792" class="l"><a href="#792"> 792: </a>                {
+</span><span id="793" class="l"><a href="#793"> 793: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
+</span><span id="794" class="l"><a href="#794"> 794: </a>                }
+</span><span id="795" class="l"><a href="#795"> 795: </a>            }
+</span><span id="796" class="l"><a href="#796"> 796: </a>        }
+</span><span id="797" class="l"><a href="#797"> 797: </a>
+</span><span id="798" class="l"><a href="#798"> 798: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="799" class="l"><a href="#799"> 799: </a>    }
+</span><span id="800" class="l"><a href="#800"> 800: </a>
+</span><span id="801" class="l"><a href="#801"> 801: </a>    <span class="php-comment">/**
+</span></span><span id="802" class="l"><a href="#802"> 802: </a><span class="php-comment">     * Detect which format should be used to output the data
+</span></span><span id="803" class="l"><a href="#803"> 803: </a><span class="php-comment">     *
+</span></span><span id="804" class="l"><a href="#804"> 804: </a><span class="php-comment">     * @access protected
+</span></span><span id="805" class="l"><a href="#805"> 805: </a><span class="php-comment">     * @return mixed|NULL|string Output format
+</span></span><span id="806" class="l"><a href="#806"> 806: </a><span class="php-comment">     */</span>
+</span><span id="807" class="l"><a href="#807"> 807: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
+</span><span id="808" class="l"><a href="#808"> 808: </a>    {
+</span><span id="809" class="l"><a href="#809"> 809: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>;
 </span><span id="810" class="l"><a href="#810"> 810: </a>
-</span><span id="811" class="l"><a href="#811"> 811: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
-</span><span id="812" class="l"><a href="#812"> 812: </a>                        <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="813" class="l"><a href="#813"> 813: </a>                        {
-</span><span id="814" class="l"><a href="#814"> 814: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="815" class="l"><a href="#815"> 815: </a>                        }
-</span><span id="816" class="l"><a href="#816"> 816: </a>                    }
-</span><span id="817" class="l"><a href="#817"> 817: </a>                }
-</span><span id="818" class="l"><a href="#818"> 818: </a>            }
-</span><span id="819" class="l"><a href="#819"> 819: </a>        } <span class="php-comment">// End HTTP_ACCEPT checking</span>
-</span><span id="820" class="l"><a href="#820"> 820: </a>
-</span><span id="821" class="l"><a href="#821"> 821: </a>        <span class="php-comment">// Well, none of that has worked! Let's see if the controller has a default</span>
-</span><span id="822" class="l"><a href="#822"> 822: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
-</span><span id="823" class="l"><a href="#823"> 823: </a>        {
-</span><span id="824" class="l"><a href="#824"> 824: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
-</span><span id="825" class="l"><a href="#825"> 825: </a>        }
-</span><span id="826" class="l"><a href="#826"> 826: </a>
-</span><span id="827" class="l"><a href="#827"> 827: </a>        <span class="php-comment">// Just use the default format</span>
-</span><span id="828" class="l"><a href="#828"> 828: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
-</span><span id="829" class="l"><a href="#829"> 829: </a>    }
-</span><span id="830" class="l"><a href="#830"> 830: </a>
-</span><span id="831" class="l"><a href="#831"> 831: </a>    <span class="php-comment">/**
-</span></span><span id="832" class="l"><a href="#832"> 832: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
-</span></span><span id="833" class="l"><a href="#833"> 833: </a><span class="php-comment">     *
-</span></span><span id="834" class="l"><a href="#834"> 834: </a><span class="php-comment">     * @access protected
-</span></span><span id="835" class="l"><a href="#835"> 835: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
-</span></span><span id="836" class="l"><a href="#836"> 836: </a><span class="php-comment">     */</span>
-</span><span id="837" class="l"><a href="#837"> 837: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
-</span><span id="838" class="l"><a href="#838"> 838: </a>    {
-</span><span id="839" class="l"><a href="#839"> 839: </a>        <span class="php-comment">// Declare a variable to store the method</span>
-</span><span id="840" class="l"><a href="#840"> 840: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="811" class="l"><a href="#811"> 811: </a>        <span class="php-comment">// Check if a file extension is used when no get arguments provided</span>
+</span><span id="812" class="l"><a href="#812"> 812: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="813" class="l"><a href="#813"> 813: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
+</span><span id="814" class="l"><a href="#814"> 814: </a>        {
+</span><span id="815" class="l"><a href="#815"> 815: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
+</span><span id="816" class="l"><a href="#816"> 816: </a>        }
+</span><span id="817" class="l"><a href="#817"> 817: </a>
+</span><span id="818" class="l"><a href="#818"> 818: </a>        <span class="php-comment">// Check if a file extension is used</span>
+</span><span id="819" class="l"><a href="#819"> 819: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args)) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args), <span class="php-var">$matches</span>))
+</span><span id="820" class="l"><a href="#820"> 820: </a>        {
+</span><span id="821" class="l"><a href="#821"> 821: </a>            <span class="php-comment">//elseif ($this-&gt;_get_args and is_array(end($this-&gt;_get_args)) === FALSE and preg_match($pattern, end(array_keys($this-&gt;_get_args)), $matches)) {</span>
+</span><span id="822" class="l"><a href="#822"> 822: </a>            <span class="php-comment">// The key of the last argument</span>
+</span><span id="823" class="l"><a href="#823"> 823: </a>            <span class="php-var">$arg_keys</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_get_args);
+</span><span id="824" class="l"><a href="#824"> 824: </a>            <span class="php-var">$last_key</span> = <span class="php-keyword2">end</span>(<span class="php-var">$arg_keys</span>);
+</span><span id="825" class="l"><a href="#825"> 825: </a>
+</span><span id="826" class="l"><a href="#826"> 826: </a>            <span class="php-comment">// Remove the extension from arguments too</span>
+</span><span id="827" class="l"><a href="#827"> 827: </a>            <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>] = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>]);
+</span><span id="828" class="l"><a href="#828"> 828: </a>            <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>] = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>]);
+</span><span id="829" class="l"><a href="#829"> 829: </a>
+</span><span id="830" class="l"><a href="#830"> 830: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
+</span><span id="831" class="l"><a href="#831"> 831: </a>        }
+</span><span id="832" class="l"><a href="#832"> 832: </a>
+</span><span id="833" class="l"><a href="#833"> 833: </a>        <span class="php-comment">// Get the format</span>
+</span><span id="834" class="l"><a href="#834"> 834: </a>        <span class="php-var">$format</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]) ? <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]) : <span class="php-keyword1">NULL</span>;
+</span><span id="835" class="l"><a href="#835"> 835: </a>
+</span><span id="836" class="l"><a href="#836"> 836: </a>        <span class="php-comment">// A format has been passed as an argument in the URL and it is supported</span>
+</span><span id="837" class="l"><a href="#837"> 837: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]))
+</span><span id="838" class="l"><a href="#838"> 838: </a>        {
+</span><span id="839" class="l"><a href="#839"> 839: </a>            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="840" class="l"><a href="#840"> 840: </a>        }
 </span><span id="841" class="l"><a href="#841"> 841: </a>
-</span><span id="842" class="l"><a href="#842"> 842: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
-</span><span id="843" class="l"><a href="#843"> 843: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="842" class="l"><a href="#842"> 842: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT (if it exists and we are allowed)</span>
+</span><span id="843" class="l"><a href="#843"> 843: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>))
 </span><span id="844" class="l"><a href="#844"> 844: </a>        {
-</span><span id="845" class="l"><a href="#845"> 845: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
-</span><span id="846" class="l"><a href="#846"> 846: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="845" class="l"><a href="#845"> 845: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="846" class="l"><a href="#846"> 846: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
 </span><span id="847" class="l"><a href="#847"> 847: </a>            {
-</span><span id="848" class="l"><a href="#848"> 848: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
-</span><span id="849" class="l"><a href="#849"> 849: </a>            }
-</span><span id="850" class="l"><a href="#850"> 850: </a>
-</span><span id="851" class="l"><a href="#851"> 851: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
-</span><span id="852" class="l"><a href="#852"> 852: </a>        }
-</span><span id="853" class="l"><a href="#853"> 853: </a>
-</span><span id="854" class="l"><a href="#854"> 854: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
-</span><span id="855" class="l"><a href="#855"> 855: </a>        {
-</span><span id="856" class="l"><a href="#856"> 856: </a>            <span class="php-comment">// Get the request method as a lowercase string.</span>
-</span><span id="857" class="l"><a href="#857"> 857: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
-</span><span id="858" class="l"><a href="#858"> 858: </a>        }
-</span><span id="859" class="l"><a href="#859"> 859: </a>
-</span><span id="860" class="l"><a href="#860"> 860: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
-</span><span id="861" class="l"><a href="#861"> 861: </a>    }
-</span><span id="862" class="l"><a href="#862"> 862: </a>
-</span><span id="863" class="l"><a href="#863"> 863: </a>    <span class="php-comment">/**
-</span></span><span id="864" class="l"><a href="#864"> 864: </a><span class="php-comment">     * See if the user has provided an API key
-</span></span><span id="865" class="l"><a href="#865"> 865: </a><span class="php-comment">     *
-</span></span><span id="866" class="l"><a href="#866"> 866: </a><span class="php-comment">     * @access protected
-</span></span><span id="867" class="l"><a href="#867"> 867: </a><span class="php-comment">     * @return bool
-</span></span><span id="868" class="l"><a href="#868"> 868: </a><span class="php-comment">     */</span>
-</span><span id="869" class="l"><a href="#869"> 869: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
-</span><span id="870" class="l"><a href="#870"> 870: </a>    {
-</span><span id="871" class="l"><a href="#871"> 871: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
-</span><span id="872" class="l"><a href="#872"> 872: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
-</span><span id="873" class="l"><a href="#873"> 873: </a>
-</span><span id="874" class="l"><a href="#874"> 874: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
-</span><span id="875" class="l"><a href="#875"> 875: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
-</span><span id="876" class="l"><a href="#876"> 876: </a>
-</span><span id="877" class="l"><a href="#877"> 877: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="878" class="l"><a href="#878"> 878: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
-</span><span id="879" class="l"><a href="#879"> 879: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
-</span><span id="880" class="l"><a href="#880"> 880: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
+</span><span id="848" class="l"><a href="#848"> 848: </a>                <span class="php-comment">// Has this format been requested?</span>
+</span><span id="849" class="l"><a href="#849"> 849: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="850" class="l"><a href="#850"> 850: </a>                {
+</span><span id="851" class="l"><a href="#851"> 851: </a>                    <span class="php-comment">// If not HTML or XML assume its right and send it on its way</span>
+</span><span id="852" class="l"><a href="#852"> 852: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
+</span><span id="853" class="l"><a href="#853"> 853: </a>                    {
+</span><span id="854" class="l"><a href="#854"> 854: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="855" class="l"><a href="#855"> 855: </a>                    }
+</span><span id="856" class="l"><a href="#856"> 856: </a>
+</span><span id="857" class="l"><a href="#857"> 857: </a>                    <span class="php-comment">// HTML or XML have shown up as a match</span>
+</span><span id="858" class="l"><a href="#858"> 858: </a>                    <span class="php-keyword1">else</span>
+</span><span id="859" class="l"><a href="#859"> 859: </a>                    {
+</span><span id="860" class="l"><a href="#860"> 860: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
+</span><span id="861" class="l"><a href="#861"> 861: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="862" class="l"><a href="#862"> 862: </a>                        {
+</span><span id="863" class="l"><a href="#863"> 863: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="864" class="l"><a href="#864"> 864: </a>                        }
+</span><span id="865" class="l"><a href="#865"> 865: </a>
+</span><span id="866" class="l"><a href="#866"> 866: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
+</span><span id="867" class="l"><a href="#867"> 867: </a>                        <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="868" class="l"><a href="#868"> 868: </a>                        {
+</span><span id="869" class="l"><a href="#869"> 869: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="870" class="l"><a href="#870"> 870: </a>                        }
+</span><span id="871" class="l"><a href="#871"> 871: </a>                    }
+</span><span id="872" class="l"><a href="#872"> 872: </a>                }
+</span><span id="873" class="l"><a href="#873"> 873: </a>            }
+</span><span id="874" class="l"><a href="#874"> 874: </a>        } <span class="php-comment">// End HTTP_ACCEPT checking</span>
+</span><span id="875" class="l"><a href="#875"> 875: </a>
+</span><span id="876" class="l"><a href="#876"> 876: </a>        <span class="php-comment">// Well, none of that has worked! Let's see if the controller has a default</span>
+</span><span id="877" class="l"><a href="#877"> 877: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
+</span><span id="878" class="l"><a href="#878"> 878: </a>        {
+</span><span id="879" class="l"><a href="#879"> 879: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
+</span><span id="880" class="l"><a href="#880"> 880: </a>        }
 </span><span id="881" class="l"><a href="#881"> 881: </a>
-</span><span id="882" class="l"><a href="#882"> 882: </a>        <span class="php-comment">// Find the key from server or arguments</span>
-</span><span id="883" class="l"><a href="#883"> 883: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
-</span><span id="884" class="l"><a href="#884"> 884: </a>        {
-</span><span id="885" class="l"><a href="#885"> 885: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
-</span><span id="886" class="l"><a href="#886"> 886: </a>            {
-</span><span id="887" class="l"><a href="#887"> 887: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="888" class="l"><a href="#888"> 888: </a>            }
-</span><span id="889" class="l"><a href="#889"> 889: </a>
-</span><span id="890" class="l"><a href="#890"> 890: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
-</span><span id="891" class="l"><a href="#891"> 891: </a>
-</span><span id="892" class="l"><a href="#892"> 892: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
-</span><span id="893" class="l"><a href="#893"> 893: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
-</span><span id="894" class="l"><a href="#894"> 894: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
-</span><span id="895" class="l"><a href="#895"> 895: </a>
-</span><span id="896" class="l"><a href="#896"> 896: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
-</span><span id="897" class="l"><a href="#897"> 897: </a>
-</span><span id="898" class="l"><a href="#898"> 898: </a>            <span class="php-comment">/*
-</span></span><span id="899" class="l"><a href="#899"> 899: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
-</span></span><span id="900" class="l"><a href="#900"> 900: </a><span class="php-comment">             * of valid ip addresses stored in the database.
-</span></span><span id="901" class="l"><a href="#901"> 901: </a><span class="php-comment">             */</span>
-</span><span id="902" class="l"><a href="#902"> 902: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
-</span><span id="903" class="l"><a href="#903"> 903: </a>            {
-</span><span id="904" class="l"><a href="#904"> 904: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
-</span><span id="905" class="l"><a href="#905"> 905: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
-</span><span id="906" class="l"><a href="#906"> 906: </a>                {
-</span><span id="907" class="l"><a href="#907"> 907: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
-</span><span id="908" class="l"><a href="#908"> 908: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
-</span><span id="909" class="l"><a href="#909"> 909: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
-</span><span id="910" class="l"><a href="#910"> 910: </a>
-</span><span id="911" class="l"><a href="#911"> 911: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
-</span><span id="912" class="l"><a href="#912"> 912: </a>                    {
-</span><span id="913" class="l"><a href="#913"> 913: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() == <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
-</span><span id="914" class="l"><a href="#914"> 914: </a>                        {
-</span><span id="915" class="l"><a href="#915"> 915: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
-</span><span id="916" class="l"><a href="#916"> 916: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
-</span><span id="917" class="l"><a href="#917"> 917: </a>                            <span class="php-keyword1">break</span>;
-</span><span id="918" class="l"><a href="#918"> 918: </a>                        }
-</span><span id="919" class="l"><a href="#919"> 919: </a>                    }
-</span><span id="920" class="l"><a href="#920"> 920: </a>
-</span><span id="921" class="l"><a href="#921"> 921: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
-</span><span id="922" class="l"><a href="#922"> 922: </a>                }
-</span><span id="923" class="l"><a href="#923"> 923: </a>                <span class="php-keyword1">else</span>
-</span><span id="924" class="l"><a href="#924"> 924: </a>                {
-</span><span id="925" class="l"><a href="#925"> 925: </a>                    <span class="php-comment">// There should be at least one IP address for this private key.</span>
-</span><span id="926" class="l"><a href="#926"> 926: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="927" class="l"><a href="#927"> 927: </a>                }
-</span><span id="928" class="l"><a href="#928"> 928: </a>            }
-</span><span id="929" class="l"><a href="#929"> 929: </a>
-</span><span id="930" class="l"><a href="#930"> 930: </a>            <span class="php-keyword1">return</span> <span class="php-var">$row</span>;
-</span><span id="931" class="l"><a href="#931"> 931: </a>        }
-</span><span id="932" class="l"><a href="#932"> 932: </a>
-</span><span id="933" class="l"><a href="#933"> 933: </a>        <span class="php-comment">// No key has been sent</span>
-</span><span id="934" class="l"><a href="#934"> 934: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="935" class="l"><a href="#935"> 935: </a>    }
+</span><span id="882" class="l"><a href="#882"> 882: </a>        <span class="php-comment">// Just use the default format</span>
+</span><span id="883" class="l"><a href="#883"> 883: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
+</span><span id="884" class="l"><a href="#884"> 884: </a>    }
+</span><span id="885" class="l"><a href="#885"> 885: </a>
+</span><span id="886" class="l"><a href="#886"> 886: </a>    <span class="php-comment">/**
+</span></span><span id="887" class="l"><a href="#887"> 887: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
+</span></span><span id="888" class="l"><a href="#888"> 888: </a><span class="php-comment">     *
+</span></span><span id="889" class="l"><a href="#889"> 889: </a><span class="php-comment">     * @access protected
+</span></span><span id="890" class="l"><a href="#890"> 890: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
+</span></span><span id="891" class="l"><a href="#891"> 891: </a><span class="php-comment">     */</span>
+</span><span id="892" class="l"><a href="#892"> 892: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
+</span><span id="893" class="l"><a href="#893"> 893: </a>    {
+</span><span id="894" class="l"><a href="#894"> 894: </a>        <span class="php-comment">// Declare a variable to store the method</span>
+</span><span id="895" class="l"><a href="#895"> 895: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="896" class="l"><a href="#896"> 896: </a>
+</span><span id="897" class="l"><a href="#897"> 897: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
+</span><span id="898" class="l"><a href="#898"> 898: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="899" class="l"><a href="#899"> 899: </a>        {
+</span><span id="900" class="l"><a href="#900"> 900: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
+</span><span id="901" class="l"><a href="#901"> 901: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="902" class="l"><a href="#902"> 902: </a>            {
+</span><span id="903" class="l"><a href="#903"> 903: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
+</span><span id="904" class="l"><a href="#904"> 904: </a>            }
+</span><span id="905" class="l"><a href="#905"> 905: </a>
+</span><span id="906" class="l"><a href="#906"> 906: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
+</span><span id="907" class="l"><a href="#907"> 907: </a>        }
+</span><span id="908" class="l"><a href="#908"> 908: </a>
+</span><span id="909" class="l"><a href="#909"> 909: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
+</span><span id="910" class="l"><a href="#910"> 910: </a>        {
+</span><span id="911" class="l"><a href="#911"> 911: </a>            <span class="php-comment">// Get the request method as a lowercase string.</span>
+</span><span id="912" class="l"><a href="#912"> 912: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
+</span><span id="913" class="l"><a href="#913"> 913: </a>        }
+</span><span id="914" class="l"><a href="#914"> 914: </a>
+</span><span id="915" class="l"><a href="#915"> 915: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
+</span><span id="916" class="l"><a href="#916"> 916: </a>    }
+</span><span id="917" class="l"><a href="#917"> 917: </a>
+</span><span id="918" class="l"><a href="#918"> 918: </a>    <span class="php-comment">/**
+</span></span><span id="919" class="l"><a href="#919"> 919: </a><span class="php-comment">     * See if the user has provided an API key
+</span></span><span id="920" class="l"><a href="#920"> 920: </a><span class="php-comment">     *
+</span></span><span id="921" class="l"><a href="#921"> 921: </a><span class="php-comment">     * @access protected
+</span></span><span id="922" class="l"><a href="#922"> 922: </a><span class="php-comment">     * @return bool
+</span></span><span id="923" class="l"><a href="#923"> 923: </a><span class="php-comment">     */</span>
+</span><span id="924" class="l"><a href="#924"> 924: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
+</span><span id="925" class="l"><a href="#925"> 925: </a>    {
+</span><span id="926" class="l"><a href="#926"> 926: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
+</span><span id="927" class="l"><a href="#927"> 927: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
+</span><span id="928" class="l"><a href="#928"> 928: </a>
+</span><span id="929" class="l"><a href="#929"> 929: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
+</span><span id="930" class="l"><a href="#930"> 930: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
+</span><span id="931" class="l"><a href="#931"> 931: </a>
+</span><span id="932" class="l"><a href="#932"> 932: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="933" class="l"><a href="#933"> 933: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
+</span><span id="934" class="l"><a href="#934"> 934: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
+</span><span id="935" class="l"><a href="#935"> 935: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
 </span><span id="936" class="l"><a href="#936"> 936: </a>
-</span><span id="937" class="l"><a href="#937"> 937: </a>    <span class="php-comment">/**
-</span></span><span id="938" class="l"><a href="#938"> 938: </a><span class="php-comment">     * What language do they want it in?
-</span></span><span id="939" class="l"><a href="#939"> 939: </a><span class="php-comment">     *
-</span></span><span id="940" class="l"><a href="#940"> 940: </a><span class="php-comment">     * @access protected
-</span></span><span id="941" class="l"><a href="#941"> 941: </a><span class="php-comment">     * @return NULL|string The language code.
-</span></span><span id="942" class="l"><a href="#942"> 942: </a><span class="php-comment">     */</span>
-</span><span id="943" class="l"><a href="#943"> 943: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
-</span><span id="944" class="l"><a href="#944"> 944: </a>    {
-</span><span id="945" class="l"><a href="#945"> 945: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>))
-</span><span id="946" class="l"><a href="#946"> 946: </a>        {
-</span><span id="947" class="l"><a href="#947"> 947: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="948" class="l"><a href="#948"> 948: </a>        }
-</span><span id="949" class="l"><a href="#949"> 949: </a>
-</span><span id="950" class="l"><a href="#950"> 950: </a>        <span class="php-comment">// They might have sent a few, make it an array</span>
-</span><span id="951" class="l"><a href="#951"> 951: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="952" class="l"><a href="#952"> 952: </a>        {
-</span><span id="953" class="l"><a href="#953"> 953: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
-</span><span id="954" class="l"><a href="#954"> 954: </a>
-</span><span id="955" class="l"><a href="#955"> 955: </a>            <span class="php-var">$return_langs</span> = [];
-</span><span id="956" class="l"><a href="#956"> 956: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
-</span><span id="957" class="l"><a href="#957"> 957: </a>            {
-</span><span id="958" class="l"><a href="#958"> 958: </a>                <span class="php-comment">// Remove weight and strip space</span>
-</span><span id="959" class="l"><a href="#959"> 959: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
-</span><span id="960" class="l"><a href="#960"> 960: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
-</span><span id="961" class="l"><a href="#961"> 961: </a>            }
-</span><span id="962" class="l"><a href="#962"> 962: </a>
-</span><span id="963" class="l"><a href="#963"> 963: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
-</span><span id="964" class="l"><a href="#964"> 964: </a>        }
+</span><span id="937" class="l"><a href="#937"> 937: </a>        <span class="php-comment">// Find the key from server or arguments</span>
+</span><span id="938" class="l"><a href="#938"> 938: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
+</span><span id="939" class="l"><a href="#939"> 939: </a>        {
+</span><span id="940" class="l"><a href="#940"> 940: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
+</span><span id="941" class="l"><a href="#941"> 941: </a>            {
+</span><span id="942" class="l"><a href="#942"> 942: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="943" class="l"><a href="#943"> 943: </a>            }
+</span><span id="944" class="l"><a href="#944"> 944: </a>
+</span><span id="945" class="l"><a href="#945"> 945: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
+</span><span id="946" class="l"><a href="#946"> 946: </a>
+</span><span id="947" class="l"><a href="#947"> 947: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
+</span><span id="948" class="l"><a href="#948"> 948: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
+</span><span id="949" class="l"><a href="#949"> 949: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
+</span><span id="950" class="l"><a href="#950"> 950: </a>
+</span><span id="951" class="l"><a href="#951"> 951: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
+</span><span id="952" class="l"><a href="#952"> 952: </a>
+</span><span id="953" class="l"><a href="#953"> 953: </a>            <span class="php-comment">/*
+</span></span><span id="954" class="l"><a href="#954"> 954: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
+</span></span><span id="955" class="l"><a href="#955"> 955: </a><span class="php-comment">             * of valid ip addresses stored in the database.
+</span></span><span id="956" class="l"><a href="#956"> 956: </a><span class="php-comment">             */</span>
+</span><span id="957" class="l"><a href="#957"> 957: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
+</span><span id="958" class="l"><a href="#958"> 958: </a>            {
+</span><span id="959" class="l"><a href="#959"> 959: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
+</span><span id="960" class="l"><a href="#960"> 960: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
+</span><span id="961" class="l"><a href="#961"> 961: </a>                {
+</span><span id="962" class="l"><a href="#962"> 962: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
+</span><span id="963" class="l"><a href="#963"> 963: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
+</span><span id="964" class="l"><a href="#964"> 964: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
 </span><span id="965" class="l"><a href="#965"> 965: </a>
-</span><span id="966" class="l"><a href="#966"> 966: </a>        <span class="php-comment">// Nope, just return the string</span>
-</span><span id="967" class="l"><a href="#967"> 967: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
-</span><span id="968" class="l"><a href="#968"> 968: </a>    }
-</span><span id="969" class="l"><a href="#969"> 969: </a>
-</span><span id="970" class="l"><a href="#970"> 970: </a>    <span class="php-comment">/**
-</span></span><span id="971" class="l"><a href="#971"> 971: </a><span class="php-comment">     * Add the request to the log table
-</span></span><span id="972" class="l"><a href="#972"> 972: </a><span class="php-comment">     *
-</span></span><span id="973" class="l"><a href="#973"> 973: </a><span class="php-comment">     * @access protected
-</span></span><span id="974" class="l"><a href="#974"> 974: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
-</span></span><span id="975" class="l"><a href="#975"> 975: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
-</span></span><span id="976" class="l"><a href="#976"> 976: </a><span class="php-comment">     */</span>
-</span><span id="977" class="l"><a href="#977"> 977: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="978" class="l"><a href="#978"> 978: </a>    {
-</span><span id="979" class="l"><a href="#979"> 979: </a>        <span class="php-comment">// Insert the request into the log table</span>
-</span><span id="980" class="l"><a href="#980"> 980: </a>        <span class="php-var">$isInserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="981" class="l"><a href="#981"> 981: </a>            -&gt;insert(
-</span><span id="982" class="l"><a href="#982"> 982: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
-</span><span id="983" class="l"><a href="#983"> 983: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
-</span><span id="984" class="l"><a href="#984"> 984: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
-</span><span id="985" class="l"><a href="#985"> 985: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
-</span><span id="986" class="l"><a href="#986"> 986: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="987" class="l"><a href="#987"> 987: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
-</span><span id="988" class="l"><a href="#988"> 988: </a>                <span class="php-quote">'time'</span> =&gt; now(), <span class="php-comment">// Used to be: function_exists('now') ? now() : time()</span>
-</span><span id="989" class="l"><a href="#989"> 989: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
-</span><span id="990" class="l"><a href="#990"> 990: </a>            ]);
+</span><span id="966" class="l"><a href="#966"> 966: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
+</span><span id="967" class="l"><a href="#967"> 967: </a>                    {
+</span><span id="968" class="l"><a href="#968"> 968: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() == <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
+</span><span id="969" class="l"><a href="#969"> 969: </a>                        {
+</span><span id="970" class="l"><a href="#970"> 970: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
+</span><span id="971" class="l"><a href="#971"> 971: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
+</span><span id="972" class="l"><a href="#972"> 972: </a>                            <span class="php-keyword1">break</span>;
+</span><span id="973" class="l"><a href="#973"> 973: </a>                        }
+</span><span id="974" class="l"><a href="#974"> 974: </a>                    }
+</span><span id="975" class="l"><a href="#975"> 975: </a>
+</span><span id="976" class="l"><a href="#976"> 976: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
+</span><span id="977" class="l"><a href="#977"> 977: </a>                }
+</span><span id="978" class="l"><a href="#978"> 978: </a>                <span class="php-keyword1">else</span>
+</span><span id="979" class="l"><a href="#979"> 979: </a>                {
+</span><span id="980" class="l"><a href="#980"> 980: </a>                    <span class="php-comment">// There should be at least one IP address for this private key.</span>
+</span><span id="981" class="l"><a href="#981"> 981: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="982" class="l"><a href="#982"> 982: </a>                }
+</span><span id="983" class="l"><a href="#983"> 983: </a>            }
+</span><span id="984" class="l"><a href="#984"> 984: </a>
+</span><span id="985" class="l"><a href="#985"> 985: </a>            <span class="php-keyword1">return</span> <span class="php-var">$row</span>;
+</span><span id="986" class="l"><a href="#986"> 986: </a>        }
+</span><span id="987" class="l"><a href="#987"> 987: </a>
+</span><span id="988" class="l"><a href="#988"> 988: </a>        <span class="php-comment">// No key has been sent</span>
+</span><span id="989" class="l"><a href="#989"> 989: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="990" class="l"><a href="#990"> 990: </a>    }
 </span><span id="991" class="l"><a href="#991"> 991: </a>
-</span><span id="992" class="l"><a href="#992"> 992: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
-</span><span id="993" class="l"><a href="#993"> 993: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
-</span><span id="994" class="l"><a href="#994"> 994: </a>
-</span><span id="995" class="l"><a href="#995"> 995: </a>        <span class="php-keyword1">return</span> <span class="php-var">$isInserted</span>;
-</span><span id="996" class="l"><a href="#996"> 996: </a>    }
-</span><span id="997" class="l"><a href="#997"> 997: </a>
-</span><span id="998" class="l"><a href="#998"> 998: </a>    <span class="php-comment">/**
-</span></span><span id="999" class="l"><a href="#999"> 999: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
-</span></span><span id="1000" class="l"><a href="#1000">1000: </a><span class="php-comment">     *
-</span></span><span id="1001" class="l"><a href="#1001">1001: </a><span class="php-comment">     * @access protected
-</span></span><span id="1002" class="l"><a href="#1002">1002: </a><span class="php-comment">     * @param  string $controller_method The method being called
-</span></span><span id="1003" class="l"><a href="#1003">1003: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
-</span></span><span id="1004" class="l"><a href="#1004">1004: </a><span class="php-comment">     */</span>
-</span><span id="1005" class="l"><a href="#1005">1005: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
-</span><span id="1006" class="l"><a href="#1006">1006: </a>    {
-</span><span id="1007" class="l"><a href="#1007">1007: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
-</span><span id="1008" class="l"><a href="#1008">1008: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span> || <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1009" class="l"><a href="#1009">1009: </a>        {
-</span><span id="1010" class="l"><a href="#1010">1010: </a>            <span class="php-comment">// Everything is fine</span>
-</span><span id="1011" class="l"><a href="#1011">1011: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1012" class="l"><a href="#1012">1012: </a>        }
-</span><span id="1013" class="l"><a href="#1013">1013: </a>
-</span><span id="1014" class="l"><a href="#1014">1014: </a>        <span class="php-comment">// How many times can you get to this method in a defined timelimit (default: 1hr)?</span>
-</span><span id="1015" class="l"><a href="#1015">1015: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>];
-</span><span id="1016" class="l"><a href="#1016">1016: </a>
-</span><span id="1017" class="l"><a href="#1017">1017: </a>        <span class="php-var">$uri_noext</span> = <span class="php-var">$this</span>-&gt;uri-&gt;uri_string();
-</span><span id="1018" class="l"><a href="#1018">1018: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;uri-&gt;uri_string()), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
-</span><span id="1019" class="l"><a href="#1019">1019: </a>        {
-</span><span id="1020" class="l"><a href="#1020">1020: </a>            <span class="php-var">$uri_noext</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)-<span class="php-num">1</span>);
-</span><span id="1021" class="l"><a href="#1021">1021: </a>        }
-</span><span id="1022" class="l"><a href="#1022">1022: </a>
-</span><span id="1023" class="l"><a href="#1023">1023: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
-</span><span id="1024" class="l"><a href="#1024">1024: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1025" class="l"><a href="#1025">1025: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
-</span><span id="1026" class="l"><a href="#1026">1026: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1027" class="l"><a href="#1027">1027: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
-</span><span id="1028" class="l"><a href="#1028">1028: </a>            -&gt;row();
-</span><span id="1029" class="l"><a href="#1029">1029: </a>
-</span><span id="1030" class="l"><a href="#1030">1030: </a>        <span class="php-var">$timelimit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'time'</span>] : <span class="php-num">60</span> * <span class="php-num">60</span>);
-</span><span id="1031" class="l"><a href="#1031">1031: </a>
-</span><span id="1032" class="l"><a href="#1032">1032: </a>        <span class="php-comment">// No calls have been made for this key</span>
-</span><span id="1033" class="l"><a href="#1033">1033: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1034" class="l"><a href="#1034">1034: </a>        {
-</span><span id="1035" class="l"><a href="#1035">1035: </a>            <span class="php-comment">// Create a new row for the following key</span>
-</span><span id="1036" class="l"><a href="#1036">1036: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
-</span><span id="1037" class="l"><a href="#1037">1037: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
-</span><span id="1038" class="l"><a href="#1038">1038: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="1039" class="l"><a href="#1039">1039: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
-</span><span id="1040" class="l"><a href="#1040">1040: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
-</span><span id="1041" class="l"><a href="#1041">1041: </a>            ]);
-</span><span id="1042" class="l"><a href="#1042">1042: </a>        }
-</span><span id="1043" class="l"><a href="#1043">1043: </a>
-</span><span id="1044" class="l"><a href="#1044">1044: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
-</span><span id="1045" class="l"><a href="#1045">1045: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$timelimit</span>))
-</span><span id="1046" class="l"><a href="#1046">1046: </a>        {
-</span><span id="1047" class="l"><a href="#1047">1047: </a>            <span class="php-comment">// Reset the started period and count</span>
-</span><span id="1048" class="l"><a href="#1048">1048: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1049" class="l"><a href="#1049">1049: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
-</span><span id="1050" class="l"><a href="#1050">1050: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
-</span><span id="1051" class="l"><a href="#1051">1051: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
-</span><span id="1052" class="l"><a href="#1052">1052: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
-</span><span id="1053" class="l"><a href="#1053">1053: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1054" class="l"><a href="#1054">1054: </a>        }
-</span><span id="1055" class="l"><a href="#1055">1055: </a>
-</span><span id="1056" class="l"><a href="#1056">1056: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
-</span><span id="1057" class="l"><a href="#1057">1057: </a>        <span class="php-keyword1">else</span>
-</span><span id="1058" class="l"><a href="#1058">1058: </a>        {
-</span><span id="1059" class="l"><a href="#1059">1059: </a>            <span class="php-comment">// The limit has been exceeded</span>
-</span><span id="1060" class="l"><a href="#1060">1060: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
-</span><span id="1061" class="l"><a href="#1061">1061: </a>            {
-</span><span id="1062" class="l"><a href="#1062">1062: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1063" class="l"><a href="#1063">1063: </a>            }
-</span><span id="1064" class="l"><a href="#1064">1064: </a>
-</span><span id="1065" class="l"><a href="#1065">1065: </a>            <span class="php-comment">// Increase the count by one</span>
-</span><span id="1066" class="l"><a href="#1066">1066: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1067" class="l"><a href="#1067">1067: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
-</span><span id="1068" class="l"><a href="#1068">1068: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1069" class="l"><a href="#1069">1069: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
-</span><span id="1070" class="l"><a href="#1070">1070: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1071" class="l"><a href="#1071">1071: </a>        }
-</span><span id="1072" class="l"><a href="#1072">1072: </a>
-</span><span id="1073" class="l"><a href="#1073">1073: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1074" class="l"><a href="#1074">1074: </a>    }
-</span><span id="1075" class="l"><a href="#1075">1075: </a>
-</span><span id="1076" class="l"><a href="#1076">1076: </a>    <span class="php-comment">/**
-</span></span><span id="1077" class="l"><a href="#1077">1077: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method being called
-</span></span><span id="1078" class="l"><a href="#1078">1078: </a><span class="php-comment">     *
-</span></span><span id="1079" class="l"><a href="#1079">1079: </a><span class="php-comment">     * @access protected
-</span></span><span id="1080" class="l"><a href="#1080">1080: </a><span class="php-comment">     * @return bool
-</span></span><span id="1081" class="l"><a href="#1081">1081: </a><span class="php-comment">     */</span>
-</span><span id="1082" class="l"><a href="#1082">1082: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
-</span><span id="1083" class="l"><a href="#1083">1083: </a>    {
-</span><span id="1084" class="l"><a href="#1084">1084: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
-</span><span id="1085" class="l"><a href="#1085">1085: </a>        <span class="php-var">$this</span>-&gt;overrides_array = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
+</span><span id="992" class="l"><a href="#992"> 992: </a>    <span class="php-comment">/**
+</span></span><span id="993" class="l"><a href="#993"> 993: </a><span class="php-comment">     * What language do they want it in?
+</span></span><span id="994" class="l"><a href="#994"> 994: </a><span class="php-comment">     *
+</span></span><span id="995" class="l"><a href="#995"> 995: </a><span class="php-comment">     * @access protected
+</span></span><span id="996" class="l"><a href="#996"> 996: </a><span class="php-comment">     * @return NULL|string The language code.
+</span></span><span id="997" class="l"><a href="#997"> 997: </a><span class="php-comment">     */</span>
+</span><span id="998" class="l"><a href="#998"> 998: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
+</span><span id="999" class="l"><a href="#999"> 999: </a>    {
+</span><span id="1000" class="l"><a href="#1000">1000: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>))
+</span><span id="1001" class="l"><a href="#1001">1001: </a>        {
+</span><span id="1002" class="l"><a href="#1002">1002: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="1003" class="l"><a href="#1003">1003: </a>        }
+</span><span id="1004" class="l"><a href="#1004">1004: </a>
+</span><span id="1005" class="l"><a href="#1005">1005: </a>        <span class="php-comment">// They might have sent a few, make it an array</span>
+</span><span id="1006" class="l"><a href="#1006">1006: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="1007" class="l"><a href="#1007">1007: </a>        {
+</span><span id="1008" class="l"><a href="#1008">1008: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
+</span><span id="1009" class="l"><a href="#1009">1009: </a>
+</span><span id="1010" class="l"><a href="#1010">1010: </a>            <span class="php-var">$return_langs</span> = [];
+</span><span id="1011" class="l"><a href="#1011">1011: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
+</span><span id="1012" class="l"><a href="#1012">1012: </a>            {
+</span><span id="1013" class="l"><a href="#1013">1013: </a>                <span class="php-comment">// Remove weight and strip space</span>
+</span><span id="1014" class="l"><a href="#1014">1014: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
+</span><span id="1015" class="l"><a href="#1015">1015: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
+</span><span id="1016" class="l"><a href="#1016">1016: </a>            }
+</span><span id="1017" class="l"><a href="#1017">1017: </a>
+</span><span id="1018" class="l"><a href="#1018">1018: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
+</span><span id="1019" class="l"><a href="#1019">1019: </a>        }
+</span><span id="1020" class="l"><a href="#1020">1020: </a>
+</span><span id="1021" class="l"><a href="#1021">1021: </a>        <span class="php-comment">// Nope, just return the string</span>
+</span><span id="1022" class="l"><a href="#1022">1022: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
+</span><span id="1023" class="l"><a href="#1023">1023: </a>    }
+</span><span id="1024" class="l"><a href="#1024">1024: </a>
+</span><span id="1025" class="l"><a href="#1025">1025: </a>    <span class="php-comment">/**
+</span></span><span id="1026" class="l"><a href="#1026">1026: </a><span class="php-comment">     * Add the request to the log table
+</span></span><span id="1027" class="l"><a href="#1027">1027: </a><span class="php-comment">     *
+</span></span><span id="1028" class="l"><a href="#1028">1028: </a><span class="php-comment">     * @access protected
+</span></span><span id="1029" class="l"><a href="#1029">1029: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
+</span></span><span id="1030" class="l"><a href="#1030">1030: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
+</span></span><span id="1031" class="l"><a href="#1031">1031: </a><span class="php-comment">     */</span>
+</span><span id="1032" class="l"><a href="#1032">1032: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="1033" class="l"><a href="#1033">1033: </a>    {
+</span><span id="1034" class="l"><a href="#1034">1034: </a>        <span class="php-comment">// Insert the request into the log table</span>
+</span><span id="1035" class="l"><a href="#1035">1035: </a>        <span class="php-var">$isInserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1036" class="l"><a href="#1036">1036: </a>            -&gt;insert(
+</span><span id="1037" class="l"><a href="#1037">1037: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
+</span><span id="1038" class="l"><a href="#1038">1038: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
+</span><span id="1039" class="l"><a href="#1039">1039: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
+</span><span id="1040" class="l"><a href="#1040">1040: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
+</span><span id="1041" class="l"><a href="#1041">1041: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="1042" class="l"><a href="#1042">1042: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
+</span><span id="1043" class="l"><a href="#1043">1043: </a>                <span class="php-quote">'time'</span> =&gt; now(), <span class="php-comment">// Used to be: function_exists('now') ? now() : time()</span>
+</span><span id="1044" class="l"><a href="#1044">1044: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
+</span><span id="1045" class="l"><a href="#1045">1045: </a>            ]);
+</span><span id="1046" class="l"><a href="#1046">1046: </a>
+</span><span id="1047" class="l"><a href="#1047">1047: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
+</span><span id="1048" class="l"><a href="#1048">1048: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
+</span><span id="1049" class="l"><a href="#1049">1049: </a>
+</span><span id="1050" class="l"><a href="#1050">1050: </a>        <span class="php-keyword1">return</span> <span class="php-var">$isInserted</span>;
+</span><span id="1051" class="l"><a href="#1051">1051: </a>    }
+</span><span id="1052" class="l"><a href="#1052">1052: </a>
+</span><span id="1053" class="l"><a href="#1053">1053: </a>    <span class="php-comment">/**
+</span></span><span id="1054" class="l"><a href="#1054">1054: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
+</span></span><span id="1055" class="l"><a href="#1055">1055: </a><span class="php-comment">     *
+</span></span><span id="1056" class="l"><a href="#1056">1056: </a><span class="php-comment">     * @access protected
+</span></span><span id="1057" class="l"><a href="#1057">1057: </a><span class="php-comment">     * @param  string $controller_method The method being called
+</span></span><span id="1058" class="l"><a href="#1058">1058: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
+</span></span><span id="1059" class="l"><a href="#1059">1059: </a><span class="php-comment">     */</span>
+</span><span id="1060" class="l"><a href="#1060">1060: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
+</span><span id="1061" class="l"><a href="#1061">1061: </a>    {
+</span><span id="1062" class="l"><a href="#1062">1062: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
+</span><span id="1063" class="l"><a href="#1063">1063: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span> || <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1064" class="l"><a href="#1064">1064: </a>        {
+</span><span id="1065" class="l"><a href="#1065">1065: </a>            <span class="php-comment">// Everything is fine</span>
+</span><span id="1066" class="l"><a href="#1066">1066: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1067" class="l"><a href="#1067">1067: </a>        }
+</span><span id="1068" class="l"><a href="#1068">1068: </a>
+</span><span id="1069" class="l"><a href="#1069">1069: </a>        <span class="php-comment">// How many times can you get to this method in a defined timelimit (default: 1hr)?</span>
+</span><span id="1070" class="l"><a href="#1070">1070: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>];
+</span><span id="1071" class="l"><a href="#1071">1071: </a>
+</span><span id="1072" class="l"><a href="#1072">1072: </a>        <span class="php-var">$uri_noext</span> = <span class="php-var">$this</span>-&gt;uri-&gt;uri_string();
+</span><span id="1073" class="l"><a href="#1073">1073: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;uri-&gt;uri_string()), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
+</span><span id="1074" class="l"><a href="#1074">1074: </a>        {
+</span><span id="1075" class="l"><a href="#1075">1075: </a>            <span class="php-var">$uri_noext</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)-<span class="php-num">1</span>);
+</span><span id="1076" class="l"><a href="#1076">1076: </a>        }
+</span><span id="1077" class="l"><a href="#1077">1077: </a>
+</span><span id="1078" class="l"><a href="#1078">1078: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
+</span><span id="1079" class="l"><a href="#1079">1079: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1080" class="l"><a href="#1080">1080: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
+</span><span id="1081" class="l"><a href="#1081">1081: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1082" class="l"><a href="#1082">1082: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
+</span><span id="1083" class="l"><a href="#1083">1083: </a>            -&gt;row();
+</span><span id="1084" class="l"><a href="#1084">1084: </a>
+</span><span id="1085" class="l"><a href="#1085">1085: </a>        <span class="php-var">$timelimit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'time'</span>] : <span class="php-num">60</span> * <span class="php-num">60</span>);
 </span><span id="1086" class="l"><a href="#1086">1086: </a>
-</span><span id="1087" class="l"><a href="#1087">1087: </a>        <span class="php-comment">// Check to see if the override array is even populated, otherwise return FALSE</span>
-</span><span id="1088" class="l"><a href="#1088">1088: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array))
+</span><span id="1087" class="l"><a href="#1087">1087: </a>        <span class="php-comment">// No calls have been made for this key</span>
+</span><span id="1088" class="l"><a href="#1088">1088: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
 </span><span id="1089" class="l"><a href="#1089">1089: </a>        {
-</span><span id="1090" class="l"><a href="#1090">1090: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1091" class="l"><a href="#1091">1091: </a>        }
-</span><span id="1092" class="l"><a href="#1092">1092: </a>
-</span><span id="1093" class="l"><a href="#1093">1093: </a>        <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="1094" class="l"><a href="#1094">1094: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>]) === <span class="php-keyword1">FALSE</span>) <span class="php-comment">// Check for class overrides</span>
-</span><span id="1095" class="l"><a href="#1095">1095: </a>        {
-</span><span id="1096" class="l"><a href="#1096">1096: </a>            <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1097" class="l"><a href="#1097">1097: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'none'</span>)
-</span><span id="1098" class="l"><a href="#1098">1098: </a>            {
-</span><span id="1099" class="l"><a href="#1099">1099: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1100" class="l"><a href="#1100">1100: </a>            }
-</span><span id="1101" class="l"><a href="#1101">1101: </a>
-</span><span id="1102" class="l"><a href="#1102">1102: </a>            <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1103" class="l"><a href="#1103">1103: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'basic'</span>)
-</span><span id="1104" class="l"><a href="#1104">1104: </a>            {
-</span><span id="1105" class="l"><a href="#1105">1105: </a>                <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1106" class="l"><a href="#1106">1106: </a>
-</span><span id="1107" class="l"><a href="#1107">1107: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1108" class="l"><a href="#1108">1108: </a>            }
-</span><span id="1109" class="l"><a href="#1109">1109: </a>
-</span><span id="1110" class="l"><a href="#1110">1110: </a>            <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1111" class="l"><a href="#1111">1111: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'digest'</span>)
-</span><span id="1112" class="l"><a href="#1112">1112: </a>            {
-</span><span id="1113" class="l"><a href="#1113">1113: </a>                <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1114" class="l"><a href="#1114">1114: </a>
-</span><span id="1115" class="l"><a href="#1115">1115: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1116" class="l"><a href="#1116">1116: </a>            }
-</span><span id="1117" class="l"><a href="#1117">1117: </a>
-</span><span id="1118" class="l"><a href="#1118">1118: </a>            <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1119" class="l"><a href="#1119">1119: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'whitelist'</span>)
-</span><span id="1120" class="l"><a href="#1120">1120: </a>            {
-</span><span id="1121" class="l"><a href="#1121">1121: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1122" class="l"><a href="#1122">1122: </a>
-</span><span id="1123" class="l"><a href="#1123">1123: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1124" class="l"><a href="#1124">1124: </a>            }
-</span><span id="1125" class="l"><a href="#1125">1125: </a>        }
-</span><span id="1126" class="l"><a href="#1126">1126: </a>
-</span><span id="1127" class="l"><a href="#1127">1127: </a>        <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
-</span><span id="1128" class="l"><a href="#1128">1128: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
-</span><span id="1129" class="l"><a href="#1129">1129: </a>        {
-</span><span id="1130" class="l"><a href="#1130">1130: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1131" class="l"><a href="#1131">1131: </a>        }
-</span><span id="1132" class="l"><a href="#1132">1132: </a>
-</span><span id="1133" class="l"><a href="#1133">1133: </a>        <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1134" class="l"><a href="#1134">1134: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'none'</span>)
-</span><span id="1135" class="l"><a href="#1135">1135: </a>        {
-</span><span id="1136" class="l"><a href="#1136">1136: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1137" class="l"><a href="#1137">1137: </a>        }
-</span><span id="1138" class="l"><a href="#1138">1138: </a>
-</span><span id="1139" class="l"><a href="#1139">1139: </a>        <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1140" class="l"><a href="#1140">1140: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'basic'</span>)
-</span><span id="1141" class="l"><a href="#1141">1141: </a>        {
-</span><span id="1142" class="l"><a href="#1142">1142: </a>            <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1143" class="l"><a href="#1143">1143: </a>
-</span><span id="1144" class="l"><a href="#1144">1144: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1145" class="l"><a href="#1145">1145: </a>        }
-</span><span id="1146" class="l"><a href="#1146">1146: </a>
-</span><span id="1147" class="l"><a href="#1147">1147: </a>        <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1148" class="l"><a href="#1148">1148: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'digest'</span>)
-</span><span id="1149" class="l"><a href="#1149">1149: </a>        {
-</span><span id="1150" class="l"><a href="#1150">1150: </a>            <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1151" class="l"><a href="#1151">1151: </a>
-</span><span id="1152" class="l"><a href="#1152">1152: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1153" class="l"><a href="#1153">1153: </a>        }
-</span><span id="1154" class="l"><a href="#1154">1154: </a>
-</span><span id="1155" class="l"><a href="#1155">1155: </a>        <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1156" class="l"><a href="#1156">1156: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'whitelist'</span>)
-</span><span id="1157" class="l"><a href="#1157">1157: </a>        {
-</span><span id="1158" class="l"><a href="#1158">1158: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1159" class="l"><a href="#1159">1159: </a>
-</span><span id="1160" class="l"><a href="#1160">1160: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1161" class="l"><a href="#1161">1161: </a>        }
-</span><span id="1162" class="l"><a href="#1162">1162: </a>
-</span><span id="1163" class="l"><a href="#1163">1163: </a>        <span class="php-comment">// Return FALSE when there is an override value set but it does not match</span>
-</span><span id="1164" class="l"><a href="#1164">1164: </a>        <span class="php-comment">// 'basic', 'digest', or 'none'. (the value was misspelled)</span>
-</span><span id="1165" class="l"><a href="#1165">1165: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1166" class="l"><a href="#1166">1166: </a>    }
-</span><span id="1167" class="l"><a href="#1167">1167: </a>
-</span><span id="1168" class="l"><a href="#1168">1168: </a>    <span class="php-comment">/**
-</span></span><span id="1169" class="l"><a href="#1169">1169: </a><span class="php-comment">     * Parse the GET request arguments
-</span></span><span id="1170" class="l"><a href="#1170">1170: </a><span class="php-comment">     *
-</span></span><span id="1171" class="l"><a href="#1171">1171: </a><span class="php-comment">     * @access protected
-</span></span><span id="1172" class="l"><a href="#1172">1172: </a><span class="php-comment">     * @return void
-</span></span><span id="1173" class="l"><a href="#1173">1173: </a><span class="php-comment">     */</span>
-</span><span id="1174" class="l"><a href="#1174">1174: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
-</span><span id="1175" class="l"><a href="#1175">1175: </a>    {
-</span><span id="1176" class="l"><a href="#1176">1176: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
-</span><span id="1177" class="l"><a href="#1177">1177: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
-</span><span id="1178" class="l"><a href="#1178">1178: </a>    }
-</span><span id="1179" class="l"><a href="#1179">1179: </a>
-</span><span id="1180" class="l"><a href="#1180">1180: </a>    <span class="php-comment">/**
-</span></span><span id="1181" class="l"><a href="#1181">1181: </a><span class="php-comment">     * Parse the POST request arguments
-</span></span><span id="1182" class="l"><a href="#1182">1182: </a><span class="php-comment">     *
-</span></span><span id="1183" class="l"><a href="#1183">1183: </a><span class="php-comment">     * @access protected
-</span></span><span id="1184" class="l"><a href="#1184">1184: </a><span class="php-comment">     * @return void
-</span></span><span id="1185" class="l"><a href="#1185">1185: </a><span class="php-comment">     */</span>
-</span><span id="1186" class="l"><a href="#1186">1186: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
-</span><span id="1187" class="l"><a href="#1187">1187: </a>    {
-</span><span id="1188" class="l"><a href="#1188">1188: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
-</span><span id="1189" class="l"><a href="#1189">1189: </a>
-</span><span id="1190" class="l"><a href="#1190">1190: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1191" class="l"><a href="#1191">1191: </a>        {
-</span><span id="1192" class="l"><a href="#1192">1192: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1193" class="l"><a href="#1193">1193: </a>        }
-</span><span id="1194" class="l"><a href="#1194">1194: </a>    }
-</span><span id="1195" class="l"><a href="#1195">1195: </a>
-</span><span id="1196" class="l"><a href="#1196">1196: </a>    <span class="php-comment">/**
-</span></span><span id="1197" class="l"><a href="#1197">1197: </a><span class="php-comment">     * Parse the PUT request arguments
-</span></span><span id="1198" class="l"><a href="#1198">1198: </a><span class="php-comment">     *
-</span></span><span id="1199" class="l"><a href="#1199">1199: </a><span class="php-comment">     * @access protected
-</span></span><span id="1200" class="l"><a href="#1200">1200: </a><span class="php-comment">     * @return void
-</span></span><span id="1201" class="l"><a href="#1201">1201: </a><span class="php-comment">     */</span>
-</span><span id="1202" class="l"><a href="#1202">1202: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
-</span><span id="1203" class="l"><a href="#1203">1203: </a>    {
-</span><span id="1204" class="l"><a href="#1204">1204: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1205" class="l"><a href="#1205">1205: </a>        {
-</span><span id="1206" class="l"><a href="#1206">1206: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1207" class="l"><a href="#1207">1207: </a>        }
-</span><span id="1208" class="l"><a href="#1208">1208: </a>        <span class="php-keyword1">else</span>
-</span><span id="1209" class="l"><a href="#1209">1209: </a>        {
-</span><span id="1210" class="l"><a href="#1210">1210: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1211" class="l"><a href="#1211">1211: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
-</span><span id="1212" class="l"><a href="#1212">1212: </a>            {
-</span><span id="1213" class="l"><a href="#1213">1213: </a>                <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1214" class="l"><a href="#1214">1214: </a>            }
-</span><span id="1215" class="l"><a href="#1215">1215: </a>        }
-</span><span id="1216" class="l"><a href="#1216">1216: </a>    }
+</span><span id="1090" class="l"><a href="#1090">1090: </a>            <span class="php-comment">// Create a new row for the following key</span>
+</span><span id="1091" class="l"><a href="#1091">1091: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
+</span><span id="1092" class="l"><a href="#1092">1092: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
+</span><span id="1093" class="l"><a href="#1093">1093: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="1094" class="l"><a href="#1094">1094: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
+</span><span id="1095" class="l"><a href="#1095">1095: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
+</span><span id="1096" class="l"><a href="#1096">1096: </a>            ]);
+</span><span id="1097" class="l"><a href="#1097">1097: </a>        }
+</span><span id="1098" class="l"><a href="#1098">1098: </a>
+</span><span id="1099" class="l"><a href="#1099">1099: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
+</span><span id="1100" class="l"><a href="#1100">1100: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$timelimit</span>))
+</span><span id="1101" class="l"><a href="#1101">1101: </a>        {
+</span><span id="1102" class="l"><a href="#1102">1102: </a>            <span class="php-comment">// Reset the started period and count</span>
+</span><span id="1103" class="l"><a href="#1103">1103: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1104" class="l"><a href="#1104">1104: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
+</span><span id="1105" class="l"><a href="#1105">1105: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
+</span><span id="1106" class="l"><a href="#1106">1106: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
+</span><span id="1107" class="l"><a href="#1107">1107: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
+</span><span id="1108" class="l"><a href="#1108">1108: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1109" class="l"><a href="#1109">1109: </a>        }
+</span><span id="1110" class="l"><a href="#1110">1110: </a>
+</span><span id="1111" class="l"><a href="#1111">1111: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
+</span><span id="1112" class="l"><a href="#1112">1112: </a>        <span class="php-keyword1">else</span>
+</span><span id="1113" class="l"><a href="#1113">1113: </a>        {
+</span><span id="1114" class="l"><a href="#1114">1114: </a>            <span class="php-comment">// The limit has been exceeded</span>
+</span><span id="1115" class="l"><a href="#1115">1115: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
+</span><span id="1116" class="l"><a href="#1116">1116: </a>            {
+</span><span id="1117" class="l"><a href="#1117">1117: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1118" class="l"><a href="#1118">1118: </a>            }
+</span><span id="1119" class="l"><a href="#1119">1119: </a>
+</span><span id="1120" class="l"><a href="#1120">1120: </a>            <span class="php-comment">// Increase the count by one</span>
+</span><span id="1121" class="l"><a href="#1121">1121: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1122" class="l"><a href="#1122">1122: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
+</span><span id="1123" class="l"><a href="#1123">1123: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1124" class="l"><a href="#1124">1124: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
+</span><span id="1125" class="l"><a href="#1125">1125: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1126" class="l"><a href="#1126">1126: </a>        }
+</span><span id="1127" class="l"><a href="#1127">1127: </a>
+</span><span id="1128" class="l"><a href="#1128">1128: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1129" class="l"><a href="#1129">1129: </a>    }
+</span><span id="1130" class="l"><a href="#1130">1130: </a>
+</span><span id="1131" class="l"><a href="#1131">1131: </a>    <span class="php-comment">/**
+</span></span><span id="1132" class="l"><a href="#1132">1132: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method being called
+</span></span><span id="1133" class="l"><a href="#1133">1133: </a><span class="php-comment">     *
+</span></span><span id="1134" class="l"><a href="#1134">1134: </a><span class="php-comment">     * @access protected
+</span></span><span id="1135" class="l"><a href="#1135">1135: </a><span class="php-comment">     * @return bool
+</span></span><span id="1136" class="l"><a href="#1136">1136: </a><span class="php-comment">     */</span>
+</span><span id="1137" class="l"><a href="#1137">1137: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
+</span><span id="1138" class="l"><a href="#1138">1138: </a>    {
+</span><span id="1139" class="l"><a href="#1139">1139: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
+</span><span id="1140" class="l"><a href="#1140">1140: </a>        <span class="php-var">$this</span>-&gt;overrides_array = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
+</span><span id="1141" class="l"><a href="#1141">1141: </a>
+</span><span id="1142" class="l"><a href="#1142">1142: </a>        <span class="php-comment">// Check to see if the override array is even populated, otherwise return FALSE</span>
+</span><span id="1143" class="l"><a href="#1143">1143: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array))
+</span><span id="1144" class="l"><a href="#1144">1144: </a>        {
+</span><span id="1145" class="l"><a href="#1145">1145: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1146" class="l"><a href="#1146">1146: </a>        }
+</span><span id="1147" class="l"><a href="#1147">1147: </a>
+</span><span id="1148" class="l"><a href="#1148">1148: </a>        <span class="php-comment">// check for wildcard flag for rules for classes</span>
+</span><span id="1149" class="l"><a href="#1149">1149: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>]) === <span class="php-keyword1">FALSE</span>) <span class="php-comment">// Check for class overrides</span>
+</span><span id="1150" class="l"><a href="#1150">1150: </a>        {
+</span><span id="1151" class="l"><a href="#1151">1151: </a>            <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1152" class="l"><a href="#1152">1152: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'none'</span>)
+</span><span id="1153" class="l"><a href="#1153">1153: </a>            {
+</span><span id="1154" class="l"><a href="#1154">1154: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1155" class="l"><a href="#1155">1155: </a>            }
+</span><span id="1156" class="l"><a href="#1156">1156: </a>
+</span><span id="1157" class="l"><a href="#1157">1157: </a>            <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1158" class="l"><a href="#1158">1158: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'basic'</span>)
+</span><span id="1159" class="l"><a href="#1159">1159: </a>            {
+</span><span id="1160" class="l"><a href="#1160">1160: </a>                <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1161" class="l"><a href="#1161">1161: </a>
+</span><span id="1162" class="l"><a href="#1162">1162: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1163" class="l"><a href="#1163">1163: </a>            }
+</span><span id="1164" class="l"><a href="#1164">1164: </a>
+</span><span id="1165" class="l"><a href="#1165">1165: </a>            <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1166" class="l"><a href="#1166">1166: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'digest'</span>)
+</span><span id="1167" class="l"><a href="#1167">1167: </a>            {
+</span><span id="1168" class="l"><a href="#1168">1168: </a>                <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1169" class="l"><a href="#1169">1169: </a>
+</span><span id="1170" class="l"><a href="#1170">1170: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1171" class="l"><a href="#1171">1171: </a>            }
+</span><span id="1172" class="l"><a href="#1172">1172: </a>
+</span><span id="1173" class="l"><a href="#1173">1173: </a>            <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1174" class="l"><a href="#1174">1174: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'whitelist'</span>)
+</span><span id="1175" class="l"><a href="#1175">1175: </a>            {
+</span><span id="1176" class="l"><a href="#1176">1176: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1177" class="l"><a href="#1177">1177: </a>
+</span><span id="1178" class="l"><a href="#1178">1178: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1179" class="l"><a href="#1179">1179: </a>            }
+</span><span id="1180" class="l"><a href="#1180">1180: </a>        }
+</span><span id="1181" class="l"><a href="#1181">1181: </a>
+</span><span id="1182" class="l"><a href="#1182">1182: </a>        <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
+</span><span id="1183" class="l"><a href="#1183">1183: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
+</span><span id="1184" class="l"><a href="#1184">1184: </a>        {
+</span><span id="1185" class="l"><a href="#1185">1185: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1186" class="l"><a href="#1186">1186: </a>        }
+</span><span id="1187" class="l"><a href="#1187">1187: </a>
+</span><span id="1188" class="l"><a href="#1188">1188: </a>        <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1189" class="l"><a href="#1189">1189: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'none'</span>)
+</span><span id="1190" class="l"><a href="#1190">1190: </a>        {
+</span><span id="1191" class="l"><a href="#1191">1191: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1192" class="l"><a href="#1192">1192: </a>        }
+</span><span id="1193" class="l"><a href="#1193">1193: </a>
+</span><span id="1194" class="l"><a href="#1194">1194: </a>        <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1195" class="l"><a href="#1195">1195: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'basic'</span>)
+</span><span id="1196" class="l"><a href="#1196">1196: </a>        {
+</span><span id="1197" class="l"><a href="#1197">1197: </a>            <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1198" class="l"><a href="#1198">1198: </a>
+</span><span id="1199" class="l"><a href="#1199">1199: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1200" class="l"><a href="#1200">1200: </a>        }
+</span><span id="1201" class="l"><a href="#1201">1201: </a>
+</span><span id="1202" class="l"><a href="#1202">1202: </a>        <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1203" class="l"><a href="#1203">1203: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'digest'</span>)
+</span><span id="1204" class="l"><a href="#1204">1204: </a>        {
+</span><span id="1205" class="l"><a href="#1205">1205: </a>            <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1206" class="l"><a href="#1206">1206: </a>
+</span><span id="1207" class="l"><a href="#1207">1207: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1208" class="l"><a href="#1208">1208: </a>        }
+</span><span id="1209" class="l"><a href="#1209">1209: </a>
+</span><span id="1210" class="l"><a href="#1210">1210: </a>        <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1211" class="l"><a href="#1211">1211: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'whitelist'</span>)
+</span><span id="1212" class="l"><a href="#1212">1212: </a>        {
+</span><span id="1213" class="l"><a href="#1213">1213: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1214" class="l"><a href="#1214">1214: </a>
+</span><span id="1215" class="l"><a href="#1215">1215: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1216" class="l"><a href="#1216">1216: </a>        }
 </span><span id="1217" class="l"><a href="#1217">1217: </a>
-</span><span id="1218" class="l"><a href="#1218">1218: </a>    <span class="php-comment">/**
-</span></span><span id="1219" class="l"><a href="#1219">1219: </a><span class="php-comment">     * Parse the HEAD request arguments
-</span></span><span id="1220" class="l"><a href="#1220">1220: </a><span class="php-comment">     *
-</span></span><span id="1221" class="l"><a href="#1221">1221: </a><span class="php-comment">     * @access protected
-</span></span><span id="1222" class="l"><a href="#1222">1222: </a><span class="php-comment">     * @return void
-</span></span><span id="1223" class="l"><a href="#1223">1223: </a><span class="php-comment">     */</span>
-</span><span id="1224" class="l"><a href="#1224">1224: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
-</span><span id="1225" class="l"><a href="#1225">1225: </a>    {
-</span><span id="1226" class="l"><a href="#1226">1226: </a>        <span class="php-comment">// Parse the HEAD variables</span>
-</span><span id="1227" class="l"><a href="#1227">1227: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
-</span><span id="1228" class="l"><a href="#1228">1228: </a>
-</span><span id="1229" class="l"><a href="#1229">1229: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
-</span><span id="1230" class="l"><a href="#1230">1230: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
-</span><span id="1231" class="l"><a href="#1231">1231: </a>    }
-</span><span id="1232" class="l"><a href="#1232">1232: </a>
-</span><span id="1233" class="l"><a href="#1233">1233: </a>    <span class="php-comment">/**
-</span></span><span id="1234" class="l"><a href="#1234">1234: </a><span class="php-comment">     * Parse the OPTIONS request arguments
-</span></span><span id="1235" class="l"><a href="#1235">1235: </a><span class="php-comment">     *
-</span></span><span id="1236" class="l"><a href="#1236">1236: </a><span class="php-comment">     * @access protected
-</span></span><span id="1237" class="l"><a href="#1237">1237: </a><span class="php-comment">     * @return void
-</span></span><span id="1238" class="l"><a href="#1238">1238: </a><span class="php-comment">     */</span>
-</span><span id="1239" class="l"><a href="#1239">1239: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
-</span><span id="1240" class="l"><a href="#1240">1240: </a>    {
-</span><span id="1241" class="l"><a href="#1241">1241: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
-</span><span id="1242" class="l"><a href="#1242">1242: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
-</span><span id="1243" class="l"><a href="#1243">1243: </a>
-</span><span id="1244" class="l"><a href="#1244">1244: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
-</span><span id="1245" class="l"><a href="#1245">1245: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
-</span><span id="1246" class="l"><a href="#1246">1246: </a>    }
-</span><span id="1247" class="l"><a href="#1247">1247: </a>
-</span><span id="1248" class="l"><a href="#1248">1248: </a>    <span class="php-comment">/**
-</span></span><span id="1249" class="l"><a href="#1249">1249: </a><span class="php-comment">     * Parse the PATCH request arguments
-</span></span><span id="1250" class="l"><a href="#1250">1250: </a><span class="php-comment">     *
-</span></span><span id="1251" class="l"><a href="#1251">1251: </a><span class="php-comment">     * @access protected
-</span></span><span id="1252" class="l"><a href="#1252">1252: </a><span class="php-comment">     * @return void
-</span></span><span id="1253" class="l"><a href="#1253">1253: </a><span class="php-comment">     */</span>
-</span><span id="1254" class="l"><a href="#1254">1254: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
-</span><span id="1255" class="l"><a href="#1255">1255: </a>    {
-</span><span id="1256" class="l"><a href="#1256">1256: </a>        <span class="php-comment">// It might be a HTTP body</span>
-</span><span id="1257" class="l"><a href="#1257">1257: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1258" class="l"><a href="#1258">1258: </a>        {
-</span><span id="1259" class="l"><a href="#1259">1259: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1260" class="l"><a href="#1260">1260: </a>        }
-</span><span id="1261" class="l"><a href="#1261">1261: </a>        <span class="php-keyword1">else</span>
-</span><span id="1262" class="l"><a href="#1262">1262: </a>        {
-</span><span id="1263" class="l"><a href="#1263">1263: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1264" class="l"><a href="#1264">1264: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
-</span><span id="1265" class="l"><a href="#1265">1265: </a>            {
-</span><span id="1266" class="l"><a href="#1266">1266: </a>                <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1267" class="l"><a href="#1267">1267: </a>            }
-</span><span id="1268" class="l"><a href="#1268">1268: </a>        }
-</span><span id="1269" class="l"><a href="#1269">1269: </a>    }
-</span><span id="1270" class="l"><a href="#1270">1270: </a>
-</span><span id="1271" class="l"><a href="#1271">1271: </a>    <span class="php-comment">/**
-</span></span><span id="1272" class="l"><a href="#1272">1272: </a><span class="php-comment">     * Parse the DELETE request arguments
-</span></span><span id="1273" class="l"><a href="#1273">1273: </a><span class="php-comment">     *
-</span></span><span id="1274" class="l"><a href="#1274">1274: </a><span class="php-comment">     * @access protected
-</span></span><span id="1275" class="l"><a href="#1275">1275: </a><span class="php-comment">     * @return void
-</span></span><span id="1276" class="l"><a href="#1276">1276: </a><span class="php-comment">     */</span>
-</span><span id="1277" class="l"><a href="#1277">1277: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
-</span><span id="1278" class="l"><a href="#1278">1278: </a>    {
-</span><span id="1279" class="l"><a href="#1279">1279: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
-</span><span id="1280" class="l"><a href="#1280">1280: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
-</span><span id="1281" class="l"><a href="#1281">1281: </a>        {
-</span><span id="1282" class="l"><a href="#1282">1282: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1283" class="l"><a href="#1283">1283: </a>        }
-</span><span id="1284" class="l"><a href="#1284">1284: </a>    }
-</span><span id="1285" class="l"><a href="#1285">1285: </a>
-</span><span id="1286" class="l"><a href="#1286">1286: </a>    <span class="php-comment">/**
-</span></span><span id="1287" class="l"><a href="#1287">1287: </a><span class="php-comment">     * Parse the query parameters
-</span></span><span id="1288" class="l"><a href="#1288">1288: </a><span class="php-comment">     *
-</span></span><span id="1289" class="l"><a href="#1289">1289: </a><span class="php-comment">     * @access protected
-</span></span><span id="1290" class="l"><a href="#1290">1290: </a><span class="php-comment">     * @return void
-</span></span><span id="1291" class="l"><a href="#1291">1291: </a><span class="php-comment">     */</span>
-</span><span id="1292" class="l"><a href="#1292">1292: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
-</span><span id="1293" class="l"><a href="#1293">1293: </a>    {
-</span><span id="1294" class="l"><a href="#1294">1294: </a>        <span class="php-comment">// Declare a variable that will hold the REQUEST_URI</span>
-</span><span id="1295" class="l"><a href="#1295">1295: </a>        <span class="php-var">$request_uri</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1296" class="l"><a href="#1296">1296: </a>
-</span><span id="1297" class="l"><a href="#1297">1297: </a>        <span class="php-comment">// If using the commandline version</span>
-</span><span id="1298" class="l"><a href="#1298">1298: </a>        <span class="php-keyword1">if</span> (is_cli())
-</span><span id="1299" class="l"><a href="#1299">1299: </a>        {
-</span><span id="1300" class="l"><a href="#1300">1300: </a>            <span class="php-var">$args</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'argv'</span>);
-</span><span id="1301" class="l"><a href="#1301">1301: </a>            <span class="php-keyword1">unset</span>(<span class="php-var">$args</span>[<span class="php-num">0</span>]);
+</span><span id="1218" class="l"><a href="#1218">1218: </a>        <span class="php-comment">// Return FALSE when there is an override value set but it does not match</span>
+</span><span id="1219" class="l"><a href="#1219">1219: </a>        <span class="php-comment">// 'basic', 'digest', or 'none'. (the value was misspelled)</span>
+</span><span id="1220" class="l"><a href="#1220">1220: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1221" class="l"><a href="#1221">1221: </a>    }
+</span><span id="1222" class="l"><a href="#1222">1222: </a>
+</span><span id="1223" class="l"><a href="#1223">1223: </a>    <span class="php-comment">/**
+</span></span><span id="1224" class="l"><a href="#1224">1224: </a><span class="php-comment">     * Parse the GET request arguments
+</span></span><span id="1225" class="l"><a href="#1225">1225: </a><span class="php-comment">     *
+</span></span><span id="1226" class="l"><a href="#1226">1226: </a><span class="php-comment">     * @access protected
+</span></span><span id="1227" class="l"><a href="#1227">1227: </a><span class="php-comment">     * @return void
+</span></span><span id="1228" class="l"><a href="#1228">1228: </a><span class="php-comment">     */</span>
+</span><span id="1229" class="l"><a href="#1229">1229: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
+</span><span id="1230" class="l"><a href="#1230">1230: </a>    {
+</span><span id="1231" class="l"><a href="#1231">1231: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
+</span><span id="1232" class="l"><a href="#1232">1232: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
+</span><span id="1233" class="l"><a href="#1233">1233: </a>    }
+</span><span id="1234" class="l"><a href="#1234">1234: </a>
+</span><span id="1235" class="l"><a href="#1235">1235: </a>    <span class="php-comment">/**
+</span></span><span id="1236" class="l"><a href="#1236">1236: </a><span class="php-comment">     * Parse the POST request arguments
+</span></span><span id="1237" class="l"><a href="#1237">1237: </a><span class="php-comment">     *
+</span></span><span id="1238" class="l"><a href="#1238">1238: </a><span class="php-comment">     * @access protected
+</span></span><span id="1239" class="l"><a href="#1239">1239: </a><span class="php-comment">     * @return void
+</span></span><span id="1240" class="l"><a href="#1240">1240: </a><span class="php-comment">     */</span>
+</span><span id="1241" class="l"><a href="#1241">1241: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
+</span><span id="1242" class="l"><a href="#1242">1242: </a>    {
+</span><span id="1243" class="l"><a href="#1243">1243: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
+</span><span id="1244" class="l"><a href="#1244">1244: </a>
+</span><span id="1245" class="l"><a href="#1245">1245: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1246" class="l"><a href="#1246">1246: </a>        {
+</span><span id="1247" class="l"><a href="#1247">1247: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1248" class="l"><a href="#1248">1248: </a>        }
+</span><span id="1249" class="l"><a href="#1249">1249: </a>    }
+</span><span id="1250" class="l"><a href="#1250">1250: </a>
+</span><span id="1251" class="l"><a href="#1251">1251: </a>    <span class="php-comment">/**
+</span></span><span id="1252" class="l"><a href="#1252">1252: </a><span class="php-comment">     * Parse the PUT request arguments
+</span></span><span id="1253" class="l"><a href="#1253">1253: </a><span class="php-comment">     *
+</span></span><span id="1254" class="l"><a href="#1254">1254: </a><span class="php-comment">     * @access protected
+</span></span><span id="1255" class="l"><a href="#1255">1255: </a><span class="php-comment">     * @return void
+</span></span><span id="1256" class="l"><a href="#1256">1256: </a><span class="php-comment">     */</span>
+</span><span id="1257" class="l"><a href="#1257">1257: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
+</span><span id="1258" class="l"><a href="#1258">1258: </a>    {
+</span><span id="1259" class="l"><a href="#1259">1259: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1260" class="l"><a href="#1260">1260: </a>        {
+</span><span id="1261" class="l"><a href="#1261">1261: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1262" class="l"><a href="#1262">1262: </a>        }
+</span><span id="1263" class="l"><a href="#1263">1263: </a>        <span class="php-keyword1">else</span>
+</span><span id="1264" class="l"><a href="#1264">1264: </a>        {
+</span><span id="1265" class="l"><a href="#1265">1265: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1266" class="l"><a href="#1266">1266: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
+</span><span id="1267" class="l"><a href="#1267">1267: </a>            {
+</span><span id="1268" class="l"><a href="#1268">1268: </a>                <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1269" class="l"><a href="#1269">1269: </a>            }
+</span><span id="1270" class="l"><a href="#1270">1270: </a>        }
+</span><span id="1271" class="l"><a href="#1271">1271: </a>    }
+</span><span id="1272" class="l"><a href="#1272">1272: </a>
+</span><span id="1273" class="l"><a href="#1273">1273: </a>    <span class="php-comment">/**
+</span></span><span id="1274" class="l"><a href="#1274">1274: </a><span class="php-comment">     * Parse the HEAD request arguments
+</span></span><span id="1275" class="l"><a href="#1275">1275: </a><span class="php-comment">     *
+</span></span><span id="1276" class="l"><a href="#1276">1276: </a><span class="php-comment">     * @access protected
+</span></span><span id="1277" class="l"><a href="#1277">1277: </a><span class="php-comment">     * @return void
+</span></span><span id="1278" class="l"><a href="#1278">1278: </a><span class="php-comment">     */</span>
+</span><span id="1279" class="l"><a href="#1279">1279: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
+</span><span id="1280" class="l"><a href="#1280">1280: </a>    {
+</span><span id="1281" class="l"><a href="#1281">1281: </a>        <span class="php-comment">// Parse the HEAD variables</span>
+</span><span id="1282" class="l"><a href="#1282">1282: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
+</span><span id="1283" class="l"><a href="#1283">1283: </a>
+</span><span id="1284" class="l"><a href="#1284">1284: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
+</span><span id="1285" class="l"><a href="#1285">1285: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
+</span><span id="1286" class="l"><a href="#1286">1286: </a>    }
+</span><span id="1287" class="l"><a href="#1287">1287: </a>
+</span><span id="1288" class="l"><a href="#1288">1288: </a>    <span class="php-comment">/**
+</span></span><span id="1289" class="l"><a href="#1289">1289: </a><span class="php-comment">     * Parse the OPTIONS request arguments
+</span></span><span id="1290" class="l"><a href="#1290">1290: </a><span class="php-comment">     *
+</span></span><span id="1291" class="l"><a href="#1291">1291: </a><span class="php-comment">     * @access protected
+</span></span><span id="1292" class="l"><a href="#1292">1292: </a><span class="php-comment">     * @return void
+</span></span><span id="1293" class="l"><a href="#1293">1293: </a><span class="php-comment">     */</span>
+</span><span id="1294" class="l"><a href="#1294">1294: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
+</span><span id="1295" class="l"><a href="#1295">1295: </a>    {
+</span><span id="1296" class="l"><a href="#1296">1296: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
+</span><span id="1297" class="l"><a href="#1297">1297: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
+</span><span id="1298" class="l"><a href="#1298">1298: </a>
+</span><span id="1299" class="l"><a href="#1299">1299: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
+</span><span id="1300" class="l"><a href="#1300">1300: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
+</span><span id="1301" class="l"><a href="#1301">1301: </a>    }
 </span><span id="1302" class="l"><a href="#1302">1302: </a>
-</span><span id="1303" class="l"><a href="#1303">1303: </a>            <span class="php-comment">// Combine the arguments using '/' as the delimiter</span>
-</span><span id="1304" class="l"><a href="#1304">1304: </a>            <span class="php-var">$request_uri</span> = <span class="php-quote">'/'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'/'</span>, <span class="php-var">$args</span>) . <span class="php-quote">'/'</span>;
-</span><span id="1305" class="l"><a href="#1305">1305: </a>
-</span><span id="1306" class="l"><a href="#1306">1306: </a>            <span class="php-comment">// Set the following server variables (perhaps not required anymore?)</span>
-</span><span id="1307" class="l"><a href="#1307">1307: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1308" class="l"><a href="#1308">1308: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'PATH_INFO'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1309" class="l"><a href="#1309">1309: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'QUERY_STRING'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1310" class="l"><a href="#1310">1310: </a>        }
-</span><span id="1311" class="l"><a href="#1311">1311: </a>        <span class="php-keyword1">else</span>
-</span><span id="1312" class="l"><a href="#1312">1312: </a>        {
-</span><span id="1313" class="l"><a href="#1313">1313: </a>            <span class="php-var">$request_uri</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>);
-</span><span id="1314" class="l"><a href="#1314">1314: </a>        }
-</span><span id="1315" class="l"><a href="#1315">1315: </a>
-</span><span id="1316" class="l"><a href="#1316">1316: </a>        <span class="php-comment">// Parse the query parameters from the query string</span>
-</span><span id="1317" class="l"><a href="#1317">1317: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$request_uri</span>, PHP_URL_QUERY), <span class="php-var">$this</span>-&gt;_query_args);
-</span><span id="1318" class="l"><a href="#1318">1318: </a>    }
-</span><span id="1319" class="l"><a href="#1319">1319: </a>
-</span><span id="1320" class="l"><a href="#1320">1320: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
-</span><span id="1321" class="l"><a href="#1321">1321: </a>
-</span><span id="1322" class="l"><a href="#1322">1322: </a>    <span class="php-comment">/**
-</span></span><span id="1323" class="l"><a href="#1323">1323: </a><span class="php-comment">     * Retrieve a value from a GET request
-</span></span><span id="1324" class="l"><a href="#1324">1324: </a><span class="php-comment">     *
-</span></span><span id="1325" class="l"><a href="#1325">1325: </a><span class="php-comment">     * @access public
-</span></span><span id="1326" class="l"><a href="#1326">1326: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
-</span></span><span id="1327" class="l"><a href="#1327">1327: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1328" class="l"><a href="#1328">1328: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1329" class="l"><a href="#1329">1329: </a><span class="php-comment">     * @return array|string|FALSE Value from the GET request; otherwise, FALSE
-</span></span><span id="1330" class="l"><a href="#1330">1330: </a><span class="php-comment">     */</span>
-</span><span id="1331" class="l"><a href="#1331">1331: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1332" class="l"><a href="#1332">1332: </a>    {
-</span><span id="1333" class="l"><a href="#1333">1333: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1334" class="l"><a href="#1334">1334: </a>        {
-</span><span id="1335" class="l"><a href="#1335">1335: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
-</span><span id="1336" class="l"><a href="#1336">1336: </a>        }
-</span><span id="1337" class="l"><a href="#1337">1337: </a>
-</span><span id="1338" class="l"><a href="#1338">1338: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_get_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1303" class="l"><a href="#1303">1303: </a>    <span class="php-comment">/**
+</span></span><span id="1304" class="l"><a href="#1304">1304: </a><span class="php-comment">     * Parse the PATCH request arguments
+</span></span><span id="1305" class="l"><a href="#1305">1305: </a><span class="php-comment">     *
+</span></span><span id="1306" class="l"><a href="#1306">1306: </a><span class="php-comment">     * @access protected
+</span></span><span id="1307" class="l"><a href="#1307">1307: </a><span class="php-comment">     * @return void
+</span></span><span id="1308" class="l"><a href="#1308">1308: </a><span class="php-comment">     */</span>
+</span><span id="1309" class="l"><a href="#1309">1309: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
+</span><span id="1310" class="l"><a href="#1310">1310: </a>    {
+</span><span id="1311" class="l"><a href="#1311">1311: </a>        <span class="php-comment">// It might be a HTTP body</span>
+</span><span id="1312" class="l"><a href="#1312">1312: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1313" class="l"><a href="#1313">1313: </a>        {
+</span><span id="1314" class="l"><a href="#1314">1314: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1315" class="l"><a href="#1315">1315: </a>        }
+</span><span id="1316" class="l"><a href="#1316">1316: </a>        <span class="php-keyword1">else</span>
+</span><span id="1317" class="l"><a href="#1317">1317: </a>        {
+</span><span id="1318" class="l"><a href="#1318">1318: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1319" class="l"><a href="#1319">1319: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
+</span><span id="1320" class="l"><a href="#1320">1320: </a>            {
+</span><span id="1321" class="l"><a href="#1321">1321: </a>                <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1322" class="l"><a href="#1322">1322: </a>            }
+</span><span id="1323" class="l"><a href="#1323">1323: </a>        }
+</span><span id="1324" class="l"><a href="#1324">1324: </a>    }
+</span><span id="1325" class="l"><a href="#1325">1325: </a>
+</span><span id="1326" class="l"><a href="#1326">1326: </a>    <span class="php-comment">/**
+</span></span><span id="1327" class="l"><a href="#1327">1327: </a><span class="php-comment">     * Parse the DELETE request arguments
+</span></span><span id="1328" class="l"><a href="#1328">1328: </a><span class="php-comment">     *
+</span></span><span id="1329" class="l"><a href="#1329">1329: </a><span class="php-comment">     * @access protected
+</span></span><span id="1330" class="l"><a href="#1330">1330: </a><span class="php-comment">     * @return void
+</span></span><span id="1331" class="l"><a href="#1331">1331: </a><span class="php-comment">     */</span>
+</span><span id="1332" class="l"><a href="#1332">1332: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
+</span><span id="1333" class="l"><a href="#1333">1333: </a>    {
+</span><span id="1334" class="l"><a href="#1334">1334: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
+</span><span id="1335" class="l"><a href="#1335">1335: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
+</span><span id="1336" class="l"><a href="#1336">1336: </a>        {
+</span><span id="1337" class="l"><a href="#1337">1337: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1338" class="l"><a href="#1338">1338: </a>        }
 </span><span id="1339" class="l"><a href="#1339">1339: </a>    }
 </span><span id="1340" class="l"><a href="#1340">1340: </a>
 </span><span id="1341" class="l"><a href="#1341">1341: </a>    <span class="php-comment">/**
-</span></span><span id="1342" class="l"><a href="#1342">1342: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
+</span></span><span id="1342" class="l"><a href="#1342">1342: </a><span class="php-comment">     * Parse the query parameters
 </span></span><span id="1343" class="l"><a href="#1343">1343: </a><span class="php-comment">     *
-</span></span><span id="1344" class="l"><a href="#1344">1344: </a><span class="php-comment">     * @access public
-</span></span><span id="1345" class="l"><a href="#1345">1345: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
-</span></span><span id="1346" class="l"><a href="#1346">1346: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1347" class="l"><a href="#1347">1347: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1348" class="l"><a href="#1348">1348: </a><span class="php-comment">     * @return array|string|FALSE Value from the OPTIONS request; otherwise, FALSE
-</span></span><span id="1349" class="l"><a href="#1349">1349: </a><span class="php-comment">     */</span>
-</span><span id="1350" class="l"><a href="#1350">1350: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1351" class="l"><a href="#1351">1351: </a>    {
-</span><span id="1352" class="l"><a href="#1352">1352: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1353" class="l"><a href="#1353">1353: </a>        {
-</span><span id="1354" class="l"><a href="#1354">1354: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
-</span><span id="1355" class="l"><a href="#1355">1355: </a>        }
-</span><span id="1356" class="l"><a href="#1356">1356: </a>
-</span><span id="1357" class="l"><a href="#1357">1357: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_options_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1358" class="l"><a href="#1358">1358: </a>    }
-</span><span id="1359" class="l"><a href="#1359">1359: </a>
-</span><span id="1360" class="l"><a href="#1360">1360: </a>    <span class="php-comment">/**
-</span></span><span id="1361" class="l"><a href="#1361">1361: </a><span class="php-comment">     * Retrieve a value from a HEAD request
-</span></span><span id="1362" class="l"><a href="#1362">1362: </a><span class="php-comment">     *
-</span></span><span id="1363" class="l"><a href="#1363">1363: </a><span class="php-comment">     * @access public
-</span></span><span id="1364" class="l"><a href="#1364">1364: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
-</span></span><span id="1365" class="l"><a href="#1365">1365: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1366" class="l"><a href="#1366">1366: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1367" class="l"><a href="#1367">1367: </a><span class="php-comment">     * @return array|string|FALSE Value from the HEAD request; otherwise, FALSE
-</span></span><span id="1368" class="l"><a href="#1368">1368: </a><span class="php-comment">     */</span>
-</span><span id="1369" class="l"><a href="#1369">1369: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1370" class="l"><a href="#1370">1370: </a>    {
-</span><span id="1371" class="l"><a href="#1371">1371: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1372" class="l"><a href="#1372">1372: </a>        {
-</span><span id="1373" class="l"><a href="#1373">1373: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;head_args;
-</span><span id="1374" class="l"><a href="#1374">1374: </a>        }
-</span><span id="1375" class="l"><a href="#1375">1375: </a>
-</span><span id="1376" class="l"><a href="#1376">1376: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;head_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1377" class="l"><a href="#1377">1377: </a>    }
-</span><span id="1378" class="l"><a href="#1378">1378: </a>
-</span><span id="1379" class="l"><a href="#1379">1379: </a>    <span class="php-comment">/**
-</span></span><span id="1380" class="l"><a href="#1380">1380: </a><span class="php-comment">     * Retrieve a value from a POST request
-</span></span><span id="1381" class="l"><a href="#1381">1381: </a><span class="php-comment">     *
-</span></span><span id="1382" class="l"><a href="#1382">1382: </a><span class="php-comment">     * @access public
-</span></span><span id="1383" class="l"><a href="#1383">1383: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
-</span></span><span id="1384" class="l"><a href="#1384">1384: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1385" class="l"><a href="#1385">1385: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1386" class="l"><a href="#1386">1386: </a><span class="php-comment">     * @return array|string|FALSE Value from the POST request; otherwise, FALSE
-</span></span><span id="1387" class="l"><a href="#1387">1387: </a><span class="php-comment">     */</span>
-</span><span id="1388" class="l"><a href="#1388">1388: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1389" class="l"><a href="#1389">1389: </a>    {
-</span><span id="1390" class="l"><a href="#1390">1390: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1391" class="l"><a href="#1391">1391: </a>        {
-</span><span id="1392" class="l"><a href="#1392">1392: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
-</span><span id="1393" class="l"><a href="#1393">1393: </a>        }
-</span><span id="1394" class="l"><a href="#1394">1394: </a>
-</span><span id="1395" class="l"><a href="#1395">1395: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_post_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1396" class="l"><a href="#1396">1396: </a>    }
-</span><span id="1397" class="l"><a href="#1397">1397: </a>
-</span><span id="1398" class="l"><a href="#1398">1398: </a>    <span class="php-comment">/**
-</span></span><span id="1399" class="l"><a href="#1399">1399: </a><span class="php-comment">     * Retrieve a value from a PUT request
-</span></span><span id="1400" class="l"><a href="#1400">1400: </a><span class="php-comment">     *
-</span></span><span id="1401" class="l"><a href="#1401">1401: </a><span class="php-comment">     * @access public
-</span></span><span id="1402" class="l"><a href="#1402">1402: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
-</span></span><span id="1403" class="l"><a href="#1403">1403: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1404" class="l"><a href="#1404">1404: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1405" class="l"><a href="#1405">1405: </a><span class="php-comment">     * @return array|string|FALSE Value from the PUT request; otherwise, FALSE
-</span></span><span id="1406" class="l"><a href="#1406">1406: </a><span class="php-comment">     */</span>
-</span><span id="1407" class="l"><a href="#1407">1407: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1408" class="l"><a href="#1408">1408: </a>    {
-</span><span id="1409" class="l"><a href="#1409">1409: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1410" class="l"><a href="#1410">1410: </a>        {
-</span><span id="1411" class="l"><a href="#1411">1411: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
-</span><span id="1412" class="l"><a href="#1412">1412: </a>        }
-</span><span id="1413" class="l"><a href="#1413">1413: </a>
-</span><span id="1414" class="l"><a href="#1414">1414: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_put_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1415" class="l"><a href="#1415">1415: </a>    }
-</span><span id="1416" class="l"><a href="#1416">1416: </a>
-</span><span id="1417" class="l"><a href="#1417">1417: </a>    <span class="php-comment">/**
-</span></span><span id="1418" class="l"><a href="#1418">1418: </a><span class="php-comment">     * Retrieve a value from a DELETE request
-</span></span><span id="1419" class="l"><a href="#1419">1419: </a><span class="php-comment">     *
-</span></span><span id="1420" class="l"><a href="#1420">1420: </a><span class="php-comment">     * @access public
-</span></span><span id="1421" class="l"><a href="#1421">1421: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
-</span></span><span id="1422" class="l"><a href="#1422">1422: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1423" class="l"><a href="#1423">1423: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1424" class="l"><a href="#1424">1424: </a><span class="php-comment">     * @return array|string|FALSE Value from the DELETE request; otherwise, FALSE
-</span></span><span id="1425" class="l"><a href="#1425">1425: </a><span class="php-comment">     */</span>
-</span><span id="1426" class="l"><a href="#1426">1426: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1427" class="l"><a href="#1427">1427: </a>    {
-</span><span id="1428" class="l"><a href="#1428">1428: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1429" class="l"><a href="#1429">1429: </a>        {
-</span><span id="1430" class="l"><a href="#1430">1430: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
-</span><span id="1431" class="l"><a href="#1431">1431: </a>        }
-</span><span id="1432" class="l"><a href="#1432">1432: </a>
-</span><span id="1433" class="l"><a href="#1433">1433: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_delete_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1434" class="l"><a href="#1434">1434: </a>    }
-</span><span id="1435" class="l"><a href="#1435">1435: </a>
-</span><span id="1436" class="l"><a href="#1436">1436: </a>    <span class="php-comment">/**
-</span></span><span id="1437" class="l"><a href="#1437">1437: </a><span class="php-comment">     * Retrieve a value from a PATCH request
-</span></span><span id="1438" class="l"><a href="#1438">1438: </a><span class="php-comment">     *
-</span></span><span id="1439" class="l"><a href="#1439">1439: </a><span class="php-comment">     * @access public
-</span></span><span id="1440" class="l"><a href="#1440">1440: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
-</span></span><span id="1441" class="l"><a href="#1441">1441: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1442" class="l"><a href="#1442">1442: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1443" class="l"><a href="#1443">1443: </a><span class="php-comment">     * @return array|string|FALSE Value from the PATCH request; otherwise, FALSE
-</span></span><span id="1444" class="l"><a href="#1444">1444: </a><span class="php-comment">     */</span>
-</span><span id="1445" class="l"><a href="#1445">1445: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1446" class="l"><a href="#1446">1446: </a>    {
-</span><span id="1447" class="l"><a href="#1447">1447: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1448" class="l"><a href="#1448">1448: </a>        {
-</span><span id="1449" class="l"><a href="#1449">1449: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
-</span><span id="1450" class="l"><a href="#1450">1450: </a>        }
-</span><span id="1451" class="l"><a href="#1451">1451: </a>
-</span><span id="1452" class="l"><a href="#1452">1452: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_patch_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1453" class="l"><a href="#1453">1453: </a>    }
-</span><span id="1454" class="l"><a href="#1454">1454: </a>
-</span><span id="1455" class="l"><a href="#1455">1455: </a>    <span class="php-comment">/**
-</span></span><span id="1456" class="l"><a href="#1456">1456: </a><span class="php-comment">     * Retrieve a value from the query parameters
-</span></span><span id="1457" class="l"><a href="#1457">1457: </a><span class="php-comment">     *
-</span></span><span id="1458" class="l"><a href="#1458">1458: </a><span class="php-comment">     * @access public
-</span></span><span id="1459" class="l"><a href="#1459">1459: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
-</span></span><span id="1460" class="l"><a href="#1460">1460: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1461" class="l"><a href="#1461">1461: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1462" class="l"><a href="#1462">1462: </a><span class="php-comment">     * @return array|string|FALSE Value from the query parameters; otherwise, FALSE
-</span></span><span id="1463" class="l"><a href="#1463">1463: </a><span class="php-comment">     */</span>
-</span><span id="1464" class="l"><a href="#1464">1464: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1465" class="l"><a href="#1465">1465: </a>    {
-</span><span id="1466" class="l"><a href="#1466">1466: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1467" class="l"><a href="#1467">1467: </a>        {
-</span><span id="1468" class="l"><a href="#1468">1468: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
-</span><span id="1469" class="l"><a href="#1469">1469: </a>        }
-</span><span id="1470" class="l"><a href="#1470">1470: </a>
-</span><span id="1471" class="l"><a href="#1471">1471: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_query_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1472" class="l"><a href="#1472">1472: </a>    }
-</span><span id="1473" class="l"><a href="#1473">1473: </a>
-</span><span id="1474" class="l"><a href="#1474">1474: </a>    <span class="php-comment">/**
-</span></span><span id="1475" class="l"><a href="#1475">1475: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
-</span></span><span id="1476" class="l"><a href="#1476">1476: </a><span class="php-comment">     * prevented.
-</span></span><span id="1477" class="l"><a href="#1477">1477: </a><span class="php-comment">     *
-</span></span><span id="1478" class="l"><a href="#1478">1478: </a><span class="php-comment">     * @access protected
-</span></span><span id="1479" class="l"><a href="#1479">1479: </a><span class="php-comment">     * @param  string $value Input data
-</span></span><span id="1480" class="l"><a href="#1480">1480: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
-</span></span><span id="1481" class="l"><a href="#1481">1481: </a><span class="php-comment">     * @return string
-</span></span><span id="1482" class="l"><a href="#1482">1482: </a><span class="php-comment">     */</span>
-</span><span id="1483" class="l"><a href="#1483">1483: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
-</span><span id="1484" class="l"><a href="#1484">1484: </a>    {
-</span><span id="1485" class="l"><a href="#1485">1485: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) <span class="php-keyword1">OR</span> <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
-</span><span id="1486" class="l"><a href="#1486">1486: </a>
-</span><span id="1487" class="l"><a href="#1487">1487: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
-</span><span id="1488" class="l"><a href="#1488">1488: </a>    }
-</span><span id="1489" class="l"><a href="#1489">1489: </a>
-</span><span id="1490" class="l"><a href="#1490">1490: </a>    <span class="php-comment">/**
-</span></span><span id="1491" class="l"><a href="#1491">1491: </a><span class="php-comment">     * Retrieve the validation errors
-</span></span><span id="1492" class="l"><a href="#1492">1492: </a><span class="php-comment">     *
-</span></span><span id="1493" class="l"><a href="#1493">1493: </a><span class="php-comment">     * @access public
-</span></span><span id="1494" class="l"><a href="#1494">1494: </a><span class="php-comment">     * @return array
-</span></span><span id="1495" class="l"><a href="#1495">1495: </a><span class="php-comment">     */</span>
-</span><span id="1496" class="l"><a href="#1496">1496: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
-</span><span id="1497" class="l"><a href="#1497">1497: </a>    {
-</span><span id="1498" class="l"><a href="#1498">1498: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
-</span><span id="1499" class="l"><a href="#1499">1499: </a>
-</span><span id="1500" class="l"><a href="#1500">1500: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
-</span><span id="1501" class="l"><a href="#1501">1501: </a>    }
-</span><span id="1502" class="l"><a href="#1502">1502: </a>
-</span><span id="1503" class="l"><a href="#1503">1503: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
-</span><span id="1504" class="l"><a href="#1504">1504: </a>
-</span><span id="1505" class="l"><a href="#1505">1505: </a>    <span class="php-comment">/**
-</span></span><span id="1506" class="l"><a href="#1506">1506: </a><span class="php-comment">     * Perform LDAP Authentication
-</span></span><span id="1507" class="l"><a href="#1507">1507: </a><span class="php-comment">     *
-</span></span><span id="1508" class="l"><a href="#1508">1508: </a><span class="php-comment">     * @access protected
-</span></span><span id="1509" class="l"><a href="#1509">1509: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1510" class="l"><a href="#1510">1510: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1511" class="l"><a href="#1511">1511: </a><span class="php-comment">     * @return bool
-</span></span><span id="1512" class="l"><a href="#1512">1512: </a><span class="php-comment">     */</span>
-</span><span id="1513" class="l"><a href="#1513">1513: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1514" class="l"><a href="#1514">1514: </a>    {
-</span><span id="1515" class="l"><a href="#1515">1515: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1516" class="l"><a href="#1516">1516: </a>        {
-</span><span id="1517" class="l"><a href="#1517">1517: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
-</span><span id="1518" class="l"><a href="#1518">1518: </a>
-</span><span id="1519" class="l"><a href="#1519">1519: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1520" class="l"><a href="#1520">1520: </a>        }
-</span><span id="1521" class="l"><a href="#1521">1521: </a>
-</span><span id="1522" class="l"><a href="#1522">1522: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading Config'</span>);
-</span><span id="1523" class="l"><a href="#1523">1523: </a>
-</span><span id="1524" class="l"><a href="#1524">1524: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
+</span></span><span id="1344" class="l"><a href="#1344">1344: </a><span class="php-comment">     * @access protected
+</span></span><span id="1345" class="l"><a href="#1345">1345: </a><span class="php-comment">     * @return void
+</span></span><span id="1346" class="l"><a href="#1346">1346: </a><span class="php-comment">     */</span>
+</span><span id="1347" class="l"><a href="#1347">1347: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
+</span><span id="1348" class="l"><a href="#1348">1348: </a>    {
+</span><span id="1349" class="l"><a href="#1349">1349: </a>        <span class="php-comment">// Declare a variable that will hold the REQUEST_URI</span>
+</span><span id="1350" class="l"><a href="#1350">1350: </a>        <span class="php-var">$request_uri</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1351" class="l"><a href="#1351">1351: </a>
+</span><span id="1352" class="l"><a href="#1352">1352: </a>        <span class="php-comment">// If using the commandline version</span>
+</span><span id="1353" class="l"><a href="#1353">1353: </a>        <span class="php-keyword1">if</span> (is_cli())
+</span><span id="1354" class="l"><a href="#1354">1354: </a>        {
+</span><span id="1355" class="l"><a href="#1355">1355: </a>            <span class="php-var">$args</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'argv'</span>);
+</span><span id="1356" class="l"><a href="#1356">1356: </a>            <span class="php-keyword1">unset</span>(<span class="php-var">$args</span>[<span class="php-num">0</span>]);
+</span><span id="1357" class="l"><a href="#1357">1357: </a>
+</span><span id="1358" class="l"><a href="#1358">1358: </a>            <span class="php-comment">// Combine the arguments using '/' as the delimiter</span>
+</span><span id="1359" class="l"><a href="#1359">1359: </a>            <span class="php-var">$request_uri</span> = <span class="php-quote">'/'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'/'</span>, <span class="php-var">$args</span>) . <span class="php-quote">'/'</span>;
+</span><span id="1360" class="l"><a href="#1360">1360: </a>
+</span><span id="1361" class="l"><a href="#1361">1361: </a>            <span class="php-comment">// Set the following server variables (perhaps not required anymore?)</span>
+</span><span id="1362" class="l"><a href="#1362">1362: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1363" class="l"><a href="#1363">1363: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'PATH_INFO'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1364" class="l"><a href="#1364">1364: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'QUERY_STRING'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1365" class="l"><a href="#1365">1365: </a>        }
+</span><span id="1366" class="l"><a href="#1366">1366: </a>        <span class="php-keyword1">else</span>
+</span><span id="1367" class="l"><a href="#1367">1367: </a>        {
+</span><span id="1368" class="l"><a href="#1368">1368: </a>            <span class="php-var">$request_uri</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>);
+</span><span id="1369" class="l"><a href="#1369">1369: </a>        }
+</span><span id="1370" class="l"><a href="#1370">1370: </a>
+</span><span id="1371" class="l"><a href="#1371">1371: </a>        <span class="php-comment">// Parse the query parameters from the query string</span>
+</span><span id="1372" class="l"><a href="#1372">1372: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$request_uri</span>, PHP_URL_QUERY), <span class="php-var">$this</span>-&gt;_query_args);
+</span><span id="1373" class="l"><a href="#1373">1373: </a>    }
+</span><span id="1374" class="l"><a href="#1374">1374: </a>
+</span><span id="1375" class="l"><a href="#1375">1375: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
+</span><span id="1376" class="l"><a href="#1376">1376: </a>
+</span><span id="1377" class="l"><a href="#1377">1377: </a>    <span class="php-comment">/**
+</span></span><span id="1378" class="l"><a href="#1378">1378: </a><span class="php-comment">     * Retrieve a value from a GET request
+</span></span><span id="1379" class="l"><a href="#1379">1379: </a><span class="php-comment">     *
+</span></span><span id="1380" class="l"><a href="#1380">1380: </a><span class="php-comment">     * @access public
+</span></span><span id="1381" class="l"><a href="#1381">1381: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
+</span></span><span id="1382" class="l"><a href="#1382">1382: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1383" class="l"><a href="#1383">1383: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1384" class="l"><a href="#1384">1384: </a><span class="php-comment">     * @return array|string|FALSE Value from the GET request; otherwise, FALSE
+</span></span><span id="1385" class="l"><a href="#1385">1385: </a><span class="php-comment">     */</span>
+</span><span id="1386" class="l"><a href="#1386">1386: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1387" class="l"><a href="#1387">1387: </a>    {
+</span><span id="1388" class="l"><a href="#1388">1388: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1389" class="l"><a href="#1389">1389: </a>        {
+</span><span id="1390" class="l"><a href="#1390">1390: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
+</span><span id="1391" class="l"><a href="#1391">1391: </a>        }
+</span><span id="1392" class="l"><a href="#1392">1392: </a>
+</span><span id="1393" class="l"><a href="#1393">1393: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_get_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1394" class="l"><a href="#1394">1394: </a>    }
+</span><span id="1395" class="l"><a href="#1395">1395: </a>
+</span><span id="1396" class="l"><a href="#1396">1396: </a>    <span class="php-comment">/**
+</span></span><span id="1397" class="l"><a href="#1397">1397: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
+</span></span><span id="1398" class="l"><a href="#1398">1398: </a><span class="php-comment">     *
+</span></span><span id="1399" class="l"><a href="#1399">1399: </a><span class="php-comment">     * @access public
+</span></span><span id="1400" class="l"><a href="#1400">1400: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
+</span></span><span id="1401" class="l"><a href="#1401">1401: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1402" class="l"><a href="#1402">1402: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1403" class="l"><a href="#1403">1403: </a><span class="php-comment">     * @return array|string|FALSE Value from the OPTIONS request; otherwise, FALSE
+</span></span><span id="1404" class="l"><a href="#1404">1404: </a><span class="php-comment">     */</span>
+</span><span id="1405" class="l"><a href="#1405">1405: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1406" class="l"><a href="#1406">1406: </a>    {
+</span><span id="1407" class="l"><a href="#1407">1407: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1408" class="l"><a href="#1408">1408: </a>        {
+</span><span id="1409" class="l"><a href="#1409">1409: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
+</span><span id="1410" class="l"><a href="#1410">1410: </a>        }
+</span><span id="1411" class="l"><a href="#1411">1411: </a>
+</span><span id="1412" class="l"><a href="#1412">1412: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_options_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1413" class="l"><a href="#1413">1413: </a>    }
+</span><span id="1414" class="l"><a href="#1414">1414: </a>
+</span><span id="1415" class="l"><a href="#1415">1415: </a>    <span class="php-comment">/**
+</span></span><span id="1416" class="l"><a href="#1416">1416: </a><span class="php-comment">     * Retrieve a value from a HEAD request
+</span></span><span id="1417" class="l"><a href="#1417">1417: </a><span class="php-comment">     *
+</span></span><span id="1418" class="l"><a href="#1418">1418: </a><span class="php-comment">     * @access public
+</span></span><span id="1419" class="l"><a href="#1419">1419: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
+</span></span><span id="1420" class="l"><a href="#1420">1420: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1421" class="l"><a href="#1421">1421: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1422" class="l"><a href="#1422">1422: </a><span class="php-comment">     * @return array|string|FALSE Value from the HEAD request; otherwise, FALSE
+</span></span><span id="1423" class="l"><a href="#1423">1423: </a><span class="php-comment">     */</span>
+</span><span id="1424" class="l"><a href="#1424">1424: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1425" class="l"><a href="#1425">1425: </a>    {
+</span><span id="1426" class="l"><a href="#1426">1426: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1427" class="l"><a href="#1427">1427: </a>        {
+</span><span id="1428" class="l"><a href="#1428">1428: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;head_args;
+</span><span id="1429" class="l"><a href="#1429">1429: </a>        }
+</span><span id="1430" class="l"><a href="#1430">1430: </a>
+</span><span id="1431" class="l"><a href="#1431">1431: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;head_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1432" class="l"><a href="#1432">1432: </a>    }
+</span><span id="1433" class="l"><a href="#1433">1433: </a>
+</span><span id="1434" class="l"><a href="#1434">1434: </a>    <span class="php-comment">/**
+</span></span><span id="1435" class="l"><a href="#1435">1435: </a><span class="php-comment">     * Retrieve a value from a POST request
+</span></span><span id="1436" class="l"><a href="#1436">1436: </a><span class="php-comment">     *
+</span></span><span id="1437" class="l"><a href="#1437">1437: </a><span class="php-comment">     * @access public
+</span></span><span id="1438" class="l"><a href="#1438">1438: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
+</span></span><span id="1439" class="l"><a href="#1439">1439: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1440" class="l"><a href="#1440">1440: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1441" class="l"><a href="#1441">1441: </a><span class="php-comment">     * @return array|string|FALSE Value from the POST request; otherwise, FALSE
+</span></span><span id="1442" class="l"><a href="#1442">1442: </a><span class="php-comment">     */</span>
+</span><span id="1443" class="l"><a href="#1443">1443: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1444" class="l"><a href="#1444">1444: </a>    {
+</span><span id="1445" class="l"><a href="#1445">1445: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1446" class="l"><a href="#1446">1446: </a>        {
+</span><span id="1447" class="l"><a href="#1447">1447: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
+</span><span id="1448" class="l"><a href="#1448">1448: </a>        }
+</span><span id="1449" class="l"><a href="#1449">1449: </a>
+</span><span id="1450" class="l"><a href="#1450">1450: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_post_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1451" class="l"><a href="#1451">1451: </a>    }
+</span><span id="1452" class="l"><a href="#1452">1452: </a>
+</span><span id="1453" class="l"><a href="#1453">1453: </a>    <span class="php-comment">/**
+</span></span><span id="1454" class="l"><a href="#1454">1454: </a><span class="php-comment">     * Retrieve a value from a PUT request
+</span></span><span id="1455" class="l"><a href="#1455">1455: </a><span class="php-comment">     *
+</span></span><span id="1456" class="l"><a href="#1456">1456: </a><span class="php-comment">     * @access public
+</span></span><span id="1457" class="l"><a href="#1457">1457: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
+</span></span><span id="1458" class="l"><a href="#1458">1458: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1459" class="l"><a href="#1459">1459: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1460" class="l"><a href="#1460">1460: </a><span class="php-comment">     * @return array|string|FALSE Value from the PUT request; otherwise, FALSE
+</span></span><span id="1461" class="l"><a href="#1461">1461: </a><span class="php-comment">     */</span>
+</span><span id="1462" class="l"><a href="#1462">1462: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1463" class="l"><a href="#1463">1463: </a>    {
+</span><span id="1464" class="l"><a href="#1464">1464: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1465" class="l"><a href="#1465">1465: </a>        {
+</span><span id="1466" class="l"><a href="#1466">1466: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
+</span><span id="1467" class="l"><a href="#1467">1467: </a>        }
+</span><span id="1468" class="l"><a href="#1468">1468: </a>
+</span><span id="1469" class="l"><a href="#1469">1469: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_put_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1470" class="l"><a href="#1470">1470: </a>    }
+</span><span id="1471" class="l"><a href="#1471">1471: </a>
+</span><span id="1472" class="l"><a href="#1472">1472: </a>    <span class="php-comment">/**
+</span></span><span id="1473" class="l"><a href="#1473">1473: </a><span class="php-comment">     * Retrieve a value from a DELETE request
+</span></span><span id="1474" class="l"><a href="#1474">1474: </a><span class="php-comment">     *
+</span></span><span id="1475" class="l"><a href="#1475">1475: </a><span class="php-comment">     * @access public
+</span></span><span id="1476" class="l"><a href="#1476">1476: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
+</span></span><span id="1477" class="l"><a href="#1477">1477: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1478" class="l"><a href="#1478">1478: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1479" class="l"><a href="#1479">1479: </a><span class="php-comment">     * @return array|string|FALSE Value from the DELETE request; otherwise, FALSE
+</span></span><span id="1480" class="l"><a href="#1480">1480: </a><span class="php-comment">     */</span>
+</span><span id="1481" class="l"><a href="#1481">1481: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1482" class="l"><a href="#1482">1482: </a>    {
+</span><span id="1483" class="l"><a href="#1483">1483: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1484" class="l"><a href="#1484">1484: </a>        {
+</span><span id="1485" class="l"><a href="#1485">1485: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
+</span><span id="1486" class="l"><a href="#1486">1486: </a>        }
+</span><span id="1487" class="l"><a href="#1487">1487: </a>
+</span><span id="1488" class="l"><a href="#1488">1488: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_delete_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1489" class="l"><a href="#1489">1489: </a>    }
+</span><span id="1490" class="l"><a href="#1490">1490: </a>
+</span><span id="1491" class="l"><a href="#1491">1491: </a>    <span class="php-comment">/**
+</span></span><span id="1492" class="l"><a href="#1492">1492: </a><span class="php-comment">     * Retrieve a value from a PATCH request
+</span></span><span id="1493" class="l"><a href="#1493">1493: </a><span class="php-comment">     *
+</span></span><span id="1494" class="l"><a href="#1494">1494: </a><span class="php-comment">     * @access public
+</span></span><span id="1495" class="l"><a href="#1495">1495: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
+</span></span><span id="1496" class="l"><a href="#1496">1496: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1497" class="l"><a href="#1497">1497: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1498" class="l"><a href="#1498">1498: </a><span class="php-comment">     * @return array|string|FALSE Value from the PATCH request; otherwise, FALSE
+</span></span><span id="1499" class="l"><a href="#1499">1499: </a><span class="php-comment">     */</span>
+</span><span id="1500" class="l"><a href="#1500">1500: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1501" class="l"><a href="#1501">1501: </a>    {
+</span><span id="1502" class="l"><a href="#1502">1502: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1503" class="l"><a href="#1503">1503: </a>        {
+</span><span id="1504" class="l"><a href="#1504">1504: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
+</span><span id="1505" class="l"><a href="#1505">1505: </a>        }
+</span><span id="1506" class="l"><a href="#1506">1506: </a>
+</span><span id="1507" class="l"><a href="#1507">1507: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_patch_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1508" class="l"><a href="#1508">1508: </a>    }
+</span><span id="1509" class="l"><a href="#1509">1509: </a>
+</span><span id="1510" class="l"><a href="#1510">1510: </a>    <span class="php-comment">/**
+</span></span><span id="1511" class="l"><a href="#1511">1511: </a><span class="php-comment">     * Retrieve a value from the query parameters
+</span></span><span id="1512" class="l"><a href="#1512">1512: </a><span class="php-comment">     *
+</span></span><span id="1513" class="l"><a href="#1513">1513: </a><span class="php-comment">     * @access public
+</span></span><span id="1514" class="l"><a href="#1514">1514: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
+</span></span><span id="1515" class="l"><a href="#1515">1515: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1516" class="l"><a href="#1516">1516: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1517" class="l"><a href="#1517">1517: </a><span class="php-comment">     * @return array|string|FALSE Value from the query parameters; otherwise, FALSE
+</span></span><span id="1518" class="l"><a href="#1518">1518: </a><span class="php-comment">     */</span>
+</span><span id="1519" class="l"><a href="#1519">1519: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1520" class="l"><a href="#1520">1520: </a>    {
+</span><span id="1521" class="l"><a href="#1521">1521: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1522" class="l"><a href="#1522">1522: </a>        {
+</span><span id="1523" class="l"><a href="#1523">1523: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
+</span><span id="1524" class="l"><a href="#1524">1524: </a>        }
 </span><span id="1525" class="l"><a href="#1525">1525: </a>
-</span><span id="1526" class="l"><a href="#1526">1526: </a>        <span class="php-var">$ldap</span> = [
-</span><span id="1527" class="l"><a href="#1527">1527: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1528" class="l"><a href="#1528">1528: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1529" class="l"><a href="#1529">1529: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1530" class="l"><a href="#1530">1530: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1531" class="l"><a href="#1531">1531: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1532" class="l"><a href="#1532">1532: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1533" class="l"><a href="#1533">1533: </a>        ];
-</span><span id="1534" class="l"><a href="#1534">1534: </a>
-</span><span id="1535" class="l"><a href="#1535">1535: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
-</span><span id="1536" class="l"><a href="#1536">1536: </a>
-</span><span id="1537" class="l"><a href="#1537">1537: </a>        <span class="php-comment">// Appears to be unused</span>
-</span><span id="1538" class="l"><a href="#1538">1538: </a>        <span class="php-comment">// $ldapconfig['authrealm'] = $this-&gt;config-&gt;item('domain', 'ldap');</span>
-</span><span id="1539" class="l"><a href="#1539">1539: </a>
-</span><span id="1540" class="l"><a href="#1540">1540: </a>        <span class="php-comment">// connect to ldap server</span>
-</span><span id="1541" class="l"><a href="#1541">1541: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
-</span><span id="1542" class="l"><a href="#1542">1542: </a>
-</span><span id="1543" class="l"><a href="#1543">1543: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
-</span><span id="1544" class="l"><a href="#1544">1544: </a>        {
-</span><span id="1545" class="l"><a href="#1545">1545: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>] . <span class="php-quote">' seconds'</span>);
-</span><span id="1546" class="l"><a href="#1546">1546: </a>
-</span><span id="1547" class="l"><a href="#1547">1547: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
-</span><span id="1548" class="l"><a href="#1548">1548: </a>
-</span><span id="1549" class="l"><a href="#1549">1549: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>] . <span class="php-quote">' with dn '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
-</span><span id="1550" class="l"><a href="#1550">1550: </a>
-</span><span id="1551" class="l"><a href="#1551">1551: </a>            <span class="php-comment">// binding to ldap server</span>
-</span><span id="1552" class="l"><a href="#1552">1552: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
-</span><span id="1553" class="l"><a href="#1553">1553: </a>
-</span><span id="1554" class="l"><a href="#1554">1554: </a>            <span class="php-comment">// verify binding</span>
-</span><span id="1555" class="l"><a href="#1555">1555: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span>)
-</span><span id="1556" class="l"><a href="#1556">1556: </a>            {
-</span><span id="1557" class="l"><a href="#1557">1557: </a>                log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
-</span><span id="1558" class="l"><a href="#1558">1558: </a>            }
-</span><span id="1559" class="l"><a href="#1559">1559: </a>            <span class="php-keyword1">else</span>
-</span><span id="1560" class="l"><a href="#1560">1560: </a>            {
-</span><span id="1561" class="l"><a href="#1561">1561: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind unsuccessful'</span>);
-</span><span id="1562" class="l"><a href="#1562">1562: </a>
-</span><span id="1563" class="l"><a href="#1563">1563: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1564" class="l"><a href="#1564">1564: </a>            }
-</span><span id="1565" class="l"><a href="#1565">1565: </a>        }
-</span><span id="1566" class="l"><a href="#1566">1566: </a>
-</span><span id="1567" class="l"><a href="#1567">1567: </a>        <span class="php-comment">// search for user</span>
-</span><span id="1568" class="l"><a href="#1568">1568: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) == <span class="php-keyword1">FALSE</span>)
-</span><span id="1569" class="l"><a href="#1569">1569: </a>        {
-</span><span id="1570" class="l"><a href="#1570">1570: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span> . <span class="php-var">$username</span> . <span class="php-quote">' not found in search'</span>);
-</span><span id="1571" class="l"><a href="#1571">1571: </a>
-</span><span id="1572" class="l"><a href="#1572">1572: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1573" class="l"><a href="#1573">1573: </a>        }
-</span><span id="1574" class="l"><a href="#1574">1574: </a>
-</span><span id="1575" class="l"><a href="#1575">1575: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
-</span><span id="1576" class="l"><a href="#1576">1576: </a>        {
-</span><span id="1577" class="l"><a href="#1577">1577: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username '</span> . <span class="php-var">$username</span> . <span class="php-quote">'found more than once'</span>);
+</span><span id="1526" class="l"><a href="#1526">1526: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_query_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
+</span><span id="1527" class="l"><a href="#1527">1527: </a>    }
+</span><span id="1528" class="l"><a href="#1528">1528: </a>
+</span><span id="1529" class="l"><a href="#1529">1529: </a>    <span class="php-comment">/**
+</span></span><span id="1530" class="l"><a href="#1530">1530: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
+</span></span><span id="1531" class="l"><a href="#1531">1531: </a><span class="php-comment">     * prevented.
+</span></span><span id="1532" class="l"><a href="#1532">1532: </a><span class="php-comment">     *
+</span></span><span id="1533" class="l"><a href="#1533">1533: </a><span class="php-comment">     * @access protected
+</span></span><span id="1534" class="l"><a href="#1534">1534: </a><span class="php-comment">     * @param  string $value Input data
+</span></span><span id="1535" class="l"><a href="#1535">1535: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
+</span></span><span id="1536" class="l"><a href="#1536">1536: </a><span class="php-comment">     * @return string
+</span></span><span id="1537" class="l"><a href="#1537">1537: </a><span class="php-comment">     */</span>
+</span><span id="1538" class="l"><a href="#1538">1538: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
+</span><span id="1539" class="l"><a href="#1539">1539: </a>    {
+</span><span id="1540" class="l"><a href="#1540">1540: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) <span class="php-keyword1">OR</span> <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
+</span><span id="1541" class="l"><a href="#1541">1541: </a>
+</span><span id="1542" class="l"><a href="#1542">1542: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
+</span><span id="1543" class="l"><a href="#1543">1543: </a>    }
+</span><span id="1544" class="l"><a href="#1544">1544: </a>
+</span><span id="1545" class="l"><a href="#1545">1545: </a>    <span class="php-comment">/**
+</span></span><span id="1546" class="l"><a href="#1546">1546: </a><span class="php-comment">     * Retrieve the validation errors
+</span></span><span id="1547" class="l"><a href="#1547">1547: </a><span class="php-comment">     *
+</span></span><span id="1548" class="l"><a href="#1548">1548: </a><span class="php-comment">     * @access public
+</span></span><span id="1549" class="l"><a href="#1549">1549: </a><span class="php-comment">     * @return array
+</span></span><span id="1550" class="l"><a href="#1550">1550: </a><span class="php-comment">     */</span>
+</span><span id="1551" class="l"><a href="#1551">1551: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
+</span><span id="1552" class="l"><a href="#1552">1552: </a>    {
+</span><span id="1553" class="l"><a href="#1553">1553: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
+</span><span id="1554" class="l"><a href="#1554">1554: </a>
+</span><span id="1555" class="l"><a href="#1555">1555: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
+</span><span id="1556" class="l"><a href="#1556">1556: </a>    }
+</span><span id="1557" class="l"><a href="#1557">1557: </a>
+</span><span id="1558" class="l"><a href="#1558">1558: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
+</span><span id="1559" class="l"><a href="#1559">1559: </a>
+</span><span id="1560" class="l"><a href="#1560">1560: </a>    <span class="php-comment">/**
+</span></span><span id="1561" class="l"><a href="#1561">1561: </a><span class="php-comment">     * Perform LDAP Authentication
+</span></span><span id="1562" class="l"><a href="#1562">1562: </a><span class="php-comment">     *
+</span></span><span id="1563" class="l"><a href="#1563">1563: </a><span class="php-comment">     * @access protected
+</span></span><span id="1564" class="l"><a href="#1564">1564: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1565" class="l"><a href="#1565">1565: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1566" class="l"><a href="#1566">1566: </a><span class="php-comment">     * @return bool
+</span></span><span id="1567" class="l"><a href="#1567">1567: </a><span class="php-comment">     */</span>
+</span><span id="1568" class="l"><a href="#1568">1568: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1569" class="l"><a href="#1569">1569: </a>    {
+</span><span id="1570" class="l"><a href="#1570">1570: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1571" class="l"><a href="#1571">1571: </a>        {
+</span><span id="1572" class="l"><a href="#1572">1572: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
+</span><span id="1573" class="l"><a href="#1573">1573: </a>
+</span><span id="1574" class="l"><a href="#1574">1574: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1575" class="l"><a href="#1575">1575: </a>        }
+</span><span id="1576" class="l"><a href="#1576">1576: </a>
+</span><span id="1577" class="l"><a href="#1577">1577: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading Config'</span>);
 </span><span id="1578" class="l"><a href="#1578">1578: </a>
-</span><span id="1579" class="l"><a href="#1579">1579: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1580" class="l"><a href="#1580">1580: </a>        }
-</span><span id="1581" class="l"><a href="#1581">1581: </a>
-</span><span id="1582" class="l"><a href="#1582">1582: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) == <span class="php-keyword1">FALSE</span>)
-</span><span id="1583" class="l"><a href="#1583">1583: </a>        {
-</span><span id="1584" class="l"><a href="#1584">1584: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, entry of searchresult could not be fetched'</span>);
-</span><span id="1585" class="l"><a href="#1585">1585: </a>
-</span><span id="1586" class="l"><a href="#1586">1586: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1587" class="l"><a href="#1587">1587: </a>        }
-</span><span id="1588" class="l"><a href="#1588">1588: </a>
-</span><span id="1589" class="l"><a href="#1589">1589: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) == <span class="php-keyword1">FALSE</span>)
-</span><span id="1590" class="l"><a href="#1590">1590: </a>        {
-</span><span id="1591" class="l"><a href="#1591">1591: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, user-dn could not be fetched'</span>);
-</span><span id="1592" class="l"><a href="#1592">1592: </a>
-</span><span id="1593" class="l"><a href="#1593">1593: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1594" class="l"><a href="#1594">1594: </a>        }
-</span><span id="1595" class="l"><a href="#1595">1595: </a>
-</span><span id="1596" class="l"><a href="#1596">1596: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
-</span><span id="1597" class="l"><a href="#1597">1597: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) == <span class="php-keyword1">FALSE</span>)
-</span><span id="1598" class="l"><a href="#1598">1598: </a>        {
-</span><span id="1599" class="l"><a href="#1599">1599: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
-</span><span id="1600" class="l"><a href="#1600">1600: </a>
-</span><span id="1601" class="l"><a href="#1601">1601: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1602" class="l"><a href="#1602">1602: </a>        }
+</span><span id="1579" class="l"><a href="#1579">1579: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="1580" class="l"><a href="#1580">1580: </a>
+</span><span id="1581" class="l"><a href="#1581">1581: </a>        <span class="php-var">$ldap</span> = [
+</span><span id="1582" class="l"><a href="#1582">1582: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1583" class="l"><a href="#1583">1583: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1584" class="l"><a href="#1584">1584: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1585" class="l"><a href="#1585">1585: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1586" class="l"><a href="#1586">1586: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1587" class="l"><a href="#1587">1587: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1588" class="l"><a href="#1588">1588: </a>        ];
+</span><span id="1589" class="l"><a href="#1589">1589: </a>
+</span><span id="1590" class="l"><a href="#1590">1590: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
+</span><span id="1591" class="l"><a href="#1591">1591: </a>
+</span><span id="1592" class="l"><a href="#1592">1592: </a>        <span class="php-comment">// Appears to be unused</span>
+</span><span id="1593" class="l"><a href="#1593">1593: </a>        <span class="php-comment">// $ldapconfig['authrealm'] = $this-&gt;config-&gt;item('domain', 'ldap');</span>
+</span><span id="1594" class="l"><a href="#1594">1594: </a>
+</span><span id="1595" class="l"><a href="#1595">1595: </a>        <span class="php-comment">// connect to ldap server</span>
+</span><span id="1596" class="l"><a href="#1596">1596: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
+</span><span id="1597" class="l"><a href="#1597">1597: </a>
+</span><span id="1598" class="l"><a href="#1598">1598: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
+</span><span id="1599" class="l"><a href="#1599">1599: </a>        {
+</span><span id="1600" class="l"><a href="#1600">1600: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>] . <span class="php-quote">' seconds'</span>);
+</span><span id="1601" class="l"><a href="#1601">1601: </a>
+</span><span id="1602" class="l"><a href="#1602">1602: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
 </span><span id="1603" class="l"><a href="#1603">1603: </a>
-</span><span id="1604" class="l"><a href="#1604">1604: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span> . <span class="php-var">$user_dn</span> . <span class="php-quote">' authenticated successfully'</span>);
+</span><span id="1604" class="l"><a href="#1604">1604: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>] . <span class="php-quote">' with dn '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
 </span><span id="1605" class="l"><a href="#1605">1605: </a>
-</span><span id="1606" class="l"><a href="#1606">1606: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
-</span><span id="1607" class="l"><a href="#1607">1607: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
+</span><span id="1606" class="l"><a href="#1606">1606: </a>            <span class="php-comment">// binding to ldap server</span>
+</span><span id="1607" class="l"><a href="#1607">1607: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
 </span><span id="1608" class="l"><a href="#1608">1608: </a>
-</span><span id="1609" class="l"><a href="#1609">1609: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1610" class="l"><a href="#1610">1610: </a>    }
-</span><span id="1611" class="l"><a href="#1611">1611: </a>
-</span><span id="1612" class="l"><a href="#1612">1612: </a>    <span class="php-comment">/**
-</span></span><span id="1613" class="l"><a href="#1613">1613: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
-</span></span><span id="1614" class="l"><a href="#1614">1614: </a><span class="php-comment">     *
-</span></span><span id="1615" class="l"><a href="#1615">1615: </a><span class="php-comment">     * @access protected
-</span></span><span id="1616" class="l"><a href="#1616">1616: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1617" class="l"><a href="#1617">1617: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1618" class="l"><a href="#1618">1618: </a><span class="php-comment">     * @return bool
-</span></span><span id="1619" class="l"><a href="#1619">1619: </a><span class="php-comment">     */</span>
-</span><span id="1620" class="l"><a href="#1620">1620: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1621" class="l"><a href="#1621">1621: </a>    {
-</span><span id="1622" class="l"><a href="#1622">1622: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1623" class="l"><a href="#1623">1623: </a>        {
-</span><span id="1624" class="l"><a href="#1624">1624: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: failure, empty username'</span>);
-</span><span id="1625" class="l"><a href="#1625">1625: </a>
-</span><span id="1626" class="l"><a href="#1626">1626: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1627" class="l"><a href="#1627">1627: </a>        }
-</span><span id="1628" class="l"><a href="#1628">1628: </a>
-</span><span id="1629" class="l"><a href="#1629">1629: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
-</span><span id="1630" class="l"><a href="#1630">1630: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
-</span><span id="1631" class="l"><a href="#1631">1631: </a>
-</span><span id="1632" class="l"><a href="#1632">1632: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
-</span><span id="1633" class="l"><a href="#1633">1633: </a>        {
-</span><span id="1634" class="l"><a href="#1634">1634: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_class'</span>);
-</span><span id="1635" class="l"><a href="#1635">1635: </a>
-</span><span id="1636" class="l"><a href="#1636">1636: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1637" class="l"><a href="#1637">1637: </a>        }
-</span><span id="1638" class="l"><a href="#1638">1638: </a>
-</span><span id="1639" class="l"><a href="#1639">1639: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
-</span><span id="1640" class="l"><a href="#1640">1640: </a>        {
-</span><span id="1641" class="l"><a href="#1641">1641: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_function'</span>);
-</span><span id="1642" class="l"><a href="#1642">1642: </a>
-</span><span id="1643" class="l"><a href="#1643">1643: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1644" class="l"><a href="#1644">1644: </a>        }
-</span><span id="1645" class="l"><a href="#1645">1645: </a>
-</span><span id="1646" class="l"><a href="#1646">1646: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1647" class="l"><a href="#1647">1647: </a>        {
-</span><span id="1648" class="l"><a href="#1648">1648: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
+</span><span id="1609" class="l"><a href="#1609">1609: </a>            <span class="php-comment">// verify binding</span>
+</span><span id="1610" class="l"><a href="#1610">1610: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span>)
+</span><span id="1611" class="l"><a href="#1611">1611: </a>            {
+</span><span id="1612" class="l"><a href="#1612">1612: </a>                log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
+</span><span id="1613" class="l"><a href="#1613">1613: </a>            }
+</span><span id="1614" class="l"><a href="#1614">1614: </a>            <span class="php-keyword1">else</span>
+</span><span id="1615" class="l"><a href="#1615">1615: </a>            {
+</span><span id="1616" class="l"><a href="#1616">1616: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind unsuccessful'</span>);
+</span><span id="1617" class="l"><a href="#1617">1617: </a>
+</span><span id="1618" class="l"><a href="#1618">1618: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1619" class="l"><a href="#1619">1619: </a>            }
+</span><span id="1620" class="l"><a href="#1620">1620: </a>        }
+</span><span id="1621" class="l"><a href="#1621">1621: </a>
+</span><span id="1622" class="l"><a href="#1622">1622: </a>        <span class="php-comment">// search for user</span>
+</span><span id="1623" class="l"><a href="#1623">1623: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) == <span class="php-keyword1">FALSE</span>)
+</span><span id="1624" class="l"><a href="#1624">1624: </a>        {
+</span><span id="1625" class="l"><a href="#1625">1625: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span> . <span class="php-var">$username</span> . <span class="php-quote">' not found in search'</span>);
+</span><span id="1626" class="l"><a href="#1626">1626: </a>
+</span><span id="1627" class="l"><a href="#1627">1627: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1628" class="l"><a href="#1628">1628: </a>        }
+</span><span id="1629" class="l"><a href="#1629">1629: </a>
+</span><span id="1630" class="l"><a href="#1630">1630: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
+</span><span id="1631" class="l"><a href="#1631">1631: </a>        {
+</span><span id="1632" class="l"><a href="#1632">1632: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username '</span> . <span class="php-var">$username</span> . <span class="php-quote">'found more than once'</span>);
+</span><span id="1633" class="l"><a href="#1633">1633: </a>
+</span><span id="1634" class="l"><a href="#1634">1634: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1635" class="l"><a href="#1635">1635: </a>        }
+</span><span id="1636" class="l"><a href="#1636">1636: </a>
+</span><span id="1637" class="l"><a href="#1637">1637: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) == <span class="php-keyword1">FALSE</span>)
+</span><span id="1638" class="l"><a href="#1638">1638: </a>        {
+</span><span id="1639" class="l"><a href="#1639">1639: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, entry of searchresult could not be fetched'</span>);
+</span><span id="1640" class="l"><a href="#1640">1640: </a>
+</span><span id="1641" class="l"><a href="#1641">1641: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1642" class="l"><a href="#1642">1642: </a>        }
+</span><span id="1643" class="l"><a href="#1643">1643: </a>
+</span><span id="1644" class="l"><a href="#1644">1644: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) == <span class="php-keyword1">FALSE</span>)
+</span><span id="1645" class="l"><a href="#1645">1645: </a>        {
+</span><span id="1646" class="l"><a href="#1646">1646: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, user-dn could not be fetched'</span>);
+</span><span id="1647" class="l"><a href="#1647">1647: </a>
+</span><span id="1648" class="l"><a href="#1648">1648: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
 </span><span id="1649" class="l"><a href="#1649">1649: </a>        }
 </span><span id="1650" class="l"><a href="#1650">1650: </a>
-</span><span id="1651" class="l"><a href="#1651">1651: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1652" class="l"><a href="#1652">1652: </a>    }
-</span><span id="1653" class="l"><a href="#1653">1653: </a>
-</span><span id="1654" class="l"><a href="#1654">1654: </a>    <span class="php-comment">/**
-</span></span><span id="1655" class="l"><a href="#1655">1655: </a><span class="php-comment">     * Check if the user is logged in
-</span></span><span id="1656" class="l"><a href="#1656">1656: </a><span class="php-comment">     *
-</span></span><span id="1657" class="l"><a href="#1657">1657: </a><span class="php-comment">     * @access protected
-</span></span><span id="1658" class="l"><a href="#1658">1658: </a><span class="php-comment">     * @param  string $username The user's name
-</span></span><span id="1659" class="l"><a href="#1659">1659: </a><span class="php-comment">     * @param  bool|string $password The user's password
-</span></span><span id="1660" class="l"><a href="#1660">1660: </a><span class="php-comment">     * @return bool
-</span></span><span id="1661" class="l"><a href="#1661">1661: </a><span class="php-comment">     */</span>
-</span><span id="1662" class="l"><a href="#1662">1662: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1663" class="l"><a href="#1663">1663: </a>    {
-</span><span id="1664" class="l"><a href="#1664">1664: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1665" class="l"><a href="#1665">1665: </a>        {
-</span><span id="1666" class="l"><a href="#1666">1666: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1667" class="l"><a href="#1667">1667: </a>        }
-</span><span id="1668" class="l"><a href="#1668">1668: </a>
-</span><span id="1669" class="l"><a href="#1669">1669: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
-</span><span id="1670" class="l"><a href="#1670">1670: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="1671" class="l"><a href="#1671">1671: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
-</span><span id="1672" class="l"><a href="#1672">1672: </a>
-</span><span id="1673" class="l"><a href="#1673">1673: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
-</span><span id="1674" class="l"><a href="#1674">1674: </a>        {
-</span><span id="1675" class="l"><a href="#1675">1675: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
-</span><span id="1676" class="l"><a href="#1676">1676: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>) . <span class="php-quote">':'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
-</span><span id="1677" class="l"><a href="#1677">1677: </a>        }
-</span><span id="1678" class="l"><a href="#1678">1678: </a>
-</span><span id="1679" class="l"><a href="#1679">1679: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1680" class="l"><a href="#1680">1680: </a>        {
+</span><span id="1651" class="l"><a href="#1651">1651: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
+</span><span id="1652" class="l"><a href="#1652">1652: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) == <span class="php-keyword1">FALSE</span>)
+</span><span id="1653" class="l"><a href="#1653">1653: </a>        {
+</span><span id="1654" class="l"><a href="#1654">1654: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
+</span><span id="1655" class="l"><a href="#1655">1655: </a>
+</span><span id="1656" class="l"><a href="#1656">1656: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1657" class="l"><a href="#1657">1657: </a>        }
+</span><span id="1658" class="l"><a href="#1658">1658: </a>
+</span><span id="1659" class="l"><a href="#1659">1659: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span> . <span class="php-var">$user_dn</span> . <span class="php-quote">' authenticated successfully'</span>);
+</span><span id="1660" class="l"><a href="#1660">1660: </a>
+</span><span id="1661" class="l"><a href="#1661">1661: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
+</span><span id="1662" class="l"><a href="#1662">1662: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
+</span><span id="1663" class="l"><a href="#1663">1663: </a>
+</span><span id="1664" class="l"><a href="#1664">1664: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1665" class="l"><a href="#1665">1665: </a>    }
+</span><span id="1666" class="l"><a href="#1666">1666: </a>
+</span><span id="1667" class="l"><a href="#1667">1667: </a>    <span class="php-comment">/**
+</span></span><span id="1668" class="l"><a href="#1668">1668: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
+</span></span><span id="1669" class="l"><a href="#1669">1669: </a><span class="php-comment">     *
+</span></span><span id="1670" class="l"><a href="#1670">1670: </a><span class="php-comment">     * @access protected
+</span></span><span id="1671" class="l"><a href="#1671">1671: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1672" class="l"><a href="#1672">1672: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1673" class="l"><a href="#1673">1673: </a><span class="php-comment">     * @return bool
+</span></span><span id="1674" class="l"><a href="#1674">1674: </a><span class="php-comment">     */</span>
+</span><span id="1675" class="l"><a href="#1675">1675: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1676" class="l"><a href="#1676">1676: </a>    {
+</span><span id="1677" class="l"><a href="#1677">1677: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1678" class="l"><a href="#1678">1678: </a>        {
+</span><span id="1679" class="l"><a href="#1679">1679: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: failure, empty username'</span>);
+</span><span id="1680" class="l"><a href="#1680">1680: </a>
 </span><span id="1681" class="l"><a href="#1681">1681: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
 </span><span id="1682" class="l"><a href="#1682">1682: </a>        }
 </span><span id="1683" class="l"><a href="#1683">1683: </a>
-</span><span id="1684" class="l"><a href="#1684">1684: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
-</span><span id="1685" class="l"><a href="#1685">1685: </a>        {
-</span><span id="1686" class="l"><a href="#1686">1686: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
-</span><span id="1687" class="l"><a href="#1687">1687: </a>
-</span><span id="1688" class="l"><a href="#1688">1688: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1689" class="l"><a href="#1689">1689: </a>        }
+</span><span id="1684" class="l"><a href="#1684">1684: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
+</span><span id="1685" class="l"><a href="#1685">1685: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
+</span><span id="1686" class="l"><a href="#1686">1686: </a>
+</span><span id="1687" class="l"><a href="#1687">1687: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
+</span><span id="1688" class="l"><a href="#1688">1688: </a>        {
+</span><span id="1689" class="l"><a href="#1689">1689: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_class'</span>);
 </span><span id="1690" class="l"><a href="#1690">1690: </a>
-</span><span id="1691" class="l"><a href="#1691">1691: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
-</span><span id="1692" class="l"><a href="#1692">1692: </a>        {
-</span><span id="1693" class="l"><a href="#1693">1693: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
-</span><span id="1694" class="l"><a href="#1694">1694: </a>
-</span><span id="1695" class="l"><a href="#1695">1695: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1696" class="l"><a href="#1696">1696: </a>        }
+</span><span id="1691" class="l"><a href="#1691">1691: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1692" class="l"><a href="#1692">1692: </a>        }
+</span><span id="1693" class="l"><a href="#1693">1693: </a>
+</span><span id="1694" class="l"><a href="#1694">1694: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
+</span><span id="1695" class="l"><a href="#1695">1695: </a>        {
+</span><span id="1696" class="l"><a href="#1696">1696: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_function'</span>);
 </span><span id="1697" class="l"><a href="#1697">1697: </a>
-</span><span id="1698" class="l"><a href="#1698">1698: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1699" class="l"><a href="#1699">1699: </a>        {
-</span><span id="1700" class="l"><a href="#1700">1700: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1701" class="l"><a href="#1701">1701: </a>        }
-</span><span id="1702" class="l"><a href="#1702">1702: </a>
-</span><span id="1703" class="l"><a href="#1703">1703: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
-</span><span id="1704" class="l"><a href="#1704">1704: </a>        {
-</span><span id="1705" class="l"><a href="#1705">1705: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1706" class="l"><a href="#1706">1706: </a>        }
-</span><span id="1707" class="l"><a href="#1707">1707: </a>
-</span><span id="1708" class="l"><a href="#1708">1708: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1709" class="l"><a href="#1709">1709: </a>    }
-</span><span id="1710" class="l"><a href="#1710">1710: </a>
-</span><span id="1711" class="l"><a href="#1711">1711: </a>    <span class="php-comment">/**
-</span></span><span id="1712" class="l"><a href="#1712">1712: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
-</span></span><span id="1713" class="l"><a href="#1713">1713: </a><span class="php-comment">     *
-</span></span><span id="1714" class="l"><a href="#1714">1714: </a><span class="php-comment">     * @access protected
-</span></span><span id="1715" class="l"><a href="#1715">1715: </a><span class="php-comment">     * @return void
+</span><span id="1698" class="l"><a href="#1698">1698: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1699" class="l"><a href="#1699">1699: </a>        }
+</span><span id="1700" class="l"><a href="#1700">1700: </a>
+</span><span id="1701" class="l"><a href="#1701">1701: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1702" class="l"><a href="#1702">1702: </a>        {
+</span><span id="1703" class="l"><a href="#1703">1703: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
+</span><span id="1704" class="l"><a href="#1704">1704: </a>        }
+</span><span id="1705" class="l"><a href="#1705">1705: </a>
+</span><span id="1706" class="l"><a href="#1706">1706: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1707" class="l"><a href="#1707">1707: </a>    }
+</span><span id="1708" class="l"><a href="#1708">1708: </a>
+</span><span id="1709" class="l"><a href="#1709">1709: </a>    <span class="php-comment">/**
+</span></span><span id="1710" class="l"><a href="#1710">1710: </a><span class="php-comment">     * Check if the user is logged in
+</span></span><span id="1711" class="l"><a href="#1711">1711: </a><span class="php-comment">     *
+</span></span><span id="1712" class="l"><a href="#1712">1712: </a><span class="php-comment">     * @access protected
+</span></span><span id="1713" class="l"><a href="#1713">1713: </a><span class="php-comment">     * @param  string $username The user's name
+</span></span><span id="1714" class="l"><a href="#1714">1714: </a><span class="php-comment">     * @param  bool|string $password The user's password
+</span></span><span id="1715" class="l"><a href="#1715">1715: </a><span class="php-comment">     * @return bool
 </span></span><span id="1716" class="l"><a href="#1716">1716: </a><span class="php-comment">     */</span>
-</span><span id="1717" class="l"><a href="#1717">1717: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
+</span><span id="1717" class="l"><a href="#1717">1717: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
 </span><span id="1718" class="l"><a href="#1718">1718: </a>    {
-</span><span id="1719" class="l"><a href="#1719">1719: </a>        <span class="php-comment">// Get the auth_source config item</span>
-</span><span id="1720" class="l"><a href="#1720">1720: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
-</span><span id="1721" class="l"><a href="#1721">1721: </a>
-</span><span id="1722" class="l"><a href="#1722">1722: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
-</span><span id="1723" class="l"><a href="#1723">1723: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
-</span><span id="1724" class="l"><a href="#1724">1724: </a>        {
-</span><span id="1725" class="l"><a href="#1725">1725: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1726" class="l"><a href="#1726">1726: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1727" class="l"><a href="#1727">1727: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1728" class="l"><a href="#1728">1728: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not Authorized'</span>
-</span><span id="1729" class="l"><a href="#1729">1729: </a>                ], self::UNAUTHORIZED);
-</span><span id="1730" class="l"><a href="#1730">1730: </a>        }
-</span><span id="1731" class="l"><a href="#1731">1731: </a>    }
-</span><span id="1732" class="l"><a href="#1732">1732: </a>
-</span><span id="1733" class="l"><a href="#1733">1733: </a>    <span class="php-comment">/**
-</span></span><span id="1734" class="l"><a href="#1734">1734: </a><span class="php-comment">     * Prepares for basic authentication
-</span></span><span id="1735" class="l"><a href="#1735">1735: </a><span class="php-comment">     *
-</span></span><span id="1736" class="l"><a href="#1736">1736: </a><span class="php-comment">     * @access protected
-</span></span><span id="1737" class="l"><a href="#1737">1737: </a><span class="php-comment">     * @return void
-</span></span><span id="1738" class="l"><a href="#1738">1738: </a><span class="php-comment">     */</span>
-</span><span id="1739" class="l"><a href="#1739">1739: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
-</span><span id="1740" class="l"><a href="#1740">1740: </a>    {
-</span><span id="1741" class="l"><a href="#1741">1741: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1742" class="l"><a href="#1742">1742: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
-</span><span id="1743" class="l"><a href="#1743">1743: </a>        {
-</span><span id="1744" class="l"><a href="#1744">1744: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1745" class="l"><a href="#1745">1745: </a>        }
-</span><span id="1746" class="l"><a href="#1746">1746: </a>
-</span><span id="1747" class="l"><a href="#1747">1747: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
-</span><span id="1748" class="l"><a href="#1748">1748: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
-</span><span id="1749" class="l"><a href="#1749">1749: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
-</span><span id="1750" class="l"><a href="#1750">1750: </a>
-</span><span id="1751" class="l"><a href="#1751">1751: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1752" class="l"><a href="#1752">1752: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1753" class="l"><a href="#1753">1753: </a>        {
-</span><span id="1754" class="l"><a href="#1754">1754: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
-</span><span id="1755" class="l"><a href="#1755">1755: </a>        }
-</span><span id="1756" class="l"><a href="#1756">1756: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1757" class="l"><a href="#1757">1757: </a>        {
-</span><span id="1758" class="l"><a href="#1758">1758: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
-</span><span id="1759" class="l"><a href="#1759">1759: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
-</span><span id="1760" class="l"><a href="#1760">1760: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
-</span><span id="1761" class="l"><a href="#1761">1761: </a>            {
-</span><span id="1762" class="l"><a href="#1762">1762: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
-</span><span id="1763" class="l"><a href="#1763">1763: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
-</span><span id="1764" class="l"><a href="#1764">1764: </a>            }
-</span><span id="1765" class="l"><a href="#1765">1765: </a>        }
-</span><span id="1766" class="l"><a href="#1766">1766: </a>
-</span><span id="1767" class="l"><a href="#1767">1767: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
-</span><span id="1768" class="l"><a href="#1768">1768: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1769" class="l"><a href="#1769">1769: </a>        {
-</span><span id="1770" class="l"><a href="#1770">1770: </a>            <span class="php-var">$this</span>-&gt;_force_login();
-</span><span id="1771" class="l"><a href="#1771">1771: </a>        }
-</span><span id="1772" class="l"><a href="#1772">1772: </a>    }
-</span><span id="1773" class="l"><a href="#1773">1773: </a>
-</span><span id="1774" class="l"><a href="#1774">1774: </a>    <span class="php-comment">/**
-</span></span><span id="1775" class="l"><a href="#1775">1775: </a><span class="php-comment">     * Prepares for digest authentication
-</span></span><span id="1776" class="l"><a href="#1776">1776: </a><span class="php-comment">     *
-</span></span><span id="1777" class="l"><a href="#1777">1777: </a><span class="php-comment">     * @access protected
-</span></span><span id="1778" class="l"><a href="#1778">1778: </a><span class="php-comment">     * @return void
-</span></span><span id="1779" class="l"><a href="#1779">1779: </a><span class="php-comment">     */</span>
-</span><span id="1780" class="l"><a href="#1780">1780: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
-</span><span id="1781" class="l"><a href="#1781">1781: </a>    {
-</span><span id="1782" class="l"><a href="#1782">1782: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1783" class="l"><a href="#1783">1783: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
-</span><span id="1784" class="l"><a href="#1784">1784: </a>        {
-</span><span id="1785" class="l"><a href="#1785">1785: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1786" class="l"><a href="#1786">1786: </a>        }
+</span><span id="1719" class="l"><a href="#1719">1719: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1720" class="l"><a href="#1720">1720: </a>        {
+</span><span id="1721" class="l"><a href="#1721">1721: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1722" class="l"><a href="#1722">1722: </a>        }
+</span><span id="1723" class="l"><a href="#1723">1723: </a>
+</span><span id="1724" class="l"><a href="#1724">1724: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
+</span><span id="1725" class="l"><a href="#1725">1725: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="1726" class="l"><a href="#1726">1726: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
+</span><span id="1727" class="l"><a href="#1727">1727: </a>
+</span><span id="1728" class="l"><a href="#1728">1728: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
+</span><span id="1729" class="l"><a href="#1729">1729: </a>        {
+</span><span id="1730" class="l"><a href="#1730">1730: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
+</span><span id="1731" class="l"><a href="#1731">1731: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>) . <span class="php-quote">':'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
+</span><span id="1732" class="l"><a href="#1732">1732: </a>        }
+</span><span id="1733" class="l"><a href="#1733">1733: </a>
+</span><span id="1734" class="l"><a href="#1734">1734: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1735" class="l"><a href="#1735">1735: </a>        {
+</span><span id="1736" class="l"><a href="#1736">1736: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1737" class="l"><a href="#1737">1737: </a>        }
+</span><span id="1738" class="l"><a href="#1738">1738: </a>
+</span><span id="1739" class="l"><a href="#1739">1739: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
+</span><span id="1740" class="l"><a href="#1740">1740: </a>        {
+</span><span id="1741" class="l"><a href="#1741">1741: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1742" class="l"><a href="#1742">1742: </a>
+</span><span id="1743" class="l"><a href="#1743">1743: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1744" class="l"><a href="#1744">1744: </a>        }
+</span><span id="1745" class="l"><a href="#1745">1745: </a>
+</span><span id="1746" class="l"><a href="#1746">1746: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
+</span><span id="1747" class="l"><a href="#1747">1747: </a>        {
+</span><span id="1748" class="l"><a href="#1748">1748: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1749" class="l"><a href="#1749">1749: </a>
+</span><span id="1750" class="l"><a href="#1750">1750: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1751" class="l"><a href="#1751">1751: </a>        }
+</span><span id="1752" class="l"><a href="#1752">1752: </a>
+</span><span id="1753" class="l"><a href="#1753">1753: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1754" class="l"><a href="#1754">1754: </a>        {
+</span><span id="1755" class="l"><a href="#1755">1755: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1756" class="l"><a href="#1756">1756: </a>        }
+</span><span id="1757" class="l"><a href="#1757">1757: </a>
+</span><span id="1758" class="l"><a href="#1758">1758: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
+</span><span id="1759" class="l"><a href="#1759">1759: </a>        {
+</span><span id="1760" class="l"><a href="#1760">1760: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1761" class="l"><a href="#1761">1761: </a>        }
+</span><span id="1762" class="l"><a href="#1762">1762: </a>
+</span><span id="1763" class="l"><a href="#1763">1763: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1764" class="l"><a href="#1764">1764: </a>    }
+</span><span id="1765" class="l"><a href="#1765">1765: </a>
+</span><span id="1766" class="l"><a href="#1766">1766: </a>    <span class="php-comment">/**
+</span></span><span id="1767" class="l"><a href="#1767">1767: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
+</span></span><span id="1768" class="l"><a href="#1768">1768: </a><span class="php-comment">     *
+</span></span><span id="1769" class="l"><a href="#1769">1769: </a><span class="php-comment">     * @access protected
+</span></span><span id="1770" class="l"><a href="#1770">1770: </a><span class="php-comment">     * @return void
+</span></span><span id="1771" class="l"><a href="#1771">1771: </a><span class="php-comment">     */</span>
+</span><span id="1772" class="l"><a href="#1772">1772: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
+</span><span id="1773" class="l"><a href="#1773">1773: </a>    {
+</span><span id="1774" class="l"><a href="#1774">1774: </a>        <span class="php-comment">// Get the auth_source config item</span>
+</span><span id="1775" class="l"><a href="#1775">1775: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
+</span><span id="1776" class="l"><a href="#1776">1776: </a>
+</span><span id="1777" class="l"><a href="#1777">1777: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
+</span><span id="1778" class="l"><a href="#1778">1778: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
+</span><span id="1779" class="l"><a href="#1779">1779: </a>        {
+</span><span id="1780" class="l"><a href="#1780">1780: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1781" class="l"><a href="#1781">1781: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1782" class="l"><a href="#1782">1782: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1783" class="l"><a href="#1783">1783: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not Authorized'</span>
+</span><span id="1784" class="l"><a href="#1784">1784: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="1785" class="l"><a href="#1785">1785: </a>        }
+</span><span id="1786" class="l"><a href="#1786">1786: </a>    }
 </span><span id="1787" class="l"><a href="#1787">1787: </a>
-</span><span id="1788" class="l"><a href="#1788">1788: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
-</span><span id="1789" class="l"><a href="#1789">1789: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
-</span><span id="1790" class="l"><a href="#1790">1790: </a>        <span class="php-var">$digest_string</span> = <span class="php-quote">''</span>;
-</span><span id="1791" class="l"><a href="#1791">1791: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>))
-</span><span id="1792" class="l"><a href="#1792">1792: </a>        {
-</span><span id="1793" class="l"><a href="#1793">1793: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
-</span><span id="1794" class="l"><a href="#1794">1794: </a>        }
-</span><span id="1795" class="l"><a href="#1795">1795: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>))
-</span><span id="1796" class="l"><a href="#1796">1796: </a>        {
-</span><span id="1797" class="l"><a href="#1797">1797: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
-</span><span id="1798" class="l"><a href="#1798">1798: </a>        }
-</span><span id="1799" class="l"><a href="#1799">1799: </a>
-</span><span id="1800" class="l"><a href="#1800">1800: </a>        <span class="php-var">$uniqueId</span> = <span class="php-keyword2">uniqid</span>();
+</span><span id="1788" class="l"><a href="#1788">1788: </a>    <span class="php-comment">/**
+</span></span><span id="1789" class="l"><a href="#1789">1789: </a><span class="php-comment">     * Prepares for basic authentication
+</span></span><span id="1790" class="l"><a href="#1790">1790: </a><span class="php-comment">     *
+</span></span><span id="1791" class="l"><a href="#1791">1791: </a><span class="php-comment">     * @access protected
+</span></span><span id="1792" class="l"><a href="#1792">1792: </a><span class="php-comment">     * @return void
+</span></span><span id="1793" class="l"><a href="#1793">1793: </a><span class="php-comment">     */</span>
+</span><span id="1794" class="l"><a href="#1794">1794: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
+</span><span id="1795" class="l"><a href="#1795">1795: </a>    {
+</span><span id="1796" class="l"><a href="#1796">1796: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1797" class="l"><a href="#1797">1797: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1798" class="l"><a href="#1798">1798: </a>        {
+</span><span id="1799" class="l"><a href="#1799">1799: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1800" class="l"><a href="#1800">1800: </a>        }
 </span><span id="1801" class="l"><a href="#1801">1801: </a>
-</span><span id="1802" class="l"><a href="#1802">1802: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
-</span><span id="1803" class="l"><a href="#1803">1803: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
-</span><span id="1804" class="l"><a href="#1804">1804: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
-</span><span id="1805" class="l"><a href="#1805">1805: </a>        {
-</span><span id="1806" class="l"><a href="#1806">1806: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqueId</span>);
-</span><span id="1807" class="l"><a href="#1807">1807: </a>        }
-</span><span id="1808" class="l"><a href="#1808">1808: </a>
-</span><span id="1809" class="l"><a href="#1809">1809: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
-</span><span id="1810" class="l"><a href="#1810">1810: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="1811" class="l"><a href="#1811">1811: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
-</span><span id="1812" class="l"><a href="#1812">1812: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
-</span><span id="1813" class="l"><a href="#1813">1813: </a>
-</span><span id="1814" class="l"><a href="#1814">1814: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config</span>
-</span><span id="1815" class="l"><a href="#1815">1815: </a>        <span class="php-var">$A1</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
-</span><span id="1816" class="l"><a href="#1816">1816: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$A1</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1817" class="l"><a href="#1817">1817: </a>        {
-</span><span id="1818" class="l"><a href="#1818">1818: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqueId</span>);
-</span><span id="1819" class="l"><a href="#1819">1819: </a>        }
-</span><span id="1820" class="l"><a href="#1820">1820: </a>
-</span><span id="1821" class="l"><a href="#1821">1821: </a>        <span class="php-var">$A2</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method) . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
-</span><span id="1822" class="l"><a href="#1822">1822: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$A1</span> . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$A2</span>);
-</span><span id="1823" class="l"><a href="#1823">1823: </a>
-</span><span id="1824" class="l"><a href="#1824">1824: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
-</span><span id="1825" class="l"><a href="#1825">1825: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
-</span><span id="1826" class="l"><a href="#1826">1826: </a>        {
-</span><span id="1827" class="l"><a href="#1827">1827: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1828" class="l"><a href="#1828">1828: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1829" class="l"><a href="#1829">1829: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-num">0</span>,
-</span><span id="1830" class="l"><a href="#1830">1830: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid credentials'</span>
-</span><span id="1831" class="l"><a href="#1831">1831: </a>                ], self::UNAUTHORIZED);
-</span><span id="1832" class="l"><a href="#1832">1832: </a>        }
-</span><span id="1833" class="l"><a href="#1833">1833: </a>    }
-</span><span id="1834" class="l"><a href="#1834">1834: </a>
-</span><span id="1835" class="l"><a href="#1835">1835: </a>    <span class="php-comment">/**
-</span></span><span id="1836" class="l"><a href="#1836">1836: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
-</span></span><span id="1837" class="l"><a href="#1837">1837: </a><span class="php-comment">     *
-</span></span><span id="1838" class="l"><a href="#1838">1838: </a><span class="php-comment">     * @access protected
-</span></span><span id="1839" class="l"><a href="#1839">1839: </a><span class="php-comment">     * @return void
-</span></span><span id="1840" class="l"><a href="#1840">1840: </a><span class="php-comment">     */</span>
-</span><span id="1841" class="l"><a href="#1841">1841: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
-</span><span id="1842" class="l"><a href="#1842">1842: </a>    {
-</span><span id="1843" class="l"><a href="#1843">1843: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
-</span><span id="1844" class="l"><a href="#1844">1844: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
-</span><span id="1845" class="l"><a href="#1845">1845: </a>
-</span><span id="1846" class="l"><a href="#1846">1846: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
-</span><span id="1847" class="l"><a href="#1847">1847: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
-</span><span id="1848" class="l"><a href="#1848">1848: </a>        {
-</span><span id="1849" class="l"><a href="#1849">1849: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1850" class="l"><a href="#1850">1850: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1851" class="l"><a href="#1851">1851: </a>                    <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1852" class="l"><a href="#1852">1852: </a>                    <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'IP Denied'</span>
-</span><span id="1853" class="l"><a href="#1853">1853: </a>                ],
-</span><span id="1854" class="l"><a href="#1854">1854: </a>                self::UNAUTHORIZED);
-</span><span id="1855" class="l"><a href="#1855">1855: </a>        }
-</span><span id="1856" class="l"><a href="#1856">1856: </a>    }
-</span><span id="1857" class="l"><a href="#1857">1857: </a>
-</span><span id="1858" class="l"><a href="#1858">1858: </a>    <span class="php-comment">/**
-</span></span><span id="1859" class="l"><a href="#1859">1859: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
-</span></span><span id="1860" class="l"><a href="#1860">1860: </a><span class="php-comment">     *
-</span></span><span id="1861" class="l"><a href="#1861">1861: </a><span class="php-comment">     * @access protected
-</span></span><span id="1862" class="l"><a href="#1862">1862: </a><span class="php-comment">     * @return void
-</span></span><span id="1863" class="l"><a href="#1863">1863: </a><span class="php-comment">     */</span>
-</span><span id="1864" class="l"><a href="#1864">1864: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
-</span><span id="1865" class="l"><a href="#1865">1865: </a>    {
-</span><span id="1866" class="l"><a href="#1866">1866: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
-</span><span id="1867" class="l"><a href="#1867">1867: </a>
-</span><span id="1868" class="l"><a href="#1868">1868: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
-</span><span id="1869" class="l"><a href="#1869">1869: </a>
-</span><span id="1870" class="l"><a href="#1870">1870: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">AS</span> &amp;<span class="php-var">$ip</span>)
-</span><span id="1871" class="l"><a href="#1871">1871: </a>        {
-</span><span id="1872" class="l"><a href="#1872">1872: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
-</span><span id="1873" class="l"><a href="#1873">1873: </a>        }
-</span><span id="1874" class="l"><a href="#1874">1874: </a>
-</span><span id="1875" class="l"><a href="#1875">1875: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1876" class="l"><a href="#1876">1876: </a>        {
-</span><span id="1877" class="l"><a href="#1877">1877: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'IP not authorized'</span>], self::UNAUTHORIZED);
-</span><span id="1878" class="l"><a href="#1878">1878: </a>        }
-</span><span id="1879" class="l"><a href="#1879">1879: </a>    }
-</span><span id="1880" class="l"><a href="#1880">1880: </a>
-</span><span id="1881" class="l"><a href="#1881">1881: </a>    <span class="php-comment">/**
-</span></span><span id="1882" class="l"><a href="#1882">1882: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
-</span></span><span id="1883" class="l"><a href="#1883">1883: </a><span class="php-comment">     *
-</span></span><span id="1884" class="l"><a href="#1884">1884: </a><span class="php-comment">     * @access protected
-</span></span><span id="1885" class="l"><a href="#1885">1885: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
-</span></span><span id="1886" class="l"><a href="#1886">1886: </a><span class="php-comment">     * each time
-</span></span><span id="1887" class="l"><a href="#1887">1887: </a><span class="php-comment">     * @return void
-</span></span><span id="1888" class="l"><a href="#1888">1888: </a><span class="php-comment">     */</span>
-</span><span id="1889" class="l"><a href="#1889">1889: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
-</span><span id="1890" class="l"><a href="#1890">1890: </a>    {
-</span><span id="1891" class="l"><a href="#1891">1891: </a>        <span class="php-var">$restAuth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
-</span><span id="1892" class="l"><a href="#1892">1892: </a>        <span class="php-var">$restRealm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
-</span><span id="1893" class="l"><a href="#1893">1893: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'basic'</span>)
-</span><span id="1894" class="l"><a href="#1894">1894: </a>        {
-</span><span id="1895" class="l"><a href="#1895">1895: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
-</span><span id="1896" class="l"><a href="#1896">1896: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span> . <span class="php-var">$restRealm</span> . <span class="php-quote">'&quot;'</span>);
-</span><span id="1897" class="l"><a href="#1897">1897: </a>        }
-</span><span id="1898" class="l"><a href="#1898">1898: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'digest'</span>)
-</span><span id="1899" class="l"><a href="#1899">1899: </a>        {
-</span><span id="1900" class="l"><a href="#1900">1900: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
-</span><span id="1901" class="l"><a href="#1901">1901: </a>            <span class="php-keyword2">header</span>(
-</span><span id="1902" class="l"><a href="#1902">1902: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span> . <span class="php-var">$restRealm</span>
-</span><span id="1903" class="l"><a href="#1903">1903: </a>                . <span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span> . <span class="php-var">$nonce</span>
-</span><span id="1904" class="l"><a href="#1904">1904: </a>                . <span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$restRealm</span>) . <span class="php-quote">'&quot;'</span>);
-</span><span id="1905" class="l"><a href="#1905">1905: </a>        }
-</span><span id="1906" class="l"><a href="#1906">1906: </a>
-</span><span id="1907" class="l"><a href="#1907">1907: </a>        <span class="php-comment">// Display an error response</span>
-</span><span id="1908" class="l"><a href="#1908">1908: </a>        <span class="php-var">$this</span>-&gt;response([
-</span><span id="1909" class="l"><a href="#1909">1909: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1910" class="l"><a href="#1910">1910: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not authorized'</span>
-</span><span id="1911" class="l"><a href="#1911">1911: </a>            ], self::UNAUTHORIZED);
-</span><span id="1912" class="l"><a href="#1912">1912: </a>    }
-</span><span id="1913" class="l"><a href="#1913">1913: </a>
-</span><span id="1914" class="l"><a href="#1914">1914: </a>    <span class="php-comment">/**
-</span></span><span id="1915" class="l"><a href="#1915">1915: </a><span class="php-comment">     * Updates the log table with the total access time
-</span></span><span id="1916" class="l"><a href="#1916">1916: </a><span class="php-comment">     *
-</span></span><span id="1917" class="l"><a href="#1917">1917: </a><span class="php-comment">     * @access protected
-</span></span><span id="1918" class="l"><a href="#1918">1918: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="1919" class="l"><a href="#1919">1919: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="1920" class="l"><a href="#1920">1920: </a><span class="php-comment">     */</span>
-</span><span id="1921" class="l"><a href="#1921">1921: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
-</span><span id="1922" class="l"><a href="#1922">1922: </a>    {
-</span><span id="1923" class="l"><a href="#1923">1923: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
+</span><span id="1802" class="l"><a href="#1802">1802: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
+</span><span id="1803" class="l"><a href="#1803">1803: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
+</span><span id="1804" class="l"><a href="#1804">1804: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
+</span><span id="1805" class="l"><a href="#1805">1805: </a>
+</span><span id="1806" class="l"><a href="#1806">1806: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1807" class="l"><a href="#1807">1807: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1808" class="l"><a href="#1808">1808: </a>        {
+</span><span id="1809" class="l"><a href="#1809">1809: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
+</span><span id="1810" class="l"><a href="#1810">1810: </a>        }
+</span><span id="1811" class="l"><a href="#1811">1811: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1812" class="l"><a href="#1812">1812: </a>        {
+</span><span id="1813" class="l"><a href="#1813">1813: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
+</span><span id="1814" class="l"><a href="#1814">1814: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
+</span><span id="1815" class="l"><a href="#1815">1815: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
+</span><span id="1816" class="l"><a href="#1816">1816: </a>            {
+</span><span id="1817" class="l"><a href="#1817">1817: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
+</span><span id="1818" class="l"><a href="#1818">1818: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
+</span><span id="1819" class="l"><a href="#1819">1819: </a>            }
+</span><span id="1820" class="l"><a href="#1820">1820: </a>        }
+</span><span id="1821" class="l"><a href="#1821">1821: </a>
+</span><span id="1822" class="l"><a href="#1822">1822: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
+</span><span id="1823" class="l"><a href="#1823">1823: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1824" class="l"><a href="#1824">1824: </a>        {
+</span><span id="1825" class="l"><a href="#1825">1825: </a>            <span class="php-var">$this</span>-&gt;_force_login();
+</span><span id="1826" class="l"><a href="#1826">1826: </a>        }
+</span><span id="1827" class="l"><a href="#1827">1827: </a>    }
+</span><span id="1828" class="l"><a href="#1828">1828: </a>
+</span><span id="1829" class="l"><a href="#1829">1829: </a>    <span class="php-comment">/**
+</span></span><span id="1830" class="l"><a href="#1830">1830: </a><span class="php-comment">     * Prepares for digest authentication
+</span></span><span id="1831" class="l"><a href="#1831">1831: </a><span class="php-comment">     *
+</span></span><span id="1832" class="l"><a href="#1832">1832: </a><span class="php-comment">     * @access protected
+</span></span><span id="1833" class="l"><a href="#1833">1833: </a><span class="php-comment">     * @return void
+</span></span><span id="1834" class="l"><a href="#1834">1834: </a><span class="php-comment">     */</span>
+</span><span id="1835" class="l"><a href="#1835">1835: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
+</span><span id="1836" class="l"><a href="#1836">1836: </a>    {
+</span><span id="1837" class="l"><a href="#1837">1837: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1838" class="l"><a href="#1838">1838: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1839" class="l"><a href="#1839">1839: </a>        {
+</span><span id="1840" class="l"><a href="#1840">1840: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1841" class="l"><a href="#1841">1841: </a>        }
+</span><span id="1842" class="l"><a href="#1842">1842: </a>
+</span><span id="1843" class="l"><a href="#1843">1843: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
+</span><span id="1844" class="l"><a href="#1844">1844: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
+</span><span id="1845" class="l"><a href="#1845">1845: </a>        <span class="php-var">$digest_string</span> = <span class="php-quote">''</span>;
+</span><span id="1846" class="l"><a href="#1846">1846: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>))
+</span><span id="1847" class="l"><a href="#1847">1847: </a>        {
+</span><span id="1848" class="l"><a href="#1848">1848: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
+</span><span id="1849" class="l"><a href="#1849">1849: </a>        }
+</span><span id="1850" class="l"><a href="#1850">1850: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>))
+</span><span id="1851" class="l"><a href="#1851">1851: </a>        {
+</span><span id="1852" class="l"><a href="#1852">1852: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
+</span><span id="1853" class="l"><a href="#1853">1853: </a>        }
+</span><span id="1854" class="l"><a href="#1854">1854: </a>
+</span><span id="1855" class="l"><a href="#1855">1855: </a>        <span class="php-var">$uniqueId</span> = <span class="php-keyword2">uniqid</span>();
+</span><span id="1856" class="l"><a href="#1856">1856: </a>
+</span><span id="1857" class="l"><a href="#1857">1857: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
+</span><span id="1858" class="l"><a href="#1858">1858: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
+</span><span id="1859" class="l"><a href="#1859">1859: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
+</span><span id="1860" class="l"><a href="#1860">1860: </a>        {
+</span><span id="1861" class="l"><a href="#1861">1861: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqueId</span>);
+</span><span id="1862" class="l"><a href="#1862">1862: </a>        }
+</span><span id="1863" class="l"><a href="#1863">1863: </a>
+</span><span id="1864" class="l"><a href="#1864">1864: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
+</span><span id="1865" class="l"><a href="#1865">1865: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="1866" class="l"><a href="#1866">1866: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
+</span><span id="1867" class="l"><a href="#1867">1867: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
+</span><span id="1868" class="l"><a href="#1868">1868: </a>
+</span><span id="1869" class="l"><a href="#1869">1869: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config</span>
+</span><span id="1870" class="l"><a href="#1870">1870: </a>        <span class="php-var">$A1</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
+</span><span id="1871" class="l"><a href="#1871">1871: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$A1</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1872" class="l"><a href="#1872">1872: </a>        {
+</span><span id="1873" class="l"><a href="#1873">1873: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqueId</span>);
+</span><span id="1874" class="l"><a href="#1874">1874: </a>        }
+</span><span id="1875" class="l"><a href="#1875">1875: </a>
+</span><span id="1876" class="l"><a href="#1876">1876: </a>        <span class="php-var">$A2</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method) . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
+</span><span id="1877" class="l"><a href="#1877">1877: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$A1</span> . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$A2</span>);
+</span><span id="1878" class="l"><a href="#1878">1878: </a>
+</span><span id="1879" class="l"><a href="#1879">1879: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
+</span><span id="1880" class="l"><a href="#1880">1880: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
+</span><span id="1881" class="l"><a href="#1881">1881: </a>        {
+</span><span id="1882" class="l"><a href="#1882">1882: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1883" class="l"><a href="#1883">1883: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1884" class="l"><a href="#1884">1884: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-num">0</span>,
+</span><span id="1885" class="l"><a href="#1885">1885: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid credentials'</span>
+</span><span id="1886" class="l"><a href="#1886">1886: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="1887" class="l"><a href="#1887">1887: </a>        }
+</span><span id="1888" class="l"><a href="#1888">1888: </a>    }
+</span><span id="1889" class="l"><a href="#1889">1889: </a>
+</span><span id="1890" class="l"><a href="#1890">1890: </a>    <span class="php-comment">/**
+</span></span><span id="1891" class="l"><a href="#1891">1891: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
+</span></span><span id="1892" class="l"><a href="#1892">1892: </a><span class="php-comment">     *
+</span></span><span id="1893" class="l"><a href="#1893">1893: </a><span class="php-comment">     * @access protected
+</span></span><span id="1894" class="l"><a href="#1894">1894: </a><span class="php-comment">     * @return void
+</span></span><span id="1895" class="l"><a href="#1895">1895: </a><span class="php-comment">     */</span>
+</span><span id="1896" class="l"><a href="#1896">1896: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
+</span><span id="1897" class="l"><a href="#1897">1897: </a>    {
+</span><span id="1898" class="l"><a href="#1898">1898: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
+</span><span id="1899" class="l"><a href="#1899">1899: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
+</span><span id="1900" class="l"><a href="#1900">1900: </a>
+</span><span id="1901" class="l"><a href="#1901">1901: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
+</span><span id="1902" class="l"><a href="#1902">1902: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
+</span><span id="1903" class="l"><a href="#1903">1903: </a>        {
+</span><span id="1904" class="l"><a href="#1904">1904: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1905" class="l"><a href="#1905">1905: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1906" class="l"><a href="#1906">1906: </a>                    <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1907" class="l"><a href="#1907">1907: </a>                    <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'IP Denied'</span>
+</span><span id="1908" class="l"><a href="#1908">1908: </a>                ],
+</span><span id="1909" class="l"><a href="#1909">1909: </a>                self::HTTP_UNAUTHORIZED);
+</span><span id="1910" class="l"><a href="#1910">1910: </a>        }
+</span><span id="1911" class="l"><a href="#1911">1911: </a>    }
+</span><span id="1912" class="l"><a href="#1912">1912: </a>
+</span><span id="1913" class="l"><a href="#1913">1913: </a>    <span class="php-comment">/**
+</span></span><span id="1914" class="l"><a href="#1914">1914: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
+</span></span><span id="1915" class="l"><a href="#1915">1915: </a><span class="php-comment">     *
+</span></span><span id="1916" class="l"><a href="#1916">1916: </a><span class="php-comment">     * @access protected
+</span></span><span id="1917" class="l"><a href="#1917">1917: </a><span class="php-comment">     * @return void
+</span></span><span id="1918" class="l"><a href="#1918">1918: </a><span class="php-comment">     */</span>
+</span><span id="1919" class="l"><a href="#1919">1919: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
+</span><span id="1920" class="l"><a href="#1920">1920: </a>    {
+</span><span id="1921" class="l"><a href="#1921">1921: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
+</span><span id="1922" class="l"><a href="#1922">1922: </a>
+</span><span id="1923" class="l"><a href="#1923">1923: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
 </span><span id="1924" class="l"><a href="#1924">1924: </a>
-</span><span id="1925" class="l"><a href="#1925">1925: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1926" class="l"><a href="#1926">1926: </a>            -&gt;update(
-</span><span id="1927" class="l"><a href="#1927">1927: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="1928" class="l"><a href="#1928">1928: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="1929" class="l"><a href="#1929">1929: </a>            ]);
-</span><span id="1930" class="l"><a href="#1930">1930: </a>    }
-</span><span id="1931" class="l"><a href="#1931">1931: </a>
-</span><span id="1932" class="l"><a href="#1932">1932: </a>    <span class="php-comment">/**
-</span></span><span id="1933" class="l"><a href="#1933">1933: </a><span class="php-comment">     * Updates the log table with HTTP response code
-</span></span><span id="1934" class="l"><a href="#1934">1934: </a><span class="php-comment">     *
-</span></span><span id="1935" class="l"><a href="#1935">1935: </a><span class="php-comment">     * @access protected
-</span></span><span id="1936" class="l"><a href="#1936">1936: </a><span class="php-comment">     * @author Justin Chen
-</span></span><span id="1937" class="l"><a href="#1937">1937: </a><span class="php-comment">     * @param $http_code int HTTP status code
-</span></span><span id="1938" class="l"><a href="#1938">1938: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="1939" class="l"><a href="#1939">1939: </a><span class="php-comment">     */</span>
-</span><span id="1940" class="l"><a href="#1940">1940: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
-</span><span id="1941" class="l"><a href="#1941">1941: </a>    {
-</span><span id="1942" class="l"><a href="#1942">1942: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
-</span><span id="1943" class="l"><a href="#1943">1943: </a>
-</span><span id="1944" class="l"><a href="#1944">1944: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
-</span><span id="1945" class="l"><a href="#1945">1945: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="1946" class="l"><a href="#1946">1946: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="1947" class="l"><a href="#1947">1947: </a>        ]);
-</span><span id="1948" class="l"><a href="#1948">1948: </a>    }
-</span><span id="1949" class="l"><a href="#1949">1949: </a>
-</span><span id="1950" class="l"><a href="#1950">1950: </a>    <span class="php-comment">/**
-</span></span><span id="1951" class="l"><a href="#1951">1951: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
-</span></span><span id="1952" class="l"><a href="#1952">1952: </a><span class="php-comment">     *
-</span></span><span id="1953" class="l"><a href="#1953">1953: </a><span class="php-comment">     * @access protected
-</span></span><span id="1954" class="l"><a href="#1954">1954: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
-</span></span><span id="1955" class="l"><a href="#1955">1955: </a><span class="php-comment">     */</span>
-</span><span id="1956" class="l"><a href="#1956">1956: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
-</span><span id="1957" class="l"><a href="#1957">1957: </a>    {
-</span><span id="1958" class="l"><a href="#1958">1958: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
-</span><span id="1959" class="l"><a href="#1959">1959: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1960" class="l"><a href="#1960">1960: </a>        {
-</span><span id="1961" class="l"><a href="#1961">1961: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1962" class="l"><a href="#1962">1962: </a>        }
-</span><span id="1963" class="l"><a href="#1963">1963: </a>
-</span><span id="1964" class="l"><a href="#1964">1964: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
-</span><span id="1965" class="l"><a href="#1965">1965: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
-</span><span id="1966" class="l"><a href="#1966">1966: </a>            <span class="php-quote">'/'</span>, [
-</span><span id="1967" class="l"><a href="#1967">1967: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
-</span><span id="1968" class="l"><a href="#1968">1968: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
-</span><span id="1969" class="l"><a href="#1969">1969: </a>        ]);
-</span><span id="1970" class="l"><a href="#1970">1970: </a>
-</span><span id="1971" class="l"><a href="#1971">1971: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
-</span><span id="1972" class="l"><a href="#1972">1972: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
-</span><span id="1973" class="l"><a href="#1973">1973: </a>
-</span><span id="1974" class="l"><a href="#1974">1974: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
-</span><span id="1975" class="l"><a href="#1975">1975: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1976" class="l"><a href="#1976">1976: </a>                   -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1977" class="l"><a href="#1977">1977: </a>                   -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
-</span><span id="1978" class="l"><a href="#1978">1978: </a>                   -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
-</span><span id="1979" class="l"><a href="#1979">1979: </a>                   -&gt;num_rows() &gt; <span class="php-num">0</span>;
-</span><span id="1980" class="l"><a href="#1980">1980: </a>    }
-</span><span id="1981" class="l"><a href="#1981">1981: </a>
-</span><span id="1982" class="l"><a href="#1982">1982: </a>}
-</span><span id="1983" class="l"><a href="#1983">1983: </a></span></code></pre>
+</span><span id="1925" class="l"><a href="#1925">1925: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">AS</span> &amp;<span class="php-var">$ip</span>)
+</span><span id="1926" class="l"><a href="#1926">1926: </a>        {
+</span><span id="1927" class="l"><a href="#1927">1927: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
+</span><span id="1928" class="l"><a href="#1928">1928: </a>        }
+</span><span id="1929" class="l"><a href="#1929">1929: </a>
+</span><span id="1930" class="l"><a href="#1930">1930: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1931" class="l"><a href="#1931">1931: </a>        {
+</span><span id="1932" class="l"><a href="#1932">1932: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'IP not authorized'</span>], self::HTTP_UNAUTHORIZED);
+</span><span id="1933" class="l"><a href="#1933">1933: </a>        }
+</span><span id="1934" class="l"><a href="#1934">1934: </a>    }
+</span><span id="1935" class="l"><a href="#1935">1935: </a>
+</span><span id="1936" class="l"><a href="#1936">1936: </a>    <span class="php-comment">/**
+</span></span><span id="1937" class="l"><a href="#1937">1937: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
+</span></span><span id="1938" class="l"><a href="#1938">1938: </a><span class="php-comment">     *
+</span></span><span id="1939" class="l"><a href="#1939">1939: </a><span class="php-comment">     * @access protected
+</span></span><span id="1940" class="l"><a href="#1940">1940: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
+</span></span><span id="1941" class="l"><a href="#1941">1941: </a><span class="php-comment">     * each time
+</span></span><span id="1942" class="l"><a href="#1942">1942: </a><span class="php-comment">     * @return void
+</span></span><span id="1943" class="l"><a href="#1943">1943: </a><span class="php-comment">     */</span>
+</span><span id="1944" class="l"><a href="#1944">1944: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
+</span><span id="1945" class="l"><a href="#1945">1945: </a>    {
+</span><span id="1946" class="l"><a href="#1946">1946: </a>        <span class="php-var">$restAuth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
+</span><span id="1947" class="l"><a href="#1947">1947: </a>        <span class="php-var">$restRealm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
+</span><span id="1948" class="l"><a href="#1948">1948: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'basic'</span>)
+</span><span id="1949" class="l"><a href="#1949">1949: </a>        {
+</span><span id="1950" class="l"><a href="#1950">1950: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
+</span><span id="1951" class="l"><a href="#1951">1951: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span> . <span class="php-var">$restRealm</span> . <span class="php-quote">'&quot;'</span>);
+</span><span id="1952" class="l"><a href="#1952">1952: </a>        }
+</span><span id="1953" class="l"><a href="#1953">1953: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'digest'</span>)
+</span><span id="1954" class="l"><a href="#1954">1954: </a>        {
+</span><span id="1955" class="l"><a href="#1955">1955: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
+</span><span id="1956" class="l"><a href="#1956">1956: </a>            <span class="php-keyword2">header</span>(
+</span><span id="1957" class="l"><a href="#1957">1957: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span> . <span class="php-var">$restRealm</span>
+</span><span id="1958" class="l"><a href="#1958">1958: </a>                . <span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span> . <span class="php-var">$nonce</span>
+</span><span id="1959" class="l"><a href="#1959">1959: </a>                . <span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$restRealm</span>) . <span class="php-quote">'&quot;'</span>);
+</span><span id="1960" class="l"><a href="#1960">1960: </a>        }
+</span><span id="1961" class="l"><a href="#1961">1961: </a>
+</span><span id="1962" class="l"><a href="#1962">1962: </a>        <span class="php-comment">// Display an error response</span>
+</span><span id="1963" class="l"><a href="#1963">1963: </a>        <span class="php-var">$this</span>-&gt;response([
+</span><span id="1964" class="l"><a href="#1964">1964: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1965" class="l"><a href="#1965">1965: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not authorized'</span>
+</span><span id="1966" class="l"><a href="#1966">1966: </a>            ], self::HTTP_UNAUTHORIZED);
+</span><span id="1967" class="l"><a href="#1967">1967: </a>    }
+</span><span id="1968" class="l"><a href="#1968">1968: </a>
+</span><span id="1969" class="l"><a href="#1969">1969: </a>    <span class="php-comment">/**
+</span></span><span id="1970" class="l"><a href="#1970">1970: </a><span class="php-comment">     * Updates the log table with the total access time
+</span></span><span id="1971" class="l"><a href="#1971">1971: </a><span class="php-comment">     *
+</span></span><span id="1972" class="l"><a href="#1972">1972: </a><span class="php-comment">     * @access protected
+</span></span><span id="1973" class="l"><a href="#1973">1973: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="1974" class="l"><a href="#1974">1974: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="1975" class="l"><a href="#1975">1975: </a><span class="php-comment">     */</span>
+</span><span id="1976" class="l"><a href="#1976">1976: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
+</span><span id="1977" class="l"><a href="#1977">1977: </a>    {
+</span><span id="1978" class="l"><a href="#1978">1978: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
+</span><span id="1979" class="l"><a href="#1979">1979: </a>
+</span><span id="1980" class="l"><a href="#1980">1980: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1981" class="l"><a href="#1981">1981: </a>            -&gt;update(
+</span><span id="1982" class="l"><a href="#1982">1982: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="1983" class="l"><a href="#1983">1983: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="1984" class="l"><a href="#1984">1984: </a>            ]);
+</span><span id="1985" class="l"><a href="#1985">1985: </a>    }
+</span><span id="1986" class="l"><a href="#1986">1986: </a>
+</span><span id="1987" class="l"><a href="#1987">1987: </a>    <span class="php-comment">/**
+</span></span><span id="1988" class="l"><a href="#1988">1988: </a><span class="php-comment">     * Updates the log table with HTTP response code
+</span></span><span id="1989" class="l"><a href="#1989">1989: </a><span class="php-comment">     *
+</span></span><span id="1990" class="l"><a href="#1990">1990: </a><span class="php-comment">     * @access protected
+</span></span><span id="1991" class="l"><a href="#1991">1991: </a><span class="php-comment">     * @author Justin Chen
+</span></span><span id="1992" class="l"><a href="#1992">1992: </a><span class="php-comment">     * @param $http_code int HTTP status code
+</span></span><span id="1993" class="l"><a href="#1993">1993: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="1994" class="l"><a href="#1994">1994: </a><span class="php-comment">     */</span>
+</span><span id="1995" class="l"><a href="#1995">1995: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
+</span><span id="1996" class="l"><a href="#1996">1996: </a>    {
+</span><span id="1997" class="l"><a href="#1997">1997: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
+</span><span id="1998" class="l"><a href="#1998">1998: </a>
+</span><span id="1999" class="l"><a href="#1999">1999: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
+</span><span id="2000" class="l"><a href="#2000">2000: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="2001" class="l"><a href="#2001">2001: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="2002" class="l"><a href="#2002">2002: </a>        ]);
+</span><span id="2003" class="l"><a href="#2003">2003: </a>    }
+</span><span id="2004" class="l"><a href="#2004">2004: </a>
+</span><span id="2005" class="l"><a href="#2005">2005: </a>    <span class="php-comment">/**
+</span></span><span id="2006" class="l"><a href="#2006">2006: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
+</span></span><span id="2007" class="l"><a href="#2007">2007: </a><span class="php-comment">     *
+</span></span><span id="2008" class="l"><a href="#2008">2008: </a><span class="php-comment">     * @access protected
+</span></span><span id="2009" class="l"><a href="#2009">2009: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
+</span></span><span id="2010" class="l"><a href="#2010">2010: </a><span class="php-comment">     */</span>
+</span><span id="2011" class="l"><a href="#2011">2011: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
+</span><span id="2012" class="l"><a href="#2012">2012: </a>    {
+</span><span id="2013" class="l"><a href="#2013">2013: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
+</span><span id="2014" class="l"><a href="#2014">2014: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="2015" class="l"><a href="#2015">2015: </a>        {
+</span><span id="2016" class="l"><a href="#2016">2016: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="2017" class="l"><a href="#2017">2017: </a>        }
+</span><span id="2018" class="l"><a href="#2018">2018: </a>
+</span><span id="2019" class="l"><a href="#2019">2019: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
+</span><span id="2020" class="l"><a href="#2020">2020: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
+</span><span id="2021" class="l"><a href="#2021">2021: </a>            <span class="php-quote">'/'</span>, [
+</span><span id="2022" class="l"><a href="#2022">2022: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
+</span><span id="2023" class="l"><a href="#2023">2023: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
+</span><span id="2024" class="l"><a href="#2024">2024: </a>        ]);
+</span><span id="2025" class="l"><a href="#2025">2025: </a>
+</span><span id="2026" class="l"><a href="#2026">2026: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
+</span><span id="2027" class="l"><a href="#2027">2027: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
+</span><span id="2028" class="l"><a href="#2028">2028: </a>
+</span><span id="2029" class="l"><a href="#2029">2029: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
+</span><span id="2030" class="l"><a href="#2030">2030: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="2031" class="l"><a href="#2031">2031: </a>                   -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="2032" class="l"><a href="#2032">2032: </a>                   -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
+</span><span id="2033" class="l"><a href="#2033">2033: </a>                   -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
+</span><span id="2034" class="l"><a href="#2034">2034: </a>                   -&gt;num_rows() &gt; <span class="php-num">0</span>;
+</span><span id="2035" class="l"><a href="#2035">2035: </a>    }
+</span><span id="2036" class="l"><a href="#2036">2036: </a>
+</span><span id="2037" class="l"><a href="#2037">2037: </a>}
+</span><span id="2038" class="l"><a href="#2038">2038: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>

From 1a5b24db96d6a768f7956eb624ae124f1427b5eb Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 09:30:29 +0300
Subject: [PATCH 051/354] Fixed typo in comment

---
 application/libraries/REST_Controller.php       | 2 +-
 documentation/class-REST_Controller.html        | 4 ++--
 documentation/source-class-REST_Controller.html | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 6d4d8862..6772ac07 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -136,7 +136,7 @@ abstract class REST_Controller extends CI_Controller {
     const HTTP_INTERNAL_SERVER_ERROR = 500;
 
     /**
-     * The server does not recognised the request method
+     * The server does not recognise the request method
      */
     const HTTP_NOT_IMPLEMENTED = 501;
     const HTTP_BAD_GATEWAY = 502;
diff --git a/documentation/class-REST_Controller.html b/documentation/class-REST_Controller.html
index 42e5c034..53124579 100644
--- a/documentation/class-REST_Controller.html
+++ b/documentation/class-REST_Controller.html
@@ -2913,11 +2913,11 @@ <h4>Returns</h4>
 			</code>
 
 			<div class="description short">
-				<p>The server does not recognised the request method</p>
+				<p>The server does not recognise the request method</p>
 			</div>
 
 			<div class="description detailed hidden">
-				<p>The server does not recognised the request method</p>
+				<p>The server does not recognise the request method</p>
 
 			</div>
 		</td>
diff --git a/documentation/source-class-REST_Controller.html b/documentation/source-class-REST_Controller.html
index f5794794..c13e0ce1 100644
--- a/documentation/source-class-REST_Controller.html
+++ b/documentation/source-class-REST_Controller.html
@@ -228,7 +228,7 @@ <h3>Classes</h3>
 </span><span id="136" class="l"><a href="#136"> 136: </a>    <span class="php-keyword1">const</span> HTTP_INTERNAL_SERVER_ERROR = <span class="php-num">500</span>;
 </span><span id="137" class="l"><a href="#137"> 137: </a>
 </span><span id="138" class="l"><a href="#138"> 138: </a>    <span class="php-comment">/**
-</span></span><span id="139" class="l"><a href="#139"> 139: </a><span class="php-comment">     * The server does not recognised the request method
+</span></span><span id="139" class="l"><a href="#139"> 139: </a><span class="php-comment">     * The server does not recognise the request method
 </span></span><span id="140" class="l"><a href="#140"> 140: </a><span class="php-comment">     */</span>
 </span><span id="141" class="l"><a href="#141"> 141: </a>    <span class="php-keyword1">const</span> HTTP_NOT_IMPLEMENTED = <span class="php-num">501</span>;
 </span><span id="142" class="l"><a href="#142"> 142: </a>    <span class="php-keyword1">const</span> HTTP_BAD_GATEWAY = <span class="php-num">502</span>;

From a258602a5160f4e8c15a17daca7b2dbb5f0e18b1 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 10:40:49 +0300
Subject: [PATCH 052/354] Changed elseif to else if

Same style as in C# and Java
---
 application/libraries/Format.php          |  4 ++--
 application/libraries/REST_Controller.php | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index fe36e7f8..b9cb9279 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -228,7 +228,7 @@ public function to_xml($data = NULL, $structure = NULL, $basenode = 'xml')
                 }
             }
             // if there is another array found recursively call this function
-            elseif (is_array($value) || is_object($value))
+            else if (is_array($value) || is_object($value))
             {
                 $node = $structure->addChild($key);
 
@@ -399,7 +399,7 @@ public function to_json($data = NULL)
         }
 
         // We only honour a jsonp callback which are valid javascript identifiers
-        elseif (preg_match('/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i', $callback))
+        else if (preg_match('/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i', $callback))
         {
             // Return the data as encoded json with a callback
             return $callback . '(' . json_encode($data) . ');';
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 6772ac07..d543bdd2 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -484,7 +484,7 @@ public function __construct($config = 'rest')
         }
 
         // Use whatever database is in use (isset returns FALSE)
-        elseif (property_exists($this, 'db'))
+        else if (property_exists($this, 'db'))
         {
             $this->rest->db = $this->db;
         }
@@ -636,7 +636,7 @@ public function _remap($object_called, $arguments)
         }
 
         // No key stuff, but record that stuff is happening
-        elseif ($this->config->item('rest_enable_logging') && $log_method)
+        else if ($this->config->item('rest_enable_logging') && $log_method)
         {
             $this->_log_request($authorized = TRUE);
         }
@@ -687,7 +687,7 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
         }
 
         // If data is not NULL and a HTTP status code provided, then continue
-        elseif ($data !== NULL)
+        else if ($data !== NULL)
         {
             // Is compression enabled and available?
             if ($this->config->item('compress_output') === TRUE && $this->_zlib_oc == FALSE)
@@ -816,9 +816,9 @@ protected function _detect_output_format()
         }
 
         // Check if a file extension is used
-        elseif ($this->_get_args && is_array(end($this->_get_args)) === FALSE && preg_match($pattern, end($this->_get_args), $matches))
+        else if ($this->_get_args && is_array(end($this->_get_args)) === FALSE && preg_match($pattern, end($this->_get_args), $matches))
         {
-            //elseif ($this->_get_args and is_array(end($this->_get_args)) === FALSE and preg_match($pattern, end(array_keys($this->_get_args)), $matches)) {
+            //else if ($this->_get_args and is_array(end($this->_get_args)) === FALSE and preg_match($pattern, end(array_keys($this->_get_args)), $matches)) {
             // The key of the last argument
             $arg_keys = array_keys($this->_get_args);
             $last_key = end($arg_keys);
@@ -864,7 +864,7 @@ protected function _detect_output_format()
                         }
 
                         // If it is truly XML, it wont want any HTML
-                        elseif ($format === 'xml' && strpos($this->input->server('HTTP_ACCEPT'), 'html') === FALSE)
+                        else if ($format === 'xml' && strpos($this->input->server('HTTP_ACCEPT'), 'html') === FALSE)
                         {
                             return $format;
                         }
@@ -1097,7 +1097,7 @@ protected function _check_limit($controller_method)
         }
 
         // Been a time limit (or by default an hour) since they called
-        elseif ($result->hour_started < (time() - $timelimit))
+        else if ($result->hour_started < (time() - $timelimit))
         {
             // Reset the started period and count
             $this->rest->db
@@ -1808,7 +1808,7 @@ protected function _prepare_basic_auth()
         {
             $password = $this->input->server('PHP_AUTH_PW');
         }
-        elseif ($http_auth !== NULL)
+        else if ($http_auth !== NULL)
         {
             // If the authentication header is set as basic, then extract the username and password from
             // HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file
@@ -1847,7 +1847,7 @@ protected function _prepare_digest_auth()
         {
             $digest_string = $this->input->server('PHP_AUTH_DIGEST');
         }
-        elseif ($this->input->server('HTTP_AUTHORIZATION'))
+        else if ($this->input->server('HTTP_AUTHORIZATION'))
         {
             $digest_string = $this->input->server('HTTP_AUTHORIZATION');
         }
@@ -1950,7 +1950,7 @@ protected function _force_login($nonce = '')
             // See http://tools.ietf.org/html/rfc2617#page-5
             header('WWW-Authenticate: Basic realm="' . $restRealm . '"');
         }
-        elseif (strtolower($restAuth) === 'digest')
+        else if (strtolower($restAuth) === 'digest')
         {
             // See http://tools.ietf.org/html/rfc2617#page-18
             header(

From c006eb33fd4d457608ef82b1bb33f1d9b36d0b3a Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 10:47:43 +0300
Subject: [PATCH 053/354] Regenerated documentation

---
 documentation/404.html                        |  2 +-
 documentation/index.html                      |  2 +-
 .../package-CodeIgniter.Libraries.html        |  2 +-
 documentation/package-CodeIgniter.Rest.html   |  2 +-
 documentation/package-CodeIgniter.html        |  2 +-
 documentation/package-None.html               |  2 +-
 documentation/source-class-Example.html       |  2 +-
 documentation/source-class-Format.html        |  6 ++---
 documentation/source-class-Key.html           |  2 +-
 .../source-class-REST_Controller.html         | 22 +++++++++----------
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/documentation/404.html b/documentation/404.html
index 8f9bffdb..556ed4fd 100644
--- a/documentation/404.html
+++ b/documentation/404.html
@@ -102,7 +102,7 @@ <h1>Page not found</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
+<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
 <script src="http://github.com/elementlist.js"></script>
 </body>
 </html>
diff --git a/documentation/index.html b/documentation/index.html
index 5eb8bc0a..592fba2e 100644
--- a/documentation/index.html
+++ b/documentation/index.html
@@ -123,7 +123,7 @@ <h1>Overview</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
+<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/package-CodeIgniter.Libraries.html b/documentation/package-CodeIgniter.Libraries.html
index 5f599f4f..65f28eaa 100644
--- a/documentation/package-CodeIgniter.Libraries.html
+++ b/documentation/package-CodeIgniter.Libraries.html
@@ -111,7 +111,7 @@ <h1>Package <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\Libraries</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
+<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/package-CodeIgniter.Rest.html b/documentation/package-CodeIgniter.Rest.html
index c231398c..4a3a68e6 100644
--- a/documentation/package-CodeIgniter.Rest.html
+++ b/documentation/package-CodeIgniter.Rest.html
@@ -117,7 +117,7 @@ <h1>Package <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\Rest</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
+<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/package-CodeIgniter.html b/documentation/package-CodeIgniter.html
index 173c8f58..85685f80 100644
--- a/documentation/package-CodeIgniter.html
+++ b/documentation/package-CodeIgniter.html
@@ -107,7 +107,7 @@ <h1>Package CodeIgniter</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
+<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/package-None.html b/documentation/package-None.html
index 3ebfafea..9dca1a71 100644
--- a/documentation/package-None.html
+++ b/documentation/package-None.html
@@ -111,7 +111,7 @@ <h1>No package</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
+<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Example.html b/documentation/source-class-Example.html
index e37b50cd..960ccc08 100644
--- a/documentation/source-class-Example.html
+++ b/documentation/source-class-Example.html
@@ -210,7 +210,7 @@ <h3>Classes</h3>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
+<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Format.html b/documentation/source-class-Format.html
index 2a81d996..262bc336 100644
--- a/documentation/source-class-Format.html
+++ b/documentation/source-class-Format.html
@@ -320,7 +320,7 @@ <h3>Classes</h3>
 </span><span id="228" class="l"><a href="#228">228: </a>                }
 </span><span id="229" class="l"><a href="#229">229: </a>            }
 </span><span id="230" class="l"><a href="#230">230: </a>            <span class="php-comment">// if there is another array found recursively call this function</span>
-</span><span id="231" class="l"><a href="#231">231: </a>            <span class="php-keyword1">elseif</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>))
+</span><span id="231" class="l"><a href="#231">231: </a>            <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>))
 </span><span id="232" class="l"><a href="#232">232: </a>            {
 </span><span id="233" class="l"><a href="#233">233: </a>                <span class="php-var">$node</span> = <span class="php-var">$structure</span>-&gt;addChild(<span class="php-var">$key</span>);
 </span><span id="234" class="l"><a href="#234">234: </a>
@@ -491,7 +491,7 @@ <h3>Classes</h3>
 </span><span id="399" class="l"><a href="#399">399: </a>        }
 </span><span id="400" class="l"><a href="#400">400: </a>
 </span><span id="401" class="l"><a href="#401">401: </a>        <span class="php-comment">// We only honour a jsonp callback which are valid javascript identifiers</span>
-</span><span id="402" class="l"><a href="#402">402: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">preg_match</span>(<span class="php-quote">'/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i'</span>, <span class="php-var">$callback</span>))
+</span><span id="402" class="l"><a href="#402">402: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-quote">'/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i'</span>, <span class="php-var">$callback</span>))
 </span><span id="403" class="l"><a href="#403">403: </a>        {
 </span><span id="404" class="l"><a href="#404">404: </a>            <span class="php-comment">// Return the data as encoded json with a callback</span>
 </span><span id="405" class="l"><a href="#405">405: </a>            <span class="php-keyword1">return</span> <span class="php-var">$callback</span> . <span class="php-quote">'('</span> . <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>) . <span class="php-quote">');'</span>;
@@ -614,7 +614,7 @@ <h3>Classes</h3>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
+<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Key.html b/documentation/source-class-Key.html
index 96eaa8a7..73885743 100644
--- a/documentation/source-class-Key.html
+++ b/documentation/source-class-Key.html
@@ -389,7 +389,7 @@ <h3>Classes</h3>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
+<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/source-class-REST_Controller.html b/documentation/source-class-REST_Controller.html
index c13e0ce1..86ccfef1 100644
--- a/documentation/source-class-REST_Controller.html
+++ b/documentation/source-class-REST_Controller.html
@@ -576,7 +576,7 @@ <h3>Classes</h3>
 </span><span id="484" class="l"><a href="#484"> 484: </a>        }
 </span><span id="485" class="l"><a href="#485"> 485: </a>
 </span><span id="486" class="l"><a href="#486"> 486: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
-</span><span id="487" class="l"><a href="#487"> 487: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
+</span><span id="487" class="l"><a href="#487"> 487: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
 </span><span id="488" class="l"><a href="#488"> 488: </a>        {
 </span><span id="489" class="l"><a href="#489"> 489: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
 </span><span id="490" class="l"><a href="#490"> 490: </a>        }
@@ -728,7 +728,7 @@ <h3>Classes</h3>
 </span><span id="636" class="l"><a href="#636"> 636: </a>        }
 </span><span id="637" class="l"><a href="#637"> 637: </a>
 </span><span id="638" class="l"><a href="#638"> 638: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
-</span><span id="639" class="l"><a href="#639"> 639: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="639" class="l"><a href="#639"> 639: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
 </span><span id="640" class="l"><a href="#640"> 640: </a>        {
 </span><span id="641" class="l"><a href="#641"> 641: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
 </span><span id="642" class="l"><a href="#642"> 642: </a>        }
@@ -779,7 +779,7 @@ <h3>Classes</h3>
 </span><span id="687" class="l"><a href="#687"> 687: </a>        }
 </span><span id="688" class="l"><a href="#688"> 688: </a>
 </span><span id="689" class="l"><a href="#689"> 689: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
-</span><span id="690" class="l"><a href="#690"> 690: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="690" class="l"><a href="#690"> 690: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
 </span><span id="691" class="l"><a href="#691"> 691: </a>        {
 </span><span id="692" class="l"><a href="#692"> 692: </a>            <span class="php-comment">// Is compression enabled and available?</span>
 </span><span id="693" class="l"><a href="#693"> 693: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'compress_output'</span>) === <span class="php-keyword1">TRUE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_zlib_oc == <span class="php-keyword1">FALSE</span>)
@@ -908,9 +908,9 @@ <h3>Classes</h3>
 </span><span id="816" class="l"><a href="#816"> 816: </a>        }
 </span><span id="817" class="l"><a href="#817"> 817: </a>
 </span><span id="818" class="l"><a href="#818"> 818: </a>        <span class="php-comment">// Check if a file extension is used</span>
-</span><span id="819" class="l"><a href="#819"> 819: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args)) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args), <span class="php-var">$matches</span>))
+</span><span id="819" class="l"><a href="#819"> 819: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args)) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args), <span class="php-var">$matches</span>))
 </span><span id="820" class="l"><a href="#820"> 820: </a>        {
-</span><span id="821" class="l"><a href="#821"> 821: </a>            <span class="php-comment">//elseif ($this-&gt;_get_args and is_array(end($this-&gt;_get_args)) === FALSE and preg_match($pattern, end(array_keys($this-&gt;_get_args)), $matches)) {</span>
+</span><span id="821" class="l"><a href="#821"> 821: </a>            <span class="php-comment">//else if ($this-&gt;_get_args and is_array(end($this-&gt;_get_args)) === FALSE and preg_match($pattern, end(array_keys($this-&gt;_get_args)), $matches)) {</span>
 </span><span id="822" class="l"><a href="#822"> 822: </a>            <span class="php-comment">// The key of the last argument</span>
 </span><span id="823" class="l"><a href="#823"> 823: </a>            <span class="php-var">$arg_keys</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_get_args);
 </span><span id="824" class="l"><a href="#824"> 824: </a>            <span class="php-var">$last_key</span> = <span class="php-keyword2">end</span>(<span class="php-var">$arg_keys</span>);
@@ -956,7 +956,7 @@ <h3>Classes</h3>
 </span><span id="864" class="l"><a href="#864"> 864: </a>                        }
 </span><span id="865" class="l"><a href="#865"> 865: </a>
 </span><span id="866" class="l"><a href="#866"> 866: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
-</span><span id="867" class="l"><a href="#867"> 867: </a>                        <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="867" class="l"><a href="#867"> 867: </a>                        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
 </span><span id="868" class="l"><a href="#868"> 868: </a>                        {
 </span><span id="869" class="l"><a href="#869"> 869: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
 </span><span id="870" class="l"><a href="#870"> 870: </a>                        }
@@ -1189,7 +1189,7 @@ <h3>Classes</h3>
 </span><span id="1097" class="l"><a href="#1097">1097: </a>        }
 </span><span id="1098" class="l"><a href="#1098">1098: </a>
 </span><span id="1099" class="l"><a href="#1099">1099: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
-</span><span id="1100" class="l"><a href="#1100">1100: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$timelimit</span>))
+</span><span id="1100" class="l"><a href="#1100">1100: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$timelimit</span>))
 </span><span id="1101" class="l"><a href="#1101">1101: </a>        {
 </span><span id="1102" class="l"><a href="#1102">1102: </a>            <span class="php-comment">// Reset the started period and count</span>
 </span><span id="1103" class="l"><a href="#1103">1103: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
@@ -1900,7 +1900,7 @@ <h3>Classes</h3>
 </span><span id="1808" class="l"><a href="#1808">1808: </a>        {
 </span><span id="1809" class="l"><a href="#1809">1809: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
 </span><span id="1810" class="l"><a href="#1810">1810: </a>        }
-</span><span id="1811" class="l"><a href="#1811">1811: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1811" class="l"><a href="#1811">1811: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
 </span><span id="1812" class="l"><a href="#1812">1812: </a>        {
 </span><span id="1813" class="l"><a href="#1813">1813: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
 </span><span id="1814" class="l"><a href="#1814">1814: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
@@ -1939,7 +1939,7 @@ <h3>Classes</h3>
 </span><span id="1847" class="l"><a href="#1847">1847: </a>        {
 </span><span id="1848" class="l"><a href="#1848">1848: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
 </span><span id="1849" class="l"><a href="#1849">1849: </a>        }
-</span><span id="1850" class="l"><a href="#1850">1850: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>))
+</span><span id="1850" class="l"><a href="#1850">1850: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>))
 </span><span id="1851" class="l"><a href="#1851">1851: </a>        {
 </span><span id="1852" class="l"><a href="#1852">1852: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
 </span><span id="1853" class="l"><a href="#1853">1853: </a>        }
@@ -2042,7 +2042,7 @@ <h3>Classes</h3>
 </span><span id="1950" class="l"><a href="#1950">1950: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
 </span><span id="1951" class="l"><a href="#1951">1951: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span> . <span class="php-var">$restRealm</span> . <span class="php-quote">'&quot;'</span>);
 </span><span id="1952" class="l"><a href="#1952">1952: </a>        }
-</span><span id="1953" class="l"><a href="#1953">1953: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'digest'</span>)
+</span><span id="1953" class="l"><a href="#1953">1953: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'digest'</span>)
 </span><span id="1954" class="l"><a href="#1954">1954: </a>        {
 </span><span id="1955" class="l"><a href="#1955">1955: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
 </span><span id="1956" class="l"><a href="#1956">1956: </a>            <span class="php-keyword2">header</span>(
@@ -2134,7 +2134,7 @@ <h3>Classes</h3>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?4b3d0a060be02c8230cd1d093bc5ca01cd73dd7f"></script>
+<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>

From feaae58e9c25aa0b8941d86f9a54805c4047be24 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 16:30:22 +0300
Subject: [PATCH 054/354] Changed from array_key_exists() to isset() and on
 error value from FALSE to NULL

---
 application/libraries/REST_Controller.php | 32 +++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index d543bdd2..3f6dbd38 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1381,7 +1381,7 @@ protected function _parse_query()
      * @param NULL $key Key to retrieve from the GET request
      * If NULL an array of arguments is returned
      * @param NULL $xss_clean Whether to apply XSS filtering
-     * @return array|string|FALSE Value from the GET request; otherwise, FALSE
+     * @return array|string|NULL Value from the GET request; otherwise, NULL
      */
     public function get($key = NULL, $xss_clean = NULL)
     {
@@ -1390,7 +1390,7 @@ public function get($key = NULL, $xss_clean = NULL)
             return $this->_get_args;
         }
 
-        return array_key_exists($key, $this->_get_args) ? $this->_xss_clean($this->_get_args[$key], $xss_clean) : FALSE;
+        return isset($this->_get_args[$key]) ? $this->_xss_clean($this->_get_args[$key], $xss_clean) : NULL;
     }
 
     /**
@@ -1400,7 +1400,7 @@ public function get($key = NULL, $xss_clean = NULL)
      * @param NULL $key Key to retrieve from the OPTIONS request.
      * If NULL an array of arguments is returned
      * @param NULL $xss_clean Whether to apply XSS filtering
-     * @return array|string|FALSE Value from the OPTIONS request; otherwise, FALSE
+     * @return array|string|NULL Value from the OPTIONS request; otherwise, NULL
      */
     public function options($key = NULL, $xss_clean = NULL)
     {
@@ -1409,7 +1409,7 @@ public function options($key = NULL, $xss_clean = NULL)
             return $this->_options_args;
         }
 
-        return array_key_exists($key, $this->_options_args) ? $this->_xss_clean($this->_options_args[$key], $xss_clean) : FALSE;
+        return isset($this->_options_args[$key]) ? $this->_xss_clean($this->_options_args[$key], $xss_clean) : NULL;
     }
 
     /**
@@ -1419,7 +1419,7 @@ public function options($key = NULL, $xss_clean = NULL)
      * @param NULL $key Key to retrieve from the HEAD request
      * If NULL an array of arguments is returned
      * @param NULL $xss_clean Whether to apply XSS filtering
-     * @return array|string|FALSE Value from the HEAD request; otherwise, FALSE
+     * @return array|string|NULL Value from the HEAD request; otherwise, NULL
      */
     public function head($key = NULL, $xss_clean = NULL)
     {
@@ -1428,7 +1428,7 @@ public function head($key = NULL, $xss_clean = NULL)
             return $this->head_args;
         }
 
-        return array_key_exists($key, $this->head_args) ? $this->_xss_clean($this->head_args[$key], $xss_clean) : FALSE;
+        return isset($this->head_args[$key]) ? $this->_xss_clean($this->head_args[$key], $xss_clean) : NULL;
     }
 
     /**
@@ -1438,7 +1438,7 @@ public function head($key = NULL, $xss_clean = NULL)
      * @param NULL $key Key to retrieve from the POST request
      * If NULL an array of arguments is returned
      * @param NULL $xss_clean Whether to apply XSS filtering
-     * @return array|string|FALSE Value from the POST request; otherwise, FALSE
+     * @return array|string|NULL Value from the POST request; otherwise, NULL
      */
     public function post($key = NULL, $xss_clean = NULL)
     {
@@ -1447,7 +1447,7 @@ public function post($key = NULL, $xss_clean = NULL)
             return $this->_post_args;
         }
 
-        return array_key_exists($key, $this->_post_args) ? $this->_xss_clean($this->_post_args[$key], $xss_clean) : FALSE;
+        return isset($this->_post_args[$key]) ? $this->_xss_clean($this->_post_args[$key], $xss_clean) : NULL;
     }
 
     /**
@@ -1457,7 +1457,7 @@ public function post($key = NULL, $xss_clean = NULL)
      * @param NULL $key Key to retrieve from the PUT request
      * If NULL an array of arguments is returned
      * @param NULL $xss_clean Whether to apply XSS filtering
-     * @return array|string|FALSE Value from the PUT request; otherwise, FALSE
+     * @return array|string|NULL Value from the PUT request; otherwise, NULL
      */
     public function put($key = NULL, $xss_clean = NULL)
     {
@@ -1466,7 +1466,7 @@ public function put($key = NULL, $xss_clean = NULL)
             return $this->_put_args;
         }
 
-        return array_key_exists($key, $this->_put_args) ? $this->_xss_clean($this->_put_args[$key], $xss_clean) : FALSE;
+        return isset($this->_put_args[$key]) ? $this->_xss_clean($this->_put_args[$key], $xss_clean) : NULL;
     }
 
     /**
@@ -1476,7 +1476,7 @@ public function put($key = NULL, $xss_clean = NULL)
      * @param NULL $key Key to retrieve from the DELETE request
      * If NULL an array of arguments is returned
      * @param NULL $xss_clean Whether to apply XSS filtering
-     * @return array|string|FALSE Value from the DELETE request; otherwise, FALSE
+     * @return array|string|NULL Value from the DELETE request; otherwise, NULL
      */
     public function delete($key = NULL, $xss_clean = NULL)
     {
@@ -1485,7 +1485,7 @@ public function delete($key = NULL, $xss_clean = NULL)
             return $this->_delete_args;
         }
 
-        return array_key_exists($key, $this->_delete_args) ? $this->_xss_clean($this->_delete_args[$key], $xss_clean) : FALSE;
+        return isset($this->_delete_args[$key]) ? $this->_xss_clean($this->_delete_args[$key], $xss_clean) : NULL;
     }
 
     /**
@@ -1495,7 +1495,7 @@ public function delete($key = NULL, $xss_clean = NULL)
      * @param NULL $key Key to retrieve from the PATCH request
      * If NULL an array of arguments is returned
      * @param NULL $xss_clean Whether to apply XSS filtering
-     * @return array|string|FALSE Value from the PATCH request; otherwise, FALSE
+     * @return array|string|NULL Value from the PATCH request; otherwise, NULL
      */
     public function patch($key = NULL, $xss_clean = NULL)
     {
@@ -1504,7 +1504,7 @@ public function patch($key = NULL, $xss_clean = NULL)
             return $this->_patch_args;
         }
 
-        return array_key_exists($key, $this->_patch_args) ? $this->_xss_clean($this->_patch_args[$key], $xss_clean) : FALSE;
+        return isset($this->_patch_args[$key]) ? $this->_xss_clean($this->_patch_args[$key], $xss_clean) : NULL;
     }
 
     /**
@@ -1514,7 +1514,7 @@ public function patch($key = NULL, $xss_clean = NULL)
      * @param NULL $key Key to retrieve from the query parameters
      * If NULL an array of arguments is returned
      * @param NULL $xss_clean Whether to apply XSS filtering
-     * @return array|string|FALSE Value from the query parameters; otherwise, FALSE
+     * @return array|string|NULL Value from the query parameters; otherwise, NULL
      */
     public function query($key = NULL, $xss_clean = NULL)
     {
@@ -1523,7 +1523,7 @@ public function query($key = NULL, $xss_clean = NULL)
             return $this->_query_args;
         }
 
-        return array_key_exists($key, $this->_query_args) ? $this->_xss_clean($this->_query_args[$key], $xss_clean) : FALSE;
+        return isset($this->_query_args[$key]) ? $this->_xss_clean($this->_query_args[$key], $xss_clean) : NULL;
     }
 
     /**

From 8d18c69dad0bd7ca683fd9bed2cc5e994d783d3b Mon Sep 17 00:00:00 2001
From: Murray Christopherson <murraychristopherson@gmail.com>
Date: Fri, 17 Jul 2015 10:44:28 -0400
Subject: [PATCH 055/354] Auth Override for HTTP Methods types. Adding
 'auth_override_class_method_http' config.

---
 application/config/rest.php               |  15 ++
 application/libraries/REST_Controller.php | 184 +++++++++++++++-------
 2 files changed, 141 insertions(+), 58 deletions(-)

diff --git a/application/config/rest.php b/application/config/rest.php
index 08df0cef..72eddd52 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -153,6 +153,21 @@
 // ---Uncomment list line for the wildard unit test
 // $config['auth_override_class_method']['wildcard_test_cases']['*'] = 'basic';
 
+/*
+|--------------------------------------------------------------------------
+| Override auth types for specfic 'class/method/HTTP method'
+|--------------------------------------------------------------------------
+|
+| example:
+|
+|			$config['auth_override_class_method_http']['deals']['view']['get'] = 'none';
+|			$config['auth_override_class_method_http']['deals']['insert']['post'] = 'none';
+|			$config['auth_override_class_method_http']['deals']['*']['options'] = 'none';
+*/
+
+// ---Uncomment list line for the wildard unit test
+// $config['auth_override_class_method_http']['wildcard_test_cases']['*']['options'] = 'basic';
+
 /*
 |--------------------------------------------------------------------------
 | REST Login Usernames
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index d543bdd2..1f0ac099 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1129,7 +1129,7 @@ protected function _check_limit($controller_method)
     }
 
     /**
-     * Check if there is a specific auth type set for the current class/method being called
+     * Check if there is a specific auth type set for the current class/method/HTTP-method being called
      *
      * @access protected
      * @return bool
@@ -1137,86 +1137,154 @@ protected function _check_limit($controller_method)
     protected function _auth_override_check()
     {
         // Assign the class/method auth type override array from the config
-        $this->overrides_array = $this->config->item('auth_override_class_method');
+        $auth_override_class_method = $this->config->item('auth_override_class_method');
 
-        // Check to see if the override array is even populated, otherwise return FALSE
-        if (empty($this->overrides_array))
+        // Check to see if the override array is even populated
+        if (!empty($auth_override_class_method))
         {
-            return FALSE;
-        }
-
-        // check for wildcard flag for rules for classes
-        if (empty($this->overrides_array[$this->router->class]['*']) === FALSE) // Check for class overrides
-        {
-            // None auth override found, prepare nothing but send back a TRUE override flag
-            if ($this->overrides_array[$this->router->class]['*'] == 'none')
+            // check for wildcard flag for rules for classes
+            if (!empty($auth_override_class_method[$this->router->class]['*'])) // Check for class overrides
             {
-                return TRUE;
-            }
+                // None auth override found, prepare nothing but send back a TRUE override flag
+                if ($auth_override_class_method[$this->router->class]['*'] == 'none')
+                {
+                    return TRUE;
+                }
 
-            // Basic auth override found, prepare basic
-            if ($this->overrides_array[$this->router->class]['*'] == 'basic')
-            {
-                $this->_prepare_basic_auth();
+                // Basic auth override found, prepare basic
+                if ($auth_override_class_method[$this->router->class]['*'] == 'basic')
+                {
+                    $this->_prepare_basic_auth();
 
-                return TRUE;
-            }
+                    return TRUE;
+                }
 
-            // Digest auth override found, prepare digest
-            if ($this->overrides_array[$this->router->class]['*'] == 'digest')
-            {
-                $this->_prepare_digest_auth();
+                // Digest auth override found, prepare digest
+                if ($auth_override_class_method[$this->router->class]['*'] == 'digest')
+                {
+                    $this->_prepare_digest_auth();
+
+                    return TRUE;
+                }
+
+                // Whitelist auth override found, check client's ip against config whitelist
+                if ($auth_override_class_method[$this->router->class]['*'] == 'whitelist')
+                {
+                    $this->_check_whitelist_auth();
 
-                return TRUE;
+                    return TRUE;
+                }
             }
 
-            // Whitelist auth override found, check client's ip against config whitelist
-            if ($this->overrides_array[$this->router->class]['*'] == 'whitelist')
+            // Check to see if there's an override value set for the current class/method being called
+            if (!empty($auth_override_class_method[$this->router->class][$this->router->method]))
             {
-                $this->_check_whitelist_auth();
+                // None auth override found, prepare nothing but send back a TRUE override flag
+                if ($auth_override_class_method[$this->router->class][$this->router->method] == 'none')
+                {
+                    return TRUE;
+                }
+
+                // Basic auth override found, prepare basic
+                if ($auth_override_class_method[$this->router->class][$this->router->method] == 'basic')
+                {
+                    $this->_prepare_basic_auth();
+
+                    return TRUE;
+                }
+
+                // Digest auth override found, prepare digest
+                if ($auth_override_class_method[$this->router->class][$this->router->method] == 'digest')
+                {
+                    $this->_prepare_digest_auth();
 
-                return TRUE;
+                    return TRUE;
+                }
+
+                // Whitelist auth override found, check client's ip against config whitelist
+                if ($auth_override_class_method[$this->router->class][$this->router->method] == 'whitelist')
+                {
+                    $this->_check_whitelist_auth();
+
+                    return TRUE;
+                }
             }
         }
 
-        // Check to see if there's an override value set for the current class/method being called
-        if (empty($this->overrides_array[$this->router->class][$this->router->method]))
-        {
-            return FALSE;
-        }
+        // Assign the class/method/HTTP-method auth type override array from the config
+        $auth_override_class_method_http = $this->config->item('auth_override_class_method_http');
 
-        // None auth override found, prepare nothing but send back a TRUE override flag
-        if ($this->overrides_array[$this->router->class][$this->router->method] == 'none')
+        // Check to see if the override array is even populated
+        if (!empty($auth_override_class_method_http))
         {
-            return TRUE;
-        }
+            // check for wildcard flag for rules for classes
+            if(!empty($auth_override_class_method_http[$this->router->class]['*'][$this->request->method]))
+            {
+                // None auth override found, prepare nothing but send back a TRUE override flag
+                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] == 'none')
+                {
+                    return TRUE;
+                }
 
-        // Basic auth override found, prepare basic
-        if ($this->overrides_array[$this->router->class][$this->router->method] == 'basic')
-        {
-            $this->_prepare_basic_auth();
+                // Basic auth override found, prepare basic
+                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] == 'basic')
+                {
+                    $this->_prepare_basic_auth();
 
-            return TRUE;
-        }
+                    return TRUE;
+                }
 
-        // Digest auth override found, prepare digest
-        if ($this->overrides_array[$this->router->class][$this->router->method] == 'digest')
-        {
-            $this->_prepare_digest_auth();
+                // Digest auth override found, prepare digest
+                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] == 'digest')
+                {
+                    $this->_prepare_digest_auth();
 
-            return TRUE;
-        }
+                    return TRUE;
+                }
 
-        // Whitelist auth override found, check client's ip against config whitelist
-        if ($this->overrides_array[$this->router->class][$this->router->method] == 'whitelist')
-        {
-            $this->_check_whitelist_auth();
+                // Whitelist auth override found, check client's ip against config whitelist
+                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] == 'whitelist')
+                {
+                    $this->_check_whitelist_auth();
 
-            return TRUE;
-        }
+                    return TRUE;
+                }
+            }
+
+            // Check to see if there's an override value set for the current class/method/HTTP-method being called
+            if(!empty($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method]))
+            {
+                // None auth override found, prepare nothing but send back a TRUE override flag
+                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] == 'none')
+                {
+                    return TRUE;
+                }
+
+                // Basic auth override found, prepare basic
+                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] == 'basic')
+                {
+                    $this->_prepare_basic_auth();
+
+                    return TRUE;
+                }
 
-        // Return FALSE when there is an override value set but it does not match
-        // 'basic', 'digest', or 'none'. (the value was misspelled)
+                // Digest auth override found, prepare digest
+                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] == 'digest')
+                {
+                    $this->_prepare_digest_auth();
+
+                    return TRUE;
+                }
+
+                // Whitelist auth override found, check client's ip against config whitelist
+                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] == 'whitelist')
+                {
+                    $this->_check_whitelist_auth();
+
+                    return TRUE;
+                }
+            }
+        }
         return FALSE;
     }
 

From a1696268fbc305cfe90ab733da8dee024e5c1f41 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 22:17:54 +0300
Subject: [PATCH 056/354] Explicit scope of functions

---
 application/controllers/api/Example.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 9d6dcf62..e81c18b4 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -30,7 +30,7 @@ function __construct()
         $this->methods['user_delete']['limit'] = 50; // 50 requests per hour per user/key
     }
 
-    function user_get()
+    public function user_get()
     {
         if (!$this->get('id'))
         {
@@ -57,7 +57,7 @@ function user_get()
         }
     }
 
-    function user_post()
+    public function user_post()
     {
         // $this->some_model->update_user($this->get('id'));
         $message = [
@@ -70,7 +70,7 @@ function user_post()
         $this->response($message, REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
     }
 
-    function user_delete()
+    public function user_delete()
     {
         // $this->some_model->delete_something($this->get();
         $message = [
@@ -81,7 +81,7 @@ function user_delete()
         $this->response($message, REST_Controller::HTTP_NO_CONTENT); // NO_CONTENT (204) being the HTTP response code
     }
 
-    function users_get()
+    public function users_get()
     {
         // $users = $this->some_model->get_something($this->get('limit'));
         $users = [

From 4fd78809f36950e5a41e970308f4c54ba2f72c3a Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 22:21:44 +0300
Subject: [PATCH 057/354] Fixed left over status code not using a constant
 variable

---
 application/controllers/api/Example.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index e81c18b4..3839a969 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -34,7 +34,7 @@ public function user_get()
     {
         if (!$this->get('id'))
         {
-            $this->response(NULL, 400);
+            $this->response(NULL, REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
         // $user = $this->some_model->getSomething( $this->get('id') );

From eaec1aef601abcab40f4cc111e1b30343a31016e Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 22:24:39 +0300
Subject: [PATCH 058/354] Added status property to the response

---
 application/controllers/api/Key.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
index 0127cab5..ad85cf3a 100644
--- a/application/controllers/api/Key.php
+++ b/application/controllers/api/Key.php
@@ -76,6 +76,7 @@ public function index_delete()
         {
             // It doesn't appear the key exists
             $this->response([
+                'status' => 0,
                 'error' => 'Invalid API Key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
@@ -109,6 +110,7 @@ public function level_post()
         {
             // It doesn't appear the key exists
             $this->response([
+                'status' => 0,
                 'error' => 'Invalid API Key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
@@ -148,6 +150,7 @@ public function suspend_post()
         {
             // It doesn't appear the key exists
             $this->response([
+                'status' => 0,
                 'error' => 'Invalid API Key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
@@ -188,6 +191,7 @@ public function regenerate_post()
         {
             // It doesn't appear the key exists
             $this->response([
+                'status' => 0,
                 'error' => 'Invalid API Key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }

From d14e6e91d065ca30401b124b50233cdfc71b2ab6 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 22:25:57 +0300
Subject: [PATCH 059/354] Changed status value from numerical to boolean

---
 application/controllers/api/Key.php | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
index ad85cf3a..d4ccb07e 100644
--- a/application/controllers/api/Key.php
+++ b/application/controllers/api/Key.php
@@ -45,14 +45,14 @@ public function index_put()
         if (self::_insert_key($key, ['level' => $level, 'ignore_limits' => $ignore_limits]))
         {
             $this->response([
-                'status' => 1,
+                'status' => TRUE,
                 'key' => $key
             ], REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
         }
         else
         {
             $this->response([
-                'status' => 0,
+                'status' => FALSE,
                 'error' => 'Could not save the key'
             ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
@@ -76,7 +76,7 @@ public function index_delete()
         {
             // It doesn't appear the key exists
             $this->response([
-                'status' => 0,
+                'status' => FALSE,
                 'error' => 'Invalid API Key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
@@ -86,7 +86,7 @@ public function index_delete()
 
         // Respond that the key was destroyed
         $this->response([
-            'status' => 1,
+            'status' => TRUE,
             'success' => 'API Key was deleted'
             ], REST_Controller::HTTP_NO_CONTENT); // NO_CONTENT (204) being the HTTP response code
     }
@@ -110,7 +110,7 @@ public function level_post()
         {
             // It doesn't appear the key exists
             $this->response([
-                'status' => 0,
+                'status' => FALSE,
                 'error' => 'Invalid API Key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
@@ -119,14 +119,14 @@ public function level_post()
         if (self::_update_key($key, ['level' => $new_level]))
         {
             $this->response([
-                'status' => 1,
+                'status' => TRUE,
                 'success' => 'API Key was updated'
             ], REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
         else
         {
             $this->response([
-                'status' => 0,
+                'status' => FALSE,
                 'error' => 'Could not update the key level'
             ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
@@ -150,7 +150,7 @@ public function suspend_post()
         {
             // It doesn't appear the key exists
             $this->response([
-                'status' => 0,
+                'status' => FALSE,
                 'error' => 'Invalid API Key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
@@ -159,14 +159,14 @@ public function suspend_post()
         if (self::_update_key($key, ['level' => 0]))
         {
             $this->response([
-                'status' => 1,
+                'status' => TRUE,
                 'success' => 'Key was suspended'
             ], REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
         else
         {
             $this->response([
-                'status' => 0,
+                'status' => FALSE,
                 'error' => 'Could not suspend the user'
             ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
@@ -191,7 +191,7 @@ public function regenerate_post()
         {
             // It doesn't appear the key exists
             $this->response([
-                'status' => 0,
+                'status' => FALSE,
                 'error' => 'Invalid API Key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
@@ -206,14 +206,14 @@ public function regenerate_post()
             self::_update_key($old_key, ['level' => 0]);
 
             $this->response([
-                'status' => 1,
+                'status' => TRUE,
                 'key' => $new_key
             ], REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
         }
         else
         {
             $this->response([
-                'status' => 0,
+                'status' => FALSE,
                 'error' => 'Could not save the key'
             ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }

From 9d60ce1022bbc5a3684a901356ed967bb438fd76 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 22:28:52 +0300
Subject: [PATCH 060/354] Removed @ before the variable, as a way to suppress
 the error

Fixes #506
---
 application/controllers/api/Example.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 3839a969..c05ac58a 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -44,13 +44,13 @@ public function user_get()
             3 => ['id' => 3, 'name' => 'Jane', 'email' => 'jane@example.com', 'fact' => 'Lives in the USA', ['hobbies' => ['guitar', 'cycling']]],
         ];
 
-        $user = @$users[$this->get('id')];
+        // Get the user from the array, by retrieving the id from the GET request
+        $user = isset($users[$this->get('id')]) ? $users[$this->get('id')] : NULL;
 
         if ($user)
         {
             $this->response($user, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
-
         else
         {
             $this->response(['error' => 'User could not be found'], REST_Controller::NOT_FOUND); // NOT_FOUND (404) being the HTTP response code

From ef6419c61ed680e770d1fa79b19d960b53b3ade7 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 22:31:46 +0300
Subject: [PATCH 061/354] Added status key

---
 application/controllers/api/Example.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index c05ac58a..21162fd1 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -53,7 +53,10 @@ public function user_get()
         }
         else
         {
-            $this->response(['error' => 'User could not be found'], REST_Controller::NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+            $this->response([
+                'status' => FALSE,
+                'error' => 'User could not be found'
+            ], REST_Controller::NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
         }
     }
 
@@ -97,7 +100,10 @@ public function users_get()
 
         else
         {
-            $this->response(['error' => 'Couldn\'t find any users!'], REST_Controller::NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+            $this->response([
+                'status' => FALSE,
+                'error' => 'Couldn\'t find any users'
+                ], REST_Controller::NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
         }
     }
 

From 0243ed2a92d0ddcb9f01d9929916e8f5be2a1a47 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 22:32:35 +0300
Subject: [PATCH 062/354] Removed whitespace

---
 application/controllers/api/Example.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 21162fd1..d14dbc3c 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -37,7 +37,7 @@ public function user_get()
             $this->response(NULL, REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
-        // $user = $this->some_model->getSomething( $this->get('id') );
+        // $user = $this->some_model->getSomething($this->get('id'));
         $users = [
             1 => ['id' => 1, 'name' => 'John', 'email' => 'john@example.com', 'fact' => 'Loves coding'],
             2 => ['id' => 2, 'name' => 'Jim', 'email' => 'jim@example.com', 'fact' => 'Developed on CodeIgniter'],
@@ -97,7 +97,6 @@ public function users_get()
         {
             $this->response($users, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
-
         else
         {
             $this->response([

From 45a12f4c15594542ed7ea9ddedfa4fd0abac7686 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 22:32:55 +0300
Subject: [PATCH 063/354] Fixed missing bracket

---
 application/controllers/api/Example.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index d14dbc3c..8886146f 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -75,7 +75,7 @@ public function user_post()
 
     public function user_delete()
     {
-        // $this->some_model->delete_something($this->get();
+        // $this->some_model->delete_something($this->get());
         $message = [
             'id' => $this->get('id'),
             'message' => 'Deleted the resource'

From 9c6765af8bf60e4b01758fac2a2eedac088a544f Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 22:33:16 +0300
Subject: [PATCH 064/354] Changed comment

---
 application/controllers/api/Example.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 8886146f..cdde2849 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -101,7 +101,7 @@ public function users_get()
         {
             $this->response([
                 'status' => FALSE,
-                'error' => 'Couldn\'t find any users'
+                'error' => 'No users were found'
                 ], REST_Controller::NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
         }
     }

From 54104a18255463c9719d6c329f75880f15dfdd59 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 22:36:00 +0300
Subject: [PATCH 065/354] Removed var_dump() in the example

As mentioned in #502
---
 application/controllers/api/Example.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index cdde2849..acc1cbd6 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -108,11 +108,11 @@ public function users_get()
 
     public function send_post()
     {
-        var_dump($this->request->body);
+        $this->response($this->request->body, REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
     }
 
     public function send_put()
     {
-        var_dump($this->put('foo'));
+        $this->response($this->put('foo'), REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
     }
 }

From 6411840115509a6878102cbd90d2525c64cf7ade Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 17 Jul 2015 22:38:09 +0300
Subject: [PATCH 066/354] Changed case of key in response array

---
 application/controllers/api/Key.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
index d4ccb07e..2eccab14 100644
--- a/application/controllers/api/Key.php
+++ b/application/controllers/api/Key.php
@@ -77,7 +77,7 @@ public function index_delete()
             // It doesn't appear the key exists
             $this->response([
                 'status' => FALSE,
-                'error' => 'Invalid API Key'
+                'error' => 'Invalid API key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
@@ -87,7 +87,7 @@ public function index_delete()
         // Respond that the key was destroyed
         $this->response([
             'status' => TRUE,
-            'success' => 'API Key was deleted'
+            'success' => 'API key was deleted'
             ], REST_Controller::HTTP_NO_CONTENT); // NO_CONTENT (204) being the HTTP response code
     }
 
@@ -111,7 +111,7 @@ public function level_post()
             // It doesn't appear the key exists
             $this->response([
                 'status' => FALSE,
-                'error' => 'Invalid API Key'
+                'error' => 'Invalid API key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
@@ -120,7 +120,7 @@ public function level_post()
         {
             $this->response([
                 'status' => TRUE,
-                'success' => 'API Key was updated'
+                'success' => 'API key was updated'
             ], REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
         else
@@ -151,7 +151,7 @@ public function suspend_post()
             // It doesn't appear the key exists
             $this->response([
                 'status' => FALSE,
-                'error' => 'Invalid API Key'
+                'error' => 'Invalid API key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
@@ -192,7 +192,7 @@ public function regenerate_post()
             // It doesn't appear the key exists
             $this->response([
                 'status' => FALSE,
-                'error' => 'Invalid API Key'
+                'error' => 'Invalid API key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 

From 9aa84a4570e28189c3fdecc5e815191fe76abfbf Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 19 Jul 2015 06:45:06 +0300
Subject: [PATCH 067/354] Changed else if to elseif to match the same style as
 CI3

---
 application/libraries/Format.php          |  4 ++--
 application/libraries/REST_Controller.php | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index b9cb9279..fe36e7f8 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -228,7 +228,7 @@ public function to_xml($data = NULL, $structure = NULL, $basenode = 'xml')
                 }
             }
             // if there is another array found recursively call this function
-            else if (is_array($value) || is_object($value))
+            elseif (is_array($value) || is_object($value))
             {
                 $node = $structure->addChild($key);
 
@@ -399,7 +399,7 @@ public function to_json($data = NULL)
         }
 
         // We only honour a jsonp callback which are valid javascript identifiers
-        else if (preg_match('/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i', $callback))
+        elseif (preg_match('/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i', $callback))
         {
             // Return the data as encoded json with a callback
             return $callback . '(' . json_encode($data) . ');';
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 3f6dbd38..0c5e6c77 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -484,7 +484,7 @@ public function __construct($config = 'rest')
         }
 
         // Use whatever database is in use (isset returns FALSE)
-        else if (property_exists($this, 'db'))
+        elseif (property_exists($this, 'db'))
         {
             $this->rest->db = $this->db;
         }
@@ -636,7 +636,7 @@ public function _remap($object_called, $arguments)
         }
 
         // No key stuff, but record that stuff is happening
-        else if ($this->config->item('rest_enable_logging') && $log_method)
+        elseif ($this->config->item('rest_enable_logging') && $log_method)
         {
             $this->_log_request($authorized = TRUE);
         }
@@ -687,7 +687,7 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
         }
 
         // If data is not NULL and a HTTP status code provided, then continue
-        else if ($data !== NULL)
+        elseif ($data !== NULL)
         {
             // Is compression enabled and available?
             if ($this->config->item('compress_output') === TRUE && $this->_zlib_oc == FALSE)
@@ -816,9 +816,9 @@ protected function _detect_output_format()
         }
 
         // Check if a file extension is used
-        else if ($this->_get_args && is_array(end($this->_get_args)) === FALSE && preg_match($pattern, end($this->_get_args), $matches))
+        elseif ($this->_get_args && is_array(end($this->_get_args)) === FALSE && preg_match($pattern, end($this->_get_args), $matches))
         {
-            //else if ($this->_get_args and is_array(end($this->_get_args)) === FALSE and preg_match($pattern, end(array_keys($this->_get_args)), $matches)) {
+            //elseif ($this->_get_args and is_array(end($this->_get_args)) === FALSE and preg_match($pattern, end(array_keys($this->_get_args)), $matches)) {
             // The key of the last argument
             $arg_keys = array_keys($this->_get_args);
             $last_key = end($arg_keys);
@@ -864,7 +864,7 @@ protected function _detect_output_format()
                         }
 
                         // If it is truly XML, it wont want any HTML
-                        else if ($format === 'xml' && strpos($this->input->server('HTTP_ACCEPT'), 'html') === FALSE)
+                        elseif ($format === 'xml' && strpos($this->input->server('HTTP_ACCEPT'), 'html') === FALSE)
                         {
                             return $format;
                         }
@@ -1097,7 +1097,7 @@ protected function _check_limit($controller_method)
         }
 
         // Been a time limit (or by default an hour) since they called
-        else if ($result->hour_started < (time() - $timelimit))
+        elseif ($result->hour_started < (time() - $timelimit))
         {
             // Reset the started period and count
             $this->rest->db
@@ -1808,7 +1808,7 @@ protected function _prepare_basic_auth()
         {
             $password = $this->input->server('PHP_AUTH_PW');
         }
-        else if ($http_auth !== NULL)
+        elseif ($http_auth !== NULL)
         {
             // If the authentication header is set as basic, then extract the username and password from
             // HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file
@@ -1847,7 +1847,7 @@ protected function _prepare_digest_auth()
         {
             $digest_string = $this->input->server('PHP_AUTH_DIGEST');
         }
-        else if ($this->input->server('HTTP_AUTHORIZATION'))
+        elseif ($this->input->server('HTTP_AUTHORIZATION'))
         {
             $digest_string = $this->input->server('HTTP_AUTHORIZATION');
         }
@@ -1950,7 +1950,7 @@ protected function _force_login($nonce = '')
             // See http://tools.ietf.org/html/rfc2617#page-5
             header('WWW-Authenticate: Basic realm="' . $restRealm . '"');
         }
-        else if (strtolower($restAuth) === 'digest')
+        elseif (strtolower($restAuth) === 'digest')
         {
             // See http://tools.ietf.org/html/rfc2617#page-18
             header(

From 7bb382de34645159569c7fbc56133d99d334b9ea Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 19 Jul 2015 08:16:42 +0300
Subject: [PATCH 068/354] Fixed typo

---
 application/libraries/REST_Controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 0c5e6c77..f2779409 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -16,7 +16,7 @@
  */
 abstract class REST_Controller extends CI_Controller {
 
-    // Note: Only the widley used HTTP status codes are documented
+    // Note: Only the widely used HTTP status codes are documented
 
     // Informational
 
@@ -338,7 +338,7 @@ abstract class REST_Controller extends CI_Controller {
 
     /**
      * HTTP status codes and their respective description
-     * Note: Only the widley used HTTP status codes are used
+     * Note: Only the widely used HTTP status codes are used
      *
      * @var array
      * @link http://www.restapitutorial.com/httpstatuscodes.html

From cc7cd0067d40245666616fc600481f44f9c7565a Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 19 Jul 2015 10:50:28 +0300
Subject: [PATCH 069/354] Removed useless functions

---
 application/controllers/api/Example.php | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index acc1cbd6..41747c77 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -105,14 +105,4 @@ public function users_get()
                 ], REST_Controller::NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
         }
     }
-
-    public function send_post()
-    {
-        $this->response($this->request->body, REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
-    }
-
-    public function send_put()
-    {
-        $this->response($this->put('foo'), REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
-    }
 }

From b4686c93c42d4f805b2089558686887e2878bef8 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 19 Jul 2015 10:58:40 +0300
Subject: [PATCH 070/354] Removed compression and added new function

This fixes #502, in which the library now using the output library to
handle the output and compression of data.
---
 application/controllers/api/Example.php   | 13 +++--
 application/libraries/REST_Controller.php | 67 +++++++++--------------
 2 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 41747c77..0d837d0d 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -34,6 +34,7 @@ public function user_get()
     {
         if (!$this->get('id'))
         {
+            // Set the response and exit
             $this->response(NULL, REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
@@ -49,11 +50,11 @@ public function user_get()
 
         if ($user)
         {
-            $this->response($user, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+            $this->set_response($user, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
         else
         {
-            $this->response([
+            $this->set_response([
                 'status' => FALSE,
                 'error' => 'User could not be found'
             ], REST_Controller::NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
@@ -70,7 +71,7 @@ public function user_post()
             'message' => 'Added a resource'
         ];
 
-        $this->response($message, REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
+        $this->set_response($message, REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
     }
 
     public function user_delete()
@@ -81,7 +82,7 @@ public function user_delete()
             'message' => 'Deleted the resource'
         ];
 
-        $this->response($message, REST_Controller::HTTP_NO_CONTENT); // NO_CONTENT (204) being the HTTP response code
+        $this->set_response($message, REST_Controller::HTTP_NO_CONTENT); // NO_CONTENT (204) being the HTTP response code
     }
 
     public function users_get()
@@ -95,11 +96,11 @@ public function users_get()
 
         if ($users)
         {
-            $this->response($users, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+            $this->set_response($users, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
         else
         {
-            $this->response([
+            $this->set_response([
                 'status' => FALSE,
                 'error' => 'No users were found'
                 ], REST_Controller::NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index f2779409..c987fc14 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -275,13 +275,6 @@ abstract class REST_Controller extends CI_Controller {
      */
     protected $_allow = TRUE;
 
-    /**
-     * Determines if output compression is enabled
-     *
-     * @var bool
-     */
-    protected $_zlib_oc = FALSE;
-
     /**
      * The LDAP Distinguished Name of the User post authentication
      *
@@ -400,6 +393,10 @@ public function __construct($config = 'rest')
         // Set the default value of global xss filtering. Same approach as CodeIgniter 3
         $this->_enable_xss = ($this->config->item('global_xss_filtering') === TRUE);
 
+        // Don't try to parse template variables like {elapsed_time} and {memory_usage}
+        // when output is displayed for not damaging data accidentally
+        $this->output->parse_exec_vars = FALSE;
+
         // Start the timer for how long the request takes
         $this->_start_rtime = microtime(TRUE);
 
@@ -414,8 +411,6 @@ public function __construct($config = 'rest')
         $this->response = new stdClass();
         $this->rest = new stdClass();
 
-        $this->_zlib_oc = @ini_get('zlib.output_compression');
-
         // Check to see if the current IP address is blacklisted
         if ($this->config->item('rest_ip_blacklist_enabled') === TRUE)
         {
@@ -689,27 +684,11 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
         // If data is not NULL and a HTTP status code provided, then continue
         elseif ($data !== NULL)
         {
-            // Is compression enabled and available?
-            if ($this->config->item('compress_output') === TRUE && $this->_zlib_oc == FALSE)
-            {
-                if (extension_loaded('zlib'))
-                {
-                    $http_encoding = $this->input->server('HTTP_ACCEPT_ENCODING');
-                    if ($http_encoding !== NULL && strpos($http_encoding, 'gzip') !== FALSE)
-                    {
-                        ob_start('ob_gzhandler');
-                    }
-                }
-            }
-
             // If the format method exists, call and return the output in that format
             if (method_exists($this->format, 'to_' . $this->response->format))
             {
                 // Set the format header
-                header('Content-Type: ' . $this->_supported_formats[$this->response->format]
-                       . '; charset=' . strtolower($this->config->item('charset')));
-
-                $output = $this->format->factory($data)->{'to_' . $this->response->format}();
+                $this->output->set_content_type($this->_supported_formats[$this->response->format], strtolower($this->config->item('charset')));
 
                 // An array must be parsed as a string, so as not to cause an array to string error.
                 // Json is the most appropriate form for such a datatype
@@ -736,7 +715,7 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
         // correct HTTP status code
         $http_code > 0 || $http_code = self::HTTP_OK;
 
-        set_status_header($http_code);
+        $this->output->set_status_header($http_code);
 
         // JC: Log response code only if rest logging enabled
         if ($this->config->item('rest_enable_logging') === TRUE)
@@ -744,24 +723,32 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
             $this->_log_response_code($http_code);
         }
 
-        // If zlib.output_compression is enabled it will compress the output,
-        // but it will not modify the content-length header to compensate for
-        // the reduction, causing the browser to hang waiting for more data.
-        // We'll just skip content-length in those cases
-        if (!$this->_zlib_oc && !$this->config->item('compress_output'))
-        {
-            header('Content-Length: ' . strlen($output));
-        }
+        // Output the data
+        $this->output->set_output($output);
 
         if ($continue === FALSE)
         {
-            exit($output);
+            // Display the data and exit execution
+            $this->output->_display();
+            exit;
         }
 
-        echo($output);
-        ob_end_flush();
-        ob_flush();
-        flush();
+        // Otherwise dump the output automatically
+    }
+
+    /**
+     * Takes mixed data and optionally a status code, then creates the response
+     * within the buffers of the Output class. The response is sent to the client
+     * lately by the framework, after the current controller's method termination.
+     * All the hooks after the controller's method termination are executable.
+     *
+     * @access public
+     * @param array|NULL $data Data to output to the user
+     * @param int|NULL $http_code HTTP status code
+     */
+    public function set_response($data = NULL, $http_code = NULL)
+    {
+        $this->response($data, $http_code, TRUE);
     }
 
     /**

From 4429a5adeea96b9b4889af211f2ddb4565bdb464 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 19 Jul 2015 11:05:51 +0300
Subject: [PATCH 071/354] Removed reference in foreach and multi array checking

---
 application/libraries/Format.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index fe36e7f8..4bac3aba 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -269,15 +269,15 @@ public function to_html($data = NULL)
             $data = (array) $data;
         }
 
-        // Multi-dimensional array
-        if (isset($data[0]) && is_array($data[0]))
+        // Check if it's a multi-dimensional array
+        if (isset($data[0]) && count($data) !== count($data, COUNT_RECURSIVE))
         {
+            // Multi-dimensional array
             $headings = array_keys($data[0]);
         }
-
-        // Single array
         else
         {
+            // Single array
             $headings = array_keys($data);
             $data = [$data];
         }
@@ -287,8 +287,7 @@ public function to_html($data = NULL)
 
         $this->_ci->table->set_heading($headings);
 
-        // Should row used as a reference?
-        foreach ($data as &$row)
+        foreach ($data as $row)
         {
             $this->_ci->table->add_row($row);
         }

From 4fd75bd06128cac9102ed122810b24c60ec84b32 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 19 Jul 2015 11:10:47 +0300
Subject: [PATCH 072/354] Added my name to the author list

As I have done quite a bit of re-writing for this library
---
 application/libraries/Format.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 4bac3aba..8d073067 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -6,7 +6,7 @@
  * Format class
  * Help convert between various formats such as XML, JSON, CSV, etc.
  *
- * @author    Phil Sturgeon, Chris Kacerguis
+ * @author    Phil Sturgeon, Chris Kacerguis, @softwarespot
  * @license   http://www.dbad-license.org/
  */
 class Format {

From 6a605740df9cf69188cba0952c6cc65c66b0e8b3 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 19 Jul 2015 11:14:53 +0300
Subject: [PATCH 073/354] Regenerated documentation

---
 documentation/404.html                        |    2 +-
 documentation/class-Example.html              |   72 +-
 documentation/class-Format.html               |   24 +-
 documentation/class-Key.html                  |   12 +-
 documentation/class-REST_Controller.html      |  206 +-
 documentation/index.html                      |    2 +-
 .../package-CodeIgniter.Libraries.html        |    2 +-
 documentation/package-CodeIgniter.Rest.html   |    2 +-
 documentation/package-CodeIgniter.html        |    2 +-
 documentation/package-None.html               |    2 +-
 documentation/source-class-Example.html       |  156 +-
 documentation/source-class-Format.html        |  479 ++-
 documentation/source-class-Key.html           |  434 +--
 .../source-class-REST_Controller.html         | 3387 ++++++++---------
 14 files changed, 2363 insertions(+), 2419 deletions(-)

diff --git a/documentation/404.html b/documentation/404.html
index 556ed4fd..20c44e08 100644
--- a/documentation/404.html
+++ b/documentation/404.html
@@ -102,7 +102,7 @@ <h1>Page not found</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
+<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
 <script src="http://github.com/elementlist.js"></script>
 </body>
 </html>
diff --git a/documentation/class-Example.html b/documentation/class-Example.html
index 0ea5f635..e7ca3ccf 100644
--- a/documentation/class-Example.html
+++ b/documentation/class-Example.html
@@ -138,7 +138,7 @@ <h1>Class Example</h1>
 				Phil Sturgeon, Chris Kacerguis<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-Example.html#8-113" title="Go to source code">controllers/api/Example.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-Example.html#8-109" title="Go to source code">controllers/api/Example.php</a>
 		<br>
 	</div>
 
@@ -196,7 +196,7 @@ <h4>Overrides</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_user_get">#</a>
-		<code><a href="http://github.com/source-class-Example.html#33-58" title="Go to source code">user_get</a>( )</code>
+		<code><a href="http://github.com/source-class-Example.html#33-62" title="Go to source code">user_get</a>( )</code>
 
 		<div class="description short">
 			
@@ -226,7 +226,7 @@ <h4>Overrides</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_user_post">#</a>
-		<code><a href="http://github.com/source-class-Example.html#60-71" title="Go to source code">user_post</a>( )</code>
+		<code><a href="http://github.com/source-class-Example.html#64-75" title="Go to source code">user_post</a>( )</code>
 
 		<div class="description short">
 			
@@ -256,7 +256,7 @@ <h4>Overrides</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_user_delete">#</a>
-		<code><a href="http://github.com/source-class-Example.html#73-82" title="Go to source code">user_delete</a>( )</code>
+		<code><a href="http://github.com/source-class-Example.html#77-86" title="Go to source code">user_delete</a>( )</code>
 
 		<div class="description short">
 			
@@ -286,67 +286,7 @@ <h4>Overrides</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_users_get">#</a>
-		<code><a href="http://github.com/source-class-Example.html#84-102" title="Go to source code">users_get</a>( )</code>
-
-		<div class="description short">
-			
-		</div>
-
-		<div class="description detailed hidden">
-			
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="send_post" id="_send_post">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_send_post">#</a>
-		<code><a href="http://github.com/source-class-Example.html#104-107" title="Go to source code">send_post</a>( )</code>
-
-		<div class="description short">
-			
-		</div>
-
-		<div class="description detailed hidden">
-			
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="send_put" id="_send_put">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_send_put">#</a>
-		<code><a href="http://github.com/source-class-Example.html#109-112" title="Go to source code">send_put</a>( )</code>
+		<code><a href="http://github.com/source-class-Example.html#88-108" title="Go to source code">users_get</a>( )</code>
 
 		<div class="description short">
 			
@@ -411,6 +351,7 @@ <h4>Overrides</h4>
 			<a href="http://github.com/class-REST_Controller.html#_put">put()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#_query">query()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#_response">response()</a>, 
+			<a href="http://github.com/class-REST_Controller.html#_set_response">set_response()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#_validation_errors">validation_errors()</a>
 		</code></td>
 	</tr>
@@ -515,7 +456,6 @@ <h4>Overrides</h4>
 			<a href="http://github.com/class-REST_Controller.html#$_start_rtime"><var>$_start_rtime</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_supported_formats"><var>$_supported_formats</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_user_ldap_dn"><var>$_user_ldap_dn</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_zlib_oc"><var>$_zlib_oc</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$allowed_http_methods"><var>$allowed_http_methods</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$http_status_codes"><var>$http_status_codes</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$methods"><var>$methods</var></a>, 
diff --git a/documentation/class-Format.html b/documentation/class-Format.html
index 274eb215..6474f07c 100644
--- a/documentation/class-Format.html
+++ b/documentation/class-Format.html
@@ -112,8 +112,8 @@ <h1>Class Format</h1>
 				<b>License:</b>
 				<a href="http://www.dbad-license.org/">http://www.dbad-license.org/</a><br>
 				<b>Author:</b>
-				Phil Sturgeon, Chris Kacerguis<br>
-			<b>Located at</b> <a href="http://github.com/source-class-Format.html#5-517" title="Go to source code">libraries/Format.php</a>
+				Phil Sturgeon, Chris Kacerguis, @softwarespot<br>
+			<b>Located at</b> <a href="http://github.com/source-class-Format.html#5-516" title="Go to source code">libraries/Format.php</a>
 		<br>
 	</div>
 
@@ -301,7 +301,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_html">#</a>
-		<code><a href="http://github.com/source-class-Format.html#250-297" title="Go to source code">to_html</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#250-296" title="Go to source code">to_html</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Format data as HTML</p>
@@ -341,7 +341,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_csv">#</a>
-		<code><a href="http://github.com/source-class-Format.html#299-375" title="Go to source code">to_csv</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>string <var>$delimiter</var> = <span class="php-quote">','</span></span>, <span>string <var>$enclosure</var> = <span class="php-quote">'&quot;'</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#298-374" title="Go to source code">to_csv</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>string <var>$delimiter</var> = <span class="php-quote">','</span></span>, <span>string <var>$enclosure</var> = <span class="php-quote">'&quot;'</span></span> )</code>
 
 		<div class="description short">
 			
@@ -391,7 +391,7 @@ <h4>Link</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_json">#</a>
-		<code><a href="http://github.com/source-class-Format.html#377-413" title="Go to source code">to_json</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#376-412" title="Go to source code">to_json</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Encode data as json</p>
@@ -431,7 +431,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_serialized">#</a>
-		<code><a href="http://github.com/source-class-Format.html#415-432" title="Go to source code">to_serialized</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#414-431" title="Go to source code">to_serialized</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Encode data as a serialized array</p>
@@ -471,7 +471,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_php">#</a>
-		<code><a href="http://github.com/source-class-Format.html#434-451" title="Go to source code">to_php</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#433-450" title="Go to source code">to_php</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Format data using a PHP structure</p>
@@ -511,7 +511,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__from_xml">#</a>
-		<code><a href="http://github.com/source-class-Format.html#455-462" title="Go to source code">_from_xml</a>( <span> <var>$data</var></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#454-461" title="Go to source code">_from_xml</a>( <span> <var>$data</var></span> )</code>
 
 		<div class="description short">
 			
@@ -550,7 +550,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__from_csv">#</a>
-		<code><a href="http://github.com/source-class-Format.html#464-488" title="Go to source code">_from_csv</a>( <span>string <var>$data</var></span>, <span>string <var>$delimiter</var> = <span class="php-quote">','</span></span>, <span>string <var>$enclosure</var> = <span class="php-quote">'&quot;'</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#463-487" title="Go to source code">_from_csv</a>( <span>string <var>$data</var></span>, <span>string <var>$delimiter</var> = <span class="php-quote">','</span></span>, <span>string <var>$enclosure</var> = <span class="php-quote">'&quot;'</span></span> )</code>
 
 		<div class="description short">
 			
@@ -596,7 +596,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__from_json">#</a>
-		<code><a href="http://github.com/source-class-Format.html#490-497" title="Go to source code">_from_json</a>( <span> <var>$data</var></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#489-496" title="Go to source code">_from_json</a>( <span> <var>$data</var></span> )</code>
 
 		<div class="description short">
 			
@@ -635,7 +635,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__from_serialize">#</a>
-		<code><a href="http://github.com/source-class-Format.html#499-506" title="Go to source code">_from_serialize</a>( <span>string <var>$data</var></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#498-505" title="Go to source code">_from_serialize</a>( <span>string <var>$data</var></span> )</code>
 
 		<div class="description short">
 			
@@ -674,7 +674,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__from_php">#</a>
-		<code><a href="http://github.com/source-class-Format.html#508-515" title="Go to source code">_from_php</a>( <span> <var>$data</var></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#507-514" title="Go to source code">_from_php</a>( <span> <var>$data</var></span> )</code>
 
 		<div class="description short">
 			
diff --git a/documentation/class-Key.html b/documentation/class-Key.html
index ca24db79..4a96e21d 100644
--- a/documentation/class-Key.html
+++ b/documentation/class-Key.html
@@ -138,7 +138,7 @@ <h1>Class Key</h1>
 				Phil Sturgeon, Chris Kacerguis<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-Key.html#8-292" title="Go to source code">controllers/api/Key.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-Key.html#8-296" title="Go to source code">controllers/api/Key.php</a>
 		<br>
 	</div>
 
@@ -190,7 +190,7 @@ <h1>Class Key</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_index_delete">#</a>
-		<code><a href="http://github.com/source-class-Key.html#63-91" title="Go to source code">index_delete</a>( )</code>
+		<code><a href="http://github.com/source-class-Key.html#63-92" title="Go to source code">index_delete</a>( )</code>
 
 		<div class="description short">
 			<p>Key Delete
@@ -222,7 +222,7 @@ <h1>Class Key</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_level_post">#</a>
-		<code><a href="http://github.com/source-class-Key.html#95-131" title="Go to source code">level_post</a>( )</code>
+		<code><a href="http://github.com/source-class-Key.html#96-133" title="Go to source code">level_post</a>( )</code>
 
 		<div class="description short">
 			<p>Update Key
@@ -254,7 +254,7 @@ <h1>Class Key</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_suspend_post">#</a>
-		<code><a href="http://github.com/source-class-Key.html#135-170" title="Go to source code">suspend_post</a>( )</code>
+		<code><a href="http://github.com/source-class-Key.html#137-173" title="Go to source code">suspend_post</a>( )</code>
 
 		<div class="description short">
 			<p>Update Key
@@ -286,7 +286,7 @@ <h1>Class Key</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_regenerate_post">#</a>
-		<code><a href="http://github.com/source-class-Key.html#174-216" title="Go to source code">regenerate_post</a>( )</code>
+		<code><a href="http://github.com/source-class-Key.html#177-220" title="Go to source code">regenerate_post</a>( )</code>
 
 		<div class="description short">
 			<p>Regenerate Key
@@ -354,6 +354,7 @@ <h1>Class Key</h1>
 			<a href="http://github.com/class-REST_Controller.html#_put">put()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#_query">query()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#_response">response()</a>, 
+			<a href="http://github.com/class-REST_Controller.html#_set_response">set_response()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#_validation_errors">validation_errors()</a>
 		</code></td>
 	</tr>
@@ -491,7 +492,6 @@ <h1>Class Key</h1>
 			<a href="http://github.com/class-REST_Controller.html#$_start_rtime"><var>$_start_rtime</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_supported_formats"><var>$_supported_formats</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_user_ldap_dn"><var>$_user_ldap_dn</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_zlib_oc"><var>$_zlib_oc</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$allowed_http_methods"><var>$allowed_http_methods</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$http_status_codes"><var>$http_status_codes</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$request"><var>$request</var></a>, 
diff --git a/documentation/class-REST_Controller.html b/documentation/class-REST_Controller.html
index 53124579..2c26dc68 100644
--- a/documentation/class-REST_Controller.html
+++ b/documentation/class-REST_Controller.html
@@ -137,7 +137,7 @@ <h4>Direct known subclasses</h4>
 				3.0.0<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-2037" title="Go to source code">libraries/REST_Controller.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-2024" title="Go to source code">libraries/REST_Controller.php</a>
 		<br>
 	</div>
 
@@ -157,7 +157,7 @@ <h4>Direct known subclasses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_early_checks">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#362-370" title="Go to source code">early_checks</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#355-363" title="Go to source code">early_checks</a>( )</code>
 
 		<div class="description short">
 			<p>Extend this function to apply additional checking early on in the process</p>
@@ -187,7 +187,7 @@ <h4>Direct known subclasses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___construct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#372-534" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#365-529" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
 
 		<div class="description short">
 			<p>Constructor for the REST API</p>
@@ -223,7 +223,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___destruct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#536-553" title="Go to source code">__destruct</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#531-548" title="Go to source code">__destruct</a>( )</code>
 
 		<div class="description short">
 			<p>Deconstructor</p>
@@ -257,7 +257,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__remap">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#555-660" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#550-655" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var></span> )</code>
 
 		<div class="description short">
 			<p>Requests are not made to methods directly, the request will be for
@@ -298,7 +298,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#662-765" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#657-737" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Takes mixed data and optionally a status code, then creates the response</p>
@@ -323,6 +323,49 @@ <h4>Parameters</h4>
 
 
 
+		</div>
+		</div></td>
+	</tr>
+	<tr data-order="set_response" id="_set_response">
+
+		<td class="attributes"><code>
+			 public 
+
+			
+			
+			</code>
+		</td>
+
+		<td class="name"><div>
+		<a class="anchor" href="#_set_response">#</a>
+		<code><a href="http://github.com/source-class-REST_Controller.html#739-752" title="Go to source code">set_response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span> )</code>
+
+		<div class="description short">
+			<p>Takes mixed data and optionally a status code, then creates the response
+within the buffers of the Output class. The response is sent to the client
+lately by the framework, after the current controller's method termination.
+All the hooks after the controller's method termination are executable.</p>
+		</div>
+
+		<div class="description detailed hidden">
+			<p>Takes mixed data and optionally a status code, then creates the response
+within the buffers of the Output class. The response is sent to the client
+lately by the framework, after the current controller's method termination.
+All the hooks after the controller's method termination are executable.</p>
+
+
+				<h4>Parameters</h4>
+				<div class="list"><dl>
+					<dt><var>$data</var></dt>
+					<dd>Data to output to the user</dd>
+					<dt><var>$http_code</var></dt>
+					<dd>HTTP status code</dd>
+				</dl></div>
+
+
+
+
+
 		</div>
 		</div></td>
 	</tr>
@@ -338,7 +381,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_input_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#767-799" title="Go to source code">_detect_input_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#754-786" title="Go to source code">_detect_input_format</a>( )</code>
 
 		<div class="description short">
 			<p>Get the input format e.g. json or xml</p>
@@ -372,7 +415,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_output_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#801-884" title="Go to source code">_detect_output_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#788-871" title="Go to source code">_detect_output_format</a>( )</code>
 
 		<div class="description short">
 			<p>Detect which format should be used to output the data</p>
@@ -406,7 +449,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_method">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#886-916" title="Go to source code">_detect_method</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#873-903" title="Go to source code">_detect_method</a>( )</code>
 
 		<div class="description short">
 			<p>Get the HTTP request string e.g. get or post</p>
@@ -440,7 +483,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_api_key">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#918-990" title="Go to source code">_detect_api_key</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#905-977" title="Go to source code">_detect_api_key</a>( )</code>
 
 		<div class="description short">
 			<p>See if the user has provided an API key</p>
@@ -474,7 +517,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_lang">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#992-1023" title="Go to source code">_detect_lang</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#979-1010" title="Go to source code">_detect_lang</a>( )</code>
 
 		<div class="description short">
 			<p>What language do they want it in?</p>
@@ -508,7 +551,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_request">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1025-1051" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1012-1038" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Add the request to the log table</p>
@@ -547,7 +590,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_limit">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1053-1129" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1040-1116" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
 
 		<div class="description short">
 			<p>Check if the requests to a controller method exceed a limit</p>
@@ -586,7 +629,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__auth_override_check">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1131-1221" title="Go to source code">_auth_override_check</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1118-1208" title="Go to source code">_auth_override_check</a>( )</code>
 
 		<div class="description short">
 			<p>Check if there is a specific auth type set for the current class/method being called</p>
@@ -620,7 +663,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1223-1233" title="Go to source code">_parse_get</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1210-1220" title="Go to source code">_parse_get</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the GET request arguments</p>
@@ -650,7 +693,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1235-1249" title="Go to source code">_parse_post</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1222-1236" title="Go to source code">_parse_post</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the POST request arguments</p>
@@ -680,7 +723,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1251-1271" title="Go to source code">_parse_put</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1238-1258" title="Go to source code">_parse_put</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PUT request arguments</p>
@@ -710,7 +753,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1273-1286" title="Go to source code">_parse_head</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1260-1273" title="Go to source code">_parse_head</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the HEAD request arguments</p>
@@ -740,7 +783,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1288-1301" title="Go to source code">_parse_options</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1275-1288" title="Go to source code">_parse_options</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the OPTIONS request arguments</p>
@@ -770,7 +813,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1303-1324" title="Go to source code">_parse_patch</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1290-1311" title="Go to source code">_parse_patch</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PATCH request arguments</p>
@@ -800,7 +843,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1326-1339" title="Go to source code">_parse_delete</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1313-1326" title="Go to source code">_parse_delete</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the DELETE request arguments</p>
@@ -830,7 +873,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1341-1373" title="Go to source code">_parse_query</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1328-1360" title="Go to source code">_parse_query</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the query parameters</p>
@@ -853,14 +896,14 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			array|string|false
+			array|string|null
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1377-1394" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1364-1381" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a GET request</p>
@@ -881,7 +924,7 @@ <h4>Parameters</h4>
 
 				<h4>Returns</h4>
 				<div class="list">
-					array|string|false<br>Value from the GET request; otherwise, FALSE
+					array|string|null<br>Value from the GET request; otherwise, NULL
 				</div>
 
 
@@ -895,14 +938,14 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			array|string|false
+			array|string|null
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1396-1413" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1383-1400" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a OPTIONS request</p>
@@ -923,7 +966,7 @@ <h4>Parameters</h4>
 
 				<h4>Returns</h4>
 				<div class="list">
-					array|string|false<br>Value from the OPTIONS request; otherwise, FALSE
+					array|string|null<br>Value from the OPTIONS request; otherwise, NULL
 				</div>
 
 
@@ -937,14 +980,14 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			array|string|false
+			array|string|null
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1415-1432" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1402-1419" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a HEAD request</p>
@@ -965,7 +1008,7 @@ <h4>Parameters</h4>
 
 				<h4>Returns</h4>
 				<div class="list">
-					array|string|false<br>Value from the HEAD request; otherwise, FALSE
+					array|string|null<br>Value from the HEAD request; otherwise, NULL
 				</div>
 
 
@@ -979,14 +1022,14 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			array|string|false
+			array|string|null
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1434-1451" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1421-1438" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a POST request</p>
@@ -1007,7 +1050,7 @@ <h4>Parameters</h4>
 
 				<h4>Returns</h4>
 				<div class="list">
-					array|string|false<br>Value from the POST request; otherwise, FALSE
+					array|string|null<br>Value from the POST request; otherwise, NULL
 				</div>
 
 
@@ -1021,14 +1064,14 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			array|string|false
+			array|string|null
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1453-1470" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1440-1457" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PUT request</p>
@@ -1049,7 +1092,7 @@ <h4>Parameters</h4>
 
 				<h4>Returns</h4>
 				<div class="list">
-					array|string|false<br>Value from the PUT request; otherwise, FALSE
+					array|string|null<br>Value from the PUT request; otherwise, NULL
 				</div>
 
 
@@ -1063,14 +1106,14 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			array|string|false
+			array|string|null
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1472-1489" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1459-1476" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a DELETE request</p>
@@ -1091,7 +1134,7 @@ <h4>Parameters</h4>
 
 				<h4>Returns</h4>
 				<div class="list">
-					array|string|false<br>Value from the DELETE request; otherwise, FALSE
+					array|string|null<br>Value from the DELETE request; otherwise, NULL
 				</div>
 
 
@@ -1105,14 +1148,14 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			array|string|false
+			array|string|null
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1491-1508" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1478-1495" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PATCH request</p>
@@ -1133,7 +1176,7 @@ <h4>Parameters</h4>
 
 				<h4>Returns</h4>
 				<div class="list">
-					array|string|false<br>Value from the PATCH request; otherwise, FALSE
+					array|string|null<br>Value from the PATCH request; otherwise, NULL
 				</div>
 
 
@@ -1147,14 +1190,14 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 public 
 
-			array|string|false
+			array|string|null
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1510-1527" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1497-1514" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from the query parameters</p>
@@ -1175,7 +1218,7 @@ <h4>Parameters</h4>
 
 				<h4>Returns</h4>
 				<div class="list">
-					array|string|false<br>Value from the query parameters; otherwise, FALSE
+					array|string|null<br>Value from the query parameters; otherwise, NULL
 				</div>
 
 
@@ -1196,7 +1239,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__xss_clean">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1529-1543" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1516-1530" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
 
 		<div class="description short">
 			<p>Sanitizes data so that Cross Site Scripting Hacks can be
@@ -1239,7 +1282,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_validation_errors">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1545-1556" title="Go to source code">validation_errors</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1532-1543" title="Go to source code">validation_errors</a>( )</code>
 
 		<div class="description short">
 			<p>Retrieve the validation errors</p>
@@ -1273,7 +1316,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_ldap_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1560-1665" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1547-1652" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform LDAP Authentication</p>
@@ -1314,7 +1357,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_library_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1667-1707" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1654-1694" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform Library Authentication - Override this function to change the way the library is called</p>
@@ -1355,7 +1398,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1709-1764" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1696-1751" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Check if the user is logged in</p>
@@ -1396,7 +1439,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_php_session">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1766-1786" title="Go to source code">_check_php_session</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1753-1773" title="Go to source code">_check_php_session</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the user is logged in with a PHP session key</p>
@@ -1426,7 +1469,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_basic_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1788-1827" title="Go to source code">_prepare_basic_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1775-1814" title="Go to source code">_prepare_basic_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for basic authentication</p>
@@ -1456,7 +1499,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_digest_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1829-1888" title="Go to source code">_prepare_digest_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1816-1875" title="Go to source code">_prepare_digest_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for digest authentication</p>
@@ -1486,7 +1529,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_blacklist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1890-1911" title="Go to source code">_check_blacklist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1877-1898" title="Go to source code">_check_blacklist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response</p>
@@ -1516,7 +1559,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_whitelist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1913-1934" title="Go to source code">_check_whitelist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1900-1921" title="Go to source code">_check_whitelist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response</p>
@@ -1546,7 +1589,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__force_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1936-1967" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1923-1954" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
 
 		<div class="description short">
 			<p>Force logging in by setting the WWW-Authenticate header</p>
@@ -1582,7 +1625,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_access_time">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1969-1985" title="Go to source code">_log_access_time</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1956-1972" title="Go to source code">_log_access_time</a>( )</code>
 
 		<div class="description short">
 			<p>Updates the log table with the total access time</p>
@@ -1620,7 +1663,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_response_code">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1987-2003" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1974-1990" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
 
 		<div class="description short">
 			<p>Updates the log table with HTTP response code</p>
@@ -1663,7 +1706,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_access">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2005-2035" title="Go to source code">_check_access</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1992-2022" title="Go to source code">_check_access</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the API key has access to the controller and methods</p>
@@ -3590,31 +3633,6 @@ <h4>Returns</h4>
 			</div>
 		</td>
 	</tr>
-	<tr data-order="_zlib_oc" id="$_zlib_oc">
-		<td class="attributes"><code>
-			protected  
-			boolean
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#278-283" title="Go to source code"><var>$_zlib_oc</var></a>
-
-			<div class="description short">
-				<p>Determines if output compression is enabled</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>Determines if output compression is enabled</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_zlib_oc" class="anchor">#</a>
-				<code><span class="php-keyword1">FALSE</span></code>
-			</div>
-		</td>
-	</tr>
 	<tr data-order="_user_ldap_dn" id="$_user_ldap_dn">
 		<td class="attributes"><code>
 			protected  
@@ -3622,7 +3640,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#285-290" title="Go to source code"><var>$_user_ldap_dn</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#278-283" title="Go to source code"><var>$_user_ldap_dn</var></a>
 
 			<div class="description short">
 				<p>The LDAP Distinguished Name of the User post authentication</p>
@@ -3647,7 +3665,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#292-297" title="Go to source code"><var>$_start_rtime</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#285-290" title="Go to source code"><var>$_start_rtime</var></a>
 
 			<div class="description short">
 				<p>The start of the response time from the server</p>
@@ -3672,7 +3690,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#299-304" title="Go to source code"><var>$_end_rtime</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#292-297" title="Go to source code"><var>$_end_rtime</var></a>
 
 			<div class="description short">
 				<p>The end of the response time from the server</p>
@@ -3697,7 +3715,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#306-320" title="Go to source code"><var>$_supported_formats</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#299-313" title="Go to source code"><var>$_supported_formats</var></a>
 
 			<div class="description short">
 				<p>List all supported methods, the first will be the default format</p>
@@ -3731,7 +3749,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#322-327" title="Go to source code"><var>$_apiuser</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#315-320" title="Go to source code"><var>$_apiuser</var></a>
 
 			<div class="description short">
 				<p>Information about the current API user</p>
@@ -3756,7 +3774,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#329-337" title="Go to source code"><var>$_enable_xss</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#322-330" title="Go to source code"><var>$_enable_xss</var></a>
 
 			<div class="description short">
 				<p>Enable XSS flag
@@ -3787,16 +3805,16 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#339-360" title="Go to source code"><var>$http_status_codes</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#332-353" title="Go to source code"><var>$http_status_codes</var></a>
 
 			<div class="description short">
 				<p>HTTP status codes and their respective description
-Note: Only the widley used HTTP status codes are used</p>
+Note: Only the widely used HTTP status codes are used</p>
 			</div>
 
 			<div class="description detailed hidden">
 				<p>HTTP status codes and their respective description
-Note: Only the widley used HTTP status codes are used</p>
+Note: Only the widely used HTTP status codes are used</p>
 
 					<h4>Link</h4>
 					<div class="list">
diff --git a/documentation/index.html b/documentation/index.html
index 592fba2e..c9d6a443 100644
--- a/documentation/index.html
+++ b/documentation/index.html
@@ -123,7 +123,7 @@ <h1>Overview</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
+<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/package-CodeIgniter.Libraries.html b/documentation/package-CodeIgniter.Libraries.html
index 65f28eaa..1331a2de 100644
--- a/documentation/package-CodeIgniter.Libraries.html
+++ b/documentation/package-CodeIgniter.Libraries.html
@@ -111,7 +111,7 @@ <h1>Package <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\Libraries</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
+<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/package-CodeIgniter.Rest.html b/documentation/package-CodeIgniter.Rest.html
index 4a3a68e6..4e3e736a 100644
--- a/documentation/package-CodeIgniter.Rest.html
+++ b/documentation/package-CodeIgniter.Rest.html
@@ -117,7 +117,7 @@ <h1>Package <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\Rest</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
+<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/package-CodeIgniter.html b/documentation/package-CodeIgniter.html
index 85685f80..e15e4310 100644
--- a/documentation/package-CodeIgniter.html
+++ b/documentation/package-CodeIgniter.html
@@ -107,7 +107,7 @@ <h1>Package CodeIgniter</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
+<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/package-None.html b/documentation/package-None.html
index 9dca1a71..d9a36338 100644
--- a/documentation/package-None.html
+++ b/documentation/package-None.html
@@ -111,7 +111,7 @@ <h1>No package</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
+<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Example.html b/documentation/source-class-Example.html
index 960ccc08..c9490664 100644
--- a/documentation/source-class-Example.html
+++ b/documentation/source-class-Example.html
@@ -122,95 +122,91 @@ <h3>Classes</h3>
 </span><span id="30" class="l"><a href="#30"> 30: </a>        <span class="php-var">$this</span>-&gt;methods[<span class="php-quote">'user_delete'</span>][<span class="php-quote">'limit'</span>] = <span class="php-num">50</span>; <span class="php-comment">// 50 requests per hour per user/key</span>
 </span><span id="31" class="l"><a href="#31"> 31: </a>    }
 </span><span id="32" class="l"><a href="#32"> 32: </a>
-</span><span id="33" class="l"><a href="#33"> 33: </a>    <span class="php-keyword1">function</span> user_get()
+</span><span id="33" class="l"><a href="#33"> 33: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> user_get()
 </span><span id="34" class="l"><a href="#34"> 34: </a>    {
 </span><span id="35" class="l"><a href="#35"> 35: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>))
 </span><span id="36" class="l"><a href="#36"> 36: </a>        {
-</span><span id="37" class="l"><a href="#37"> 37: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">NULL</span>, <span class="php-num">400</span>);
-</span><span id="38" class="l"><a href="#38"> 38: </a>        }
-</span><span id="39" class="l"><a href="#39"> 39: </a>
-</span><span id="40" class="l"><a href="#40"> 40: </a>        <span class="php-comment">// $user = $this-&gt;some_model-&gt;getSomething( $this-&gt;get('id') );</span>
-</span><span id="41" class="l"><a href="#41"> 41: </a>        <span class="php-var">$users</span> = [
-</span><span id="42" class="l"><a href="#42"> 42: </a>            <span class="php-num">1</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'John'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'john@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Loves coding'</span>],
-</span><span id="43" class="l"><a href="#43"> 43: </a>            <span class="php-num">2</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">2</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jim'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jim@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Developed on CodeIgniter'</span>],
-</span><span id="44" class="l"><a href="#44"> 44: </a>            <span class="php-num">3</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">3</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jane'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jane@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Lives in the USA'</span>, [<span class="php-quote">'hobbies'</span> =&gt; [<span class="php-quote">'guitar'</span>, <span class="php-quote">'cycling'</span>]]],
-</span><span id="45" class="l"><a href="#45"> 45: </a>        ];
-</span><span id="46" class="l"><a href="#46"> 46: </a>
-</span><span id="47" class="l"><a href="#47"> 47: </a>        <span class="php-var">$user</span> = @<span class="php-var">$users</span>[<span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>)];
-</span><span id="48" class="l"><a href="#48"> 48: </a>
-</span><span id="49" class="l"><a href="#49"> 49: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$user</span>)
-</span><span id="50" class="l"><a href="#50"> 50: </a>        {
-</span><span id="51" class="l"><a href="#51"> 51: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-var">$user</span>, REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
-</span><span id="52" class="l"><a href="#52"> 52: </a>        }
-</span><span id="53" class="l"><a href="#53"> 53: </a>
-</span><span id="54" class="l"><a href="#54"> 54: </a>        <span class="php-keyword1">else</span>
-</span><span id="55" class="l"><a href="#55"> 55: </a>        {
-</span><span id="56" class="l"><a href="#56"> 56: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-quote">'error'</span> =&gt; <span class="php-quote">'User could not be found'</span>], REST_Controller::NOT_FOUND); <span class="php-comment">// NOT_FOUND (404) being the HTTP response code</span>
-</span><span id="57" class="l"><a href="#57"> 57: </a>        }
-</span><span id="58" class="l"><a href="#58"> 58: </a>    }
-</span><span id="59" class="l"><a href="#59"> 59: </a>
-</span><span id="60" class="l"><a href="#60"> 60: </a>    <span class="php-keyword1">function</span> user_post()
-</span><span id="61" class="l"><a href="#61"> 61: </a>    {
-</span><span id="62" class="l"><a href="#62"> 62: </a>        <span class="php-comment">// $this-&gt;some_model-&gt;update_user($this-&gt;get('id'));</span>
-</span><span id="63" class="l"><a href="#63"> 63: </a>        <span class="php-var">$message</span> = [
-</span><span id="64" class="l"><a href="#64"> 64: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>),
-</span><span id="65" class="l"><a href="#65"> 65: </a>            <span class="php-quote">'name'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'name'</span>),
-</span><span id="66" class="l"><a href="#66"> 66: </a>            <span class="php-quote">'email'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'email'</span>),
-</span><span id="67" class="l"><a href="#67"> 67: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Added a resource'</span>
-</span><span id="68" class="l"><a href="#68"> 68: </a>        ];
-</span><span id="69" class="l"><a href="#69"> 69: </a>
-</span><span id="70" class="l"><a href="#70"> 70: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$message</span>, REST_Controller::HTTP_CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
-</span><span id="71" class="l"><a href="#71"> 71: </a>    }
-</span><span id="72" class="l"><a href="#72"> 72: </a>
-</span><span id="73" class="l"><a href="#73"> 73: </a>    <span class="php-keyword1">function</span> user_delete()
-</span><span id="74" class="l"><a href="#74"> 74: </a>    {
-</span><span id="75" class="l"><a href="#75"> 75: </a>        <span class="php-comment">// $this-&gt;some_model-&gt;delete_something($this-&gt;get();</span>
-</span><span id="76" class="l"><a href="#76"> 76: </a>        <span class="php-var">$message</span> = [
-</span><span id="77" class="l"><a href="#77"> 77: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>),
-</span><span id="78" class="l"><a href="#78"> 78: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Deleted the resource'</span>
-</span><span id="79" class="l"><a href="#79"> 79: </a>        ];
-</span><span id="80" class="l"><a href="#80"> 80: </a>
-</span><span id="81" class="l"><a href="#81"> 81: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$message</span>, REST_Controller::HTTP_NO_CONTENT); <span class="php-comment">// NO_CONTENT (204) being the HTTP response code</span>
-</span><span id="82" class="l"><a href="#82"> 82: </a>    }
-</span><span id="83" class="l"><a href="#83"> 83: </a>
-</span><span id="84" class="l"><a href="#84"> 84: </a>    <span class="php-keyword1">function</span> users_get()
-</span><span id="85" class="l"><a href="#85"> 85: </a>    {
-</span><span id="86" class="l"><a href="#86"> 86: </a>        <span class="php-comment">// $users = $this-&gt;some_model-&gt;get_something($this-&gt;get('limit'));</span>
-</span><span id="87" class="l"><a href="#87"> 87: </a>        <span class="php-var">$users</span> = [
-</span><span id="88" class="l"><a href="#88"> 88: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'John'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'john@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Loves coding'</span>],
-</span><span id="89" class="l"><a href="#89"> 89: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">2</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jim'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jim@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Developed on CodeIgniter'</span>],
-</span><span id="90" class="l"><a href="#90"> 90: </a>            <span class="php-num">3</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">3</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jane'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jane@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Lives in the USA'</span>, [<span class="php-quote">'hobbies'</span> =&gt; [<span class="php-quote">'guitar'</span>, <span class="php-quote">'cycling'</span>]]],
-</span><span id="91" class="l"><a href="#91"> 91: </a>        ];
-</span><span id="92" class="l"><a href="#92"> 92: </a>
-</span><span id="93" class="l"><a href="#93"> 93: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$users</span>)
-</span><span id="94" class="l"><a href="#94"> 94: </a>        {
-</span><span id="95" class="l"><a href="#95"> 95: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-var">$users</span>, REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
-</span><span id="96" class="l"><a href="#96"> 96: </a>        }
-</span><span id="97" class="l"><a href="#97"> 97: </a>
-</span><span id="98" class="l"><a href="#98"> 98: </a>        <span class="php-keyword1">else</span>
-</span><span id="99" class="l"><a href="#99"> 99: </a>        {
-</span><span id="100" class="l"><a href="#100">100: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Couldn\'t find any users!'</span>], REST_Controller::NOT_FOUND); <span class="php-comment">// NOT_FOUND (404) being the HTTP response code</span>
-</span><span id="101" class="l"><a href="#101">101: </a>        }
-</span><span id="102" class="l"><a href="#102">102: </a>    }
-</span><span id="103" class="l"><a href="#103">103: </a>
-</span><span id="104" class="l"><a href="#104">104: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> send_post()
-</span><span id="105" class="l"><a href="#105">105: </a>    {
-</span><span id="106" class="l"><a href="#106">106: </a>        <span class="php-keyword2">var_dump</span>(<span class="php-var">$this</span>-&gt;request-&gt;body);
-</span><span id="107" class="l"><a href="#107">107: </a>    }
-</span><span id="108" class="l"><a href="#108">108: </a>
-</span><span id="109" class="l"><a href="#109">109: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> send_put()
-</span><span id="110" class="l"><a href="#110">110: </a>    {
-</span><span id="111" class="l"><a href="#111">111: </a>        <span class="php-keyword2">var_dump</span>(<span class="php-var">$this</span>-&gt;put(<span class="php-quote">'foo'</span>));
-</span><span id="112" class="l"><a href="#112">112: </a>    }
-</span><span id="113" class="l"><a href="#113">113: </a>}
-</span><span id="114" class="l"><a href="#114">114: </a></span></code></pre>
+</span><span id="37" class="l"><a href="#37"> 37: </a>            <span class="php-comment">// Set the response and exit</span>
+</span><span id="38" class="l"><a href="#38"> 38: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">NULL</span>, REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
+</span><span id="39" class="l"><a href="#39"> 39: </a>        }
+</span><span id="40" class="l"><a href="#40"> 40: </a>
+</span><span id="41" class="l"><a href="#41"> 41: </a>        <span class="php-comment">// $user = $this-&gt;some_model-&gt;getSomething($this-&gt;get('id'));</span>
+</span><span id="42" class="l"><a href="#42"> 42: </a>        <span class="php-var">$users</span> = [
+</span><span id="43" class="l"><a href="#43"> 43: </a>            <span class="php-num">1</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'John'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'john@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Loves coding'</span>],
+</span><span id="44" class="l"><a href="#44"> 44: </a>            <span class="php-num">2</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">2</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jim'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jim@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Developed on CodeIgniter'</span>],
+</span><span id="45" class="l"><a href="#45"> 45: </a>            <span class="php-num">3</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">3</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jane'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jane@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Lives in the USA'</span>, [<span class="php-quote">'hobbies'</span> =&gt; [<span class="php-quote">'guitar'</span>, <span class="php-quote">'cycling'</span>]]],
+</span><span id="46" class="l"><a href="#46"> 46: </a>        ];
+</span><span id="47" class="l"><a href="#47"> 47: </a>
+</span><span id="48" class="l"><a href="#48"> 48: </a>        <span class="php-comment">// Get the user from the array, by retrieving the id from the GET request</span>
+</span><span id="49" class="l"><a href="#49"> 49: </a>        <span class="php-var">$user</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$users</span>[<span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>)]) ? <span class="php-var">$users</span>[<span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>)] : <span class="php-keyword1">NULL</span>;
+</span><span id="50" class="l"><a href="#50"> 50: </a>
+</span><span id="51" class="l"><a href="#51"> 51: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$user</span>)
+</span><span id="52" class="l"><a href="#52"> 52: </a>        {
+</span><span id="53" class="l"><a href="#53"> 53: </a>            <span class="php-var">$this</span>-&gt;set_response(<span class="php-var">$user</span>, REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
+</span><span id="54" class="l"><a href="#54"> 54: </a>        }
+</span><span id="55" class="l"><a href="#55"> 55: </a>        <span class="php-keyword1">else</span>
+</span><span id="56" class="l"><a href="#56"> 56: </a>        {
+</span><span id="57" class="l"><a href="#57"> 57: </a>            <span class="php-var">$this</span>-&gt;set_response([
+</span><span id="58" class="l"><a href="#58"> 58: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="59" class="l"><a href="#59"> 59: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'User could not be found'</span>
+</span><span id="60" class="l"><a href="#60"> 60: </a>            ], REST_Controller::NOT_FOUND); <span class="php-comment">// NOT_FOUND (404) being the HTTP response code</span>
+</span><span id="61" class="l"><a href="#61"> 61: </a>        }
+</span><span id="62" class="l"><a href="#62"> 62: </a>    }
+</span><span id="63" class="l"><a href="#63"> 63: </a>
+</span><span id="64" class="l"><a href="#64"> 64: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> user_post()
+</span><span id="65" class="l"><a href="#65"> 65: </a>    {
+</span><span id="66" class="l"><a href="#66"> 66: </a>        <span class="php-comment">// $this-&gt;some_model-&gt;update_user($this-&gt;get('id'));</span>
+</span><span id="67" class="l"><a href="#67"> 67: </a>        <span class="php-var">$message</span> = [
+</span><span id="68" class="l"><a href="#68"> 68: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>),
+</span><span id="69" class="l"><a href="#69"> 69: </a>            <span class="php-quote">'name'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'name'</span>),
+</span><span id="70" class="l"><a href="#70"> 70: </a>            <span class="php-quote">'email'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'email'</span>),
+</span><span id="71" class="l"><a href="#71"> 71: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Added a resource'</span>
+</span><span id="72" class="l"><a href="#72"> 72: </a>        ];
+</span><span id="73" class="l"><a href="#73"> 73: </a>
+</span><span id="74" class="l"><a href="#74"> 74: </a>        <span class="php-var">$this</span>-&gt;set_response(<span class="php-var">$message</span>, REST_Controller::HTTP_CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
+</span><span id="75" class="l"><a href="#75"> 75: </a>    }
+</span><span id="76" class="l"><a href="#76"> 76: </a>
+</span><span id="77" class="l"><a href="#77"> 77: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> user_delete()
+</span><span id="78" class="l"><a href="#78"> 78: </a>    {
+</span><span id="79" class="l"><a href="#79"> 79: </a>        <span class="php-comment">// $this-&gt;some_model-&gt;delete_something($this-&gt;get());</span>
+</span><span id="80" class="l"><a href="#80"> 80: </a>        <span class="php-var">$message</span> = [
+</span><span id="81" class="l"><a href="#81"> 81: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>),
+</span><span id="82" class="l"><a href="#82"> 82: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Deleted the resource'</span>
+</span><span id="83" class="l"><a href="#83"> 83: </a>        ];
+</span><span id="84" class="l"><a href="#84"> 84: </a>
+</span><span id="85" class="l"><a href="#85"> 85: </a>        <span class="php-var">$this</span>-&gt;set_response(<span class="php-var">$message</span>, REST_Controller::HTTP_NO_CONTENT); <span class="php-comment">// NO_CONTENT (204) being the HTTP response code</span>
+</span><span id="86" class="l"><a href="#86"> 86: </a>    }
+</span><span id="87" class="l"><a href="#87"> 87: </a>
+</span><span id="88" class="l"><a href="#88"> 88: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> users_get()
+</span><span id="89" class="l"><a href="#89"> 89: </a>    {
+</span><span id="90" class="l"><a href="#90"> 90: </a>        <span class="php-comment">// $users = $this-&gt;some_model-&gt;get_something($this-&gt;get('limit'));</span>
+</span><span id="91" class="l"><a href="#91"> 91: </a>        <span class="php-var">$users</span> = [
+</span><span id="92" class="l"><a href="#92"> 92: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'John'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'john@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Loves coding'</span>],
+</span><span id="93" class="l"><a href="#93"> 93: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">2</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jim'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jim@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Developed on CodeIgniter'</span>],
+</span><span id="94" class="l"><a href="#94"> 94: </a>            <span class="php-num">3</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">3</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jane'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jane@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Lives in the USA'</span>, [<span class="php-quote">'hobbies'</span> =&gt; [<span class="php-quote">'guitar'</span>, <span class="php-quote">'cycling'</span>]]],
+</span><span id="95" class="l"><a href="#95"> 95: </a>        ];
+</span><span id="96" class="l"><a href="#96"> 96: </a>
+</span><span id="97" class="l"><a href="#97"> 97: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$users</span>)
+</span><span id="98" class="l"><a href="#98"> 98: </a>        {
+</span><span id="99" class="l"><a href="#99"> 99: </a>            <span class="php-var">$this</span>-&gt;set_response(<span class="php-var">$users</span>, REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
+</span><span id="100" class="l"><a href="#100">100: </a>        }
+</span><span id="101" class="l"><a href="#101">101: </a>        <span class="php-keyword1">else</span>
+</span><span id="102" class="l"><a href="#102">102: </a>        {
+</span><span id="103" class="l"><a href="#103">103: </a>            <span class="php-var">$this</span>-&gt;set_response([
+</span><span id="104" class="l"><a href="#104">104: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="105" class="l"><a href="#105">105: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'No users were found'</span>
+</span><span id="106" class="l"><a href="#106">106: </a>                ], REST_Controller::NOT_FOUND); <span class="php-comment">// NOT_FOUND (404) being the HTTP response code</span>
+</span><span id="107" class="l"><a href="#107">107: </a>        }
+</span><span id="108" class="l"><a href="#108">108: </a>    }
+</span><span id="109" class="l"><a href="#109">109: </a>}
+</span><span id="110" class="l"><a href="#110">110: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
+<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Format.html b/documentation/source-class-Format.html
index 262bc336..014615b7 100644
--- a/documentation/source-class-Format.html
+++ b/documentation/source-class-Format.html
@@ -98,7 +98,7 @@ <h3>Classes</h3>
 </span></span><span id="6" class="l"><a href="#6">  6: </a><span class="php-comment"> * Format class
 </span></span><span id="7" class="l"><a href="#7">  7: </a><span class="php-comment"> * Help convert between various formats such as XML, JSON, CSV, etc.
 </span></span><span id="8" class="l"><a href="#8">  8: </a><span class="php-comment"> *
-</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment"> * @author    Phil Sturgeon, Chris Kacerguis
+</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment"> * @author    Phil Sturgeon, Chris Kacerguis, @softwarespot
 </span></span><span id="10" class="l"><a href="#10"> 10: </a><span class="php-comment"> * @license   http://www.dbad-license.org/
 </span></span><span id="11" class="l"><a href="#11"> 11: </a><span class="php-comment"> */</span>
 </span><span id="12" class="l"><a href="#12"> 12: </a><span class="php-keyword1">class</span> Format {
@@ -320,7 +320,7 @@ <h3>Classes</h3>
 </span><span id="228" class="l"><a href="#228">228: </a>                }
 </span><span id="229" class="l"><a href="#229">229: </a>            }
 </span><span id="230" class="l"><a href="#230">230: </a>            <span class="php-comment">// if there is another array found recursively call this function</span>
-</span><span id="231" class="l"><a href="#231">231: </a>            <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>))
+</span><span id="231" class="l"><a href="#231">231: </a>            <span class="php-keyword1">elseif</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>))
 </span><span id="232" class="l"><a href="#232">232: </a>            {
 </span><span id="233" class="l"><a href="#233">233: </a>                <span class="php-var">$node</span> = <span class="php-var">$structure</span>-&gt;addChild(<span class="php-var">$key</span>);
 </span><span id="234" class="l"><a href="#234">234: </a>
@@ -361,15 +361,15 @@ <h3>Classes</h3>
 </span><span id="269" class="l"><a href="#269">269: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
 </span><span id="270" class="l"><a href="#270">270: </a>        }
 </span><span id="271" class="l"><a href="#271">271: </a>
-</span><span id="272" class="l"><a href="#272">272: </a>        <span class="php-comment">// Multi-dimensional array</span>
-</span><span id="273" class="l"><a href="#273">273: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]) &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]))
+</span><span id="272" class="l"><a href="#272">272: </a>        <span class="php-comment">// Check if it's a multi-dimensional array</span>
+</span><span id="273" class="l"><a href="#273">273: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]) &amp;&amp; <span class="php-keyword2">count</span>(<span class="php-var">$data</span>) !== <span class="php-keyword2">count</span>(<span class="php-var">$data</span>, COUNT_RECURSIVE))
 </span><span id="274" class="l"><a href="#274">274: </a>        {
-</span><span id="275" class="l"><a href="#275">275: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]);
-</span><span id="276" class="l"><a href="#276">276: </a>        }
-</span><span id="277" class="l"><a href="#277">277: </a>
-</span><span id="278" class="l"><a href="#278">278: </a>        <span class="php-comment">// Single array</span>
-</span><span id="279" class="l"><a href="#279">279: </a>        <span class="php-keyword1">else</span>
-</span><span id="280" class="l"><a href="#280">280: </a>        {
+</span><span id="275" class="l"><a href="#275">275: </a>            <span class="php-comment">// Multi-dimensional array</span>
+</span><span id="276" class="l"><a href="#276">276: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]);
+</span><span id="277" class="l"><a href="#277">277: </a>        }
+</span><span id="278" class="l"><a href="#278">278: </a>        <span class="php-keyword1">else</span>
+</span><span id="279" class="l"><a href="#279">279: </a>        {
+</span><span id="280" class="l"><a href="#280">280: </a>            <span class="php-comment">// Single array</span>
 </span><span id="281" class="l"><a href="#281">281: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>);
 </span><span id="282" class="l"><a href="#282">282: </a>            <span class="php-var">$data</span> = [<span class="php-var">$data</span>];
 </span><span id="283" class="l"><a href="#283">283: </a>        }
@@ -379,242 +379,241 @@ <h3>Classes</h3>
 </span><span id="287" class="l"><a href="#287">287: </a>
 </span><span id="288" class="l"><a href="#288">288: </a>        <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;set_heading(<span class="php-var">$headings</span>);
 </span><span id="289" class="l"><a href="#289">289: </a>
-</span><span id="290" class="l"><a href="#290">290: </a>        <span class="php-comment">// Should row used as a reference?</span>
-</span><span id="291" class="l"><a href="#291">291: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$row</span>)
-</span><span id="292" class="l"><a href="#292">292: </a>        {
-</span><span id="293" class="l"><a href="#293">293: </a>            <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;add_row(<span class="php-var">$row</span>);
-</span><span id="294" class="l"><a href="#294">294: </a>        }
-</span><span id="295" class="l"><a href="#295">295: </a>
-</span><span id="296" class="l"><a href="#296">296: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;generate();
-</span><span id="297" class="l"><a href="#297">297: </a>    }
-</span><span id="298" class="l"><a href="#298">298: </a>
-</span><span id="299" class="l"><a href="#299">299: </a>    <span class="php-comment">/**
-</span></span><span id="300" class="l"><a href="#300">300: </a><span class="php-comment">     * @link http://www.metashock.de/2014/02/create-csv-file-in-memory-php/
-</span></span><span id="301" class="l"><a href="#301">301: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="302" class="l"><a href="#302">302: </a><span class="php-comment">     * to the constructor
-</span></span><span id="303" class="l"><a href="#303">303: </a><span class="php-comment">     * @param string $delimiter The optional delimiter parameter sets the field
-</span></span><span id="304" class="l"><a href="#304">304: </a><span class="php-comment">     * delimiter (one character only). NULL will use the default value (,)
-</span></span><span id="305" class="l"><a href="#305">305: </a><span class="php-comment">     * @param string $enclosure The optional enclosure parameter sets the field
-</span></span><span id="306" class="l"><a href="#306">306: </a><span class="php-comment">     * enclosure (one character only). NULL will use the default value (&quot;)
-</span></span><span id="307" class="l"><a href="#307">307: </a><span class="php-comment">     * @return string A csv string
-</span></span><span id="308" class="l"><a href="#308">308: </a><span class="php-comment">     */</span>
-</span><span id="309" class="l"><a href="#309">309: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_csv(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>, <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>)
-</span><span id="310" class="l"><a href="#310">310: </a>    {
-</span><span id="311" class="l"><a href="#311">311: </a>        <span class="php-comment">// Use a threshold of 1 MB (1024 * 1024)</span>
-</span><span id="312" class="l"><a href="#312">312: </a>        <span class="php-var">$handle</span> = <span class="php-keyword2">fopen</span>(<span class="php-quote">'php://temp/maxmemory:1048576'</span>, <span class="php-quote">'w'</span>);
-</span><span id="313" class="l"><a href="#313">313: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$handle</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="314" class="l"><a href="#314">314: </a>        {
-</span><span id="315" class="l"><a href="#315">315: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="316" class="l"><a href="#316">316: </a>        }
-</span><span id="317" class="l"><a href="#317">317: </a>
-</span><span id="318" class="l"><a href="#318">318: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="319" class="l"><a href="#319">319: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="320" class="l"><a href="#320">320: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="321" class="l"><a href="#321">321: </a>        {
-</span><span id="322" class="l"><a href="#322">322: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="323" class="l"><a href="#323">323: </a>        }
-</span><span id="324" class="l"><a href="#324">324: </a>
-</span><span id="325" class="l"><a href="#325">325: </a>        <span class="php-comment">// If NULL, then set as the default delimiter</span>
-</span><span id="326" class="l"><a href="#326">326: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$delimiter</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="327" class="l"><a href="#327">327: </a>        {
-</span><span id="328" class="l"><a href="#328">328: </a>            <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>;
-</span><span id="329" class="l"><a href="#329">329: </a>        }
-</span><span id="330" class="l"><a href="#330">330: </a>
-</span><span id="331" class="l"><a href="#331">331: </a>        <span class="php-comment">// If NULL, then set as the default enclosure</span>
-</span><span id="332" class="l"><a href="#332">332: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$enclosure</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="333" class="l"><a href="#333">333: </a>        {
-</span><span id="334" class="l"><a href="#334">334: </a>            <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>;
-</span><span id="335" class="l"><a href="#335">335: </a>        }
-</span><span id="336" class="l"><a href="#336">336: </a>
-</span><span id="337" class="l"><a href="#337">337: </a>        <span class="php-comment">// Cast as an array if not already</span>
-</span><span id="338" class="l"><a href="#338">338: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="339" class="l"><a href="#339">339: </a>        {
-</span><span id="340" class="l"><a href="#340">340: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
-</span><span id="341" class="l"><a href="#341">341: </a>        }
-</span><span id="342" class="l"><a href="#342">342: </a>
-</span><span id="343" class="l"><a href="#343">343: </a>        <span class="php-comment">// Check if it's a multi-dimensional array</span>
-</span><span id="344" class="l"><a href="#344">344: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]) &amp;&amp; <span class="php-keyword2">count</span>(<span class="php-var">$data</span>) !== <span class="php-keyword2">count</span>(<span class="php-var">$data</span>, COUNT_RECURSIVE))
-</span><span id="345" class="l"><a href="#345">345: </a>        {
-</span><span id="346" class="l"><a href="#346">346: </a>            <span class="php-comment">// Multi-dimensional array</span>
-</span><span id="347" class="l"><a href="#347">347: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]);
-</span><span id="348" class="l"><a href="#348">348: </a>        }
-</span><span id="349" class="l"><a href="#349">349: </a>        <span class="php-keyword1">else</span>
-</span><span id="350" class="l"><a href="#350">350: </a>        {
-</span><span id="351" class="l"><a href="#351">351: </a>            <span class="php-comment">// Single array</span>
-</span><span id="352" class="l"><a href="#352">352: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>);
-</span><span id="353" class="l"><a href="#353">353: </a>            <span class="php-var">$data</span> = [<span class="php-var">$data</span>];
-</span><span id="354" class="l"><a href="#354">354: </a>        }
-</span><span id="355" class="l"><a href="#355">355: </a>
-</span><span id="356" class="l"><a href="#356">356: </a>        <span class="php-comment">// Apply the headings</span>
-</span><span id="357" class="l"><a href="#357">357: </a>        <span class="php-keyword2">fputcsv</span>(<span class="php-var">$handle</span>, <span class="php-var">$headings</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
-</span><span id="358" class="l"><a href="#358">358: </a>
-</span><span id="359" class="l"><a href="#359">359: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$record</span>)
-</span><span id="360" class="l"><a href="#360">360: </a>        {
-</span><span id="361" class="l"><a href="#361">361: </a>            <span class="php-comment">// Returns the length of the string written or FALSE</span>
-</span><span id="362" class="l"><a href="#362">362: </a>            <span class="php-keyword2">fputcsv</span>(<span class="php-var">$handle</span>, <span class="php-var">$record</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
-</span><span id="363" class="l"><a href="#363">363: </a>        }
-</span><span id="364" class="l"><a href="#364">364: </a>
-</span><span id="365" class="l"><a href="#365">365: </a>        <span class="php-comment">// Reset the file pointer</span>
-</span><span id="366" class="l"><a href="#366">366: </a>        <span class="php-keyword2">rewind</span>(<span class="php-var">$handle</span>);
-</span><span id="367" class="l"><a href="#367">367: </a>
-</span><span id="368" class="l"><a href="#368">368: </a>        <span class="php-comment">// Retrieve the csv contents</span>
-</span><span id="369" class="l"><a href="#369">369: </a>        <span class="php-var">$csv</span> = <span class="php-keyword2">stream_get_contents</span>(<span class="php-var">$handle</span>);
-</span><span id="370" class="l"><a href="#370">370: </a>
-</span><span id="371" class="l"><a href="#371">371: </a>        <span class="php-comment">// Close the handle</span>
-</span><span id="372" class="l"><a href="#372">372: </a>        <span class="php-keyword2">fclose</span>(<span class="php-var">$handle</span>);
-</span><span id="373" class="l"><a href="#373">373: </a>
-</span><span id="374" class="l"><a href="#374">374: </a>        <span class="php-keyword1">return</span> <span class="php-var">$csv</span>;
-</span><span id="375" class="l"><a href="#375">375: </a>    }
-</span><span id="376" class="l"><a href="#376">376: </a>
-</span><span id="377" class="l"><a href="#377">377: </a>    <span class="php-comment">/**
-</span></span><span id="378" class="l"><a href="#378">378: </a><span class="php-comment">     * Encode data as json
-</span></span><span id="379" class="l"><a href="#379">379: </a><span class="php-comment">     *
-</span></span><span id="380" class="l"><a href="#380">380: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="381" class="l"><a href="#381">381: </a><span class="php-comment">     * to the constructor
-</span></span><span id="382" class="l"><a href="#382">382: </a><span class="php-comment">     * @return string Json representation of a value
-</span></span><span id="383" class="l"><a href="#383">383: </a><span class="php-comment">     */</span>
-</span><span id="384" class="l"><a href="#384">384: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_json(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="385" class="l"><a href="#385">385: </a>    {
-</span><span id="386" class="l"><a href="#386">386: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="387" class="l"><a href="#387">387: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="388" class="l"><a href="#388">388: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="389" class="l"><a href="#389">389: </a>        {
-</span><span id="390" class="l"><a href="#390">390: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="391" class="l"><a href="#391">391: </a>        }
-</span><span id="392" class="l"><a href="#392">392: </a>
-</span><span id="393" class="l"><a href="#393">393: </a>        <span class="php-comment">// Get the callback parameter (if set)</span>
-</span><span id="394" class="l"><a href="#394">394: </a>        <span class="php-var">$callback</span> = <span class="php-var">$this</span>-&gt;_ci-&gt;input-&gt;get(<span class="php-quote">'callback'</span>);
-</span><span id="395" class="l"><a href="#395">395: </a>
-</span><span id="396" class="l"><a href="#396">396: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$callback</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="397" class="l"><a href="#397">397: </a>        {
-</span><span id="398" class="l"><a href="#398">398: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
-</span><span id="399" class="l"><a href="#399">399: </a>        }
-</span><span id="400" class="l"><a href="#400">400: </a>
-</span><span id="401" class="l"><a href="#401">401: </a>        <span class="php-comment">// We only honour a jsonp callback which are valid javascript identifiers</span>
-</span><span id="402" class="l"><a href="#402">402: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-quote">'/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i'</span>, <span class="php-var">$callback</span>))
-</span><span id="403" class="l"><a href="#403">403: </a>        {
-</span><span id="404" class="l"><a href="#404">404: </a>            <span class="php-comment">// Return the data as encoded json with a callback</span>
-</span><span id="405" class="l"><a href="#405">405: </a>            <span class="php-keyword1">return</span> <span class="php-var">$callback</span> . <span class="php-quote">'('</span> . <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>) . <span class="php-quote">');'</span>;
-</span><span id="406" class="l"><a href="#406">406: </a>        }
-</span><span id="407" class="l"><a href="#407">407: </a>
-</span><span id="408" class="l"><a href="#408">408: </a>        <span class="php-comment">// An invalid jsonp callback function provided.</span>
-</span><span id="409" class="l"><a href="#409">409: </a>        <span class="php-comment">// Though I don't believe this should be hardcoded here</span>
-</span><span id="410" class="l"><a href="#410">410: </a>        <span class="php-var">$data</span>[<span class="php-quote">'warning'</span>] = <span class="php-quote">'INVALID JSONP CALLBACK: '</span> . <span class="php-var">$callback</span>;
-</span><span id="411" class="l"><a href="#411">411: </a>
-</span><span id="412" class="l"><a href="#412">412: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
-</span><span id="413" class="l"><a href="#413">413: </a>    }
-</span><span id="414" class="l"><a href="#414">414: </a>
-</span><span id="415" class="l"><a href="#415">415: </a>    <span class="php-comment">/**
-</span></span><span id="416" class="l"><a href="#416">416: </a><span class="php-comment">     * Encode data as a serialized array
-</span></span><span id="417" class="l"><a href="#417">417: </a><span class="php-comment">     *
-</span></span><span id="418" class="l"><a href="#418">418: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="419" class="l"><a href="#419">419: </a><span class="php-comment">     * to the constructor
-</span></span><span id="420" class="l"><a href="#420">420: </a><span class="php-comment">     * @return string Serialized data
-</span></span><span id="421" class="l"><a href="#421">421: </a><span class="php-comment">     */</span>
-</span><span id="422" class="l"><a href="#422">422: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_serialized(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="423" class="l"><a href="#423">423: </a>    {
-</span><span id="424" class="l"><a href="#424">424: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="425" class="l"><a href="#425">425: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="426" class="l"><a href="#426">426: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="427" class="l"><a href="#427">427: </a>        {
-</span><span id="428" class="l"><a href="#428">428: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="429" class="l"><a href="#429">429: </a>        }
-</span><span id="430" class="l"><a href="#430">430: </a>
-</span><span id="431" class="l"><a href="#431">431: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">serialize</span>(<span class="php-var">$data</span>);
-</span><span id="432" class="l"><a href="#432">432: </a>    }
-</span><span id="433" class="l"><a href="#433">433: </a>
-</span><span id="434" class="l"><a href="#434">434: </a>    <span class="php-comment">/**
-</span></span><span id="435" class="l"><a href="#435">435: </a><span class="php-comment">     * Format data using a PHP structure
-</span></span><span id="436" class="l"><a href="#436">436: </a><span class="php-comment">     *
-</span></span><span id="437" class="l"><a href="#437">437: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="438" class="l"><a href="#438">438: </a><span class="php-comment">     * to the constructor
-</span></span><span id="439" class="l"><a href="#439">439: </a><span class="php-comment">     * @return mixed String representation of a variable
-</span></span><span id="440" class="l"><a href="#440">440: </a><span class="php-comment">     */</span>
-</span><span id="441" class="l"><a href="#441">441: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_php(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="442" class="l"><a href="#442">442: </a>    {
-</span><span id="443" class="l"><a href="#443">443: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="444" class="l"><a href="#444">444: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="445" class="l"><a href="#445">445: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="446" class="l"><a href="#446">446: </a>        {
-</span><span id="447" class="l"><a href="#447">447: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="448" class="l"><a href="#448">448: </a>        }
-</span><span id="449" class="l"><a href="#449">449: </a>
-</span><span id="450" class="l"><a href="#450">450: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">var_export</span>(<span class="php-var">$data</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="451" class="l"><a href="#451">451: </a>    }
-</span><span id="452" class="l"><a href="#452">452: </a>
-</span><span id="453" class="l"><a href="#453">453: </a>    <span class="php-comment">// INTERNAL FUNCTIONS</span>
-</span><span id="454" class="l"><a href="#454">454: </a>
-</span><span id="455" class="l"><a href="#455">455: </a>    <span class="php-comment">/**
-</span></span><span id="456" class="l"><a href="#456">456: </a><span class="php-comment">     * @param $data XML string
-</span></span><span id="457" class="l"><a href="#457">457: </a><span class="php-comment">     * @return SimpleXMLElement XML element object; otherwise, empty array
-</span></span><span id="458" class="l"><a href="#458">458: </a><span class="php-comment">     */</span>
-</span><span id="459" class="l"><a href="#459">459: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_xml(<span class="php-var">$data</span>)
-</span><span id="460" class="l"><a href="#460">460: </a>    {
-</span><span id="461" class="l"><a href="#461">461: </a>        <span class="php-keyword1">return</span> <span class="php-var">$data</span> ? (<span class="php-keyword1">array</span>) <span class="php-keyword2">simplexml_load_string</span>(<span class="php-var">$data</span>, <span class="php-quote">'SimpleXMLElement'</span>, LIBXML_NOCDATA) : [];
-</span><span id="462" class="l"><a href="#462">462: </a>    }
-</span><span id="463" class="l"><a href="#463">463: </a>
-</span><span id="464" class="l"><a href="#464">464: </a>    <span class="php-comment">/**
-</span></span><span id="465" class="l"><a href="#465">465: </a><span class="php-comment">     * @param string $data CSV string
-</span></span><span id="466" class="l"><a href="#466">466: </a><span class="php-comment">     * @param string $delimiter The optional delimiter parameter sets the field
-</span></span><span id="467" class="l"><a href="#467">467: </a><span class="php-comment">     * delimiter (one character only). NULL will use the default value (,)
-</span></span><span id="468" class="l"><a href="#468">468: </a><span class="php-comment">     * @param string $enclosure The optional enclosure parameter sets the field
-</span></span><span id="469" class="l"><a href="#469">469: </a><span class="php-comment">     * enclosure (one character only). NULL will use the default value (&quot;)
-</span></span><span id="470" class="l"><a href="#470">470: </a><span class="php-comment">     * @return array A multi-dimensional array with the outer array being the number of rows
-</span></span><span id="471" class="l"><a href="#471">471: </a><span class="php-comment">     * and the inner arrays the individual fields
-</span></span><span id="472" class="l"><a href="#472">472: </a><span class="php-comment">     */</span>
-</span><span id="473" class="l"><a href="#473">473: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_csv(<span class="php-var">$data</span>, <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>, <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>)
-</span><span id="474" class="l"><a href="#474">474: </a>    {
-</span><span id="475" class="l"><a href="#475">475: </a>        <span class="php-comment">// If NULL, then set as the default delimiter</span>
-</span><span id="476" class="l"><a href="#476">476: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$delimiter</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="477" class="l"><a href="#477">477: </a>        {
-</span><span id="478" class="l"><a href="#478">478: </a>            <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>;
-</span><span id="479" class="l"><a href="#479">479: </a>        }
-</span><span id="480" class="l"><a href="#480">480: </a>
-</span><span id="481" class="l"><a href="#481">481: </a>        <span class="php-comment">// If NULL, then set as the default enclosure</span>
-</span><span id="482" class="l"><a href="#482">482: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$enclosure</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="483" class="l"><a href="#483">483: </a>        {
-</span><span id="484" class="l"><a href="#484">484: </a>            <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>;
-</span><span id="485" class="l"><a href="#485">485: </a>        }
-</span><span id="486" class="l"><a href="#486">486: </a>
-</span><span id="487" class="l"><a href="#487">487: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">str_getcsv</span>(<span class="php-var">$data</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
-</span><span id="488" class="l"><a href="#488">488: </a>    }
-</span><span id="489" class="l"><a href="#489">489: </a>
-</span><span id="490" class="l"><a href="#490">490: </a>    <span class="php-comment">/**
-</span></span><span id="491" class="l"><a href="#491">491: </a><span class="php-comment">     * @param $data Encoded json string
-</span></span><span id="492" class="l"><a href="#492">492: </a><span class="php-comment">     * @return mixed Decoded json string with leading and trailing whitespace removed
-</span></span><span id="493" class="l"><a href="#493">493: </a><span class="php-comment">     */</span>
-</span><span id="494" class="l"><a href="#494">494: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_json(<span class="php-var">$data</span>)
-</span><span id="495" class="l"><a href="#495">495: </a>    {
-</span><span id="496" class="l"><a href="#496">496: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_decode</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
-</span><span id="497" class="l"><a href="#497">497: </a>    }
-</span><span id="498" class="l"><a href="#498">498: </a>
-</span><span id="499" class="l"><a href="#499">499: </a>    <span class="php-comment">/**
-</span></span><span id="500" class="l"><a href="#500">500: </a><span class="php-comment">     * @param string Data to unserialized
-</span></span><span id="501" class="l"><a href="#501">501: </a><span class="php-comment">     * @return mixed Unserialized data
-</span></span><span id="502" class="l"><a href="#502">502: </a><span class="php-comment">     */</span>
-</span><span id="503" class="l"><a href="#503">503: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_serialize(<span class="php-var">$data</span>)
-</span><span id="504" class="l"><a href="#504">504: </a>    {
-</span><span id="505" class="l"><a href="#505">505: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">unserialize</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
-</span><span id="506" class="l"><a href="#506">506: </a>    }
-</span><span id="507" class="l"><a href="#507">507: </a>
-</span><span id="508" class="l"><a href="#508">508: </a>    <span class="php-comment">/**
-</span></span><span id="509" class="l"><a href="#509">509: </a><span class="php-comment">     * @param $data Data to trim leading and trailing whitespace
-</span></span><span id="510" class="l"><a href="#510">510: </a><span class="php-comment">     * @return string Data with leading and trailing whitespace removed
-</span></span><span id="511" class="l"><a href="#511">511: </a><span class="php-comment">     */</span>
-</span><span id="512" class="l"><a href="#512">512: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_php(<span class="php-var">$data</span>)
-</span><span id="513" class="l"><a href="#513">513: </a>    {
-</span><span id="514" class="l"><a href="#514">514: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">trim</span>(<span class="php-var">$data</span>);
-</span><span id="515" class="l"><a href="#515">515: </a>    }
-</span><span id="516" class="l"><a href="#516">516: </a>
-</span><span id="517" class="l"><a href="#517">517: </a>}
-</span><span id="518" class="l"><a href="#518">518: </a></span></code></pre>
+</span><span id="290" class="l"><a href="#290">290: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$row</span>)
+</span><span id="291" class="l"><a href="#291">291: </a>        {
+</span><span id="292" class="l"><a href="#292">292: </a>            <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;add_row(<span class="php-var">$row</span>);
+</span><span id="293" class="l"><a href="#293">293: </a>        }
+</span><span id="294" class="l"><a href="#294">294: </a>
+</span><span id="295" class="l"><a href="#295">295: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;generate();
+</span><span id="296" class="l"><a href="#296">296: </a>    }
+</span><span id="297" class="l"><a href="#297">297: </a>
+</span><span id="298" class="l"><a href="#298">298: </a>    <span class="php-comment">/**
+</span></span><span id="299" class="l"><a href="#299">299: </a><span class="php-comment">     * @link http://www.metashock.de/2014/02/create-csv-file-in-memory-php/
+</span></span><span id="300" class="l"><a href="#300">300: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="301" class="l"><a href="#301">301: </a><span class="php-comment">     * to the constructor
+</span></span><span id="302" class="l"><a href="#302">302: </a><span class="php-comment">     * @param string $delimiter The optional delimiter parameter sets the field
+</span></span><span id="303" class="l"><a href="#303">303: </a><span class="php-comment">     * delimiter (one character only). NULL will use the default value (,)
+</span></span><span id="304" class="l"><a href="#304">304: </a><span class="php-comment">     * @param string $enclosure The optional enclosure parameter sets the field
+</span></span><span id="305" class="l"><a href="#305">305: </a><span class="php-comment">     * enclosure (one character only). NULL will use the default value (&quot;)
+</span></span><span id="306" class="l"><a href="#306">306: </a><span class="php-comment">     * @return string A csv string
+</span></span><span id="307" class="l"><a href="#307">307: </a><span class="php-comment">     */</span>
+</span><span id="308" class="l"><a href="#308">308: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_csv(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>, <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>)
+</span><span id="309" class="l"><a href="#309">309: </a>    {
+</span><span id="310" class="l"><a href="#310">310: </a>        <span class="php-comment">// Use a threshold of 1 MB (1024 * 1024)</span>
+</span><span id="311" class="l"><a href="#311">311: </a>        <span class="php-var">$handle</span> = <span class="php-keyword2">fopen</span>(<span class="php-quote">'php://temp/maxmemory:1048576'</span>, <span class="php-quote">'w'</span>);
+</span><span id="312" class="l"><a href="#312">312: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$handle</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="313" class="l"><a href="#313">313: </a>        {
+</span><span id="314" class="l"><a href="#314">314: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="315" class="l"><a href="#315">315: </a>        }
+</span><span id="316" class="l"><a href="#316">316: </a>
+</span><span id="317" class="l"><a href="#317">317: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="318" class="l"><a href="#318">318: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="319" class="l"><a href="#319">319: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="320" class="l"><a href="#320">320: </a>        {
+</span><span id="321" class="l"><a href="#321">321: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="322" class="l"><a href="#322">322: </a>        }
+</span><span id="323" class="l"><a href="#323">323: </a>
+</span><span id="324" class="l"><a href="#324">324: </a>        <span class="php-comment">// If NULL, then set as the default delimiter</span>
+</span><span id="325" class="l"><a href="#325">325: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$delimiter</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="326" class="l"><a href="#326">326: </a>        {
+</span><span id="327" class="l"><a href="#327">327: </a>            <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>;
+</span><span id="328" class="l"><a href="#328">328: </a>        }
+</span><span id="329" class="l"><a href="#329">329: </a>
+</span><span id="330" class="l"><a href="#330">330: </a>        <span class="php-comment">// If NULL, then set as the default enclosure</span>
+</span><span id="331" class="l"><a href="#331">331: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$enclosure</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="332" class="l"><a href="#332">332: </a>        {
+</span><span id="333" class="l"><a href="#333">333: </a>            <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>;
+</span><span id="334" class="l"><a href="#334">334: </a>        }
+</span><span id="335" class="l"><a href="#335">335: </a>
+</span><span id="336" class="l"><a href="#336">336: </a>        <span class="php-comment">// Cast as an array if not already</span>
+</span><span id="337" class="l"><a href="#337">337: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="338" class="l"><a href="#338">338: </a>        {
+</span><span id="339" class="l"><a href="#339">339: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
+</span><span id="340" class="l"><a href="#340">340: </a>        }
+</span><span id="341" class="l"><a href="#341">341: </a>
+</span><span id="342" class="l"><a href="#342">342: </a>        <span class="php-comment">// Check if it's a multi-dimensional array</span>
+</span><span id="343" class="l"><a href="#343">343: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]) &amp;&amp; <span class="php-keyword2">count</span>(<span class="php-var">$data</span>) !== <span class="php-keyword2">count</span>(<span class="php-var">$data</span>, COUNT_RECURSIVE))
+</span><span id="344" class="l"><a href="#344">344: </a>        {
+</span><span id="345" class="l"><a href="#345">345: </a>            <span class="php-comment">// Multi-dimensional array</span>
+</span><span id="346" class="l"><a href="#346">346: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]);
+</span><span id="347" class="l"><a href="#347">347: </a>        }
+</span><span id="348" class="l"><a href="#348">348: </a>        <span class="php-keyword1">else</span>
+</span><span id="349" class="l"><a href="#349">349: </a>        {
+</span><span id="350" class="l"><a href="#350">350: </a>            <span class="php-comment">// Single array</span>
+</span><span id="351" class="l"><a href="#351">351: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>);
+</span><span id="352" class="l"><a href="#352">352: </a>            <span class="php-var">$data</span> = [<span class="php-var">$data</span>];
+</span><span id="353" class="l"><a href="#353">353: </a>        }
+</span><span id="354" class="l"><a href="#354">354: </a>
+</span><span id="355" class="l"><a href="#355">355: </a>        <span class="php-comment">// Apply the headings</span>
+</span><span id="356" class="l"><a href="#356">356: </a>        <span class="php-keyword2">fputcsv</span>(<span class="php-var">$handle</span>, <span class="php-var">$headings</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
+</span><span id="357" class="l"><a href="#357">357: </a>
+</span><span id="358" class="l"><a href="#358">358: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$record</span>)
+</span><span id="359" class="l"><a href="#359">359: </a>        {
+</span><span id="360" class="l"><a href="#360">360: </a>            <span class="php-comment">// Returns the length of the string written or FALSE</span>
+</span><span id="361" class="l"><a href="#361">361: </a>            <span class="php-keyword2">fputcsv</span>(<span class="php-var">$handle</span>, <span class="php-var">$record</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
+</span><span id="362" class="l"><a href="#362">362: </a>        }
+</span><span id="363" class="l"><a href="#363">363: </a>
+</span><span id="364" class="l"><a href="#364">364: </a>        <span class="php-comment">// Reset the file pointer</span>
+</span><span id="365" class="l"><a href="#365">365: </a>        <span class="php-keyword2">rewind</span>(<span class="php-var">$handle</span>);
+</span><span id="366" class="l"><a href="#366">366: </a>
+</span><span id="367" class="l"><a href="#367">367: </a>        <span class="php-comment">// Retrieve the csv contents</span>
+</span><span id="368" class="l"><a href="#368">368: </a>        <span class="php-var">$csv</span> = <span class="php-keyword2">stream_get_contents</span>(<span class="php-var">$handle</span>);
+</span><span id="369" class="l"><a href="#369">369: </a>
+</span><span id="370" class="l"><a href="#370">370: </a>        <span class="php-comment">// Close the handle</span>
+</span><span id="371" class="l"><a href="#371">371: </a>        <span class="php-keyword2">fclose</span>(<span class="php-var">$handle</span>);
+</span><span id="372" class="l"><a href="#372">372: </a>
+</span><span id="373" class="l"><a href="#373">373: </a>        <span class="php-keyword1">return</span> <span class="php-var">$csv</span>;
+</span><span id="374" class="l"><a href="#374">374: </a>    }
+</span><span id="375" class="l"><a href="#375">375: </a>
+</span><span id="376" class="l"><a href="#376">376: </a>    <span class="php-comment">/**
+</span></span><span id="377" class="l"><a href="#377">377: </a><span class="php-comment">     * Encode data as json
+</span></span><span id="378" class="l"><a href="#378">378: </a><span class="php-comment">     *
+</span></span><span id="379" class="l"><a href="#379">379: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="380" class="l"><a href="#380">380: </a><span class="php-comment">     * to the constructor
+</span></span><span id="381" class="l"><a href="#381">381: </a><span class="php-comment">     * @return string Json representation of a value
+</span></span><span id="382" class="l"><a href="#382">382: </a><span class="php-comment">     */</span>
+</span><span id="383" class="l"><a href="#383">383: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_json(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="384" class="l"><a href="#384">384: </a>    {
+</span><span id="385" class="l"><a href="#385">385: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="386" class="l"><a href="#386">386: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="387" class="l"><a href="#387">387: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="388" class="l"><a href="#388">388: </a>        {
+</span><span id="389" class="l"><a href="#389">389: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="390" class="l"><a href="#390">390: </a>        }
+</span><span id="391" class="l"><a href="#391">391: </a>
+</span><span id="392" class="l"><a href="#392">392: </a>        <span class="php-comment">// Get the callback parameter (if set)</span>
+</span><span id="393" class="l"><a href="#393">393: </a>        <span class="php-var">$callback</span> = <span class="php-var">$this</span>-&gt;_ci-&gt;input-&gt;get(<span class="php-quote">'callback'</span>);
+</span><span id="394" class="l"><a href="#394">394: </a>
+</span><span id="395" class="l"><a href="#395">395: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$callback</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="396" class="l"><a href="#396">396: </a>        {
+</span><span id="397" class="l"><a href="#397">397: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
+</span><span id="398" class="l"><a href="#398">398: </a>        }
+</span><span id="399" class="l"><a href="#399">399: </a>
+</span><span id="400" class="l"><a href="#400">400: </a>        <span class="php-comment">// We only honour a jsonp callback which are valid javascript identifiers</span>
+</span><span id="401" class="l"><a href="#401">401: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">preg_match</span>(<span class="php-quote">'/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i'</span>, <span class="php-var">$callback</span>))
+</span><span id="402" class="l"><a href="#402">402: </a>        {
+</span><span id="403" class="l"><a href="#403">403: </a>            <span class="php-comment">// Return the data as encoded json with a callback</span>
+</span><span id="404" class="l"><a href="#404">404: </a>            <span class="php-keyword1">return</span> <span class="php-var">$callback</span> . <span class="php-quote">'('</span> . <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>) . <span class="php-quote">');'</span>;
+</span><span id="405" class="l"><a href="#405">405: </a>        }
+</span><span id="406" class="l"><a href="#406">406: </a>
+</span><span id="407" class="l"><a href="#407">407: </a>        <span class="php-comment">// An invalid jsonp callback function provided.</span>
+</span><span id="408" class="l"><a href="#408">408: </a>        <span class="php-comment">// Though I don't believe this should be hardcoded here</span>
+</span><span id="409" class="l"><a href="#409">409: </a>        <span class="php-var">$data</span>[<span class="php-quote">'warning'</span>] = <span class="php-quote">'INVALID JSONP CALLBACK: '</span> . <span class="php-var">$callback</span>;
+</span><span id="410" class="l"><a href="#410">410: </a>
+</span><span id="411" class="l"><a href="#411">411: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
+</span><span id="412" class="l"><a href="#412">412: </a>    }
+</span><span id="413" class="l"><a href="#413">413: </a>
+</span><span id="414" class="l"><a href="#414">414: </a>    <span class="php-comment">/**
+</span></span><span id="415" class="l"><a href="#415">415: </a><span class="php-comment">     * Encode data as a serialized array
+</span></span><span id="416" class="l"><a href="#416">416: </a><span class="php-comment">     *
+</span></span><span id="417" class="l"><a href="#417">417: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="418" class="l"><a href="#418">418: </a><span class="php-comment">     * to the constructor
+</span></span><span id="419" class="l"><a href="#419">419: </a><span class="php-comment">     * @return string Serialized data
+</span></span><span id="420" class="l"><a href="#420">420: </a><span class="php-comment">     */</span>
+</span><span id="421" class="l"><a href="#421">421: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_serialized(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="422" class="l"><a href="#422">422: </a>    {
+</span><span id="423" class="l"><a href="#423">423: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="424" class="l"><a href="#424">424: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="425" class="l"><a href="#425">425: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="426" class="l"><a href="#426">426: </a>        {
+</span><span id="427" class="l"><a href="#427">427: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="428" class="l"><a href="#428">428: </a>        }
+</span><span id="429" class="l"><a href="#429">429: </a>
+</span><span id="430" class="l"><a href="#430">430: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">serialize</span>(<span class="php-var">$data</span>);
+</span><span id="431" class="l"><a href="#431">431: </a>    }
+</span><span id="432" class="l"><a href="#432">432: </a>
+</span><span id="433" class="l"><a href="#433">433: </a>    <span class="php-comment">/**
+</span></span><span id="434" class="l"><a href="#434">434: </a><span class="php-comment">     * Format data using a PHP structure
+</span></span><span id="435" class="l"><a href="#435">435: </a><span class="php-comment">     *
+</span></span><span id="436" class="l"><a href="#436">436: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="437" class="l"><a href="#437">437: </a><span class="php-comment">     * to the constructor
+</span></span><span id="438" class="l"><a href="#438">438: </a><span class="php-comment">     * @return mixed String representation of a variable
+</span></span><span id="439" class="l"><a href="#439">439: </a><span class="php-comment">     */</span>
+</span><span id="440" class="l"><a href="#440">440: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_php(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="441" class="l"><a href="#441">441: </a>    {
+</span><span id="442" class="l"><a href="#442">442: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="443" class="l"><a href="#443">443: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="444" class="l"><a href="#444">444: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="445" class="l"><a href="#445">445: </a>        {
+</span><span id="446" class="l"><a href="#446">446: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="447" class="l"><a href="#447">447: </a>        }
+</span><span id="448" class="l"><a href="#448">448: </a>
+</span><span id="449" class="l"><a href="#449">449: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">var_export</span>(<span class="php-var">$data</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="450" class="l"><a href="#450">450: </a>    }
+</span><span id="451" class="l"><a href="#451">451: </a>
+</span><span id="452" class="l"><a href="#452">452: </a>    <span class="php-comment">// INTERNAL FUNCTIONS</span>
+</span><span id="453" class="l"><a href="#453">453: </a>
+</span><span id="454" class="l"><a href="#454">454: </a>    <span class="php-comment">/**
+</span></span><span id="455" class="l"><a href="#455">455: </a><span class="php-comment">     * @param $data XML string
+</span></span><span id="456" class="l"><a href="#456">456: </a><span class="php-comment">     * @return SimpleXMLElement XML element object; otherwise, empty array
+</span></span><span id="457" class="l"><a href="#457">457: </a><span class="php-comment">     */</span>
+</span><span id="458" class="l"><a href="#458">458: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_xml(<span class="php-var">$data</span>)
+</span><span id="459" class="l"><a href="#459">459: </a>    {
+</span><span id="460" class="l"><a href="#460">460: </a>        <span class="php-keyword1">return</span> <span class="php-var">$data</span> ? (<span class="php-keyword1">array</span>) <span class="php-keyword2">simplexml_load_string</span>(<span class="php-var">$data</span>, <span class="php-quote">'SimpleXMLElement'</span>, LIBXML_NOCDATA) : [];
+</span><span id="461" class="l"><a href="#461">461: </a>    }
+</span><span id="462" class="l"><a href="#462">462: </a>
+</span><span id="463" class="l"><a href="#463">463: </a>    <span class="php-comment">/**
+</span></span><span id="464" class="l"><a href="#464">464: </a><span class="php-comment">     * @param string $data CSV string
+</span></span><span id="465" class="l"><a href="#465">465: </a><span class="php-comment">     * @param string $delimiter The optional delimiter parameter sets the field
+</span></span><span id="466" class="l"><a href="#466">466: </a><span class="php-comment">     * delimiter (one character only). NULL will use the default value (,)
+</span></span><span id="467" class="l"><a href="#467">467: </a><span class="php-comment">     * @param string $enclosure The optional enclosure parameter sets the field
+</span></span><span id="468" class="l"><a href="#468">468: </a><span class="php-comment">     * enclosure (one character only). NULL will use the default value (&quot;)
+</span></span><span id="469" class="l"><a href="#469">469: </a><span class="php-comment">     * @return array A multi-dimensional array with the outer array being the number of rows
+</span></span><span id="470" class="l"><a href="#470">470: </a><span class="php-comment">     * and the inner arrays the individual fields
+</span></span><span id="471" class="l"><a href="#471">471: </a><span class="php-comment">     */</span>
+</span><span id="472" class="l"><a href="#472">472: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_csv(<span class="php-var">$data</span>, <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>, <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>)
+</span><span id="473" class="l"><a href="#473">473: </a>    {
+</span><span id="474" class="l"><a href="#474">474: </a>        <span class="php-comment">// If NULL, then set as the default delimiter</span>
+</span><span id="475" class="l"><a href="#475">475: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$delimiter</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="476" class="l"><a href="#476">476: </a>        {
+</span><span id="477" class="l"><a href="#477">477: </a>            <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>;
+</span><span id="478" class="l"><a href="#478">478: </a>        }
+</span><span id="479" class="l"><a href="#479">479: </a>
+</span><span id="480" class="l"><a href="#480">480: </a>        <span class="php-comment">// If NULL, then set as the default enclosure</span>
+</span><span id="481" class="l"><a href="#481">481: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$enclosure</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="482" class="l"><a href="#482">482: </a>        {
+</span><span id="483" class="l"><a href="#483">483: </a>            <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>;
+</span><span id="484" class="l"><a href="#484">484: </a>        }
+</span><span id="485" class="l"><a href="#485">485: </a>
+</span><span id="486" class="l"><a href="#486">486: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">str_getcsv</span>(<span class="php-var">$data</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
+</span><span id="487" class="l"><a href="#487">487: </a>    }
+</span><span id="488" class="l"><a href="#488">488: </a>
+</span><span id="489" class="l"><a href="#489">489: </a>    <span class="php-comment">/**
+</span></span><span id="490" class="l"><a href="#490">490: </a><span class="php-comment">     * @param $data Encoded json string
+</span></span><span id="491" class="l"><a href="#491">491: </a><span class="php-comment">     * @return mixed Decoded json string with leading and trailing whitespace removed
+</span></span><span id="492" class="l"><a href="#492">492: </a><span class="php-comment">     */</span>
+</span><span id="493" class="l"><a href="#493">493: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_json(<span class="php-var">$data</span>)
+</span><span id="494" class="l"><a href="#494">494: </a>    {
+</span><span id="495" class="l"><a href="#495">495: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_decode</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
+</span><span id="496" class="l"><a href="#496">496: </a>    }
+</span><span id="497" class="l"><a href="#497">497: </a>
+</span><span id="498" class="l"><a href="#498">498: </a>    <span class="php-comment">/**
+</span></span><span id="499" class="l"><a href="#499">499: </a><span class="php-comment">     * @param string Data to unserialized
+</span></span><span id="500" class="l"><a href="#500">500: </a><span class="php-comment">     * @return mixed Unserialized data
+</span></span><span id="501" class="l"><a href="#501">501: </a><span class="php-comment">     */</span>
+</span><span id="502" class="l"><a href="#502">502: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_serialize(<span class="php-var">$data</span>)
+</span><span id="503" class="l"><a href="#503">503: </a>    {
+</span><span id="504" class="l"><a href="#504">504: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">unserialize</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
+</span><span id="505" class="l"><a href="#505">505: </a>    }
+</span><span id="506" class="l"><a href="#506">506: </a>
+</span><span id="507" class="l"><a href="#507">507: </a>    <span class="php-comment">/**
+</span></span><span id="508" class="l"><a href="#508">508: </a><span class="php-comment">     * @param $data Data to trim leading and trailing whitespace
+</span></span><span id="509" class="l"><a href="#509">509: </a><span class="php-comment">     * @return string Data with leading and trailing whitespace removed
+</span></span><span id="510" class="l"><a href="#510">510: </a><span class="php-comment">     */</span>
+</span><span id="511" class="l"><a href="#511">511: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_php(<span class="php-var">$data</span>)
+</span><span id="512" class="l"><a href="#512">512: </a>    {
+</span><span id="513" class="l"><a href="#513">513: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">trim</span>(<span class="php-var">$data</span>);
+</span><span id="514" class="l"><a href="#514">514: </a>    }
+</span><span id="515" class="l"><a href="#515">515: </a>
+</span><span id="516" class="l"><a href="#516">516: </a>}
+</span><span id="517" class="l"><a href="#517">517: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
+<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Key.html b/documentation/source-class-Key.html
index 73885743..4a39dcd4 100644
--- a/documentation/source-class-Key.html
+++ b/documentation/source-class-Key.html
@@ -137,14 +137,14 @@ <h3>Classes</h3>
 </span><span id="45" class="l"><a href="#45"> 45: </a>        <span class="php-keyword1">if</span> (self::_insert_key(<span class="php-var">$key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-var">$level</span>, <span class="php-quote">'ignore_limits'</span> =&gt; <span class="php-var">$ignore_limits</span>]))
 </span><span id="46" class="l"><a href="#46"> 46: </a>        {
 </span><span id="47" class="l"><a href="#47"> 47: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="48" class="l"><a href="#48"> 48: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
+</span><span id="48" class="l"><a href="#48"> 48: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
 </span><span id="49" class="l"><a href="#49"> 49: </a>                <span class="php-quote">'key'</span> =&gt; <span class="php-var">$key</span>
 </span><span id="50" class="l"><a href="#50"> 50: </a>            ], REST_Controller::HTTP_CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
 </span><span id="51" class="l"><a href="#51"> 51: </a>        }
 </span><span id="52" class="l"><a href="#52"> 52: </a>        <span class="php-keyword1">else</span>
 </span><span id="53" class="l"><a href="#53"> 53: </a>        {
 </span><span id="54" class="l"><a href="#54"> 54: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="55" class="l"><a href="#55"> 55: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>,
+</span><span id="55" class="l"><a href="#55"> 55: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
 </span><span id="56" class="l"><a href="#56"> 56: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
 </span><span id="57" class="l"><a href="#57"> 57: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
 </span><span id="58" class="l"><a href="#58"> 58: </a>        }
@@ -168,228 +168,232 @@ <h3>Classes</h3>
 </span><span id="76" class="l"><a href="#76"> 76: </a>        {
 </span><span id="77" class="l"><a href="#77"> 77: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
 </span><span id="78" class="l"><a href="#78"> 78: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="79" class="l"><a href="#79"> 79: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key'</span>
-</span><span id="80" class="l"><a href="#80"> 80: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
-</span><span id="81" class="l"><a href="#81"> 81: </a>        }
-</span><span id="82" class="l"><a href="#82"> 82: </a>
-</span><span id="83" class="l"><a href="#83"> 83: </a>        <span class="php-comment">// Destroy it</span>
-</span><span id="84" class="l"><a href="#84"> 84: </a>        self::_delete_key(<span class="php-var">$key</span>);
-</span><span id="85" class="l"><a href="#85"> 85: </a>
-</span><span id="86" class="l"><a href="#86"> 86: </a>        <span class="php-comment">// Respond that the key was destroyed</span>
-</span><span id="87" class="l"><a href="#87"> 87: </a>        <span class="php-var">$this</span>-&gt;response([
-</span><span id="88" class="l"><a href="#88"> 88: </a>            <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
-</span><span id="89" class="l"><a href="#89"> 89: </a>            <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API Key was deleted'</span>
-</span><span id="90" class="l"><a href="#90"> 90: </a>            ], REST_Controller::HTTP_NO_CONTENT); <span class="php-comment">// NO_CONTENT (204) being the HTTP response code</span>
-</span><span id="91" class="l"><a href="#91"> 91: </a>    }
-</span><span id="92" class="l"><a href="#92"> 92: </a>
-</span><span id="93" class="l"><a href="#93"> 93: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="94" class="l"><a href="#94"> 94: </a>
-</span><span id="95" class="l"><a href="#95"> 95: </a>    <span class="php-comment">/**
-</span></span><span id="96" class="l"><a href="#96"> 96: </a><span class="php-comment">     * Update Key
-</span></span><span id="97" class="l"><a href="#97"> 97: </a><span class="php-comment">     * Change the level
-</span></span><span id="98" class="l"><a href="#98"> 98: </a><span class="php-comment">     *
-</span></span><span id="99" class="l"><a href="#99"> 99: </a><span class="php-comment">     * @access    public
-</span></span><span id="100" class="l"><a href="#100">100: </a><span class="php-comment">     * @return    void
-</span></span><span id="101" class="l"><a href="#101">101: </a><span class="php-comment">     */</span>
-</span><span id="102" class="l"><a href="#102">102: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> level_post()
-</span><span id="103" class="l"><a href="#103">103: </a>    {
-</span><span id="104" class="l"><a href="#104">104: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
-</span><span id="105" class="l"><a href="#105">105: </a>        <span class="php-var">$new_level</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'level'</span>);
-</span><span id="106" class="l"><a href="#106">106: </a>
-</span><span id="107" class="l"><a href="#107">107: </a>        <span class="php-comment">// Does this key exist?</span>
-</span><span id="108" class="l"><a href="#108">108: </a>        <span class="php-keyword1">if</span> (!self::_key_exists(<span class="php-var">$key</span>))
-</span><span id="109" class="l"><a href="#109">109: </a>        {
-</span><span id="110" class="l"><a href="#110">110: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
-</span><span id="111" class="l"><a href="#111">111: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="112" class="l"><a href="#112">112: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key'</span>
-</span><span id="113" class="l"><a href="#113">113: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
-</span><span id="114" class="l"><a href="#114">114: </a>        }
-</span><span id="115" class="l"><a href="#115">115: </a>
-</span><span id="116" class="l"><a href="#116">116: </a>        <span class="php-comment">// Update the key level</span>
-</span><span id="117" class="l"><a href="#117">117: </a>        <span class="php-keyword1">if</span> (self::_update_key(<span class="php-var">$key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-var">$new_level</span>]))
-</span><span id="118" class="l"><a href="#118">118: </a>        {
-</span><span id="119" class="l"><a href="#119">119: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="120" class="l"><a href="#120">120: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
-</span><span id="121" class="l"><a href="#121">121: </a>                <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API Key was updated'</span>
-</span><span id="122" class="l"><a href="#122">122: </a>            ], REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
-</span><span id="123" class="l"><a href="#123">123: </a>        }
-</span><span id="124" class="l"><a href="#124">124: </a>        <span class="php-keyword1">else</span>
-</span><span id="125" class="l"><a href="#125">125: </a>        {
-</span><span id="126" class="l"><a href="#126">126: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="127" class="l"><a href="#127">127: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>,
-</span><span id="128" class="l"><a href="#128">128: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not update the key level'</span>
-</span><span id="129" class="l"><a href="#129">129: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
-</span><span id="130" class="l"><a href="#130">130: </a>        }
-</span><span id="131" class="l"><a href="#131">131: </a>    }
-</span><span id="132" class="l"><a href="#132">132: </a>
-</span><span id="133" class="l"><a href="#133">133: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="79" class="l"><a href="#79"> 79: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="80" class="l"><a href="#80"> 80: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
+</span><span id="81" class="l"><a href="#81"> 81: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
+</span><span id="82" class="l"><a href="#82"> 82: </a>        }
+</span><span id="83" class="l"><a href="#83"> 83: </a>
+</span><span id="84" class="l"><a href="#84"> 84: </a>        <span class="php-comment">// Destroy it</span>
+</span><span id="85" class="l"><a href="#85"> 85: </a>        self::_delete_key(<span class="php-var">$key</span>);
+</span><span id="86" class="l"><a href="#86"> 86: </a>
+</span><span id="87" class="l"><a href="#87"> 87: </a>        <span class="php-comment">// Respond that the key was destroyed</span>
+</span><span id="88" class="l"><a href="#88"> 88: </a>        <span class="php-var">$this</span>-&gt;response([
+</span><span id="89" class="l"><a href="#89"> 89: </a>            <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
+</span><span id="90" class="l"><a href="#90"> 90: </a>            <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API key was deleted'</span>
+</span><span id="91" class="l"><a href="#91"> 91: </a>            ], REST_Controller::HTTP_NO_CONTENT); <span class="php-comment">// NO_CONTENT (204) being the HTTP response code</span>
+</span><span id="92" class="l"><a href="#92"> 92: </a>    }
+</span><span id="93" class="l"><a href="#93"> 93: </a>
+</span><span id="94" class="l"><a href="#94"> 94: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="95" class="l"><a href="#95"> 95: </a>
+</span><span id="96" class="l"><a href="#96"> 96: </a>    <span class="php-comment">/**
+</span></span><span id="97" class="l"><a href="#97"> 97: </a><span class="php-comment">     * Update Key
+</span></span><span id="98" class="l"><a href="#98"> 98: </a><span class="php-comment">     * Change the level
+</span></span><span id="99" class="l"><a href="#99"> 99: </a><span class="php-comment">     *
+</span></span><span id="100" class="l"><a href="#100">100: </a><span class="php-comment">     * @access    public
+</span></span><span id="101" class="l"><a href="#101">101: </a><span class="php-comment">     * @return    void
+</span></span><span id="102" class="l"><a href="#102">102: </a><span class="php-comment">     */</span>
+</span><span id="103" class="l"><a href="#103">103: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> level_post()
+</span><span id="104" class="l"><a href="#104">104: </a>    {
+</span><span id="105" class="l"><a href="#105">105: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
+</span><span id="106" class="l"><a href="#106">106: </a>        <span class="php-var">$new_level</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'level'</span>);
+</span><span id="107" class="l"><a href="#107">107: </a>
+</span><span id="108" class="l"><a href="#108">108: </a>        <span class="php-comment">// Does this key exist?</span>
+</span><span id="109" class="l"><a href="#109">109: </a>        <span class="php-keyword1">if</span> (!self::_key_exists(<span class="php-var">$key</span>))
+</span><span id="110" class="l"><a href="#110">110: </a>        {
+</span><span id="111" class="l"><a href="#111">111: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
+</span><span id="112" class="l"><a href="#112">112: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="113" class="l"><a href="#113">113: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="114" class="l"><a href="#114">114: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
+</span><span id="115" class="l"><a href="#115">115: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
+</span><span id="116" class="l"><a href="#116">116: </a>        }
+</span><span id="117" class="l"><a href="#117">117: </a>
+</span><span id="118" class="l"><a href="#118">118: </a>        <span class="php-comment">// Update the key level</span>
+</span><span id="119" class="l"><a href="#119">119: </a>        <span class="php-keyword1">if</span> (self::_update_key(<span class="php-var">$key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-var">$new_level</span>]))
+</span><span id="120" class="l"><a href="#120">120: </a>        {
+</span><span id="121" class="l"><a href="#121">121: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="122" class="l"><a href="#122">122: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
+</span><span id="123" class="l"><a href="#123">123: </a>                <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API key was updated'</span>
+</span><span id="124" class="l"><a href="#124">124: </a>            ], REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
+</span><span id="125" class="l"><a href="#125">125: </a>        }
+</span><span id="126" class="l"><a href="#126">126: </a>        <span class="php-keyword1">else</span>
+</span><span id="127" class="l"><a href="#127">127: </a>        {
+</span><span id="128" class="l"><a href="#128">128: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="129" class="l"><a href="#129">129: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="130" class="l"><a href="#130">130: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not update the key level'</span>
+</span><span id="131" class="l"><a href="#131">131: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
+</span><span id="132" class="l"><a href="#132">132: </a>        }
+</span><span id="133" class="l"><a href="#133">133: </a>    }
 </span><span id="134" class="l"><a href="#134">134: </a>
-</span><span id="135" class="l"><a href="#135">135: </a>    <span class="php-comment">/**
-</span></span><span id="136" class="l"><a href="#136">136: </a><span class="php-comment">     * Update Key
-</span></span><span id="137" class="l"><a href="#137">137: </a><span class="php-comment">     * Change the level
-</span></span><span id="138" class="l"><a href="#138">138: </a><span class="php-comment">     *
-</span></span><span id="139" class="l"><a href="#139">139: </a><span class="php-comment">     * @access    public
-</span></span><span id="140" class="l"><a href="#140">140: </a><span class="php-comment">     * @return    void
-</span></span><span id="141" class="l"><a href="#141">141: </a><span class="php-comment">     */</span>
-</span><span id="142" class="l"><a href="#142">142: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> suspend_post()
-</span><span id="143" class="l"><a href="#143">143: </a>    {
-</span><span id="144" class="l"><a href="#144">144: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
-</span><span id="145" class="l"><a href="#145">145: </a>
-</span><span id="146" class="l"><a href="#146">146: </a>        <span class="php-comment">// Does this key exist?</span>
-</span><span id="147" class="l"><a href="#147">147: </a>        <span class="php-keyword1">if</span> (!self::_key_exists(<span class="php-var">$key</span>))
-</span><span id="148" class="l"><a href="#148">148: </a>        {
-</span><span id="149" class="l"><a href="#149">149: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
-</span><span id="150" class="l"><a href="#150">150: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="151" class="l"><a href="#151">151: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key'</span>
-</span><span id="152" class="l"><a href="#152">152: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
-</span><span id="153" class="l"><a href="#153">153: </a>        }
-</span><span id="154" class="l"><a href="#154">154: </a>
-</span><span id="155" class="l"><a href="#155">155: </a>        <span class="php-comment">// Update the key level</span>
-</span><span id="156" class="l"><a href="#156">156: </a>        <span class="php-keyword1">if</span> (self::_update_key(<span class="php-var">$key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-num">0</span>]))
-</span><span id="157" class="l"><a href="#157">157: </a>        {
-</span><span id="158" class="l"><a href="#158">158: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="159" class="l"><a href="#159">159: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
-</span><span id="160" class="l"><a href="#160">160: </a>                <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'Key was suspended'</span>
-</span><span id="161" class="l"><a href="#161">161: </a>            ], REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
-</span><span id="162" class="l"><a href="#162">162: </a>        }
-</span><span id="163" class="l"><a href="#163">163: </a>        <span class="php-keyword1">else</span>
-</span><span id="164" class="l"><a href="#164">164: </a>        {
-</span><span id="165" class="l"><a href="#165">165: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="166" class="l"><a href="#166">166: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>,
-</span><span id="167" class="l"><a href="#167">167: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not suspend the user'</span>
-</span><span id="168" class="l"><a href="#168">168: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
-</span><span id="169" class="l"><a href="#169">169: </a>        }
-</span><span id="170" class="l"><a href="#170">170: </a>    }
-</span><span id="171" class="l"><a href="#171">171: </a>
-</span><span id="172" class="l"><a href="#172">172: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="173" class="l"><a href="#173">173: </a>
-</span><span id="174" class="l"><a href="#174">174: </a>    <span class="php-comment">/**
-</span></span><span id="175" class="l"><a href="#175">175: </a><span class="php-comment">     * Regenerate Key
-</span></span><span id="176" class="l"><a href="#176">176: </a><span class="php-comment">     * Remove a key from the database to stop it working
-</span></span><span id="177" class="l"><a href="#177">177: </a><span class="php-comment">     *
-</span></span><span id="178" class="l"><a href="#178">178: </a><span class="php-comment">     * @access    public
-</span></span><span id="179" class="l"><a href="#179">179: </a><span class="php-comment">     * @return    void
-</span></span><span id="180" class="l"><a href="#180">180: </a><span class="php-comment">     */</span>
-</span><span id="181" class="l"><a href="#181">181: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> regenerate_post()
-</span><span id="182" class="l"><a href="#182">182: </a>    {
-</span><span id="183" class="l"><a href="#183">183: </a>        <span class="php-var">$old_key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
-</span><span id="184" class="l"><a href="#184">184: </a>        <span class="php-var">$key_details</span> = self::_get_key(<span class="php-var">$old_key</span>);
-</span><span id="185" class="l"><a href="#185">185: </a>
-</span><span id="186" class="l"><a href="#186">186: </a>        <span class="php-comment">// Does this key exist?</span>
-</span><span id="187" class="l"><a href="#187">187: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$key_details</span>)
-</span><span id="188" class="l"><a href="#188">188: </a>        {
-</span><span id="189" class="l"><a href="#189">189: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
-</span><span id="190" class="l"><a href="#190">190: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="191" class="l"><a href="#191">191: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API Key'</span>
-</span><span id="192" class="l"><a href="#192">192: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
-</span><span id="193" class="l"><a href="#193">193: </a>        }
-</span><span id="194" class="l"><a href="#194">194: </a>
-</span><span id="195" class="l"><a href="#195">195: </a>        <span class="php-comment">// Build a new key</span>
-</span><span id="196" class="l"><a href="#196">196: </a>        <span class="php-var">$new_key</span> = self::_generate_key();
-</span><span id="197" class="l"><a href="#197">197: </a>
-</span><span id="198" class="l"><a href="#198">198: </a>        <span class="php-comment">// Insert the new key</span>
-</span><span id="199" class="l"><a href="#199">199: </a>        <span class="php-keyword1">if</span> (self::_insert_key(<span class="php-var">$new_key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-var">$key_details</span>-&gt;level, <span class="php-quote">'ignore_limits'</span> =&gt; <span class="php-var">$key_details</span>-&gt;ignore_limits]))
-</span><span id="200" class="l"><a href="#200">200: </a>        {
-</span><span id="201" class="l"><a href="#201">201: </a>            <span class="php-comment">// Suspend old key</span>
-</span><span id="202" class="l"><a href="#202">202: </a>            self::_update_key(<span class="php-var">$old_key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-num">0</span>]);
-</span><span id="203" class="l"><a href="#203">203: </a>
-</span><span id="204" class="l"><a href="#204">204: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="205" class="l"><a href="#205">205: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">1</span>,
-</span><span id="206" class="l"><a href="#206">206: </a>                <span class="php-quote">'key'</span> =&gt; <span class="php-var">$new_key</span>
-</span><span id="207" class="l"><a href="#207">207: </a>            ], REST_Controller::HTTP_CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
-</span><span id="208" class="l"><a href="#208">208: </a>        }
-</span><span id="209" class="l"><a href="#209">209: </a>        <span class="php-keyword1">else</span>
-</span><span id="210" class="l"><a href="#210">210: </a>        {
-</span><span id="211" class="l"><a href="#211">211: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="212" class="l"><a href="#212">212: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-num">0</span>,
-</span><span id="213" class="l"><a href="#213">213: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
-</span><span id="214" class="l"><a href="#214">214: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
-</span><span id="215" class="l"><a href="#215">215: </a>        }
-</span><span id="216" class="l"><a href="#216">216: </a>    }
-</span><span id="217" class="l"><a href="#217">217: </a>
-</span><span id="218" class="l"><a href="#218">218: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="219" class="l"><a href="#219">219: </a>
-</span><span id="220" class="l"><a href="#220">220: </a>    <span class="php-comment">/* Helper Methods */</span>
+</span><span id="135" class="l"><a href="#135">135: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="136" class="l"><a href="#136">136: </a>
+</span><span id="137" class="l"><a href="#137">137: </a>    <span class="php-comment">/**
+</span></span><span id="138" class="l"><a href="#138">138: </a><span class="php-comment">     * Update Key
+</span></span><span id="139" class="l"><a href="#139">139: </a><span class="php-comment">     * Change the level
+</span></span><span id="140" class="l"><a href="#140">140: </a><span class="php-comment">     *
+</span></span><span id="141" class="l"><a href="#141">141: </a><span class="php-comment">     * @access    public
+</span></span><span id="142" class="l"><a href="#142">142: </a><span class="php-comment">     * @return    void
+</span></span><span id="143" class="l"><a href="#143">143: </a><span class="php-comment">     */</span>
+</span><span id="144" class="l"><a href="#144">144: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> suspend_post()
+</span><span id="145" class="l"><a href="#145">145: </a>    {
+</span><span id="146" class="l"><a href="#146">146: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
+</span><span id="147" class="l"><a href="#147">147: </a>
+</span><span id="148" class="l"><a href="#148">148: </a>        <span class="php-comment">// Does this key exist?</span>
+</span><span id="149" class="l"><a href="#149">149: </a>        <span class="php-keyword1">if</span> (!self::_key_exists(<span class="php-var">$key</span>))
+</span><span id="150" class="l"><a href="#150">150: </a>        {
+</span><span id="151" class="l"><a href="#151">151: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
+</span><span id="152" class="l"><a href="#152">152: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="153" class="l"><a href="#153">153: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="154" class="l"><a href="#154">154: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
+</span><span id="155" class="l"><a href="#155">155: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
+</span><span id="156" class="l"><a href="#156">156: </a>        }
+</span><span id="157" class="l"><a href="#157">157: </a>
+</span><span id="158" class="l"><a href="#158">158: </a>        <span class="php-comment">// Update the key level</span>
+</span><span id="159" class="l"><a href="#159">159: </a>        <span class="php-keyword1">if</span> (self::_update_key(<span class="php-var">$key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-num">0</span>]))
+</span><span id="160" class="l"><a href="#160">160: </a>        {
+</span><span id="161" class="l"><a href="#161">161: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="162" class="l"><a href="#162">162: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
+</span><span id="163" class="l"><a href="#163">163: </a>                <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'Key was suspended'</span>
+</span><span id="164" class="l"><a href="#164">164: </a>            ], REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
+</span><span id="165" class="l"><a href="#165">165: </a>        }
+</span><span id="166" class="l"><a href="#166">166: </a>        <span class="php-keyword1">else</span>
+</span><span id="167" class="l"><a href="#167">167: </a>        {
+</span><span id="168" class="l"><a href="#168">168: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="169" class="l"><a href="#169">169: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="170" class="l"><a href="#170">170: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not suspend the user'</span>
+</span><span id="171" class="l"><a href="#171">171: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
+</span><span id="172" class="l"><a href="#172">172: </a>        }
+</span><span id="173" class="l"><a href="#173">173: </a>    }
+</span><span id="174" class="l"><a href="#174">174: </a>
+</span><span id="175" class="l"><a href="#175">175: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="176" class="l"><a href="#176">176: </a>
+</span><span id="177" class="l"><a href="#177">177: </a>    <span class="php-comment">/**
+</span></span><span id="178" class="l"><a href="#178">178: </a><span class="php-comment">     * Regenerate Key
+</span></span><span id="179" class="l"><a href="#179">179: </a><span class="php-comment">     * Remove a key from the database to stop it working
+</span></span><span id="180" class="l"><a href="#180">180: </a><span class="php-comment">     *
+</span></span><span id="181" class="l"><a href="#181">181: </a><span class="php-comment">     * @access    public
+</span></span><span id="182" class="l"><a href="#182">182: </a><span class="php-comment">     * @return    void
+</span></span><span id="183" class="l"><a href="#183">183: </a><span class="php-comment">     */</span>
+</span><span id="184" class="l"><a href="#184">184: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> regenerate_post()
+</span><span id="185" class="l"><a href="#185">185: </a>    {
+</span><span id="186" class="l"><a href="#186">186: </a>        <span class="php-var">$old_key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
+</span><span id="187" class="l"><a href="#187">187: </a>        <span class="php-var">$key_details</span> = self::_get_key(<span class="php-var">$old_key</span>);
+</span><span id="188" class="l"><a href="#188">188: </a>
+</span><span id="189" class="l"><a href="#189">189: </a>        <span class="php-comment">// Does this key exist?</span>
+</span><span id="190" class="l"><a href="#190">190: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$key_details</span>)
+</span><span id="191" class="l"><a href="#191">191: </a>        {
+</span><span id="192" class="l"><a href="#192">192: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
+</span><span id="193" class="l"><a href="#193">193: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="194" class="l"><a href="#194">194: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="195" class="l"><a href="#195">195: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
+</span><span id="196" class="l"><a href="#196">196: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
+</span><span id="197" class="l"><a href="#197">197: </a>        }
+</span><span id="198" class="l"><a href="#198">198: </a>
+</span><span id="199" class="l"><a href="#199">199: </a>        <span class="php-comment">// Build a new key</span>
+</span><span id="200" class="l"><a href="#200">200: </a>        <span class="php-var">$new_key</span> = self::_generate_key();
+</span><span id="201" class="l"><a href="#201">201: </a>
+</span><span id="202" class="l"><a href="#202">202: </a>        <span class="php-comment">// Insert the new key</span>
+</span><span id="203" class="l"><a href="#203">203: </a>        <span class="php-keyword1">if</span> (self::_insert_key(<span class="php-var">$new_key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-var">$key_details</span>-&gt;level, <span class="php-quote">'ignore_limits'</span> =&gt; <span class="php-var">$key_details</span>-&gt;ignore_limits]))
+</span><span id="204" class="l"><a href="#204">204: </a>        {
+</span><span id="205" class="l"><a href="#205">205: </a>            <span class="php-comment">// Suspend old key</span>
+</span><span id="206" class="l"><a href="#206">206: </a>            self::_update_key(<span class="php-var">$old_key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-num">0</span>]);
+</span><span id="207" class="l"><a href="#207">207: </a>
+</span><span id="208" class="l"><a href="#208">208: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="209" class="l"><a href="#209">209: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
+</span><span id="210" class="l"><a href="#210">210: </a>                <span class="php-quote">'key'</span> =&gt; <span class="php-var">$new_key</span>
+</span><span id="211" class="l"><a href="#211">211: </a>            ], REST_Controller::HTTP_CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
+</span><span id="212" class="l"><a href="#212">212: </a>        }
+</span><span id="213" class="l"><a href="#213">213: </a>        <span class="php-keyword1">else</span>
+</span><span id="214" class="l"><a href="#214">214: </a>        {
+</span><span id="215" class="l"><a href="#215">215: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="216" class="l"><a href="#216">216: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="217" class="l"><a href="#217">217: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
+</span><span id="218" class="l"><a href="#218">218: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
+</span><span id="219" class="l"><a href="#219">219: </a>        }
+</span><span id="220" class="l"><a href="#220">220: </a>    }
 </span><span id="221" class="l"><a href="#221">221: </a>
-</span><span id="222" class="l"><a href="#222">222: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _generate_key()
-</span><span id="223" class="l"><a href="#223">223: </a>    {
-</span><span id="224" class="l"><a href="#224">224: </a>        <span class="php-keyword1">do</span>
-</span><span id="225" class="l"><a href="#225">225: </a>        {
-</span><span id="226" class="l"><a href="#226">226: </a>            <span class="php-comment">// Generate a random salt</span>
-</span><span id="227" class="l"><a href="#227">227: </a>            <span class="php-var">$salt</span> = <span class="php-var">$this</span>-&gt;security-&gt;get_random_bytes(<span class="php-num">64</span>);
-</span><span id="228" class="l"><a href="#228">228: </a>
-</span><span id="229" class="l"><a href="#229">229: </a>            <span class="php-comment">// If an error occurred, then fall back to the previous method</span>
-</span><span id="230" class="l"><a href="#230">230: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$salt</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="231" class="l"><a href="#231">231: </a>            {
-</span><span id="232" class="l"><a href="#232">232: </a>                <span class="php-var">$salt</span> = <span class="php-keyword2">hash</span>(<span class="php-quote">'sha256'</span>, <span class="php-keyword2">time</span>() . <span class="php-keyword2">mt_rand</span>());
-</span><span id="233" class="l"><a href="#233">233: </a>            }
-</span><span id="234" class="l"><a href="#234">234: </a>            <span class="php-var">$new_key</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$salt</span>, <span class="php-num">0</span>, config_item(<span class="php-quote">'rest_key_length'</span>));
-</span><span id="235" class="l"><a href="#235">235: </a>        }
-</span><span id="236" class="l"><a href="#236">236: </a>        <span class="php-keyword1">while</span> (self::_key_exists(<span class="php-var">$new_key</span>));
-</span><span id="237" class="l"><a href="#237">237: </a>        <span class="php-comment">// Already in the DB? Fail. Try again</span>
-</span><span id="238" class="l"><a href="#238">238: </a>
-</span><span id="239" class="l"><a href="#239">239: </a>        <span class="php-keyword1">return</span> <span class="php-var">$new_key</span>;
-</span><span id="240" class="l"><a href="#240">240: </a>    }
-</span><span id="241" class="l"><a href="#241">241: </a>
-</span><span id="242" class="l"><a href="#242">242: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="243" class="l"><a href="#243">243: </a>
-</span><span id="244" class="l"><a href="#244">244: </a>    <span class="php-comment">/* Private Data Methods */</span>
+</span><span id="222" class="l"><a href="#222">222: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="223" class="l"><a href="#223">223: </a>
+</span><span id="224" class="l"><a href="#224">224: </a>    <span class="php-comment">/* Helper Methods */</span>
+</span><span id="225" class="l"><a href="#225">225: </a>
+</span><span id="226" class="l"><a href="#226">226: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _generate_key()
+</span><span id="227" class="l"><a href="#227">227: </a>    {
+</span><span id="228" class="l"><a href="#228">228: </a>        <span class="php-keyword1">do</span>
+</span><span id="229" class="l"><a href="#229">229: </a>        {
+</span><span id="230" class="l"><a href="#230">230: </a>            <span class="php-comment">// Generate a random salt</span>
+</span><span id="231" class="l"><a href="#231">231: </a>            <span class="php-var">$salt</span> = <span class="php-var">$this</span>-&gt;security-&gt;get_random_bytes(<span class="php-num">64</span>);
+</span><span id="232" class="l"><a href="#232">232: </a>
+</span><span id="233" class="l"><a href="#233">233: </a>            <span class="php-comment">// If an error occurred, then fall back to the previous method</span>
+</span><span id="234" class="l"><a href="#234">234: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$salt</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="235" class="l"><a href="#235">235: </a>            {
+</span><span id="236" class="l"><a href="#236">236: </a>                <span class="php-var">$salt</span> = <span class="php-keyword2">hash</span>(<span class="php-quote">'sha256'</span>, <span class="php-keyword2">time</span>() . <span class="php-keyword2">mt_rand</span>());
+</span><span id="237" class="l"><a href="#237">237: </a>            }
+</span><span id="238" class="l"><a href="#238">238: </a>            <span class="php-var">$new_key</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$salt</span>, <span class="php-num">0</span>, config_item(<span class="php-quote">'rest_key_length'</span>));
+</span><span id="239" class="l"><a href="#239">239: </a>        }
+</span><span id="240" class="l"><a href="#240">240: </a>        <span class="php-keyword1">while</span> (self::_key_exists(<span class="php-var">$new_key</span>));
+</span><span id="241" class="l"><a href="#241">241: </a>        <span class="php-comment">// Already in the DB? Fail. Try again</span>
+</span><span id="242" class="l"><a href="#242">242: </a>
+</span><span id="243" class="l"><a href="#243">243: </a>        <span class="php-keyword1">return</span> <span class="php-var">$new_key</span>;
+</span><span id="244" class="l"><a href="#244">244: </a>    }
 </span><span id="245" class="l"><a href="#245">245: </a>
-</span><span id="246" class="l"><a href="#246">246: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _get_key(<span class="php-var">$key</span>)
-</span><span id="247" class="l"><a href="#247">247: </a>    {
-</span><span id="248" class="l"><a href="#248">248: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="249" class="l"><a href="#249">249: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
-</span><span id="250" class="l"><a href="#250">250: </a>            -&gt;get(config_item(<span class="php-quote">'rest_keys_table'</span>))
-</span><span id="251" class="l"><a href="#251">251: </a>            -&gt;row();
-</span><span id="252" class="l"><a href="#252">252: </a>    }
-</span><span id="253" class="l"><a href="#253">253: </a>
-</span><span id="254" class="l"><a href="#254">254: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="255" class="l"><a href="#255">255: </a>
-</span><span id="256" class="l"><a href="#256">256: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _key_exists(<span class="php-var">$key</span>)
-</span><span id="257" class="l"><a href="#257">257: </a>    {
-</span><span id="258" class="l"><a href="#258">258: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="259" class="l"><a href="#259">259: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
-</span><span id="260" class="l"><a href="#260">260: </a>            -&gt;count_all_results(config_item(<span class="php-quote">'rest_keys_table'</span>)) &gt; <span class="php-num">0</span>;
-</span><span id="261" class="l"><a href="#261">261: </a>    }
-</span><span id="262" class="l"><a href="#262">262: </a>
-</span><span id="263" class="l"><a href="#263">263: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="264" class="l"><a href="#264">264: </a>
-</span><span id="265" class="l"><a href="#265">265: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _insert_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
-</span><span id="266" class="l"><a href="#266">266: </a>    {
-</span><span id="267" class="l"><a href="#267">267: </a>        <span class="php-var">$data</span>[config_item(<span class="php-quote">'rest_key_column'</span>)] = <span class="php-var">$key</span>;
-</span><span id="268" class="l"><a href="#268">268: </a>        <span class="php-var">$data</span>[<span class="php-quote">'date_created'</span>] = <span class="php-keyword2">function_exists</span>(<span class="php-quote">'now'</span>) ? now() : <span class="php-keyword2">time</span>();
-</span><span id="269" class="l"><a href="#269">269: </a>
-</span><span id="270" class="l"><a href="#270">270: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="271" class="l"><a href="#271">271: </a>            -&gt;set(<span class="php-var">$data</span>)
-</span><span id="272" class="l"><a href="#272">272: </a>            -&gt;insert(config_item(<span class="php-quote">'rest_keys_table'</span>));
-</span><span id="273" class="l"><a href="#273">273: </a>    }
-</span><span id="274" class="l"><a href="#274">274: </a>
-</span><span id="275" class="l"><a href="#275">275: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="276" class="l"><a href="#276">276: </a>
-</span><span id="277" class="l"><a href="#277">277: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _update_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
-</span><span id="278" class="l"><a href="#278">278: </a>    {
-</span><span id="279" class="l"><a href="#279">279: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="280" class="l"><a href="#280">280: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
-</span><span id="281" class="l"><a href="#281">281: </a>            -&gt;update(config_item(<span class="php-quote">'rest_keys_table'</span>), <span class="php-var">$data</span>);
-</span><span id="282" class="l"><a href="#282">282: </a>    }
-</span><span id="283" class="l"><a href="#283">283: </a>
-</span><span id="284" class="l"><a href="#284">284: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="285" class="l"><a href="#285">285: </a>
-</span><span id="286" class="l"><a href="#286">286: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _delete_key(<span class="php-var">$key</span>)
-</span><span id="287" class="l"><a href="#287">287: </a>    {
-</span><span id="288" class="l"><a href="#288">288: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="289" class="l"><a href="#289">289: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
-</span><span id="290" class="l"><a href="#290">290: </a>            -&gt;<span class="php-keyword2">delete</span>(config_item(<span class="php-quote">'rest_keys_table'</span>));
-</span><span id="291" class="l"><a href="#291">291: </a>    }
-</span><span id="292" class="l"><a href="#292">292: </a>}
-</span><span id="293" class="l"><a href="#293">293: </a></span></code></pre>
+</span><span id="246" class="l"><a href="#246">246: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="247" class="l"><a href="#247">247: </a>
+</span><span id="248" class="l"><a href="#248">248: </a>    <span class="php-comment">/* Private Data Methods */</span>
+</span><span id="249" class="l"><a href="#249">249: </a>
+</span><span id="250" class="l"><a href="#250">250: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _get_key(<span class="php-var">$key</span>)
+</span><span id="251" class="l"><a href="#251">251: </a>    {
+</span><span id="252" class="l"><a href="#252">252: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="253" class="l"><a href="#253">253: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
+</span><span id="254" class="l"><a href="#254">254: </a>            -&gt;get(config_item(<span class="php-quote">'rest_keys_table'</span>))
+</span><span id="255" class="l"><a href="#255">255: </a>            -&gt;row();
+</span><span id="256" class="l"><a href="#256">256: </a>    }
+</span><span id="257" class="l"><a href="#257">257: </a>
+</span><span id="258" class="l"><a href="#258">258: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="259" class="l"><a href="#259">259: </a>
+</span><span id="260" class="l"><a href="#260">260: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _key_exists(<span class="php-var">$key</span>)
+</span><span id="261" class="l"><a href="#261">261: </a>    {
+</span><span id="262" class="l"><a href="#262">262: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="263" class="l"><a href="#263">263: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
+</span><span id="264" class="l"><a href="#264">264: </a>            -&gt;count_all_results(config_item(<span class="php-quote">'rest_keys_table'</span>)) &gt; <span class="php-num">0</span>;
+</span><span id="265" class="l"><a href="#265">265: </a>    }
+</span><span id="266" class="l"><a href="#266">266: </a>
+</span><span id="267" class="l"><a href="#267">267: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="268" class="l"><a href="#268">268: </a>
+</span><span id="269" class="l"><a href="#269">269: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _insert_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
+</span><span id="270" class="l"><a href="#270">270: </a>    {
+</span><span id="271" class="l"><a href="#271">271: </a>        <span class="php-var">$data</span>[config_item(<span class="php-quote">'rest_key_column'</span>)] = <span class="php-var">$key</span>;
+</span><span id="272" class="l"><a href="#272">272: </a>        <span class="php-var">$data</span>[<span class="php-quote">'date_created'</span>] = <span class="php-keyword2">function_exists</span>(<span class="php-quote">'now'</span>) ? now() : <span class="php-keyword2">time</span>();
+</span><span id="273" class="l"><a href="#273">273: </a>
+</span><span id="274" class="l"><a href="#274">274: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="275" class="l"><a href="#275">275: </a>            -&gt;set(<span class="php-var">$data</span>)
+</span><span id="276" class="l"><a href="#276">276: </a>            -&gt;insert(config_item(<span class="php-quote">'rest_keys_table'</span>));
+</span><span id="277" class="l"><a href="#277">277: </a>    }
+</span><span id="278" class="l"><a href="#278">278: </a>
+</span><span id="279" class="l"><a href="#279">279: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="280" class="l"><a href="#280">280: </a>
+</span><span id="281" class="l"><a href="#281">281: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _update_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
+</span><span id="282" class="l"><a href="#282">282: </a>    {
+</span><span id="283" class="l"><a href="#283">283: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="284" class="l"><a href="#284">284: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
+</span><span id="285" class="l"><a href="#285">285: </a>            -&gt;update(config_item(<span class="php-quote">'rest_keys_table'</span>), <span class="php-var">$data</span>);
+</span><span id="286" class="l"><a href="#286">286: </a>    }
+</span><span id="287" class="l"><a href="#287">287: </a>
+</span><span id="288" class="l"><a href="#288">288: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="289" class="l"><a href="#289">289: </a>
+</span><span id="290" class="l"><a href="#290">290: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _delete_key(<span class="php-var">$key</span>)
+</span><span id="291" class="l"><a href="#291">291: </a>    {
+</span><span id="292" class="l"><a href="#292">292: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="293" class="l"><a href="#293">293: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
+</span><span id="294" class="l"><a href="#294">294: </a>            -&gt;<span class="php-keyword2">delete</span>(config_item(<span class="php-quote">'rest_keys_table'</span>));
+</span><span id="295" class="l"><a href="#295">295: </a>    }
+</span><span id="296" class="l"><a href="#296">296: </a>}
+</span><span id="297" class="l"><a href="#297">297: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
+<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>
diff --git a/documentation/source-class-REST_Controller.html b/documentation/source-class-REST_Controller.html
index 86ccfef1..8550f99a 100644
--- a/documentation/source-class-REST_Controller.html
+++ b/documentation/source-class-REST_Controller.html
@@ -108,7 +108,7 @@ <h3>Classes</h3>
 </span></span><span id="16" class="l"><a href="#16">  16: </a><span class="php-comment"> */</span>
 </span><span id="17" class="l"><a href="#17">  17: </a><span class="php-keyword1">abstract</span> <span class="php-keyword1">class</span> REST_Controller <span class="php-keyword1">extends</span> CI_Controller {
 </span><span id="18" class="l"><a href="#18">  18: </a>
-</span><span id="19" class="l"><a href="#19">  19: </a>    <span class="php-comment">// Note: Only the widley used HTTP status codes are documented</span>
+</span><span id="19" class="l"><a href="#19">  19: </a>    <span class="php-comment">// Note: Only the widely used HTTP status codes are documented</span>
 </span><span id="20" class="l"><a href="#20">  20: </a>
 </span><span id="21" class="l"><a href="#21">  21: </a>    <span class="php-comment">// Informational</span>
 </span><span id="22" class="l"><a href="#22">  22: </a>
@@ -368,1773 +368,1760 @@ <h3>Classes</h3>
 </span><span id="276" class="l"><a href="#276"> 276: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_allow</span> = <span class="php-keyword1">TRUE</span>;
 </span><span id="277" class="l"><a href="#277"> 277: </a>
 </span><span id="278" class="l"><a href="#278"> 278: </a>    <span class="php-comment">/**
-</span></span><span id="279" class="l"><a href="#279"> 279: </a><span class="php-comment">     * Determines if output compression is enabled
+</span></span><span id="279" class="l"><a href="#279"> 279: </a><span class="php-comment">     * The LDAP Distinguished Name of the User post authentication
 </span></span><span id="280" class="l"><a href="#280"> 280: </a><span class="php-comment">     *
-</span></span><span id="281" class="l"><a href="#281"> 281: </a><span class="php-comment">     * @var bool
+</span></span><span id="281" class="l"><a href="#281"> 281: </a><span class="php-comment">     * @var string
 </span></span><span id="282" class="l"><a href="#282"> 282: </a><span class="php-comment">     */</span>
-</span><span id="283" class="l"><a href="#283"> 283: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_zlib_oc</span> = <span class="php-keyword1">FALSE</span>;
+</span><span id="283" class="l"><a href="#283"> 283: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_user_ldap_dn</span> = <span class="php-quote">''</span>;
 </span><span id="284" class="l"><a href="#284"> 284: </a>
 </span><span id="285" class="l"><a href="#285"> 285: </a>    <span class="php-comment">/**
-</span></span><span id="286" class="l"><a href="#286"> 286: </a><span class="php-comment">     * The LDAP Distinguished Name of the User post authentication
+</span></span><span id="286" class="l"><a href="#286"> 286: </a><span class="php-comment">     * The start of the response time from the server
 </span></span><span id="287" class="l"><a href="#287"> 287: </a><span class="php-comment">     *
 </span></span><span id="288" class="l"><a href="#288"> 288: </a><span class="php-comment">     * @var string
 </span></span><span id="289" class="l"><a href="#289"> 289: </a><span class="php-comment">     */</span>
-</span><span id="290" class="l"><a href="#290"> 290: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_user_ldap_dn</span> = <span class="php-quote">''</span>;
+</span><span id="290" class="l"><a href="#290"> 290: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_start_rtime</span> = <span class="php-quote">''</span>;
 </span><span id="291" class="l"><a href="#291"> 291: </a>
 </span><span id="292" class="l"><a href="#292"> 292: </a>    <span class="php-comment">/**
-</span></span><span id="293" class="l"><a href="#293"> 293: </a><span class="php-comment">     * The start of the response time from the server
+</span></span><span id="293" class="l"><a href="#293"> 293: </a><span class="php-comment">     * The end of the response time from the server
 </span></span><span id="294" class="l"><a href="#294"> 294: </a><span class="php-comment">     *
 </span></span><span id="295" class="l"><a href="#295"> 295: </a><span class="php-comment">     * @var string
 </span></span><span id="296" class="l"><a href="#296"> 296: </a><span class="php-comment">     */</span>
-</span><span id="297" class="l"><a href="#297"> 297: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_start_rtime</span> = <span class="php-quote">''</span>;
+</span><span id="297" class="l"><a href="#297"> 297: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_end_rtime</span> = <span class="php-quote">''</span>;
 </span><span id="298" class="l"><a href="#298"> 298: </a>
 </span><span id="299" class="l"><a href="#299"> 299: </a>    <span class="php-comment">/**
-</span></span><span id="300" class="l"><a href="#300"> 300: </a><span class="php-comment">     * The end of the response time from the server
+</span></span><span id="300" class="l"><a href="#300"> 300: </a><span class="php-comment">     * List all supported methods, the first will be the default format
 </span></span><span id="301" class="l"><a href="#301"> 301: </a><span class="php-comment">     *
-</span></span><span id="302" class="l"><a href="#302"> 302: </a><span class="php-comment">     * @var string
+</span></span><span id="302" class="l"><a href="#302"> 302: </a><span class="php-comment">     * @var array
 </span></span><span id="303" class="l"><a href="#303"> 303: </a><span class="php-comment">     */</span>
-</span><span id="304" class="l"><a href="#304"> 304: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_end_rtime</span> = <span class="php-quote">''</span>;
-</span><span id="305" class="l"><a href="#305"> 305: </a>
-</span><span id="306" class="l"><a href="#306"> 306: </a>    <span class="php-comment">/**
-</span></span><span id="307" class="l"><a href="#307"> 307: </a><span class="php-comment">     * List all supported methods, the first will be the default format
-</span></span><span id="308" class="l"><a href="#308"> 308: </a><span class="php-comment">     *
-</span></span><span id="309" class="l"><a href="#309"> 309: </a><span class="php-comment">     * @var array
-</span></span><span id="310" class="l"><a href="#310"> 310: </a><span class="php-comment">     */</span>
-</span><span id="311" class="l"><a href="#311"> 311: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_supported_formats</span> = [
-</span><span id="312" class="l"><a href="#312"> 312: </a>            <span class="php-quote">'json'</span> =&gt; <span class="php-quote">'application/json'</span>,
-</span><span id="313" class="l"><a href="#313"> 313: </a>            <span class="php-quote">'array'</span> =&gt; <span class="php-quote">'application/json'</span>,
-</span><span id="314" class="l"><a href="#314"> 314: </a>            <span class="php-quote">'csv'</span> =&gt; <span class="php-quote">'application/csv'</span>,
-</span><span id="315" class="l"><a href="#315"> 315: </a>            <span class="php-quote">'html'</span> =&gt; <span class="php-quote">'text/html'</span>,
-</span><span id="316" class="l"><a href="#316"> 316: </a>            <span class="php-quote">'jsonp'</span> =&gt; <span class="php-quote">'application/javascript'</span>,
-</span><span id="317" class="l"><a href="#317"> 317: </a>            <span class="php-quote">'php'</span> =&gt; <span class="php-quote">'text/plain'</span>,
-</span><span id="318" class="l"><a href="#318"> 318: </a>            <span class="php-quote">'serialized'</span> =&gt; <span class="php-quote">'application/vnd.php.serialized'</span>,
-</span><span id="319" class="l"><a href="#319"> 319: </a>            <span class="php-quote">'xml'</span> =&gt; <span class="php-quote">'application/xml'</span>
-</span><span id="320" class="l"><a href="#320"> 320: </a>        ];
+</span><span id="304" class="l"><a href="#304"> 304: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_supported_formats</span> = [
+</span><span id="305" class="l"><a href="#305"> 305: </a>            <span class="php-quote">'json'</span> =&gt; <span class="php-quote">'application/json'</span>,
+</span><span id="306" class="l"><a href="#306"> 306: </a>            <span class="php-quote">'array'</span> =&gt; <span class="php-quote">'application/json'</span>,
+</span><span id="307" class="l"><a href="#307"> 307: </a>            <span class="php-quote">'csv'</span> =&gt; <span class="php-quote">'application/csv'</span>,
+</span><span id="308" class="l"><a href="#308"> 308: </a>            <span class="php-quote">'html'</span> =&gt; <span class="php-quote">'text/html'</span>,
+</span><span id="309" class="l"><a href="#309"> 309: </a>            <span class="php-quote">'jsonp'</span> =&gt; <span class="php-quote">'application/javascript'</span>,
+</span><span id="310" class="l"><a href="#310"> 310: </a>            <span class="php-quote">'php'</span> =&gt; <span class="php-quote">'text/plain'</span>,
+</span><span id="311" class="l"><a href="#311"> 311: </a>            <span class="php-quote">'serialized'</span> =&gt; <span class="php-quote">'application/vnd.php.serialized'</span>,
+</span><span id="312" class="l"><a href="#312"> 312: </a>            <span class="php-quote">'xml'</span> =&gt; <span class="php-quote">'application/xml'</span>
+</span><span id="313" class="l"><a href="#313"> 313: </a>        ];
+</span><span id="314" class="l"><a href="#314"> 314: </a>
+</span><span id="315" class="l"><a href="#315"> 315: </a>    <span class="php-comment">/**
+</span></span><span id="316" class="l"><a href="#316"> 316: </a><span class="php-comment">     * Information about the current API user
+</span></span><span id="317" class="l"><a href="#317"> 317: </a><span class="php-comment">     *
+</span></span><span id="318" class="l"><a href="#318"> 318: </a><span class="php-comment">     * @var object
+</span></span><span id="319" class="l"><a href="#319"> 319: </a><span class="php-comment">     */</span>
+</span><span id="320" class="l"><a href="#320"> 320: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_apiuser</span>;
 </span><span id="321" class="l"><a href="#321"> 321: </a>
 </span><span id="322" class="l"><a href="#322"> 322: </a>    <span class="php-comment">/**
-</span></span><span id="323" class="l"><a href="#323"> 323: </a><span class="php-comment">     * Information about the current API user
-</span></span><span id="324" class="l"><a href="#324"> 324: </a><span class="php-comment">     *
-</span></span><span id="325" class="l"><a href="#325"> 325: </a><span class="php-comment">     * @var object
-</span></span><span id="326" class="l"><a href="#326"> 326: </a><span class="php-comment">     */</span>
-</span><span id="327" class="l"><a href="#327"> 327: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_apiuser</span>;
-</span><span id="328" class="l"><a href="#328"> 328: </a>
-</span><span id="329" class="l"><a href="#329"> 329: </a>    <span class="php-comment">/**
-</span></span><span id="330" class="l"><a href="#330"> 330: </a><span class="php-comment">     * Enable XSS flag
-</span></span><span id="331" class="l"><a href="#331"> 331: </a><span class="php-comment">     * Determines whether the XSS filter is always active when
-</span></span><span id="332" class="l"><a href="#332"> 332: </a><span class="php-comment">     * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered.
-</span></span><span id="333" class="l"><a href="#333"> 333: </a><span class="php-comment">     * Set automatically based on config setting.
-</span></span><span id="334" class="l"><a href="#334"> 334: </a><span class="php-comment">     *
-</span></span><span id="335" class="l"><a href="#335"> 335: </a><span class="php-comment">     * @var bool
-</span></span><span id="336" class="l"><a href="#336"> 336: </a><span class="php-comment">     */</span>
-</span><span id="337" class="l"><a href="#337"> 337: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_enable_xss</span> = <span class="php-keyword1">FALSE</span>;
-</span><span id="338" class="l"><a href="#338"> 338: </a>
-</span><span id="339" class="l"><a href="#339"> 339: </a>    <span class="php-comment">/**
-</span></span><span id="340" class="l"><a href="#340"> 340: </a><span class="php-comment">     * HTTP status codes and their respective description
-</span></span><span id="341" class="l"><a href="#341"> 341: </a><span class="php-comment">     * Note: Only the widley used HTTP status codes are used
-</span></span><span id="342" class="l"><a href="#342"> 342: </a><span class="php-comment">     *
-</span></span><span id="343" class="l"><a href="#343"> 343: </a><span class="php-comment">     * @var array
-</span></span><span id="344" class="l"><a href="#344"> 344: </a><span class="php-comment">     * @link http://www.restapitutorial.com/httpstatuscodes.html
-</span></span><span id="345" class="l"><a href="#345"> 345: </a><span class="php-comment">     */</span>
-</span><span id="346" class="l"><a href="#346"> 346: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$http_status_codes</span> = [
-</span><span id="347" class="l"><a href="#347"> 347: </a>        self::HTTP_OK =&gt; <span class="php-quote">'OK'</span>,
-</span><span id="348" class="l"><a href="#348"> 348: </a>        self::HTTP_CREATED =&gt; <span class="php-quote">'CREATED'</span>,
-</span><span id="349" class="l"><a href="#349"> 349: </a>        self::HTTP_NO_CONTENT =&gt; <span class="php-quote">'NO CONTENT'</span>,
-</span><span id="350" class="l"><a href="#350"> 350: </a>        self::HTTP_NOT_MODIFIED =&gt; <span class="php-quote">'NOT MODIFIED'</span>,
-</span><span id="351" class="l"><a href="#351"> 351: </a>        self::HTTP_BAD_REQUEST =&gt; <span class="php-quote">'BAD REQUEST'</span>,
-</span><span id="352" class="l"><a href="#352"> 352: </a>        self::HTTP_UNAUTHORIZED =&gt; <span class="php-quote">'UNAUTHORIZED'</span>,
-</span><span id="353" class="l"><a href="#353"> 353: </a>        self::HTTP_FORBIDDEN =&gt; <span class="php-quote">'FORBIDDEN'</span>,
-</span><span id="354" class="l"><a href="#354"> 354: </a>        self::HTTP_NOT_FOUND =&gt; <span class="php-quote">'NOT FOUND'</span>,
-</span><span id="355" class="l"><a href="#355"> 355: </a>        self::HTTP_METHOD_NOT_ALLOWED =&gt; <span class="php-quote">'METHOD NOT ALLOWED'</span>,
-</span><span id="356" class="l"><a href="#356"> 356: </a>        self::HTTP_NOT_ACCEPTABLE =&gt; <span class="php-quote">'NOT ACCEPTABLE'</span>,
-</span><span id="357" class="l"><a href="#357"> 357: </a>        self::HTTP_CONFLICT =&gt; <span class="php-quote">'CONFLICT'</span>,
-</span><span id="358" class="l"><a href="#358"> 358: </a>        self::HTTP_INTERNAL_SERVER_ERROR =&gt; <span class="php-quote">'INTERNAL SERVER ERROR'</span>,
-</span><span id="359" class="l"><a href="#359"> 359: </a>        self::HTTP_NOT_IMPLEMENTED =&gt; <span class="php-quote">'NOT IMPLEMENTED'</span>
-</span><span id="360" class="l"><a href="#360"> 360: </a>    ];
-</span><span id="361" class="l"><a href="#361"> 361: </a>
-</span><span id="362" class="l"><a href="#362"> 362: </a>    <span class="php-comment">/**
-</span></span><span id="363" class="l"><a href="#363"> 363: </a><span class="php-comment">     * Extend this function to apply additional checking early on in the process
-</span></span><span id="364" class="l"><a href="#364"> 364: </a><span class="php-comment">     *
-</span></span><span id="365" class="l"><a href="#365"> 365: </a><span class="php-comment">     * @access protected
-</span></span><span id="366" class="l"><a href="#366"> 366: </a><span class="php-comment">     * @return void
-</span></span><span id="367" class="l"><a href="#367"> 367: </a><span class="php-comment">     */</span>
-</span><span id="368" class="l"><a href="#368"> 368: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> early_checks()
-</span><span id="369" class="l"><a href="#369"> 369: </a>    {
-</span><span id="370" class="l"><a href="#370"> 370: </a>    }
-</span><span id="371" class="l"><a href="#371"> 371: </a>
-</span><span id="372" class="l"><a href="#372"> 372: </a>    <span class="php-comment">/**
-</span></span><span id="373" class="l"><a href="#373"> 373: </a><span class="php-comment">     * Constructor for the REST API
-</span></span><span id="374" class="l"><a href="#374"> 374: </a><span class="php-comment">     *
-</span></span><span id="375" class="l"><a href="#375"> 375: </a><span class="php-comment">     * @access public
-</span></span><span id="376" class="l"><a href="#376"> 376: </a><span class="php-comment">     * @param string $config Configuration filename minus the file extension
-</span></span><span id="377" class="l"><a href="#377"> 377: </a><span class="php-comment">     * e.g: my_rest.php is passed as 'my_rest'
-</span></span><span id="378" class="l"><a href="#378"> 378: </a><span class="php-comment">     * @return void
-</span></span><span id="379" class="l"><a href="#379"> 379: </a><span class="php-comment">     */</span>
-</span><span id="380" class="l"><a href="#380"> 380: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$config</span> = <span class="php-quote">'rest'</span>)
-</span><span id="381" class="l"><a href="#381"> 381: </a>    {
-</span><span id="382" class="l"><a href="#382"> 382: </a>        parent::__construct();
-</span><span id="383" class="l"><a href="#383"> 383: </a>
-</span><span id="384" class="l"><a href="#384"> 384: </a>        <span class="php-comment">// Disable XML Entity (security vulnerability)</span>
-</span><span id="385" class="l"><a href="#385"> 385: </a>        <span class="php-keyword2">libxml_disable_entity_loader</span>(<span class="php-keyword1">TRUE</span>);
+</span></span><span id="323" class="l"><a href="#323"> 323: </a><span class="php-comment">     * Enable XSS flag
+</span></span><span id="324" class="l"><a href="#324"> 324: </a><span class="php-comment">     * Determines whether the XSS filter is always active when
+</span></span><span id="325" class="l"><a href="#325"> 325: </a><span class="php-comment">     * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered.
+</span></span><span id="326" class="l"><a href="#326"> 326: </a><span class="php-comment">     * Set automatically based on config setting.
+</span></span><span id="327" class="l"><a href="#327"> 327: </a><span class="php-comment">     *
+</span></span><span id="328" class="l"><a href="#328"> 328: </a><span class="php-comment">     * @var bool
+</span></span><span id="329" class="l"><a href="#329"> 329: </a><span class="php-comment">     */</span>
+</span><span id="330" class="l"><a href="#330"> 330: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_enable_xss</span> = <span class="php-keyword1">FALSE</span>;
+</span><span id="331" class="l"><a href="#331"> 331: </a>
+</span><span id="332" class="l"><a href="#332"> 332: </a>    <span class="php-comment">/**
+</span></span><span id="333" class="l"><a href="#333"> 333: </a><span class="php-comment">     * HTTP status codes and their respective description
+</span></span><span id="334" class="l"><a href="#334"> 334: </a><span class="php-comment">     * Note: Only the widely used HTTP status codes are used
+</span></span><span id="335" class="l"><a href="#335"> 335: </a><span class="php-comment">     *
+</span></span><span id="336" class="l"><a href="#336"> 336: </a><span class="php-comment">     * @var array
+</span></span><span id="337" class="l"><a href="#337"> 337: </a><span class="php-comment">     * @link http://www.restapitutorial.com/httpstatuscodes.html
+</span></span><span id="338" class="l"><a href="#338"> 338: </a><span class="php-comment">     */</span>
+</span><span id="339" class="l"><a href="#339"> 339: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$http_status_codes</span> = [
+</span><span id="340" class="l"><a href="#340"> 340: </a>        self::HTTP_OK =&gt; <span class="php-quote">'OK'</span>,
+</span><span id="341" class="l"><a href="#341"> 341: </a>        self::HTTP_CREATED =&gt; <span class="php-quote">'CREATED'</span>,
+</span><span id="342" class="l"><a href="#342"> 342: </a>        self::HTTP_NO_CONTENT =&gt; <span class="php-quote">'NO CONTENT'</span>,
+</span><span id="343" class="l"><a href="#343"> 343: </a>        self::HTTP_NOT_MODIFIED =&gt; <span class="php-quote">'NOT MODIFIED'</span>,
+</span><span id="344" class="l"><a href="#344"> 344: </a>        self::HTTP_BAD_REQUEST =&gt; <span class="php-quote">'BAD REQUEST'</span>,
+</span><span id="345" class="l"><a href="#345"> 345: </a>        self::HTTP_UNAUTHORIZED =&gt; <span class="php-quote">'UNAUTHORIZED'</span>,
+</span><span id="346" class="l"><a href="#346"> 346: </a>        self::HTTP_FORBIDDEN =&gt; <span class="php-quote">'FORBIDDEN'</span>,
+</span><span id="347" class="l"><a href="#347"> 347: </a>        self::HTTP_NOT_FOUND =&gt; <span class="php-quote">'NOT FOUND'</span>,
+</span><span id="348" class="l"><a href="#348"> 348: </a>        self::HTTP_METHOD_NOT_ALLOWED =&gt; <span class="php-quote">'METHOD NOT ALLOWED'</span>,
+</span><span id="349" class="l"><a href="#349"> 349: </a>        self::HTTP_NOT_ACCEPTABLE =&gt; <span class="php-quote">'NOT ACCEPTABLE'</span>,
+</span><span id="350" class="l"><a href="#350"> 350: </a>        self::HTTP_CONFLICT =&gt; <span class="php-quote">'CONFLICT'</span>,
+</span><span id="351" class="l"><a href="#351"> 351: </a>        self::HTTP_INTERNAL_SERVER_ERROR =&gt; <span class="php-quote">'INTERNAL SERVER ERROR'</span>,
+</span><span id="352" class="l"><a href="#352"> 352: </a>        self::HTTP_NOT_IMPLEMENTED =&gt; <span class="php-quote">'NOT IMPLEMENTED'</span>
+</span><span id="353" class="l"><a href="#353"> 353: </a>    ];
+</span><span id="354" class="l"><a href="#354"> 354: </a>
+</span><span id="355" class="l"><a href="#355"> 355: </a>    <span class="php-comment">/**
+</span></span><span id="356" class="l"><a href="#356"> 356: </a><span class="php-comment">     * Extend this function to apply additional checking early on in the process
+</span></span><span id="357" class="l"><a href="#357"> 357: </a><span class="php-comment">     *
+</span></span><span id="358" class="l"><a href="#358"> 358: </a><span class="php-comment">     * @access protected
+</span></span><span id="359" class="l"><a href="#359"> 359: </a><span class="php-comment">     * @return void
+</span></span><span id="360" class="l"><a href="#360"> 360: </a><span class="php-comment">     */</span>
+</span><span id="361" class="l"><a href="#361"> 361: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> early_checks()
+</span><span id="362" class="l"><a href="#362"> 362: </a>    {
+</span><span id="363" class="l"><a href="#363"> 363: </a>    }
+</span><span id="364" class="l"><a href="#364"> 364: </a>
+</span><span id="365" class="l"><a href="#365"> 365: </a>    <span class="php-comment">/**
+</span></span><span id="366" class="l"><a href="#366"> 366: </a><span class="php-comment">     * Constructor for the REST API
+</span></span><span id="367" class="l"><a href="#367"> 367: </a><span class="php-comment">     *
+</span></span><span id="368" class="l"><a href="#368"> 368: </a><span class="php-comment">     * @access public
+</span></span><span id="369" class="l"><a href="#369"> 369: </a><span class="php-comment">     * @param string $config Configuration filename minus the file extension
+</span></span><span id="370" class="l"><a href="#370"> 370: </a><span class="php-comment">     * e.g: my_rest.php is passed as 'my_rest'
+</span></span><span id="371" class="l"><a href="#371"> 371: </a><span class="php-comment">     * @return void
+</span></span><span id="372" class="l"><a href="#372"> 372: </a><span class="php-comment">     */</span>
+</span><span id="373" class="l"><a href="#373"> 373: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$config</span> = <span class="php-quote">'rest'</span>)
+</span><span id="374" class="l"><a href="#374"> 374: </a>    {
+</span><span id="375" class="l"><a href="#375"> 375: </a>        parent::__construct();
+</span><span id="376" class="l"><a href="#376"> 376: </a>
+</span><span id="377" class="l"><a href="#377"> 377: </a>        <span class="php-comment">// Disable XML Entity (security vulnerability)</span>
+</span><span id="378" class="l"><a href="#378"> 378: </a>        <span class="php-keyword2">libxml_disable_entity_loader</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="379" class="l"><a href="#379"> 379: </a>
+</span><span id="380" class="l"><a href="#380"> 380: </a>        <span class="php-comment">// Check to see if PHP is equal to or greater than 5.4.x</span>
+</span><span id="381" class="l"><a href="#381"> 381: </a>        <span class="php-keyword1">if</span> (is_php(<span class="php-quote">'5.4'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="382" class="l"><a href="#382"> 382: </a>        {
+</span><span id="383" class="l"><a href="#383"> 383: </a>            <span class="php-comment">// CodeIgniter 3 is recommended for v5.4 or above</span>
+</span><span id="384" class="l"><a href="#384"> 384: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'Using PHP v'</span> . PHP_VERSION . <span class="php-quote">', though PHP v5.4 or greater is required'</span>);
+</span><span id="385" class="l"><a href="#385"> 385: </a>        }
 </span><span id="386" class="l"><a href="#386"> 386: </a>
-</span><span id="387" class="l"><a href="#387"> 387: </a>        <span class="php-comment">// Check to see if PHP is equal to or greater than 5.4.x</span>
-</span><span id="388" class="l"><a href="#388"> 388: </a>        <span class="php-keyword1">if</span> (is_php(<span class="php-quote">'5.4'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="387" class="l"><a href="#387"> 387: </a>        <span class="php-comment">// Check to see if this is CI 3.x</span>
+</span><span id="388" class="l"><a href="#388"> 388: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">explode</span>(<span class="php-quote">'.'</span>, CI_VERSION, <span class="php-num">2</span>)[<span class="php-num">0</span>] &lt; <span class="php-num">3</span>)
 </span><span id="389" class="l"><a href="#389"> 389: </a>        {
-</span><span id="390" class="l"><a href="#390"> 390: </a>            <span class="php-comment">// CodeIgniter 3 is recommended for v5.4 or above</span>
-</span><span id="391" class="l"><a href="#391"> 391: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'Using PHP v'</span> . PHP_VERSION . <span class="php-quote">', though PHP v5.4 or greater is required'</span>);
-</span><span id="392" class="l"><a href="#392"> 392: </a>        }
-</span><span id="393" class="l"><a href="#393"> 393: </a>
-</span><span id="394" class="l"><a href="#394"> 394: </a>        <span class="php-comment">// Check to see if this is CI 3.x</span>
-</span><span id="395" class="l"><a href="#395"> 395: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">explode</span>(<span class="php-quote">'.'</span>, CI_VERSION, <span class="php-num">2</span>)[<span class="php-num">0</span>] &lt; <span class="php-num">3</span>)
-</span><span id="396" class="l"><a href="#396"> 396: </a>        {
-</span><span id="397" class="l"><a href="#397"> 397: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
-</span><span id="398" class="l"><a href="#398"> 398: </a>        }
+</span><span id="390" class="l"><a href="#390"> 390: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
+</span><span id="391" class="l"><a href="#391"> 391: </a>        }
+</span><span id="392" class="l"><a href="#392"> 392: </a>
+</span><span id="393" class="l"><a href="#393"> 393: </a>        <span class="php-comment">// Set the default value of global xss filtering. Same approach as CodeIgniter 3</span>
+</span><span id="394" class="l"><a href="#394"> 394: </a>        <span class="php-var">$this</span>-&gt;_enable_xss = (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'global_xss_filtering'</span>) === <span class="php-keyword1">TRUE</span>);
+</span><span id="395" class="l"><a href="#395"> 395: </a>
+</span><span id="396" class="l"><a href="#396"> 396: </a>        <span class="php-comment">// Don't try to parse template variables like {elapsed_time} and {memory_usage}</span>
+</span><span id="397" class="l"><a href="#397"> 397: </a>        <span class="php-comment">// when output is displayed for not damaging data accidentally</span>
+</span><span id="398" class="l"><a href="#398"> 398: </a>        <span class="php-var">$this</span>-&gt;output-&gt;parse_exec_vars = <span class="php-keyword1">FALSE</span>;
 </span><span id="399" class="l"><a href="#399"> 399: </a>
-</span><span id="400" class="l"><a href="#400"> 400: </a>        <span class="php-comment">// Set the default value of global xss filtering. Same approach as CodeIgniter 3</span>
-</span><span id="401" class="l"><a href="#401"> 401: </a>        <span class="php-var">$this</span>-&gt;_enable_xss = (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'global_xss_filtering'</span>) === <span class="php-keyword1">TRUE</span>);
+</span><span id="400" class="l"><a href="#400"> 400: </a>        <span class="php-comment">// Start the timer for how long the request takes</span>
+</span><span id="401" class="l"><a href="#401"> 401: </a>        <span class="php-var">$this</span>-&gt;_start_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
 </span><span id="402" class="l"><a href="#402"> 402: </a>
-</span><span id="403" class="l"><a href="#403"> 403: </a>        <span class="php-comment">// Start the timer for how long the request takes</span>
-</span><span id="404" class="l"><a href="#404"> 404: </a>        <span class="php-var">$this</span>-&gt;_start_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="403" class="l"><a href="#403"> 403: </a>        <span class="php-comment">// Load the rest.php configuration file</span>
+</span><span id="404" class="l"><a href="#404"> 404: </a>        <span class="php-var">$this</span>-&gt;load-&gt;config(<span class="php-var">$config</span>);
 </span><span id="405" class="l"><a href="#405"> 405: </a>
-</span><span id="406" class="l"><a href="#406"> 406: </a>        <span class="php-comment">// Load the rest.php configuration file</span>
-</span><span id="407" class="l"><a href="#407"> 407: </a>        <span class="php-var">$this</span>-&gt;load-&gt;config(<span class="php-var">$config</span>);
+</span><span id="406" class="l"><a href="#406"> 406: </a>        <span class="php-comment">// At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)</span>
+</span><span id="407" class="l"><a href="#407"> 407: </a>        <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-quote">'format'</span>);
 </span><span id="408" class="l"><a href="#408"> 408: </a>
-</span><span id="409" class="l"><a href="#409"> 409: </a>        <span class="php-comment">// At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)</span>
-</span><span id="410" class="l"><a href="#410"> 410: </a>        <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-quote">'format'</span>);
-</span><span id="411" class="l"><a href="#411"> 411: </a>
-</span><span id="412" class="l"><a href="#412"> 412: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
-</span><span id="413" class="l"><a href="#413"> 413: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
-</span><span id="414" class="l"><a href="#414"> 414: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
-</span><span id="415" class="l"><a href="#415"> 415: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
-</span><span id="416" class="l"><a href="#416"> 416: </a>
-</span><span id="417" class="l"><a href="#417"> 417: </a>        <span class="php-var">$this</span>-&gt;_zlib_oc = @<span class="php-keyword2">ini_get</span>(<span class="php-quote">'zlib.output_compression'</span>);
-</span><span id="418" class="l"><a href="#418"> 418: </a>
-</span><span id="419" class="l"><a href="#419"> 419: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
-</span><span id="420" class="l"><a href="#420"> 420: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="421" class="l"><a href="#421"> 421: </a>        {
-</span><span id="422" class="l"><a href="#422"> 422: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
-</span><span id="423" class="l"><a href="#423"> 423: </a>        }
-</span><span id="424" class="l"><a href="#424"> 424: </a>
-</span><span id="425" class="l"><a href="#425"> 425: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
-</span><span id="426" class="l"><a href="#426"> 426: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
-</span><span id="427" class="l"><a href="#427"> 427: </a>
-</span><span id="428" class="l"><a href="#428"> 428: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
-</span><span id="429" class="l"><a href="#429"> 429: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
-</span><span id="430" class="l"><a href="#430"> 430: </a>
-</span><span id="431" class="l"><a href="#431"> 431: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
-</span><span id="432" class="l"><a href="#432"> 432: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
-</span><span id="433" class="l"><a href="#433"> 433: </a>        {
-</span><span id="434" class="l"><a href="#434"> 434: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = [];
-</span><span id="435" class="l"><a href="#435"> 435: </a>        }
-</span><span id="436" class="l"><a href="#436"> 436: </a>
-</span><span id="437" class="l"><a href="#437"> 437: </a>        <span class="php-comment">// Set up the query parameters</span>
-</span><span id="438" class="l"><a href="#438"> 438: </a>        <span class="php-var">$this</span>-&gt;_parse_query();
-</span><span id="439" class="l"><a href="#439"> 439: </a>
-</span><span id="440" class="l"><a href="#440"> 440: </a>        <span class="php-comment">// Set up the GET variables</span>
-</span><span id="441" class="l"><a href="#441"> 441: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
-</span><span id="442" class="l"><a href="#442"> 442: </a>
-</span><span id="443" class="l"><a href="#443"> 443: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
-</span><span id="444" class="l"><a href="#444"> 444: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
+</span><span id="409" class="l"><a href="#409"> 409: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
+</span><span id="410" class="l"><a href="#410"> 410: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
+</span><span id="411" class="l"><a href="#411"> 411: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
+</span><span id="412" class="l"><a href="#412"> 412: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
+</span><span id="413" class="l"><a href="#413"> 413: </a>
+</span><span id="414" class="l"><a href="#414"> 414: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
+</span><span id="415" class="l"><a href="#415"> 415: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="416" class="l"><a href="#416"> 416: </a>        {
+</span><span id="417" class="l"><a href="#417"> 417: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
+</span><span id="418" class="l"><a href="#418"> 418: </a>        }
+</span><span id="419" class="l"><a href="#419"> 419: </a>
+</span><span id="420" class="l"><a href="#420"> 420: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
+</span><span id="421" class="l"><a href="#421"> 421: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
+</span><span id="422" class="l"><a href="#422"> 422: </a>
+</span><span id="423" class="l"><a href="#423"> 423: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
+</span><span id="424" class="l"><a href="#424"> 424: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
+</span><span id="425" class="l"><a href="#425"> 425: </a>
+</span><span id="426" class="l"><a href="#426"> 426: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
+</span><span id="427" class="l"><a href="#427"> 427: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
+</span><span id="428" class="l"><a href="#428"> 428: </a>        {
+</span><span id="429" class="l"><a href="#429"> 429: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = [];
+</span><span id="430" class="l"><a href="#430"> 430: </a>        }
+</span><span id="431" class="l"><a href="#431"> 431: </a>
+</span><span id="432" class="l"><a href="#432"> 432: </a>        <span class="php-comment">// Set up the query parameters</span>
+</span><span id="433" class="l"><a href="#433"> 433: </a>        <span class="php-var">$this</span>-&gt;_parse_query();
+</span><span id="434" class="l"><a href="#434"> 434: </a>
+</span><span id="435" class="l"><a href="#435"> 435: </a>        <span class="php-comment">// Set up the GET variables</span>
+</span><span id="436" class="l"><a href="#436"> 436: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
+</span><span id="437" class="l"><a href="#437"> 437: </a>
+</span><span id="438" class="l"><a href="#438"> 438: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
+</span><span id="439" class="l"><a href="#439"> 439: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
+</span><span id="440" class="l"><a href="#440"> 440: </a>
+</span><span id="441" class="l"><a href="#441"> 441: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
+</span><span id="442" class="l"><a href="#442"> 442: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
+</span><span id="443" class="l"><a href="#443"> 443: </a>
+</span><span id="444" class="l"><a href="#444"> 444: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
 </span><span id="445" class="l"><a href="#445"> 445: </a>
-</span><span id="446" class="l"><a href="#446"> 446: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
-</span><span id="447" class="l"><a href="#447"> 447: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
-</span><span id="448" class="l"><a href="#448"> 448: </a>
-</span><span id="449" class="l"><a href="#449"> 449: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
-</span><span id="450" class="l"><a href="#450"> 450: </a>
-</span><span id="451" class="l"><a href="#451"> 451: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
-</span><span id="452" class="l"><a href="#452"> 452: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
-</span><span id="453" class="l"><a href="#453"> 453: </a>        {
-</span><span id="454" class="l"><a href="#454"> 454: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
-</span><span id="455" class="l"><a href="#455"> 455: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
-</span><span id="456" class="l"><a href="#456"> 456: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
-</span><span id="457" class="l"><a href="#457"> 457: </a>        }
-</span><span id="458" class="l"><a href="#458"> 458: </a>
-</span><span id="459" class="l"><a href="#459"> 459: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
-</span><span id="460" class="l"><a href="#460"> 460: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
-</span><span id="461" class="l"><a href="#461"> 461: </a>            <span class="php-var">$this</span>-&gt;_get_args,
-</span><span id="462" class="l"><a href="#462"> 462: </a>            <span class="php-var">$this</span>-&gt;_options_args,
-</span><span id="463" class="l"><a href="#463"> 463: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
-</span><span id="464" class="l"><a href="#464"> 464: </a>            <span class="php-var">$this</span>-&gt;_head_args,
-</span><span id="465" class="l"><a href="#465"> 465: </a>            <span class="php-var">$this</span>-&gt;_put_args,
-</span><span id="466" class="l"><a href="#466"> 466: </a>            <span class="php-var">$this</span>-&gt;_post_args,
-</span><span id="467" class="l"><a href="#467"> 467: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
-</span><span id="468" class="l"><a href="#468"> 468: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}
-</span><span id="469" class="l"><a href="#469"> 469: </a>        );
-</span><span id="470" class="l"><a href="#470"> 470: </a>
-</span><span id="471" class="l"><a href="#471"> 471: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
-</span><span id="472" class="l"><a href="#472"> 472: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
-</span><span id="473" class="l"><a href="#473"> 473: </a>
-</span><span id="474" class="l"><a href="#474"> 474: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
-</span><span id="475" class="l"><a href="#475"> 475: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
-</span><span id="476" class="l"><a href="#476"> 476: </a>
-</span><span id="477" class="l"><a href="#477"> 477: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
-</span><span id="478" class="l"><a href="#478"> 478: </a>        <span class="php-var">$this</span>-&gt;early_checks();
-</span><span id="479" class="l"><a href="#479"> 479: </a>
-</span><span id="480" class="l"><a href="#480"> 480: </a>        <span class="php-comment">// Load DB if its enabled</span>
-</span><span id="481" class="l"><a href="#481"> 481: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
-</span><span id="482" class="l"><a href="#482"> 482: </a>        {
-</span><span id="483" class="l"><a href="#483"> 483: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
-</span><span id="484" class="l"><a href="#484"> 484: </a>        }
-</span><span id="485" class="l"><a href="#485"> 485: </a>
-</span><span id="486" class="l"><a href="#486"> 486: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
-</span><span id="487" class="l"><a href="#487"> 487: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
-</span><span id="488" class="l"><a href="#488"> 488: </a>        {
-</span><span id="489" class="l"><a href="#489"> 489: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
-</span><span id="490" class="l"><a href="#490"> 490: </a>        }
-</span><span id="491" class="l"><a href="#491"> 491: </a>
-</span><span id="492" class="l"><a href="#492"> 492: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
-</span><span id="493" class="l"><a href="#493"> 493: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
-</span><span id="494" class="l"><a href="#494"> 494: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
-</span><span id="495" class="l"><a href="#495"> 495: </a>
-</span><span id="496" class="l"><a href="#496"> 496: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
-</span><span id="497" class="l"><a href="#497"> 497: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
-</span><span id="498" class="l"><a href="#498"> 498: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
-</span><span id="499" class="l"><a href="#499"> 499: </a>        {
-</span><span id="500" class="l"><a href="#500"> 500: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
-</span><span id="501" class="l"><a href="#501"> 501: </a>        }
-</span><span id="502" class="l"><a href="#502"> 502: </a>
-</span><span id="503" class="l"><a href="#503"> 503: </a>        <span class="php-comment">// Only allow ajax requests</span>
-</span><span id="504" class="l"><a href="#504"> 504: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
-</span><span id="505" class="l"><a href="#505"> 505: </a>        {
-</span><span id="506" class="l"><a href="#506"> 506: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="507" class="l"><a href="#507"> 507: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="508" class="l"><a href="#508"> 508: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="509" class="l"><a href="#509"> 509: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Only AJAX requests are acceptable'</span>
-</span><span id="510" class="l"><a href="#510"> 510: </a>                ], self::HTTP_NOT_ACCEPTABLE);
-</span><span id="511" class="l"><a href="#511"> 511: </a>        }
-</span><span id="512" class="l"><a href="#512"> 512: </a>
-</span><span id="513" class="l"><a href="#513"> 513: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
-</span><span id="514" class="l"><a href="#514"> 514: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; !(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
-</span><span id="515" class="l"><a href="#515"> 515: </a>        {
-</span><span id="516" class="l"><a href="#516"> 516: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="517" class="l"><a href="#517"> 517: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
-</span><span id="518" class="l"><a href="#518"> 518: </a>            {
-</span><span id="519" class="l"><a href="#519"> 519: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
-</span><span id="520" class="l"><a href="#520"> 520: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="521" class="l"><a href="#521"> 521: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="522" class="l"><a href="#522"> 522: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
-</span><span id="523" class="l"><a href="#523"> 523: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="524" class="l"><a href="#524"> 524: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="525" class="l"><a href="#525"> 525: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
-</span><span id="526" class="l"><a href="#526"> 526: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="527" class="l"><a href="#527"> 527: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="528" class="l"><a href="#528"> 528: </a>            }
-</span><span id="529" class="l"><a href="#529"> 529: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="530" class="l"><a href="#530"> 530: </a>            {
-</span><span id="531" class="l"><a href="#531"> 531: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="532" class="l"><a href="#532"> 532: </a>            }
-</span><span id="533" class="l"><a href="#533"> 533: </a>        }
-</span><span id="534" class="l"><a href="#534"> 534: </a>    }
-</span><span id="535" class="l"><a href="#535"> 535: </a>
-</span><span id="536" class="l"><a href="#536"> 536: </a>    <span class="php-comment">/**
-</span></span><span id="537" class="l"><a href="#537"> 537: </a><span class="php-comment">     * Deconstructor
-</span></span><span id="538" class="l"><a href="#538"> 538: </a><span class="php-comment">     *
-</span></span><span id="539" class="l"><a href="#539"> 539: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="540" class="l"><a href="#540"> 540: </a><span class="php-comment">     * @access public
-</span></span><span id="541" class="l"><a href="#541"> 541: </a><span class="php-comment">     * @return void
-</span></span><span id="542" class="l"><a href="#542"> 542: </a><span class="php-comment">     */</span>
-</span><span id="543" class="l"><a href="#543"> 543: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
-</span><span id="544" class="l"><a href="#544"> 544: </a>    {
-</span><span id="545" class="l"><a href="#545"> 545: </a>        <span class="php-comment">// Get the current timestamp</span>
-</span><span id="546" class="l"><a href="#546"> 546: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="547" class="l"><a href="#547"> 547: </a>
-</span><span id="548" class="l"><a href="#548"> 548: </a>        <span class="php-comment">// Log the loading time to the log table</span>
-</span><span id="549" class="l"><a href="#549"> 549: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="550" class="l"><a href="#550"> 550: </a>        {
-</span><span id="551" class="l"><a href="#551"> 551: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
-</span><span id="552" class="l"><a href="#552"> 552: </a>        }
-</span><span id="553" class="l"><a href="#553"> 553: </a>    }
-</span><span id="554" class="l"><a href="#554"> 554: </a>
-</span><span id="555" class="l"><a href="#555"> 555: </a>    <span class="php-comment">/**
-</span></span><span id="556" class="l"><a href="#556"> 556: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
-</span></span><span id="557" class="l"><a href="#557"> 557: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
-</span></span><span id="558" class="l"><a href="#558"> 558: </a><span class="php-comment">     * Controller method.
-</span></span><span id="559" class="l"><a href="#559"> 559: </a><span class="php-comment">     *
-</span></span><span id="560" class="l"><a href="#560"> 560: </a><span class="php-comment">     * @access public
-</span></span><span id="561" class="l"><a href="#561"> 561: </a><span class="php-comment">     * @param  string $object_called
-</span></span><span id="562" class="l"><a href="#562"> 562: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method.
-</span></span><span id="563" class="l"><a href="#563"> 563: </a><span class="php-comment">     */</span>
-</span><span id="564" class="l"><a href="#564"> 564: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span>)
-</span><span id="565" class="l"><a href="#565"> 565: </a>    {
-</span><span id="566" class="l"><a href="#566"> 566: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
-</span><span id="567" class="l"><a href="#567"> 567: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
-</span><span id="568" class="l"><a href="#568"> 568: </a>        {
-</span><span id="569" class="l"><a href="#569"> 569: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unsupported protocol'</span>], self::HTTP_FORBIDDEN);
-</span><span id="570" class="l"><a href="#570"> 570: </a>        }
+</span><span id="446" class="l"><a href="#446"> 446: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
+</span><span id="447" class="l"><a href="#447"> 447: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
+</span><span id="448" class="l"><a href="#448"> 448: </a>        {
+</span><span id="449" class="l"><a href="#449"> 449: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
+</span><span id="450" class="l"><a href="#450"> 450: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
+</span><span id="451" class="l"><a href="#451"> 451: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
+</span><span id="452" class="l"><a href="#452"> 452: </a>        }
+</span><span id="453" class="l"><a href="#453"> 453: </a>
+</span><span id="454" class="l"><a href="#454"> 454: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
+</span><span id="455" class="l"><a href="#455"> 455: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
+</span><span id="456" class="l"><a href="#456"> 456: </a>            <span class="php-var">$this</span>-&gt;_get_args,
+</span><span id="457" class="l"><a href="#457"> 457: </a>            <span class="php-var">$this</span>-&gt;_options_args,
+</span><span id="458" class="l"><a href="#458"> 458: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
+</span><span id="459" class="l"><a href="#459"> 459: </a>            <span class="php-var">$this</span>-&gt;_head_args,
+</span><span id="460" class="l"><a href="#460"> 460: </a>            <span class="php-var">$this</span>-&gt;_put_args,
+</span><span id="461" class="l"><a href="#461"> 461: </a>            <span class="php-var">$this</span>-&gt;_post_args,
+</span><span id="462" class="l"><a href="#462"> 462: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
+</span><span id="463" class="l"><a href="#463"> 463: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}
+</span><span id="464" class="l"><a href="#464"> 464: </a>        );
+</span><span id="465" class="l"><a href="#465"> 465: </a>
+</span><span id="466" class="l"><a href="#466"> 466: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
+</span><span id="467" class="l"><a href="#467"> 467: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
+</span><span id="468" class="l"><a href="#468"> 468: </a>
+</span><span id="469" class="l"><a href="#469"> 469: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
+</span><span id="470" class="l"><a href="#470"> 470: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
+</span><span id="471" class="l"><a href="#471"> 471: </a>
+</span><span id="472" class="l"><a href="#472"> 472: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
+</span><span id="473" class="l"><a href="#473"> 473: </a>        <span class="php-var">$this</span>-&gt;early_checks();
+</span><span id="474" class="l"><a href="#474"> 474: </a>
+</span><span id="475" class="l"><a href="#475"> 475: </a>        <span class="php-comment">// Load DB if its enabled</span>
+</span><span id="476" class="l"><a href="#476"> 476: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
+</span><span id="477" class="l"><a href="#477"> 477: </a>        {
+</span><span id="478" class="l"><a href="#478"> 478: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
+</span><span id="479" class="l"><a href="#479"> 479: </a>        }
+</span><span id="480" class="l"><a href="#480"> 480: </a>
+</span><span id="481" class="l"><a href="#481"> 481: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
+</span><span id="482" class="l"><a href="#482"> 482: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
+</span><span id="483" class="l"><a href="#483"> 483: </a>        {
+</span><span id="484" class="l"><a href="#484"> 484: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
+</span><span id="485" class="l"><a href="#485"> 485: </a>        }
+</span><span id="486" class="l"><a href="#486"> 486: </a>
+</span><span id="487" class="l"><a href="#487"> 487: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
+</span><span id="488" class="l"><a href="#488"> 488: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
+</span><span id="489" class="l"><a href="#489"> 489: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
+</span><span id="490" class="l"><a href="#490"> 490: </a>
+</span><span id="491" class="l"><a href="#491"> 491: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
+</span><span id="492" class="l"><a href="#492"> 492: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
+</span><span id="493" class="l"><a href="#493"> 493: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
+</span><span id="494" class="l"><a href="#494"> 494: </a>        {
+</span><span id="495" class="l"><a href="#495"> 495: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
+</span><span id="496" class="l"><a href="#496"> 496: </a>        }
+</span><span id="497" class="l"><a href="#497"> 497: </a>
+</span><span id="498" class="l"><a href="#498"> 498: </a>        <span class="php-comment">// Only allow ajax requests</span>
+</span><span id="499" class="l"><a href="#499"> 499: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
+</span><span id="500" class="l"><a href="#500"> 500: </a>        {
+</span><span id="501" class="l"><a href="#501"> 501: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="502" class="l"><a href="#502"> 502: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="503" class="l"><a href="#503"> 503: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="504" class="l"><a href="#504"> 504: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Only AJAX requests are acceptable'</span>
+</span><span id="505" class="l"><a href="#505"> 505: </a>                ], self::HTTP_NOT_ACCEPTABLE);
+</span><span id="506" class="l"><a href="#506"> 506: </a>        }
+</span><span id="507" class="l"><a href="#507"> 507: </a>
+</span><span id="508" class="l"><a href="#508"> 508: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
+</span><span id="509" class="l"><a href="#509"> 509: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; !(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
+</span><span id="510" class="l"><a href="#510"> 510: </a>        {
+</span><span id="511" class="l"><a href="#511"> 511: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="512" class="l"><a href="#512"> 512: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
+</span><span id="513" class="l"><a href="#513"> 513: </a>            {
+</span><span id="514" class="l"><a href="#514"> 514: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
+</span><span id="515" class="l"><a href="#515"> 515: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="516" class="l"><a href="#516"> 516: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="517" class="l"><a href="#517"> 517: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
+</span><span id="518" class="l"><a href="#518"> 518: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="519" class="l"><a href="#519"> 519: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="520" class="l"><a href="#520"> 520: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
+</span><span id="521" class="l"><a href="#521"> 521: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="522" class="l"><a href="#522"> 522: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="523" class="l"><a href="#523"> 523: </a>            }
+</span><span id="524" class="l"><a href="#524"> 524: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="525" class="l"><a href="#525"> 525: </a>            {
+</span><span id="526" class="l"><a href="#526"> 526: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="527" class="l"><a href="#527"> 527: </a>            }
+</span><span id="528" class="l"><a href="#528"> 528: </a>        }
+</span><span id="529" class="l"><a href="#529"> 529: </a>    }
+</span><span id="530" class="l"><a href="#530"> 530: </a>
+</span><span id="531" class="l"><a href="#531"> 531: </a>    <span class="php-comment">/**
+</span></span><span id="532" class="l"><a href="#532"> 532: </a><span class="php-comment">     * Deconstructor
+</span></span><span id="533" class="l"><a href="#533"> 533: </a><span class="php-comment">     *
+</span></span><span id="534" class="l"><a href="#534"> 534: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="535" class="l"><a href="#535"> 535: </a><span class="php-comment">     * @access public
+</span></span><span id="536" class="l"><a href="#536"> 536: </a><span class="php-comment">     * @return void
+</span></span><span id="537" class="l"><a href="#537"> 537: </a><span class="php-comment">     */</span>
+</span><span id="538" class="l"><a href="#538"> 538: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
+</span><span id="539" class="l"><a href="#539"> 539: </a>    {
+</span><span id="540" class="l"><a href="#540"> 540: </a>        <span class="php-comment">// Get the current timestamp</span>
+</span><span id="541" class="l"><a href="#541"> 541: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="542" class="l"><a href="#542"> 542: </a>
+</span><span id="543" class="l"><a href="#543"> 543: </a>        <span class="php-comment">// Log the loading time to the log table</span>
+</span><span id="544" class="l"><a href="#544"> 544: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="545" class="l"><a href="#545"> 545: </a>        {
+</span><span id="546" class="l"><a href="#546"> 546: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
+</span><span id="547" class="l"><a href="#547"> 547: </a>        }
+</span><span id="548" class="l"><a href="#548"> 548: </a>    }
+</span><span id="549" class="l"><a href="#549"> 549: </a>
+</span><span id="550" class="l"><a href="#550"> 550: </a>    <span class="php-comment">/**
+</span></span><span id="551" class="l"><a href="#551"> 551: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
+</span></span><span id="552" class="l"><a href="#552"> 552: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
+</span></span><span id="553" class="l"><a href="#553"> 553: </a><span class="php-comment">     * Controller method.
+</span></span><span id="554" class="l"><a href="#554"> 554: </a><span class="php-comment">     *
+</span></span><span id="555" class="l"><a href="#555"> 555: </a><span class="php-comment">     * @access public
+</span></span><span id="556" class="l"><a href="#556"> 556: </a><span class="php-comment">     * @param  string $object_called
+</span></span><span id="557" class="l"><a href="#557"> 557: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method.
+</span></span><span id="558" class="l"><a href="#558"> 558: </a><span class="php-comment">     */</span>
+</span><span id="559" class="l"><a href="#559"> 559: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span>)
+</span><span id="560" class="l"><a href="#560"> 560: </a>    {
+</span><span id="561" class="l"><a href="#561"> 561: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
+</span><span id="562" class="l"><a href="#562"> 562: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
+</span><span id="563" class="l"><a href="#563"> 563: </a>        {
+</span><span id="564" class="l"><a href="#564"> 564: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unsupported protocol'</span>], self::HTTP_FORBIDDEN);
+</span><span id="565" class="l"><a href="#565"> 565: </a>        }
+</span><span id="566" class="l"><a href="#566"> 566: </a>
+</span><span id="567" class="l"><a href="#567"> 567: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
+</span><span id="568" class="l"><a href="#568"> 568: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
+</span><span id="569" class="l"><a href="#569"> 569: </a>
+</span><span id="570" class="l"><a href="#570"> 570: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span> . <span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method;
 </span><span id="571" class="l"><a href="#571"> 571: </a>
-</span><span id="572" class="l"><a href="#572"> 572: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
-</span><span id="573" class="l"><a href="#573"> 573: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
+</span><span id="572" class="l"><a href="#572"> 572: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
+</span><span id="573" class="l"><a href="#573"> 573: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] == <span class="php-keyword1">FALSE</span>);
 </span><span id="574" class="l"><a href="#574"> 574: </a>
-</span><span id="575" class="l"><a href="#575"> 575: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span> . <span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method;
-</span><span id="576" class="l"><a href="#576"> 576: </a>
-</span><span id="577" class="l"><a href="#577"> 577: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
-</span><span id="578" class="l"><a href="#578"> 578: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] == <span class="php-keyword1">FALSE</span>);
-</span><span id="579" class="l"><a href="#579"> 579: </a>
-</span><span id="580" class="l"><a href="#580"> 580: </a>        <span class="php-comment">// Use keys for this method?</span>
-</span><span id="581" class="l"><a href="#581"> 581: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] == <span class="php-keyword1">FALSE</span>);
-</span><span id="582" class="l"><a href="#582"> 582: </a>
-</span><span id="583" class="l"><a href="#583"> 583: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here.</span>
-</span><span id="584" class="l"><a href="#584"> 584: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
-</span><span id="585" class="l"><a href="#585"> 585: </a>        {
-</span><span id="586" class="l"><a href="#586"> 586: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="587" class="l"><a href="#587"> 587: </a>            {
-</span><span id="588" class="l"><a href="#588"> 588: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="589" class="l"><a href="#589"> 589: </a>            }
-</span><span id="590" class="l"><a href="#590"> 590: </a>
-</span><span id="591" class="l"><a href="#591"> 591: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid API Key '</span> . <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>], self::HTTP_FORBIDDEN);
-</span><span id="592" class="l"><a href="#592"> 592: </a>        }
-</span><span id="593" class="l"><a href="#593"> 593: </a>
-</span><span id="594" class="l"><a href="#594"> 594: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller.</span>
-</span><span id="595" class="l"><a href="#595"> 595: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
-</span><span id="596" class="l"><a href="#596"> 596: </a>        {
-</span><span id="597" class="l"><a href="#597"> 597: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="598" class="l"><a href="#598"> 598: </a>            {
-</span><span id="599" class="l"><a href="#599"> 599: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="600" class="l"><a href="#600"> 600: </a>            }
-</span><span id="601" class="l"><a href="#601"> 601: </a>
-</span><span id="602" class="l"><a href="#602"> 602: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have access to the requested controller.'</span>], self::HTTP_UNAUTHORIZED);
-</span><span id="603" class="l"><a href="#603"> 603: </a>        }
-</span><span id="604" class="l"><a href="#604"> 604: </a>
-</span><span id="605" class="l"><a href="#605"> 605: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
-</span><span id="606" class="l"><a href="#606"> 606: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="607" class="l"><a href="#607"> 607: </a>        {
-</span><span id="608" class="l"><a href="#608"> 608: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unknown method.'</span>], self::HTTP_NOT_FOUND);
-</span><span id="609" class="l"><a href="#609"> 609: </a>        }
-</span><span id="610" class="l"><a href="#610"> 610: </a>
-</span><span id="611" class="l"><a href="#611"> 611: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
-</span><span id="612" class="l"><a href="#612"> 612: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="613" class="l"><a href="#613"> 613: </a>        {
-</span><span id="614" class="l"><a href="#614"> 614: </a>            <span class="php-comment">// Check the limit</span>
-</span><span id="615" class="l"><a href="#615"> 615: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="616" class="l"><a href="#616"> 616: </a>            {
-</span><span id="617" class="l"><a href="#617"> 617: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key has reached the time limit for this method.'</span>];
-</span><span id="618" class="l"><a href="#618"> 618: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
-</span><span id="619" class="l"><a href="#619"> 619: </a>            }
-</span><span id="620" class="l"><a href="#620"> 620: </a>
-</span><span id="621" class="l"><a href="#621"> 621: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
-</span><span id="622" class="l"><a href="#622"> 622: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
-</span><span id="623" class="l"><a href="#623"> 623: </a>
-</span><span id="624" class="l"><a href="#624"> 624: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
-</span><span id="625" class="l"><a href="#625"> 625: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
-</span><span id="626" class="l"><a href="#626"> 626: </a>
-</span><span id="627" class="l"><a href="#627"> 627: </a>            <span class="php-comment">// IM TELLIN!</span>
-</span><span id="628" class="l"><a href="#628"> 628: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="629" class="l"><a href="#629"> 629: </a>            {
-</span><span id="630" class="l"><a href="#630"> 630: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
-</span><span id="631" class="l"><a href="#631"> 631: </a>            }
+</span><span id="575" class="l"><a href="#575"> 575: </a>        <span class="php-comment">// Use keys for this method?</span>
+</span><span id="576" class="l"><a href="#576"> 576: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] == <span class="php-keyword1">FALSE</span>);
+</span><span id="577" class="l"><a href="#577"> 577: </a>
+</span><span id="578" class="l"><a href="#578"> 578: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here.</span>
+</span><span id="579" class="l"><a href="#579"> 579: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
+</span><span id="580" class="l"><a href="#580"> 580: </a>        {
+</span><span id="581" class="l"><a href="#581"> 581: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="582" class="l"><a href="#582"> 582: </a>            {
+</span><span id="583" class="l"><a href="#583"> 583: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="584" class="l"><a href="#584"> 584: </a>            }
+</span><span id="585" class="l"><a href="#585"> 585: </a>
+</span><span id="586" class="l"><a href="#586"> 586: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid API Key '</span> . <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>], self::HTTP_FORBIDDEN);
+</span><span id="587" class="l"><a href="#587"> 587: </a>        }
+</span><span id="588" class="l"><a href="#588"> 588: </a>
+</span><span id="589" class="l"><a href="#589"> 589: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller.</span>
+</span><span id="590" class="l"><a href="#590"> 590: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
+</span><span id="591" class="l"><a href="#591"> 591: </a>        {
+</span><span id="592" class="l"><a href="#592"> 592: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="593" class="l"><a href="#593"> 593: </a>            {
+</span><span id="594" class="l"><a href="#594"> 594: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="595" class="l"><a href="#595"> 595: </a>            }
+</span><span id="596" class="l"><a href="#596"> 596: </a>
+</span><span id="597" class="l"><a href="#597"> 597: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have access to the requested controller.'</span>], self::HTTP_UNAUTHORIZED);
+</span><span id="598" class="l"><a href="#598"> 598: </a>        }
+</span><span id="599" class="l"><a href="#599"> 599: </a>
+</span><span id="600" class="l"><a href="#600"> 600: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
+</span><span id="601" class="l"><a href="#601"> 601: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="602" class="l"><a href="#602"> 602: </a>        {
+</span><span id="603" class="l"><a href="#603"> 603: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unknown method.'</span>], self::HTTP_NOT_FOUND);
+</span><span id="604" class="l"><a href="#604"> 604: </a>        }
+</span><span id="605" class="l"><a href="#605"> 605: </a>
+</span><span id="606" class="l"><a href="#606"> 606: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
+</span><span id="607" class="l"><a href="#607"> 607: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="608" class="l"><a href="#608"> 608: </a>        {
+</span><span id="609" class="l"><a href="#609"> 609: </a>            <span class="php-comment">// Check the limit</span>
+</span><span id="610" class="l"><a href="#610"> 610: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="611" class="l"><a href="#611"> 611: </a>            {
+</span><span id="612" class="l"><a href="#612"> 612: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key has reached the time limit for this method.'</span>];
+</span><span id="613" class="l"><a href="#613"> 613: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
+</span><span id="614" class="l"><a href="#614"> 614: </a>            }
+</span><span id="615" class="l"><a href="#615"> 615: </a>
+</span><span id="616" class="l"><a href="#616"> 616: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
+</span><span id="617" class="l"><a href="#617"> 617: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
+</span><span id="618" class="l"><a href="#618"> 618: </a>
+</span><span id="619" class="l"><a href="#619"> 619: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
+</span><span id="620" class="l"><a href="#620"> 620: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
+</span><span id="621" class="l"><a href="#621"> 621: </a>
+</span><span id="622" class="l"><a href="#622"> 622: </a>            <span class="php-comment">// IM TELLIN!</span>
+</span><span id="623" class="l"><a href="#623"> 623: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="624" class="l"><a href="#624"> 624: </a>            {
+</span><span id="625" class="l"><a href="#625"> 625: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
+</span><span id="626" class="l"><a href="#626"> 626: </a>            }
+</span><span id="627" class="l"><a href="#627"> 627: </a>
+</span><span id="628" class="l"><a href="#628"> 628: </a>            <span class="php-comment">// They don't have good enough perms</span>
+</span><span id="629" class="l"><a href="#629"> 629: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have enough permissions.'</span>];
+</span><span id="630" class="l"><a href="#630"> 630: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
+</span><span id="631" class="l"><a href="#631"> 631: </a>        }
 </span><span id="632" class="l"><a href="#632"> 632: </a>
-</span><span id="633" class="l"><a href="#633"> 633: </a>            <span class="php-comment">// They don't have good enough perms</span>
-</span><span id="634" class="l"><a href="#634"> 634: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have enough permissions.'</span>];
-</span><span id="635" class="l"><a href="#635"> 635: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
-</span><span id="636" class="l"><a href="#636"> 636: </a>        }
-</span><span id="637" class="l"><a href="#637"> 637: </a>
-</span><span id="638" class="l"><a href="#638"> 638: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
-</span><span id="639" class="l"><a href="#639"> 639: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="640" class="l"><a href="#640"> 640: </a>        {
-</span><span id="641" class="l"><a href="#641"> 641: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
-</span><span id="642" class="l"><a href="#642"> 642: </a>        }
-</span><span id="643" class="l"><a href="#643"> 643: </a>
-</span><span id="644" class="l"><a href="#644"> 644: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
-</span><span id="645" class="l"><a href="#645"> 645: </a>        <span class="php-keyword1">try</span>
-</span><span id="646" class="l"><a href="#646"> 646: </a>        {
-</span><span id="647" class="l"><a href="#647"> 647: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
-</span><span id="648" class="l"><a href="#648"> 648: </a>        }
-</span><span id="649" class="l"><a href="#649"> 649: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
-</span><span id="650" class="l"><a href="#650"> 650: </a>        {
-</span><span id="651" class="l"><a href="#651"> 651: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
-</span><span id="652" class="l"><a href="#652"> 652: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="653" class="l"><a href="#653"> 653: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="654" class="l"><a href="#654"> 654: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
-</span><span id="655" class="l"><a href="#655"> 655: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
-</span><span id="656" class="l"><a href="#656"> 656: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
-</span><span id="657" class="l"><a href="#657"> 657: </a>                    ]
-</span><span id="658" class="l"><a href="#658"> 658: </a>                ], self::HTTP_INTERNAL_SERVER_ERROR);
-</span><span id="659" class="l"><a href="#659"> 659: </a>        }
-</span><span id="660" class="l"><a href="#660"> 660: </a>    }
-</span><span id="661" class="l"><a href="#661"> 661: </a>
-</span><span id="662" class="l"><a href="#662"> 662: </a>    <span class="php-comment">/**
-</span></span><span id="663" class="l"><a href="#663"> 663: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
-</span></span><span id="664" class="l"><a href="#664"> 664: </a><span class="php-comment">     *
-</span></span><span id="665" class="l"><a href="#665"> 665: </a><span class="php-comment">     * @access public
-</span></span><span id="666" class="l"><a href="#666"> 666: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
-</span></span><span id="667" class="l"><a href="#667"> 667: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
-</span></span><span id="668" class="l"><a href="#668"> 668: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
-</span></span><span id="669" class="l"><a href="#669"> 669: </a><span class="php-comment">     * running the script; otherwise, exit
-</span></span><span id="670" class="l"><a href="#670"> 670: </a><span class="php-comment">     */</span>
-</span><span id="671" class="l"><a href="#671"> 671: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="672" class="l"><a href="#672"> 672: </a>    {
-</span><span id="673" class="l"><a href="#673"> 673: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
-</span><span id="674" class="l"><a href="#674"> 674: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="675" class="l"><a href="#675"> 675: </a>        {
-</span><span id="676" class="l"><a href="#676"> 676: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
-</span><span id="677" class="l"><a href="#677"> 677: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
-</span><span id="678" class="l"><a href="#678"> 678: </a>        }
-</span><span id="679" class="l"><a href="#679"> 679: </a>
-</span><span id="680" class="l"><a href="#680"> 680: </a>        <span class="php-comment">// Set the output as NULL by default</span>
-</span><span id="681" class="l"><a href="#681"> 681: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="682" class="l"><a href="#682"> 682: </a>
-</span><span id="683" class="l"><a href="#683"> 683: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
-</span><span id="684" class="l"><a href="#684"> 684: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="685" class="l"><a href="#685"> 685: </a>        {
-</span><span id="686" class="l"><a href="#686"> 686: </a>            <span class="php-var">$http_code</span> = self::HTTP_NOT_FOUND;
-</span><span id="687" class="l"><a href="#687"> 687: </a>        }
-</span><span id="688" class="l"><a href="#688"> 688: </a>
-</span><span id="689" class="l"><a href="#689"> 689: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
-</span><span id="690" class="l"><a href="#690"> 690: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="691" class="l"><a href="#691"> 691: </a>        {
-</span><span id="692" class="l"><a href="#692"> 692: </a>            <span class="php-comment">// Is compression enabled and available?</span>
-</span><span id="693" class="l"><a href="#693"> 693: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'compress_output'</span>) === <span class="php-keyword1">TRUE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_zlib_oc == <span class="php-keyword1">FALSE</span>)
-</span><span id="694" class="l"><a href="#694"> 694: </a>            {
-</span><span id="695" class="l"><a href="#695"> 695: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">extension_loaded</span>(<span class="php-quote">'zlib'</span>))
+</span><span id="633" class="l"><a href="#633"> 633: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
+</span><span id="634" class="l"><a href="#634"> 634: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="635" class="l"><a href="#635"> 635: </a>        {
+</span><span id="636" class="l"><a href="#636"> 636: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
+</span><span id="637" class="l"><a href="#637"> 637: </a>        }
+</span><span id="638" class="l"><a href="#638"> 638: </a>
+</span><span id="639" class="l"><a href="#639"> 639: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
+</span><span id="640" class="l"><a href="#640"> 640: </a>        <span class="php-keyword1">try</span>
+</span><span id="641" class="l"><a href="#641"> 641: </a>        {
+</span><span id="642" class="l"><a href="#642"> 642: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
+</span><span id="643" class="l"><a href="#643"> 643: </a>        }
+</span><span id="644" class="l"><a href="#644"> 644: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
+</span><span id="645" class="l"><a href="#645"> 645: </a>        {
+</span><span id="646" class="l"><a href="#646"> 646: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
+</span><span id="647" class="l"><a href="#647"> 647: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="648" class="l"><a href="#648"> 648: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="649" class="l"><a href="#649"> 649: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
+</span><span id="650" class="l"><a href="#650"> 650: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
+</span><span id="651" class="l"><a href="#651"> 651: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
+</span><span id="652" class="l"><a href="#652"> 652: </a>                    ]
+</span><span id="653" class="l"><a href="#653"> 653: </a>                ], self::HTTP_INTERNAL_SERVER_ERROR);
+</span><span id="654" class="l"><a href="#654"> 654: </a>        }
+</span><span id="655" class="l"><a href="#655"> 655: </a>    }
+</span><span id="656" class="l"><a href="#656"> 656: </a>
+</span><span id="657" class="l"><a href="#657"> 657: </a>    <span class="php-comment">/**
+</span></span><span id="658" class="l"><a href="#658"> 658: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
+</span></span><span id="659" class="l"><a href="#659"> 659: </a><span class="php-comment">     *
+</span></span><span id="660" class="l"><a href="#660"> 660: </a><span class="php-comment">     * @access public
+</span></span><span id="661" class="l"><a href="#661"> 661: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
+</span></span><span id="662" class="l"><a href="#662"> 662: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
+</span></span><span id="663" class="l"><a href="#663"> 663: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
+</span></span><span id="664" class="l"><a href="#664"> 664: </a><span class="php-comment">     * running the script; otherwise, exit
+</span></span><span id="665" class="l"><a href="#665"> 665: </a><span class="php-comment">     */</span>
+</span><span id="666" class="l"><a href="#666"> 666: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="667" class="l"><a href="#667"> 667: </a>    {
+</span><span id="668" class="l"><a href="#668"> 668: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
+</span><span id="669" class="l"><a href="#669"> 669: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="670" class="l"><a href="#670"> 670: </a>        {
+</span><span id="671" class="l"><a href="#671"> 671: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
+</span><span id="672" class="l"><a href="#672"> 672: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
+</span><span id="673" class="l"><a href="#673"> 673: </a>        }
+</span><span id="674" class="l"><a href="#674"> 674: </a>
+</span><span id="675" class="l"><a href="#675"> 675: </a>        <span class="php-comment">// Set the output as NULL by default</span>
+</span><span id="676" class="l"><a href="#676"> 676: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="677" class="l"><a href="#677"> 677: </a>
+</span><span id="678" class="l"><a href="#678"> 678: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
+</span><span id="679" class="l"><a href="#679"> 679: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="680" class="l"><a href="#680"> 680: </a>        {
+</span><span id="681" class="l"><a href="#681"> 681: </a>            <span class="php-var">$http_code</span> = self::HTTP_NOT_FOUND;
+</span><span id="682" class="l"><a href="#682"> 682: </a>        }
+</span><span id="683" class="l"><a href="#683"> 683: </a>
+</span><span id="684" class="l"><a href="#684"> 684: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
+</span><span id="685" class="l"><a href="#685"> 685: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="686" class="l"><a href="#686"> 686: </a>        {
+</span><span id="687" class="l"><a href="#687"> 687: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
+</span><span id="688" class="l"><a href="#688"> 688: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
+</span><span id="689" class="l"><a href="#689"> 689: </a>            {
+</span><span id="690" class="l"><a href="#690"> 690: </a>                <span class="php-comment">// Set the format header</span>
+</span><span id="691" class="l"><a href="#691"> 691: </a>                <span class="php-var">$this</span>-&gt;output-&gt;set_content_type(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format], <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
+</span><span id="692" class="l"><a href="#692"> 692: </a>
+</span><span id="693" class="l"><a href="#693"> 693: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error.</span>
+</span><span id="694" class="l"><a href="#694"> 694: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
+</span><span id="695" class="l"><a href="#695"> 695: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
 </span><span id="696" class="l"><a href="#696"> 696: </a>                {
-</span><span id="697" class="l"><a href="#697"> 697: </a>                    <span class="php-var">$http_encoding</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_ENCODING'</span>);
-</span><span id="698" class="l"><a href="#698"> 698: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$http_encoding</span> !== <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_encoding</span>, <span class="php-quote">'gzip'</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="699" class="l"><a href="#699"> 699: </a>                    {
-</span><span id="700" class="l"><a href="#700"> 700: </a>                        <span class="php-keyword2">ob_start</span>(<span class="php-quote">'ob_gzhandler'</span>);
-</span><span id="701" class="l"><a href="#701"> 701: </a>                    }
-</span><span id="702" class="l"><a href="#702"> 702: </a>                }
-</span><span id="703" class="l"><a href="#703"> 703: </a>            }
-</span><span id="704" class="l"><a href="#704"> 704: </a>
-</span><span id="705" class="l"><a href="#705"> 705: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
-</span><span id="706" class="l"><a href="#706"> 706: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
-</span><span id="707" class="l"><a href="#707"> 707: </a>            {
-</span><span id="708" class="l"><a href="#708"> 708: </a>                <span class="php-comment">// Set the format header</span>
-</span><span id="709" class="l"><a href="#709"> 709: </a>                <span class="php-keyword2">header</span>(<span class="php-quote">'Content-Type: '</span> . <span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format]
-</span><span id="710" class="l"><a href="#710"> 710: </a>                       . <span class="php-quote">'; charset='</span> . <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
-</span><span id="711" class="l"><a href="#711"> 711: </a>
-</span><span id="712" class="l"><a href="#712"> 712: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
-</span><span id="713" class="l"><a href="#713"> 713: </a>
-</span><span id="714" class="l"><a href="#714"> 714: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error.</span>
-</span><span id="715" class="l"><a href="#715"> 715: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
-</span><span id="716" class="l"><a href="#716"> 716: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
-</span><span id="717" class="l"><a href="#717"> 717: </a>                {
-</span><span id="718" class="l"><a href="#718"> 718: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="719" class="l"><a href="#719"> 719: </a>                }
-</span><span id="720" class="l"><a href="#720"> 720: </a>            }
-</span><span id="721" class="l"><a href="#721"> 721: </a>            <span class="php-keyword1">else</span>
-</span><span id="722" class="l"><a href="#722"> 722: </a>            {
-</span><span id="723" class="l"><a href="#723"> 723: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
-</span><span id="724" class="l"><a href="#724"> 724: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
-</span><span id="725" class="l"><a href="#725"> 725: </a>                {
-</span><span id="726" class="l"><a href="#726"> 726: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="727" class="l"><a href="#727"> 727: </a>                }
+</span><span id="697" class="l"><a href="#697"> 697: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="698" class="l"><a href="#698"> 698: </a>                }
+</span><span id="699" class="l"><a href="#699"> 699: </a>            }
+</span><span id="700" class="l"><a href="#700"> 700: </a>            <span class="php-keyword1">else</span>
+</span><span id="701" class="l"><a href="#701"> 701: </a>            {
+</span><span id="702" class="l"><a href="#702"> 702: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
+</span><span id="703" class="l"><a href="#703"> 703: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
+</span><span id="704" class="l"><a href="#704"> 704: </a>                {
+</span><span id="705" class="l"><a href="#705"> 705: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="706" class="l"><a href="#706"> 706: </a>                }
+</span><span id="707" class="l"><a href="#707"> 707: </a>
+</span><span id="708" class="l"><a href="#708"> 708: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
+</span><span id="709" class="l"><a href="#709"> 709: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
+</span><span id="710" class="l"><a href="#710"> 710: </a>            }
+</span><span id="711" class="l"><a href="#711"> 711: </a>        }
+</span><span id="712" class="l"><a href="#712"> 712: </a>
+</span><span id="713" class="l"><a href="#713"> 713: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
+</span><span id="714" class="l"><a href="#714"> 714: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
+</span><span id="715" class="l"><a href="#715"> 715: </a>        <span class="php-comment">// correct HTTP status code</span>
+</span><span id="716" class="l"><a href="#716"> 716: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = self::HTTP_OK;
+</span><span id="717" class="l"><a href="#717"> 717: </a>
+</span><span id="718" class="l"><a href="#718"> 718: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_status_header(<span class="php-var">$http_code</span>);
+</span><span id="719" class="l"><a href="#719"> 719: </a>
+</span><span id="720" class="l"><a href="#720"> 720: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
+</span><span id="721" class="l"><a href="#721"> 721: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="722" class="l"><a href="#722"> 722: </a>        {
+</span><span id="723" class="l"><a href="#723"> 723: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
+</span><span id="724" class="l"><a href="#724"> 724: </a>        }
+</span><span id="725" class="l"><a href="#725"> 725: </a>
+</span><span id="726" class="l"><a href="#726"> 726: </a>        <span class="php-comment">// Output the data</span>
+</span><span id="727" class="l"><a href="#727"> 727: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_output(<span class="php-var">$output</span>);
 </span><span id="728" class="l"><a href="#728"> 728: </a>
-</span><span id="729" class="l"><a href="#729"> 729: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
-</span><span id="730" class="l"><a href="#730"> 730: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
-</span><span id="731" class="l"><a href="#731"> 731: </a>            }
-</span><span id="732" class="l"><a href="#732"> 732: </a>        }
-</span><span id="733" class="l"><a href="#733"> 733: </a>
-</span><span id="734" class="l"><a href="#734"> 734: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
-</span><span id="735" class="l"><a href="#735"> 735: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
-</span><span id="736" class="l"><a href="#736"> 736: </a>        <span class="php-comment">// correct HTTP status code</span>
-</span><span id="737" class="l"><a href="#737"> 737: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = self::HTTP_OK;
+</span><span id="729" class="l"><a href="#729"> 729: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="730" class="l"><a href="#730"> 730: </a>        {
+</span><span id="731" class="l"><a href="#731"> 731: </a>            <span class="php-comment">// Display the data and exit execution</span>
+</span><span id="732" class="l"><a href="#732"> 732: </a>            <span class="php-var">$this</span>-&gt;output-&gt;_display();
+</span><span id="733" class="l"><a href="#733"> 733: </a>            <span class="php-keyword1">exit</span>;
+</span><span id="734" class="l"><a href="#734"> 734: </a>        }
+</span><span id="735" class="l"><a href="#735"> 735: </a>
+</span><span id="736" class="l"><a href="#736"> 736: </a>        <span class="php-comment">// Otherwise dump the output automatically</span>
+</span><span id="737" class="l"><a href="#737"> 737: </a>    }
 </span><span id="738" class="l"><a href="#738"> 738: </a>
-</span><span id="739" class="l"><a href="#739"> 739: </a>        set_status_header(<span class="php-var">$http_code</span>);
-</span><span id="740" class="l"><a href="#740"> 740: </a>
-</span><span id="741" class="l"><a href="#741"> 741: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
-</span><span id="742" class="l"><a href="#742"> 742: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="743" class="l"><a href="#743"> 743: </a>        {
-</span><span id="744" class="l"><a href="#744"> 744: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
-</span><span id="745" class="l"><a href="#745"> 745: </a>        }
-</span><span id="746" class="l"><a href="#746"> 746: </a>
-</span><span id="747" class="l"><a href="#747"> 747: </a>        <span class="php-comment">// If zlib.output_compression is enabled it will compress the output,</span>
-</span><span id="748" class="l"><a href="#748"> 748: </a>        <span class="php-comment">// but it will not modify the content-length header to compensate for</span>
-</span><span id="749" class="l"><a href="#749"> 749: </a>        <span class="php-comment">// the reduction, causing the browser to hang waiting for more data.</span>
-</span><span id="750" class="l"><a href="#750"> 750: </a>        <span class="php-comment">// We'll just skip content-length in those cases</span>
-</span><span id="751" class="l"><a href="#751"> 751: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_zlib_oc &amp;&amp; !<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'compress_output'</span>))
-</span><span id="752" class="l"><a href="#752"> 752: </a>        {
-</span><span id="753" class="l"><a href="#753"> 753: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'Content-Length: '</span> . <span class="php-keyword2">strlen</span>(<span class="php-var">$output</span>));
-</span><span id="754" class="l"><a href="#754"> 754: </a>        }
-</span><span id="755" class="l"><a href="#755"> 755: </a>
-</span><span id="756" class="l"><a href="#756"> 756: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="757" class="l"><a href="#757"> 757: </a>        {
-</span><span id="758" class="l"><a href="#758"> 758: </a>            <span class="php-keyword1">exit</span>(<span class="php-var">$output</span>);
-</span><span id="759" class="l"><a href="#759"> 759: </a>        }
-</span><span id="760" class="l"><a href="#760"> 760: </a>
-</span><span id="761" class="l"><a href="#761"> 761: </a>        <span class="php-keyword1">echo</span>(<span class="php-var">$output</span>);
-</span><span id="762" class="l"><a href="#762"> 762: </a>        <span class="php-keyword2">ob_end_flush</span>();
-</span><span id="763" class="l"><a href="#763"> 763: </a>        <span class="php-keyword2">ob_flush</span>();
-</span><span id="764" class="l"><a href="#764"> 764: </a>        <span class="php-keyword2">flush</span>();
-</span><span id="765" class="l"><a href="#765"> 765: </a>    }
-</span><span id="766" class="l"><a href="#766"> 766: </a>
-</span><span id="767" class="l"><a href="#767"> 767: </a>    <span class="php-comment">/**
-</span></span><span id="768" class="l"><a href="#768"> 768: </a><span class="php-comment">     * Get the input format e.g. json or xml
-</span></span><span id="769" class="l"><a href="#769"> 769: </a><span class="php-comment">     *
-</span></span><span id="770" class="l"><a href="#770"> 770: </a><span class="php-comment">     * @access protected
-</span></span><span id="771" class="l"><a href="#771"> 771: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
-</span></span><span id="772" class="l"><a href="#772"> 772: </a><span class="php-comment">     */</span>
-</span><span id="773" class="l"><a href="#773"> 773: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
-</span><span id="774" class="l"><a href="#774"> 774: </a>    {
-</span><span id="775" class="l"><a href="#775"> 775: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
-</span><span id="776" class="l"><a href="#776"> 776: </a>        <span class="php-var">$contentType</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
-</span><span id="777" class="l"><a href="#777"> 777: </a>
-</span><span id="778" class="l"><a href="#778"> 778: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$contentType</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="779" class="l"><a href="#779"> 779: </a>        {
-</span><span id="780" class="l"><a href="#780"> 780: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="781" class="l"><a href="#781"> 781: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
-</span><span id="782" class="l"><a href="#782"> 782: </a>            {
-</span><span id="783" class="l"><a href="#783"> 783: </a>                <span class="php-comment">// $key = format e.g. csv</span>
-</span><span id="784" class="l"><a href="#784"> 784: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
-</span><span id="785" class="l"><a href="#785"> 785: </a>
-</span><span id="786" class="l"><a href="#786"> 786: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
-</span><span id="787" class="l"><a href="#787"> 787: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
-</span><span id="788" class="l"><a href="#788"> 788: </a>                <span class="php-var">$contentType</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$contentType</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$contentType</span>)) : <span class="php-var">$contentType</span>);
-</span><span id="789" class="l"><a href="#789"> 789: </a>
-</span><span id="790" class="l"><a href="#790"> 790: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
-</span><span id="791" class="l"><a href="#791"> 791: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$contentType</span> === <span class="php-var">$value</span>)
-</span><span id="792" class="l"><a href="#792"> 792: </a>                {
-</span><span id="793" class="l"><a href="#793"> 793: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
-</span><span id="794" class="l"><a href="#794"> 794: </a>                }
-</span><span id="795" class="l"><a href="#795"> 795: </a>            }
-</span><span id="796" class="l"><a href="#796"> 796: </a>        }
+</span><span id="739" class="l"><a href="#739"> 739: </a>    <span class="php-comment">/**
+</span></span><span id="740" class="l"><a href="#740"> 740: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
+</span></span><span id="741" class="l"><a href="#741"> 741: </a><span class="php-comment">     * within the buffers of the Output class. The response is sent to the client
+</span></span><span id="742" class="l"><a href="#742"> 742: </a><span class="php-comment">     * lately by the framework, after the current controller's method termination.
+</span></span><span id="743" class="l"><a href="#743"> 743: </a><span class="php-comment">     * All the hooks after the controller's method termination are executable.
+</span></span><span id="744" class="l"><a href="#744"> 744: </a><span class="php-comment">     *
+</span></span><span id="745" class="l"><a href="#745"> 745: </a><span class="php-comment">     * @access public
+</span></span><span id="746" class="l"><a href="#746"> 746: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
+</span></span><span id="747" class="l"><a href="#747"> 747: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
+</span></span><span id="748" class="l"><a href="#748"> 748: </a><span class="php-comment">     */</span>
+</span><span id="749" class="l"><a href="#749"> 749: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> set_response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="750" class="l"><a href="#750"> 750: </a>    {
+</span><span id="751" class="l"><a href="#751"> 751: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$data</span>, <span class="php-var">$http_code</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="752" class="l"><a href="#752"> 752: </a>    }
+</span><span id="753" class="l"><a href="#753"> 753: </a>
+</span><span id="754" class="l"><a href="#754"> 754: </a>    <span class="php-comment">/**
+</span></span><span id="755" class="l"><a href="#755"> 755: </a><span class="php-comment">     * Get the input format e.g. json or xml
+</span></span><span id="756" class="l"><a href="#756"> 756: </a><span class="php-comment">     *
+</span></span><span id="757" class="l"><a href="#757"> 757: </a><span class="php-comment">     * @access protected
+</span></span><span id="758" class="l"><a href="#758"> 758: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
+</span></span><span id="759" class="l"><a href="#759"> 759: </a><span class="php-comment">     */</span>
+</span><span id="760" class="l"><a href="#760"> 760: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
+</span><span id="761" class="l"><a href="#761"> 761: </a>    {
+</span><span id="762" class="l"><a href="#762"> 762: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
+</span><span id="763" class="l"><a href="#763"> 763: </a>        <span class="php-var">$contentType</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
+</span><span id="764" class="l"><a href="#764"> 764: </a>
+</span><span id="765" class="l"><a href="#765"> 765: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$contentType</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="766" class="l"><a href="#766"> 766: </a>        {
+</span><span id="767" class="l"><a href="#767"> 767: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="768" class="l"><a href="#768"> 768: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
+</span><span id="769" class="l"><a href="#769"> 769: </a>            {
+</span><span id="770" class="l"><a href="#770"> 770: </a>                <span class="php-comment">// $key = format e.g. csv</span>
+</span><span id="771" class="l"><a href="#771"> 771: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
+</span><span id="772" class="l"><a href="#772"> 772: </a>
+</span><span id="773" class="l"><a href="#773"> 773: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
+</span><span id="774" class="l"><a href="#774"> 774: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
+</span><span id="775" class="l"><a href="#775"> 775: </a>                <span class="php-var">$contentType</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$contentType</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$contentType</span>)) : <span class="php-var">$contentType</span>);
+</span><span id="776" class="l"><a href="#776"> 776: </a>
+</span><span id="777" class="l"><a href="#777"> 777: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
+</span><span id="778" class="l"><a href="#778"> 778: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$contentType</span> === <span class="php-var">$value</span>)
+</span><span id="779" class="l"><a href="#779"> 779: </a>                {
+</span><span id="780" class="l"><a href="#780"> 780: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
+</span><span id="781" class="l"><a href="#781"> 781: </a>                }
+</span><span id="782" class="l"><a href="#782"> 782: </a>            }
+</span><span id="783" class="l"><a href="#783"> 783: </a>        }
+</span><span id="784" class="l"><a href="#784"> 784: </a>
+</span><span id="785" class="l"><a href="#785"> 785: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="786" class="l"><a href="#786"> 786: </a>    }
+</span><span id="787" class="l"><a href="#787"> 787: </a>
+</span><span id="788" class="l"><a href="#788"> 788: </a>    <span class="php-comment">/**
+</span></span><span id="789" class="l"><a href="#789"> 789: </a><span class="php-comment">     * Detect which format should be used to output the data
+</span></span><span id="790" class="l"><a href="#790"> 790: </a><span class="php-comment">     *
+</span></span><span id="791" class="l"><a href="#791"> 791: </a><span class="php-comment">     * @access protected
+</span></span><span id="792" class="l"><a href="#792"> 792: </a><span class="php-comment">     * @return mixed|NULL|string Output format
+</span></span><span id="793" class="l"><a href="#793"> 793: </a><span class="php-comment">     */</span>
+</span><span id="794" class="l"><a href="#794"> 794: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
+</span><span id="795" class="l"><a href="#795"> 795: </a>    {
+</span><span id="796" class="l"><a href="#796"> 796: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>;
 </span><span id="797" class="l"><a href="#797"> 797: </a>
-</span><span id="798" class="l"><a href="#798"> 798: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="799" class="l"><a href="#799"> 799: </a>    }
-</span><span id="800" class="l"><a href="#800"> 800: </a>
-</span><span id="801" class="l"><a href="#801"> 801: </a>    <span class="php-comment">/**
-</span></span><span id="802" class="l"><a href="#802"> 802: </a><span class="php-comment">     * Detect which format should be used to output the data
-</span></span><span id="803" class="l"><a href="#803"> 803: </a><span class="php-comment">     *
-</span></span><span id="804" class="l"><a href="#804"> 804: </a><span class="php-comment">     * @access protected
-</span></span><span id="805" class="l"><a href="#805"> 805: </a><span class="php-comment">     * @return mixed|NULL|string Output format
-</span></span><span id="806" class="l"><a href="#806"> 806: </a><span class="php-comment">     */</span>
-</span><span id="807" class="l"><a href="#807"> 807: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
-</span><span id="808" class="l"><a href="#808"> 808: </a>    {
-</span><span id="809" class="l"><a href="#809"> 809: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>;
-</span><span id="810" class="l"><a href="#810"> 810: </a>
-</span><span id="811" class="l"><a href="#811"> 811: </a>        <span class="php-comment">// Check if a file extension is used when no get arguments provided</span>
-</span><span id="812" class="l"><a href="#812"> 812: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="813" class="l"><a href="#813"> 813: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
-</span><span id="814" class="l"><a href="#814"> 814: </a>        {
-</span><span id="815" class="l"><a href="#815"> 815: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
-</span><span id="816" class="l"><a href="#816"> 816: </a>        }
-</span><span id="817" class="l"><a href="#817"> 817: </a>
-</span><span id="818" class="l"><a href="#818"> 818: </a>        <span class="php-comment">// Check if a file extension is used</span>
-</span><span id="819" class="l"><a href="#819"> 819: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args)) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args), <span class="php-var">$matches</span>))
-</span><span id="820" class="l"><a href="#820"> 820: </a>        {
-</span><span id="821" class="l"><a href="#821"> 821: </a>            <span class="php-comment">//else if ($this-&gt;_get_args and is_array(end($this-&gt;_get_args)) === FALSE and preg_match($pattern, end(array_keys($this-&gt;_get_args)), $matches)) {</span>
-</span><span id="822" class="l"><a href="#822"> 822: </a>            <span class="php-comment">// The key of the last argument</span>
-</span><span id="823" class="l"><a href="#823"> 823: </a>            <span class="php-var">$arg_keys</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_get_args);
-</span><span id="824" class="l"><a href="#824"> 824: </a>            <span class="php-var">$last_key</span> = <span class="php-keyword2">end</span>(<span class="php-var">$arg_keys</span>);
-</span><span id="825" class="l"><a href="#825"> 825: </a>
-</span><span id="826" class="l"><a href="#826"> 826: </a>            <span class="php-comment">// Remove the extension from arguments too</span>
-</span><span id="827" class="l"><a href="#827"> 827: </a>            <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>] = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>]);
-</span><span id="828" class="l"><a href="#828"> 828: </a>            <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>] = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>]);
-</span><span id="829" class="l"><a href="#829"> 829: </a>
-</span><span id="830" class="l"><a href="#830"> 830: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
-</span><span id="831" class="l"><a href="#831"> 831: </a>        }
-</span><span id="832" class="l"><a href="#832"> 832: </a>
-</span><span id="833" class="l"><a href="#833"> 833: </a>        <span class="php-comment">// Get the format</span>
-</span><span id="834" class="l"><a href="#834"> 834: </a>        <span class="php-var">$format</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]) ? <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]) : <span class="php-keyword1">NULL</span>;
-</span><span id="835" class="l"><a href="#835"> 835: </a>
-</span><span id="836" class="l"><a href="#836"> 836: </a>        <span class="php-comment">// A format has been passed as an argument in the URL and it is supported</span>
-</span><span id="837" class="l"><a href="#837"> 837: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]))
-</span><span id="838" class="l"><a href="#838"> 838: </a>        {
-</span><span id="839" class="l"><a href="#839"> 839: </a>            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="840" class="l"><a href="#840"> 840: </a>        }
-</span><span id="841" class="l"><a href="#841"> 841: </a>
-</span><span id="842" class="l"><a href="#842"> 842: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT (if it exists and we are allowed)</span>
-</span><span id="843" class="l"><a href="#843"> 843: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>))
-</span><span id="844" class="l"><a href="#844"> 844: </a>        {
-</span><span id="845" class="l"><a href="#845"> 845: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="846" class="l"><a href="#846"> 846: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
-</span><span id="847" class="l"><a href="#847"> 847: </a>            {
-</span><span id="848" class="l"><a href="#848"> 848: </a>                <span class="php-comment">// Has this format been requested?</span>
-</span><span id="849" class="l"><a href="#849"> 849: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="850" class="l"><a href="#850"> 850: </a>                {
-</span><span id="851" class="l"><a href="#851"> 851: </a>                    <span class="php-comment">// If not HTML or XML assume its right and send it on its way</span>
-</span><span id="852" class="l"><a href="#852"> 852: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
-</span><span id="853" class="l"><a href="#853"> 853: </a>                    {
-</span><span id="854" class="l"><a href="#854"> 854: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="855" class="l"><a href="#855"> 855: </a>                    }
-</span><span id="856" class="l"><a href="#856"> 856: </a>
-</span><span id="857" class="l"><a href="#857"> 857: </a>                    <span class="php-comment">// HTML or XML have shown up as a match</span>
-</span><span id="858" class="l"><a href="#858"> 858: </a>                    <span class="php-keyword1">else</span>
-</span><span id="859" class="l"><a href="#859"> 859: </a>                    {
-</span><span id="860" class="l"><a href="#860"> 860: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
-</span><span id="861" class="l"><a href="#861"> 861: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="862" class="l"><a href="#862"> 862: </a>                        {
-</span><span id="863" class="l"><a href="#863"> 863: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="864" class="l"><a href="#864"> 864: </a>                        }
-</span><span id="865" class="l"><a href="#865"> 865: </a>
-</span><span id="866" class="l"><a href="#866"> 866: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
-</span><span id="867" class="l"><a href="#867"> 867: </a>                        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="868" class="l"><a href="#868"> 868: </a>                        {
-</span><span id="869" class="l"><a href="#869"> 869: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="870" class="l"><a href="#870"> 870: </a>                        }
-</span><span id="871" class="l"><a href="#871"> 871: </a>                    }
-</span><span id="872" class="l"><a href="#872"> 872: </a>                }
-</span><span id="873" class="l"><a href="#873"> 873: </a>            }
-</span><span id="874" class="l"><a href="#874"> 874: </a>        } <span class="php-comment">// End HTTP_ACCEPT checking</span>
-</span><span id="875" class="l"><a href="#875"> 875: </a>
-</span><span id="876" class="l"><a href="#876"> 876: </a>        <span class="php-comment">// Well, none of that has worked! Let's see if the controller has a default</span>
-</span><span id="877" class="l"><a href="#877"> 877: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
-</span><span id="878" class="l"><a href="#878"> 878: </a>        {
-</span><span id="879" class="l"><a href="#879"> 879: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
-</span><span id="880" class="l"><a href="#880"> 880: </a>        }
-</span><span id="881" class="l"><a href="#881"> 881: </a>
-</span><span id="882" class="l"><a href="#882"> 882: </a>        <span class="php-comment">// Just use the default format</span>
-</span><span id="883" class="l"><a href="#883"> 883: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
-</span><span id="884" class="l"><a href="#884"> 884: </a>    }
-</span><span id="885" class="l"><a href="#885"> 885: </a>
-</span><span id="886" class="l"><a href="#886"> 886: </a>    <span class="php-comment">/**
-</span></span><span id="887" class="l"><a href="#887"> 887: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
-</span></span><span id="888" class="l"><a href="#888"> 888: </a><span class="php-comment">     *
-</span></span><span id="889" class="l"><a href="#889"> 889: </a><span class="php-comment">     * @access protected
-</span></span><span id="890" class="l"><a href="#890"> 890: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
-</span></span><span id="891" class="l"><a href="#891"> 891: </a><span class="php-comment">     */</span>
-</span><span id="892" class="l"><a href="#892"> 892: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
-</span><span id="893" class="l"><a href="#893"> 893: </a>    {
-</span><span id="894" class="l"><a href="#894"> 894: </a>        <span class="php-comment">// Declare a variable to store the method</span>
-</span><span id="895" class="l"><a href="#895"> 895: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="896" class="l"><a href="#896"> 896: </a>
-</span><span id="897" class="l"><a href="#897"> 897: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
-</span><span id="898" class="l"><a href="#898"> 898: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="899" class="l"><a href="#899"> 899: </a>        {
-</span><span id="900" class="l"><a href="#900"> 900: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
-</span><span id="901" class="l"><a href="#901"> 901: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="902" class="l"><a href="#902"> 902: </a>            {
-</span><span id="903" class="l"><a href="#903"> 903: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
-</span><span id="904" class="l"><a href="#904"> 904: </a>            }
-</span><span id="905" class="l"><a href="#905"> 905: </a>
-</span><span id="906" class="l"><a href="#906"> 906: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
-</span><span id="907" class="l"><a href="#907"> 907: </a>        }
-</span><span id="908" class="l"><a href="#908"> 908: </a>
-</span><span id="909" class="l"><a href="#909"> 909: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
-</span><span id="910" class="l"><a href="#910"> 910: </a>        {
-</span><span id="911" class="l"><a href="#911"> 911: </a>            <span class="php-comment">// Get the request method as a lowercase string.</span>
-</span><span id="912" class="l"><a href="#912"> 912: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
-</span><span id="913" class="l"><a href="#913"> 913: </a>        }
-</span><span id="914" class="l"><a href="#914"> 914: </a>
-</span><span id="915" class="l"><a href="#915"> 915: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
-</span><span id="916" class="l"><a href="#916"> 916: </a>    }
-</span><span id="917" class="l"><a href="#917"> 917: </a>
-</span><span id="918" class="l"><a href="#918"> 918: </a>    <span class="php-comment">/**
-</span></span><span id="919" class="l"><a href="#919"> 919: </a><span class="php-comment">     * See if the user has provided an API key
-</span></span><span id="920" class="l"><a href="#920"> 920: </a><span class="php-comment">     *
-</span></span><span id="921" class="l"><a href="#921"> 921: </a><span class="php-comment">     * @access protected
-</span></span><span id="922" class="l"><a href="#922"> 922: </a><span class="php-comment">     * @return bool
-</span></span><span id="923" class="l"><a href="#923"> 923: </a><span class="php-comment">     */</span>
-</span><span id="924" class="l"><a href="#924"> 924: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
-</span><span id="925" class="l"><a href="#925"> 925: </a>    {
-</span><span id="926" class="l"><a href="#926"> 926: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
-</span><span id="927" class="l"><a href="#927"> 927: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
-</span><span id="928" class="l"><a href="#928"> 928: </a>
-</span><span id="929" class="l"><a href="#929"> 929: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
-</span><span id="930" class="l"><a href="#930"> 930: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
+</span><span id="798" class="l"><a href="#798"> 798: </a>        <span class="php-comment">// Check if a file extension is used when no get arguments provided</span>
+</span><span id="799" class="l"><a href="#799"> 799: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="800" class="l"><a href="#800"> 800: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
+</span><span id="801" class="l"><a href="#801"> 801: </a>        {
+</span><span id="802" class="l"><a href="#802"> 802: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
+</span><span id="803" class="l"><a href="#803"> 803: </a>        }
+</span><span id="804" class="l"><a href="#804"> 804: </a>
+</span><span id="805" class="l"><a href="#805"> 805: </a>        <span class="php-comment">// Check if a file extension is used</span>
+</span><span id="806" class="l"><a href="#806"> 806: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args)) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args), <span class="php-var">$matches</span>))
+</span><span id="807" class="l"><a href="#807"> 807: </a>        {
+</span><span id="808" class="l"><a href="#808"> 808: </a>            <span class="php-comment">//elseif ($this-&gt;_get_args and is_array(end($this-&gt;_get_args)) === FALSE and preg_match($pattern, end(array_keys($this-&gt;_get_args)), $matches)) {</span>
+</span><span id="809" class="l"><a href="#809"> 809: </a>            <span class="php-comment">// The key of the last argument</span>
+</span><span id="810" class="l"><a href="#810"> 810: </a>            <span class="php-var">$arg_keys</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_get_args);
+</span><span id="811" class="l"><a href="#811"> 811: </a>            <span class="php-var">$last_key</span> = <span class="php-keyword2">end</span>(<span class="php-var">$arg_keys</span>);
+</span><span id="812" class="l"><a href="#812"> 812: </a>
+</span><span id="813" class="l"><a href="#813"> 813: </a>            <span class="php-comment">// Remove the extension from arguments too</span>
+</span><span id="814" class="l"><a href="#814"> 814: </a>            <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>] = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>]);
+</span><span id="815" class="l"><a href="#815"> 815: </a>            <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>] = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>]);
+</span><span id="816" class="l"><a href="#816"> 816: </a>
+</span><span id="817" class="l"><a href="#817"> 817: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
+</span><span id="818" class="l"><a href="#818"> 818: </a>        }
+</span><span id="819" class="l"><a href="#819"> 819: </a>
+</span><span id="820" class="l"><a href="#820"> 820: </a>        <span class="php-comment">// Get the format</span>
+</span><span id="821" class="l"><a href="#821"> 821: </a>        <span class="php-var">$format</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]) ? <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]) : <span class="php-keyword1">NULL</span>;
+</span><span id="822" class="l"><a href="#822"> 822: </a>
+</span><span id="823" class="l"><a href="#823"> 823: </a>        <span class="php-comment">// A format has been passed as an argument in the URL and it is supported</span>
+</span><span id="824" class="l"><a href="#824"> 824: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]))
+</span><span id="825" class="l"><a href="#825"> 825: </a>        {
+</span><span id="826" class="l"><a href="#826"> 826: </a>            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="827" class="l"><a href="#827"> 827: </a>        }
+</span><span id="828" class="l"><a href="#828"> 828: </a>
+</span><span id="829" class="l"><a href="#829"> 829: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT (if it exists and we are allowed)</span>
+</span><span id="830" class="l"><a href="#830"> 830: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>))
+</span><span id="831" class="l"><a href="#831"> 831: </a>        {
+</span><span id="832" class="l"><a href="#832"> 832: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="833" class="l"><a href="#833"> 833: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
+</span><span id="834" class="l"><a href="#834"> 834: </a>            {
+</span><span id="835" class="l"><a href="#835"> 835: </a>                <span class="php-comment">// Has this format been requested?</span>
+</span><span id="836" class="l"><a href="#836"> 836: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="837" class="l"><a href="#837"> 837: </a>                {
+</span><span id="838" class="l"><a href="#838"> 838: </a>                    <span class="php-comment">// If not HTML or XML assume its right and send it on its way</span>
+</span><span id="839" class="l"><a href="#839"> 839: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
+</span><span id="840" class="l"><a href="#840"> 840: </a>                    {
+</span><span id="841" class="l"><a href="#841"> 841: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="842" class="l"><a href="#842"> 842: </a>                    }
+</span><span id="843" class="l"><a href="#843"> 843: </a>
+</span><span id="844" class="l"><a href="#844"> 844: </a>                    <span class="php-comment">// HTML or XML have shown up as a match</span>
+</span><span id="845" class="l"><a href="#845"> 845: </a>                    <span class="php-keyword1">else</span>
+</span><span id="846" class="l"><a href="#846"> 846: </a>                    {
+</span><span id="847" class="l"><a href="#847"> 847: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
+</span><span id="848" class="l"><a href="#848"> 848: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="849" class="l"><a href="#849"> 849: </a>                        {
+</span><span id="850" class="l"><a href="#850"> 850: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="851" class="l"><a href="#851"> 851: </a>                        }
+</span><span id="852" class="l"><a href="#852"> 852: </a>
+</span><span id="853" class="l"><a href="#853"> 853: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
+</span><span id="854" class="l"><a href="#854"> 854: </a>                        <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="855" class="l"><a href="#855"> 855: </a>                        {
+</span><span id="856" class="l"><a href="#856"> 856: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="857" class="l"><a href="#857"> 857: </a>                        }
+</span><span id="858" class="l"><a href="#858"> 858: </a>                    }
+</span><span id="859" class="l"><a href="#859"> 859: </a>                }
+</span><span id="860" class="l"><a href="#860"> 860: </a>            }
+</span><span id="861" class="l"><a href="#861"> 861: </a>        } <span class="php-comment">// End HTTP_ACCEPT checking</span>
+</span><span id="862" class="l"><a href="#862"> 862: </a>
+</span><span id="863" class="l"><a href="#863"> 863: </a>        <span class="php-comment">// Well, none of that has worked! Let's see if the controller has a default</span>
+</span><span id="864" class="l"><a href="#864"> 864: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
+</span><span id="865" class="l"><a href="#865"> 865: </a>        {
+</span><span id="866" class="l"><a href="#866"> 866: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
+</span><span id="867" class="l"><a href="#867"> 867: </a>        }
+</span><span id="868" class="l"><a href="#868"> 868: </a>
+</span><span id="869" class="l"><a href="#869"> 869: </a>        <span class="php-comment">// Just use the default format</span>
+</span><span id="870" class="l"><a href="#870"> 870: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
+</span><span id="871" class="l"><a href="#871"> 871: </a>    }
+</span><span id="872" class="l"><a href="#872"> 872: </a>
+</span><span id="873" class="l"><a href="#873"> 873: </a>    <span class="php-comment">/**
+</span></span><span id="874" class="l"><a href="#874"> 874: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
+</span></span><span id="875" class="l"><a href="#875"> 875: </a><span class="php-comment">     *
+</span></span><span id="876" class="l"><a href="#876"> 876: </a><span class="php-comment">     * @access protected
+</span></span><span id="877" class="l"><a href="#877"> 877: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
+</span></span><span id="878" class="l"><a href="#878"> 878: </a><span class="php-comment">     */</span>
+</span><span id="879" class="l"><a href="#879"> 879: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
+</span><span id="880" class="l"><a href="#880"> 880: </a>    {
+</span><span id="881" class="l"><a href="#881"> 881: </a>        <span class="php-comment">// Declare a variable to store the method</span>
+</span><span id="882" class="l"><a href="#882"> 882: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="883" class="l"><a href="#883"> 883: </a>
+</span><span id="884" class="l"><a href="#884"> 884: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
+</span><span id="885" class="l"><a href="#885"> 885: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="886" class="l"><a href="#886"> 886: </a>        {
+</span><span id="887" class="l"><a href="#887"> 887: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
+</span><span id="888" class="l"><a href="#888"> 888: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="889" class="l"><a href="#889"> 889: </a>            {
+</span><span id="890" class="l"><a href="#890"> 890: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
+</span><span id="891" class="l"><a href="#891"> 891: </a>            }
+</span><span id="892" class="l"><a href="#892"> 892: </a>
+</span><span id="893" class="l"><a href="#893"> 893: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
+</span><span id="894" class="l"><a href="#894"> 894: </a>        }
+</span><span id="895" class="l"><a href="#895"> 895: </a>
+</span><span id="896" class="l"><a href="#896"> 896: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
+</span><span id="897" class="l"><a href="#897"> 897: </a>        {
+</span><span id="898" class="l"><a href="#898"> 898: </a>            <span class="php-comment">// Get the request method as a lowercase string.</span>
+</span><span id="899" class="l"><a href="#899"> 899: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
+</span><span id="900" class="l"><a href="#900"> 900: </a>        }
+</span><span id="901" class="l"><a href="#901"> 901: </a>
+</span><span id="902" class="l"><a href="#902"> 902: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
+</span><span id="903" class="l"><a href="#903"> 903: </a>    }
+</span><span id="904" class="l"><a href="#904"> 904: </a>
+</span><span id="905" class="l"><a href="#905"> 905: </a>    <span class="php-comment">/**
+</span></span><span id="906" class="l"><a href="#906"> 906: </a><span class="php-comment">     * See if the user has provided an API key
+</span></span><span id="907" class="l"><a href="#907"> 907: </a><span class="php-comment">     *
+</span></span><span id="908" class="l"><a href="#908"> 908: </a><span class="php-comment">     * @access protected
+</span></span><span id="909" class="l"><a href="#909"> 909: </a><span class="php-comment">     * @return bool
+</span></span><span id="910" class="l"><a href="#910"> 910: </a><span class="php-comment">     */</span>
+</span><span id="911" class="l"><a href="#911"> 911: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
+</span><span id="912" class="l"><a href="#912"> 912: </a>    {
+</span><span id="913" class="l"><a href="#913"> 913: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
+</span><span id="914" class="l"><a href="#914"> 914: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
+</span><span id="915" class="l"><a href="#915"> 915: </a>
+</span><span id="916" class="l"><a href="#916"> 916: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
+</span><span id="917" class="l"><a href="#917"> 917: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
+</span><span id="918" class="l"><a href="#918"> 918: </a>
+</span><span id="919" class="l"><a href="#919"> 919: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="920" class="l"><a href="#920"> 920: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
+</span><span id="921" class="l"><a href="#921"> 921: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
+</span><span id="922" class="l"><a href="#922"> 922: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
+</span><span id="923" class="l"><a href="#923"> 923: </a>
+</span><span id="924" class="l"><a href="#924"> 924: </a>        <span class="php-comment">// Find the key from server or arguments</span>
+</span><span id="925" class="l"><a href="#925"> 925: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
+</span><span id="926" class="l"><a href="#926"> 926: </a>        {
+</span><span id="927" class="l"><a href="#927"> 927: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
+</span><span id="928" class="l"><a href="#928"> 928: </a>            {
+</span><span id="929" class="l"><a href="#929"> 929: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="930" class="l"><a href="#930"> 930: </a>            }
 </span><span id="931" class="l"><a href="#931"> 931: </a>
-</span><span id="932" class="l"><a href="#932"> 932: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="933" class="l"><a href="#933"> 933: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
-</span><span id="934" class="l"><a href="#934"> 934: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
-</span><span id="935" class="l"><a href="#935"> 935: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
-</span><span id="936" class="l"><a href="#936"> 936: </a>
-</span><span id="937" class="l"><a href="#937"> 937: </a>        <span class="php-comment">// Find the key from server or arguments</span>
-</span><span id="938" class="l"><a href="#938"> 938: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
-</span><span id="939" class="l"><a href="#939"> 939: </a>        {
-</span><span id="940" class="l"><a href="#940"> 940: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
-</span><span id="941" class="l"><a href="#941"> 941: </a>            {
-</span><span id="942" class="l"><a href="#942"> 942: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="943" class="l"><a href="#943"> 943: </a>            }
-</span><span id="944" class="l"><a href="#944"> 944: </a>
-</span><span id="945" class="l"><a href="#945"> 945: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
-</span><span id="946" class="l"><a href="#946"> 946: </a>
-</span><span id="947" class="l"><a href="#947"> 947: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
-</span><span id="948" class="l"><a href="#948"> 948: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
-</span><span id="949" class="l"><a href="#949"> 949: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
-</span><span id="950" class="l"><a href="#950"> 950: </a>
-</span><span id="951" class="l"><a href="#951"> 951: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
+</span><span id="932" class="l"><a href="#932"> 932: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
+</span><span id="933" class="l"><a href="#933"> 933: </a>
+</span><span id="934" class="l"><a href="#934"> 934: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
+</span><span id="935" class="l"><a href="#935"> 935: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
+</span><span id="936" class="l"><a href="#936"> 936: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
+</span><span id="937" class="l"><a href="#937"> 937: </a>
+</span><span id="938" class="l"><a href="#938"> 938: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
+</span><span id="939" class="l"><a href="#939"> 939: </a>
+</span><span id="940" class="l"><a href="#940"> 940: </a>            <span class="php-comment">/*
+</span></span><span id="941" class="l"><a href="#941"> 941: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
+</span></span><span id="942" class="l"><a href="#942"> 942: </a><span class="php-comment">             * of valid ip addresses stored in the database.
+</span></span><span id="943" class="l"><a href="#943"> 943: </a><span class="php-comment">             */</span>
+</span><span id="944" class="l"><a href="#944"> 944: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
+</span><span id="945" class="l"><a href="#945"> 945: </a>            {
+</span><span id="946" class="l"><a href="#946"> 946: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
+</span><span id="947" class="l"><a href="#947"> 947: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
+</span><span id="948" class="l"><a href="#948"> 948: </a>                {
+</span><span id="949" class="l"><a href="#949"> 949: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
+</span><span id="950" class="l"><a href="#950"> 950: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
+</span><span id="951" class="l"><a href="#951"> 951: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
 </span><span id="952" class="l"><a href="#952"> 952: </a>
-</span><span id="953" class="l"><a href="#953"> 953: </a>            <span class="php-comment">/*
-</span></span><span id="954" class="l"><a href="#954"> 954: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
-</span></span><span id="955" class="l"><a href="#955"> 955: </a><span class="php-comment">             * of valid ip addresses stored in the database.
-</span></span><span id="956" class="l"><a href="#956"> 956: </a><span class="php-comment">             */</span>
-</span><span id="957" class="l"><a href="#957"> 957: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
-</span><span id="958" class="l"><a href="#958"> 958: </a>            {
-</span><span id="959" class="l"><a href="#959"> 959: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
-</span><span id="960" class="l"><a href="#960"> 960: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
-</span><span id="961" class="l"><a href="#961"> 961: </a>                {
-</span><span id="962" class="l"><a href="#962"> 962: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
-</span><span id="963" class="l"><a href="#963"> 963: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
-</span><span id="964" class="l"><a href="#964"> 964: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
-</span><span id="965" class="l"><a href="#965"> 965: </a>
-</span><span id="966" class="l"><a href="#966"> 966: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
-</span><span id="967" class="l"><a href="#967"> 967: </a>                    {
-</span><span id="968" class="l"><a href="#968"> 968: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() == <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
-</span><span id="969" class="l"><a href="#969"> 969: </a>                        {
-</span><span id="970" class="l"><a href="#970"> 970: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
-</span><span id="971" class="l"><a href="#971"> 971: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
-</span><span id="972" class="l"><a href="#972"> 972: </a>                            <span class="php-keyword1">break</span>;
-</span><span id="973" class="l"><a href="#973"> 973: </a>                        }
-</span><span id="974" class="l"><a href="#974"> 974: </a>                    }
-</span><span id="975" class="l"><a href="#975"> 975: </a>
-</span><span id="976" class="l"><a href="#976"> 976: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
-</span><span id="977" class="l"><a href="#977"> 977: </a>                }
-</span><span id="978" class="l"><a href="#978"> 978: </a>                <span class="php-keyword1">else</span>
-</span><span id="979" class="l"><a href="#979"> 979: </a>                {
-</span><span id="980" class="l"><a href="#980"> 980: </a>                    <span class="php-comment">// There should be at least one IP address for this private key.</span>
-</span><span id="981" class="l"><a href="#981"> 981: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="982" class="l"><a href="#982"> 982: </a>                }
-</span><span id="983" class="l"><a href="#983"> 983: </a>            }
-</span><span id="984" class="l"><a href="#984"> 984: </a>
-</span><span id="985" class="l"><a href="#985"> 985: </a>            <span class="php-keyword1">return</span> <span class="php-var">$row</span>;
-</span><span id="986" class="l"><a href="#986"> 986: </a>        }
-</span><span id="987" class="l"><a href="#987"> 987: </a>
-</span><span id="988" class="l"><a href="#988"> 988: </a>        <span class="php-comment">// No key has been sent</span>
-</span><span id="989" class="l"><a href="#989"> 989: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="990" class="l"><a href="#990"> 990: </a>    }
+</span><span id="953" class="l"><a href="#953"> 953: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
+</span><span id="954" class="l"><a href="#954"> 954: </a>                    {
+</span><span id="955" class="l"><a href="#955"> 955: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() == <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
+</span><span id="956" class="l"><a href="#956"> 956: </a>                        {
+</span><span id="957" class="l"><a href="#957"> 957: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
+</span><span id="958" class="l"><a href="#958"> 958: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
+</span><span id="959" class="l"><a href="#959"> 959: </a>                            <span class="php-keyword1">break</span>;
+</span><span id="960" class="l"><a href="#960"> 960: </a>                        }
+</span><span id="961" class="l"><a href="#961"> 961: </a>                    }
+</span><span id="962" class="l"><a href="#962"> 962: </a>
+</span><span id="963" class="l"><a href="#963"> 963: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
+</span><span id="964" class="l"><a href="#964"> 964: </a>                }
+</span><span id="965" class="l"><a href="#965"> 965: </a>                <span class="php-keyword1">else</span>
+</span><span id="966" class="l"><a href="#966"> 966: </a>                {
+</span><span id="967" class="l"><a href="#967"> 967: </a>                    <span class="php-comment">// There should be at least one IP address for this private key.</span>
+</span><span id="968" class="l"><a href="#968"> 968: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="969" class="l"><a href="#969"> 969: </a>                }
+</span><span id="970" class="l"><a href="#970"> 970: </a>            }
+</span><span id="971" class="l"><a href="#971"> 971: </a>
+</span><span id="972" class="l"><a href="#972"> 972: </a>            <span class="php-keyword1">return</span> <span class="php-var">$row</span>;
+</span><span id="973" class="l"><a href="#973"> 973: </a>        }
+</span><span id="974" class="l"><a href="#974"> 974: </a>
+</span><span id="975" class="l"><a href="#975"> 975: </a>        <span class="php-comment">// No key has been sent</span>
+</span><span id="976" class="l"><a href="#976"> 976: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="977" class="l"><a href="#977"> 977: </a>    }
+</span><span id="978" class="l"><a href="#978"> 978: </a>
+</span><span id="979" class="l"><a href="#979"> 979: </a>    <span class="php-comment">/**
+</span></span><span id="980" class="l"><a href="#980"> 980: </a><span class="php-comment">     * What language do they want it in?
+</span></span><span id="981" class="l"><a href="#981"> 981: </a><span class="php-comment">     *
+</span></span><span id="982" class="l"><a href="#982"> 982: </a><span class="php-comment">     * @access protected
+</span></span><span id="983" class="l"><a href="#983"> 983: </a><span class="php-comment">     * @return NULL|string The language code.
+</span></span><span id="984" class="l"><a href="#984"> 984: </a><span class="php-comment">     */</span>
+</span><span id="985" class="l"><a href="#985"> 985: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
+</span><span id="986" class="l"><a href="#986"> 986: </a>    {
+</span><span id="987" class="l"><a href="#987"> 987: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>))
+</span><span id="988" class="l"><a href="#988"> 988: </a>        {
+</span><span id="989" class="l"><a href="#989"> 989: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="990" class="l"><a href="#990"> 990: </a>        }
 </span><span id="991" class="l"><a href="#991"> 991: </a>
-</span><span id="992" class="l"><a href="#992"> 992: </a>    <span class="php-comment">/**
-</span></span><span id="993" class="l"><a href="#993"> 993: </a><span class="php-comment">     * What language do they want it in?
-</span></span><span id="994" class="l"><a href="#994"> 994: </a><span class="php-comment">     *
-</span></span><span id="995" class="l"><a href="#995"> 995: </a><span class="php-comment">     * @access protected
-</span></span><span id="996" class="l"><a href="#996"> 996: </a><span class="php-comment">     * @return NULL|string The language code.
-</span></span><span id="997" class="l"><a href="#997"> 997: </a><span class="php-comment">     */</span>
-</span><span id="998" class="l"><a href="#998"> 998: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
-</span><span id="999" class="l"><a href="#999"> 999: </a>    {
-</span><span id="1000" class="l"><a href="#1000">1000: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>))
-</span><span id="1001" class="l"><a href="#1001">1001: </a>        {
-</span><span id="1002" class="l"><a href="#1002">1002: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="1003" class="l"><a href="#1003">1003: </a>        }
+</span><span id="992" class="l"><a href="#992"> 992: </a>        <span class="php-comment">// They might have sent a few, make it an array</span>
+</span><span id="993" class="l"><a href="#993"> 993: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="994" class="l"><a href="#994"> 994: </a>        {
+</span><span id="995" class="l"><a href="#995"> 995: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
+</span><span id="996" class="l"><a href="#996"> 996: </a>
+</span><span id="997" class="l"><a href="#997"> 997: </a>            <span class="php-var">$return_langs</span> = [];
+</span><span id="998" class="l"><a href="#998"> 998: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
+</span><span id="999" class="l"><a href="#999"> 999: </a>            {
+</span><span id="1000" class="l"><a href="#1000">1000: </a>                <span class="php-comment">// Remove weight and strip space</span>
+</span><span id="1001" class="l"><a href="#1001">1001: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
+</span><span id="1002" class="l"><a href="#1002">1002: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
+</span><span id="1003" class="l"><a href="#1003">1003: </a>            }
 </span><span id="1004" class="l"><a href="#1004">1004: </a>
-</span><span id="1005" class="l"><a href="#1005">1005: </a>        <span class="php-comment">// They might have sent a few, make it an array</span>
-</span><span id="1006" class="l"><a href="#1006">1006: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="1007" class="l"><a href="#1007">1007: </a>        {
-</span><span id="1008" class="l"><a href="#1008">1008: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
-</span><span id="1009" class="l"><a href="#1009">1009: </a>
-</span><span id="1010" class="l"><a href="#1010">1010: </a>            <span class="php-var">$return_langs</span> = [];
-</span><span id="1011" class="l"><a href="#1011">1011: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
-</span><span id="1012" class="l"><a href="#1012">1012: </a>            {
-</span><span id="1013" class="l"><a href="#1013">1013: </a>                <span class="php-comment">// Remove weight and strip space</span>
-</span><span id="1014" class="l"><a href="#1014">1014: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
-</span><span id="1015" class="l"><a href="#1015">1015: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
-</span><span id="1016" class="l"><a href="#1016">1016: </a>            }
-</span><span id="1017" class="l"><a href="#1017">1017: </a>
-</span><span id="1018" class="l"><a href="#1018">1018: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
-</span><span id="1019" class="l"><a href="#1019">1019: </a>        }
-</span><span id="1020" class="l"><a href="#1020">1020: </a>
-</span><span id="1021" class="l"><a href="#1021">1021: </a>        <span class="php-comment">// Nope, just return the string</span>
-</span><span id="1022" class="l"><a href="#1022">1022: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
-</span><span id="1023" class="l"><a href="#1023">1023: </a>    }
-</span><span id="1024" class="l"><a href="#1024">1024: </a>
-</span><span id="1025" class="l"><a href="#1025">1025: </a>    <span class="php-comment">/**
-</span></span><span id="1026" class="l"><a href="#1026">1026: </a><span class="php-comment">     * Add the request to the log table
-</span></span><span id="1027" class="l"><a href="#1027">1027: </a><span class="php-comment">     *
-</span></span><span id="1028" class="l"><a href="#1028">1028: </a><span class="php-comment">     * @access protected
-</span></span><span id="1029" class="l"><a href="#1029">1029: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
-</span></span><span id="1030" class="l"><a href="#1030">1030: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
-</span></span><span id="1031" class="l"><a href="#1031">1031: </a><span class="php-comment">     */</span>
-</span><span id="1032" class="l"><a href="#1032">1032: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1033" class="l"><a href="#1033">1033: </a>    {
-</span><span id="1034" class="l"><a href="#1034">1034: </a>        <span class="php-comment">// Insert the request into the log table</span>
-</span><span id="1035" class="l"><a href="#1035">1035: </a>        <span class="php-var">$isInserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1036" class="l"><a href="#1036">1036: </a>            -&gt;insert(
-</span><span id="1037" class="l"><a href="#1037">1037: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
-</span><span id="1038" class="l"><a href="#1038">1038: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
-</span><span id="1039" class="l"><a href="#1039">1039: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
-</span><span id="1040" class="l"><a href="#1040">1040: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
-</span><span id="1041" class="l"><a href="#1041">1041: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="1042" class="l"><a href="#1042">1042: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
-</span><span id="1043" class="l"><a href="#1043">1043: </a>                <span class="php-quote">'time'</span> =&gt; now(), <span class="php-comment">// Used to be: function_exists('now') ? now() : time()</span>
-</span><span id="1044" class="l"><a href="#1044">1044: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
-</span><span id="1045" class="l"><a href="#1045">1045: </a>            ]);
-</span><span id="1046" class="l"><a href="#1046">1046: </a>
-</span><span id="1047" class="l"><a href="#1047">1047: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
-</span><span id="1048" class="l"><a href="#1048">1048: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
-</span><span id="1049" class="l"><a href="#1049">1049: </a>
-</span><span id="1050" class="l"><a href="#1050">1050: </a>        <span class="php-keyword1">return</span> <span class="php-var">$isInserted</span>;
-</span><span id="1051" class="l"><a href="#1051">1051: </a>    }
-</span><span id="1052" class="l"><a href="#1052">1052: </a>
-</span><span id="1053" class="l"><a href="#1053">1053: </a>    <span class="php-comment">/**
-</span></span><span id="1054" class="l"><a href="#1054">1054: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
-</span></span><span id="1055" class="l"><a href="#1055">1055: </a><span class="php-comment">     *
-</span></span><span id="1056" class="l"><a href="#1056">1056: </a><span class="php-comment">     * @access protected
-</span></span><span id="1057" class="l"><a href="#1057">1057: </a><span class="php-comment">     * @param  string $controller_method The method being called
-</span></span><span id="1058" class="l"><a href="#1058">1058: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
-</span></span><span id="1059" class="l"><a href="#1059">1059: </a><span class="php-comment">     */</span>
-</span><span id="1060" class="l"><a href="#1060">1060: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
-</span><span id="1061" class="l"><a href="#1061">1061: </a>    {
-</span><span id="1062" class="l"><a href="#1062">1062: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
-</span><span id="1063" class="l"><a href="#1063">1063: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span> || <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1064" class="l"><a href="#1064">1064: </a>        {
-</span><span id="1065" class="l"><a href="#1065">1065: </a>            <span class="php-comment">// Everything is fine</span>
-</span><span id="1066" class="l"><a href="#1066">1066: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1067" class="l"><a href="#1067">1067: </a>        }
-</span><span id="1068" class="l"><a href="#1068">1068: </a>
-</span><span id="1069" class="l"><a href="#1069">1069: </a>        <span class="php-comment">// How many times can you get to this method in a defined timelimit (default: 1hr)?</span>
-</span><span id="1070" class="l"><a href="#1070">1070: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>];
+</span><span id="1005" class="l"><a href="#1005">1005: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
+</span><span id="1006" class="l"><a href="#1006">1006: </a>        }
+</span><span id="1007" class="l"><a href="#1007">1007: </a>
+</span><span id="1008" class="l"><a href="#1008">1008: </a>        <span class="php-comment">// Nope, just return the string</span>
+</span><span id="1009" class="l"><a href="#1009">1009: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
+</span><span id="1010" class="l"><a href="#1010">1010: </a>    }
+</span><span id="1011" class="l"><a href="#1011">1011: </a>
+</span><span id="1012" class="l"><a href="#1012">1012: </a>    <span class="php-comment">/**
+</span></span><span id="1013" class="l"><a href="#1013">1013: </a><span class="php-comment">     * Add the request to the log table
+</span></span><span id="1014" class="l"><a href="#1014">1014: </a><span class="php-comment">     *
+</span></span><span id="1015" class="l"><a href="#1015">1015: </a><span class="php-comment">     * @access protected
+</span></span><span id="1016" class="l"><a href="#1016">1016: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
+</span></span><span id="1017" class="l"><a href="#1017">1017: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
+</span></span><span id="1018" class="l"><a href="#1018">1018: </a><span class="php-comment">     */</span>
+</span><span id="1019" class="l"><a href="#1019">1019: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="1020" class="l"><a href="#1020">1020: </a>    {
+</span><span id="1021" class="l"><a href="#1021">1021: </a>        <span class="php-comment">// Insert the request into the log table</span>
+</span><span id="1022" class="l"><a href="#1022">1022: </a>        <span class="php-var">$isInserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1023" class="l"><a href="#1023">1023: </a>            -&gt;insert(
+</span><span id="1024" class="l"><a href="#1024">1024: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
+</span><span id="1025" class="l"><a href="#1025">1025: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
+</span><span id="1026" class="l"><a href="#1026">1026: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
+</span><span id="1027" class="l"><a href="#1027">1027: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
+</span><span id="1028" class="l"><a href="#1028">1028: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="1029" class="l"><a href="#1029">1029: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
+</span><span id="1030" class="l"><a href="#1030">1030: </a>                <span class="php-quote">'time'</span> =&gt; now(), <span class="php-comment">// Used to be: function_exists('now') ? now() : time()</span>
+</span><span id="1031" class="l"><a href="#1031">1031: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
+</span><span id="1032" class="l"><a href="#1032">1032: </a>            ]);
+</span><span id="1033" class="l"><a href="#1033">1033: </a>
+</span><span id="1034" class="l"><a href="#1034">1034: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
+</span><span id="1035" class="l"><a href="#1035">1035: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
+</span><span id="1036" class="l"><a href="#1036">1036: </a>
+</span><span id="1037" class="l"><a href="#1037">1037: </a>        <span class="php-keyword1">return</span> <span class="php-var">$isInserted</span>;
+</span><span id="1038" class="l"><a href="#1038">1038: </a>    }
+</span><span id="1039" class="l"><a href="#1039">1039: </a>
+</span><span id="1040" class="l"><a href="#1040">1040: </a>    <span class="php-comment">/**
+</span></span><span id="1041" class="l"><a href="#1041">1041: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
+</span></span><span id="1042" class="l"><a href="#1042">1042: </a><span class="php-comment">     *
+</span></span><span id="1043" class="l"><a href="#1043">1043: </a><span class="php-comment">     * @access protected
+</span></span><span id="1044" class="l"><a href="#1044">1044: </a><span class="php-comment">     * @param  string $controller_method The method being called
+</span></span><span id="1045" class="l"><a href="#1045">1045: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
+</span></span><span id="1046" class="l"><a href="#1046">1046: </a><span class="php-comment">     */</span>
+</span><span id="1047" class="l"><a href="#1047">1047: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
+</span><span id="1048" class="l"><a href="#1048">1048: </a>    {
+</span><span id="1049" class="l"><a href="#1049">1049: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
+</span><span id="1050" class="l"><a href="#1050">1050: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span> || <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1051" class="l"><a href="#1051">1051: </a>        {
+</span><span id="1052" class="l"><a href="#1052">1052: </a>            <span class="php-comment">// Everything is fine</span>
+</span><span id="1053" class="l"><a href="#1053">1053: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1054" class="l"><a href="#1054">1054: </a>        }
+</span><span id="1055" class="l"><a href="#1055">1055: </a>
+</span><span id="1056" class="l"><a href="#1056">1056: </a>        <span class="php-comment">// How many times can you get to this method in a defined timelimit (default: 1hr)?</span>
+</span><span id="1057" class="l"><a href="#1057">1057: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>];
+</span><span id="1058" class="l"><a href="#1058">1058: </a>
+</span><span id="1059" class="l"><a href="#1059">1059: </a>        <span class="php-var">$uri_noext</span> = <span class="php-var">$this</span>-&gt;uri-&gt;uri_string();
+</span><span id="1060" class="l"><a href="#1060">1060: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;uri-&gt;uri_string()), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
+</span><span id="1061" class="l"><a href="#1061">1061: </a>        {
+</span><span id="1062" class="l"><a href="#1062">1062: </a>            <span class="php-var">$uri_noext</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)-<span class="php-num">1</span>);
+</span><span id="1063" class="l"><a href="#1063">1063: </a>        }
+</span><span id="1064" class="l"><a href="#1064">1064: </a>
+</span><span id="1065" class="l"><a href="#1065">1065: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
+</span><span id="1066" class="l"><a href="#1066">1066: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1067" class="l"><a href="#1067">1067: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
+</span><span id="1068" class="l"><a href="#1068">1068: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1069" class="l"><a href="#1069">1069: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
+</span><span id="1070" class="l"><a href="#1070">1070: </a>            -&gt;row();
 </span><span id="1071" class="l"><a href="#1071">1071: </a>
-</span><span id="1072" class="l"><a href="#1072">1072: </a>        <span class="php-var">$uri_noext</span> = <span class="php-var">$this</span>-&gt;uri-&gt;uri_string();
-</span><span id="1073" class="l"><a href="#1073">1073: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;uri-&gt;uri_string()), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
-</span><span id="1074" class="l"><a href="#1074">1074: </a>        {
-</span><span id="1075" class="l"><a href="#1075">1075: </a>            <span class="php-var">$uri_noext</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)-<span class="php-num">1</span>);
-</span><span id="1076" class="l"><a href="#1076">1076: </a>        }
-</span><span id="1077" class="l"><a href="#1077">1077: </a>
-</span><span id="1078" class="l"><a href="#1078">1078: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
-</span><span id="1079" class="l"><a href="#1079">1079: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1080" class="l"><a href="#1080">1080: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
-</span><span id="1081" class="l"><a href="#1081">1081: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1082" class="l"><a href="#1082">1082: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
-</span><span id="1083" class="l"><a href="#1083">1083: </a>            -&gt;row();
-</span><span id="1084" class="l"><a href="#1084">1084: </a>
-</span><span id="1085" class="l"><a href="#1085">1085: </a>        <span class="php-var">$timelimit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'time'</span>] : <span class="php-num">60</span> * <span class="php-num">60</span>);
-</span><span id="1086" class="l"><a href="#1086">1086: </a>
-</span><span id="1087" class="l"><a href="#1087">1087: </a>        <span class="php-comment">// No calls have been made for this key</span>
-</span><span id="1088" class="l"><a href="#1088">1088: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1089" class="l"><a href="#1089">1089: </a>        {
-</span><span id="1090" class="l"><a href="#1090">1090: </a>            <span class="php-comment">// Create a new row for the following key</span>
-</span><span id="1091" class="l"><a href="#1091">1091: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
-</span><span id="1092" class="l"><a href="#1092">1092: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
-</span><span id="1093" class="l"><a href="#1093">1093: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="1094" class="l"><a href="#1094">1094: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
-</span><span id="1095" class="l"><a href="#1095">1095: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
-</span><span id="1096" class="l"><a href="#1096">1096: </a>            ]);
-</span><span id="1097" class="l"><a href="#1097">1097: </a>        }
-</span><span id="1098" class="l"><a href="#1098">1098: </a>
-</span><span id="1099" class="l"><a href="#1099">1099: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
-</span><span id="1100" class="l"><a href="#1100">1100: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$timelimit</span>))
-</span><span id="1101" class="l"><a href="#1101">1101: </a>        {
-</span><span id="1102" class="l"><a href="#1102">1102: </a>            <span class="php-comment">// Reset the started period and count</span>
-</span><span id="1103" class="l"><a href="#1103">1103: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1104" class="l"><a href="#1104">1104: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
-</span><span id="1105" class="l"><a href="#1105">1105: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
-</span><span id="1106" class="l"><a href="#1106">1106: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
-</span><span id="1107" class="l"><a href="#1107">1107: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
-</span><span id="1108" class="l"><a href="#1108">1108: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1109" class="l"><a href="#1109">1109: </a>        }
-</span><span id="1110" class="l"><a href="#1110">1110: </a>
-</span><span id="1111" class="l"><a href="#1111">1111: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
-</span><span id="1112" class="l"><a href="#1112">1112: </a>        <span class="php-keyword1">else</span>
-</span><span id="1113" class="l"><a href="#1113">1113: </a>        {
-</span><span id="1114" class="l"><a href="#1114">1114: </a>            <span class="php-comment">// The limit has been exceeded</span>
-</span><span id="1115" class="l"><a href="#1115">1115: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
-</span><span id="1116" class="l"><a href="#1116">1116: </a>            {
-</span><span id="1117" class="l"><a href="#1117">1117: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1118" class="l"><a href="#1118">1118: </a>            }
-</span><span id="1119" class="l"><a href="#1119">1119: </a>
-</span><span id="1120" class="l"><a href="#1120">1120: </a>            <span class="php-comment">// Increase the count by one</span>
-</span><span id="1121" class="l"><a href="#1121">1121: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1122" class="l"><a href="#1122">1122: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
-</span><span id="1123" class="l"><a href="#1123">1123: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1124" class="l"><a href="#1124">1124: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
-</span><span id="1125" class="l"><a href="#1125">1125: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1126" class="l"><a href="#1126">1126: </a>        }
-</span><span id="1127" class="l"><a href="#1127">1127: </a>
-</span><span id="1128" class="l"><a href="#1128">1128: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1129" class="l"><a href="#1129">1129: </a>    }
-</span><span id="1130" class="l"><a href="#1130">1130: </a>
-</span><span id="1131" class="l"><a href="#1131">1131: </a>    <span class="php-comment">/**
-</span></span><span id="1132" class="l"><a href="#1132">1132: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method being called
-</span></span><span id="1133" class="l"><a href="#1133">1133: </a><span class="php-comment">     *
-</span></span><span id="1134" class="l"><a href="#1134">1134: </a><span class="php-comment">     * @access protected
-</span></span><span id="1135" class="l"><a href="#1135">1135: </a><span class="php-comment">     * @return bool
-</span></span><span id="1136" class="l"><a href="#1136">1136: </a><span class="php-comment">     */</span>
-</span><span id="1137" class="l"><a href="#1137">1137: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
-</span><span id="1138" class="l"><a href="#1138">1138: </a>    {
-</span><span id="1139" class="l"><a href="#1139">1139: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
-</span><span id="1140" class="l"><a href="#1140">1140: </a>        <span class="php-var">$this</span>-&gt;overrides_array = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
-</span><span id="1141" class="l"><a href="#1141">1141: </a>
-</span><span id="1142" class="l"><a href="#1142">1142: </a>        <span class="php-comment">// Check to see if the override array is even populated, otherwise return FALSE</span>
-</span><span id="1143" class="l"><a href="#1143">1143: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array))
-</span><span id="1144" class="l"><a href="#1144">1144: </a>        {
-</span><span id="1145" class="l"><a href="#1145">1145: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1146" class="l"><a href="#1146">1146: </a>        }
-</span><span id="1147" class="l"><a href="#1147">1147: </a>
-</span><span id="1148" class="l"><a href="#1148">1148: </a>        <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="1149" class="l"><a href="#1149">1149: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>]) === <span class="php-keyword1">FALSE</span>) <span class="php-comment">// Check for class overrides</span>
-</span><span id="1150" class="l"><a href="#1150">1150: </a>        {
-</span><span id="1151" class="l"><a href="#1151">1151: </a>            <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1152" class="l"><a href="#1152">1152: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'none'</span>)
-</span><span id="1153" class="l"><a href="#1153">1153: </a>            {
-</span><span id="1154" class="l"><a href="#1154">1154: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1155" class="l"><a href="#1155">1155: </a>            }
+</span><span id="1072" class="l"><a href="#1072">1072: </a>        <span class="php-var">$timelimit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'time'</span>] : <span class="php-num">60</span> * <span class="php-num">60</span>);
+</span><span id="1073" class="l"><a href="#1073">1073: </a>
+</span><span id="1074" class="l"><a href="#1074">1074: </a>        <span class="php-comment">// No calls have been made for this key</span>
+</span><span id="1075" class="l"><a href="#1075">1075: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1076" class="l"><a href="#1076">1076: </a>        {
+</span><span id="1077" class="l"><a href="#1077">1077: </a>            <span class="php-comment">// Create a new row for the following key</span>
+</span><span id="1078" class="l"><a href="#1078">1078: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
+</span><span id="1079" class="l"><a href="#1079">1079: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
+</span><span id="1080" class="l"><a href="#1080">1080: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="1081" class="l"><a href="#1081">1081: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
+</span><span id="1082" class="l"><a href="#1082">1082: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
+</span><span id="1083" class="l"><a href="#1083">1083: </a>            ]);
+</span><span id="1084" class="l"><a href="#1084">1084: </a>        }
+</span><span id="1085" class="l"><a href="#1085">1085: </a>
+</span><span id="1086" class="l"><a href="#1086">1086: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
+</span><span id="1087" class="l"><a href="#1087">1087: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$timelimit</span>))
+</span><span id="1088" class="l"><a href="#1088">1088: </a>        {
+</span><span id="1089" class="l"><a href="#1089">1089: </a>            <span class="php-comment">// Reset the started period and count</span>
+</span><span id="1090" class="l"><a href="#1090">1090: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1091" class="l"><a href="#1091">1091: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
+</span><span id="1092" class="l"><a href="#1092">1092: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
+</span><span id="1093" class="l"><a href="#1093">1093: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
+</span><span id="1094" class="l"><a href="#1094">1094: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
+</span><span id="1095" class="l"><a href="#1095">1095: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1096" class="l"><a href="#1096">1096: </a>        }
+</span><span id="1097" class="l"><a href="#1097">1097: </a>
+</span><span id="1098" class="l"><a href="#1098">1098: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
+</span><span id="1099" class="l"><a href="#1099">1099: </a>        <span class="php-keyword1">else</span>
+</span><span id="1100" class="l"><a href="#1100">1100: </a>        {
+</span><span id="1101" class="l"><a href="#1101">1101: </a>            <span class="php-comment">// The limit has been exceeded</span>
+</span><span id="1102" class="l"><a href="#1102">1102: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
+</span><span id="1103" class="l"><a href="#1103">1103: </a>            {
+</span><span id="1104" class="l"><a href="#1104">1104: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1105" class="l"><a href="#1105">1105: </a>            }
+</span><span id="1106" class="l"><a href="#1106">1106: </a>
+</span><span id="1107" class="l"><a href="#1107">1107: </a>            <span class="php-comment">// Increase the count by one</span>
+</span><span id="1108" class="l"><a href="#1108">1108: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1109" class="l"><a href="#1109">1109: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
+</span><span id="1110" class="l"><a href="#1110">1110: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1111" class="l"><a href="#1111">1111: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
+</span><span id="1112" class="l"><a href="#1112">1112: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1113" class="l"><a href="#1113">1113: </a>        }
+</span><span id="1114" class="l"><a href="#1114">1114: </a>
+</span><span id="1115" class="l"><a href="#1115">1115: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1116" class="l"><a href="#1116">1116: </a>    }
+</span><span id="1117" class="l"><a href="#1117">1117: </a>
+</span><span id="1118" class="l"><a href="#1118">1118: </a>    <span class="php-comment">/**
+</span></span><span id="1119" class="l"><a href="#1119">1119: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method being called
+</span></span><span id="1120" class="l"><a href="#1120">1120: </a><span class="php-comment">     *
+</span></span><span id="1121" class="l"><a href="#1121">1121: </a><span class="php-comment">     * @access protected
+</span></span><span id="1122" class="l"><a href="#1122">1122: </a><span class="php-comment">     * @return bool
+</span></span><span id="1123" class="l"><a href="#1123">1123: </a><span class="php-comment">     */</span>
+</span><span id="1124" class="l"><a href="#1124">1124: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
+</span><span id="1125" class="l"><a href="#1125">1125: </a>    {
+</span><span id="1126" class="l"><a href="#1126">1126: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
+</span><span id="1127" class="l"><a href="#1127">1127: </a>        <span class="php-var">$this</span>-&gt;overrides_array = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
+</span><span id="1128" class="l"><a href="#1128">1128: </a>
+</span><span id="1129" class="l"><a href="#1129">1129: </a>        <span class="php-comment">// Check to see if the override array is even populated, otherwise return FALSE</span>
+</span><span id="1130" class="l"><a href="#1130">1130: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array))
+</span><span id="1131" class="l"><a href="#1131">1131: </a>        {
+</span><span id="1132" class="l"><a href="#1132">1132: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1133" class="l"><a href="#1133">1133: </a>        }
+</span><span id="1134" class="l"><a href="#1134">1134: </a>
+</span><span id="1135" class="l"><a href="#1135">1135: </a>        <span class="php-comment">// check for wildcard flag for rules for classes</span>
+</span><span id="1136" class="l"><a href="#1136">1136: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>]) === <span class="php-keyword1">FALSE</span>) <span class="php-comment">// Check for class overrides</span>
+</span><span id="1137" class="l"><a href="#1137">1137: </a>        {
+</span><span id="1138" class="l"><a href="#1138">1138: </a>            <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1139" class="l"><a href="#1139">1139: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'none'</span>)
+</span><span id="1140" class="l"><a href="#1140">1140: </a>            {
+</span><span id="1141" class="l"><a href="#1141">1141: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1142" class="l"><a href="#1142">1142: </a>            }
+</span><span id="1143" class="l"><a href="#1143">1143: </a>
+</span><span id="1144" class="l"><a href="#1144">1144: </a>            <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1145" class="l"><a href="#1145">1145: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'basic'</span>)
+</span><span id="1146" class="l"><a href="#1146">1146: </a>            {
+</span><span id="1147" class="l"><a href="#1147">1147: </a>                <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1148" class="l"><a href="#1148">1148: </a>
+</span><span id="1149" class="l"><a href="#1149">1149: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1150" class="l"><a href="#1150">1150: </a>            }
+</span><span id="1151" class="l"><a href="#1151">1151: </a>
+</span><span id="1152" class="l"><a href="#1152">1152: </a>            <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1153" class="l"><a href="#1153">1153: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'digest'</span>)
+</span><span id="1154" class="l"><a href="#1154">1154: </a>            {
+</span><span id="1155" class="l"><a href="#1155">1155: </a>                <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
 </span><span id="1156" class="l"><a href="#1156">1156: </a>
-</span><span id="1157" class="l"><a href="#1157">1157: </a>            <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1158" class="l"><a href="#1158">1158: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'basic'</span>)
-</span><span id="1159" class="l"><a href="#1159">1159: </a>            {
-</span><span id="1160" class="l"><a href="#1160">1160: </a>                <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1161" class="l"><a href="#1161">1161: </a>
-</span><span id="1162" class="l"><a href="#1162">1162: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1163" class="l"><a href="#1163">1163: </a>            }
+</span><span id="1157" class="l"><a href="#1157">1157: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1158" class="l"><a href="#1158">1158: </a>            }
+</span><span id="1159" class="l"><a href="#1159">1159: </a>
+</span><span id="1160" class="l"><a href="#1160">1160: </a>            <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1161" class="l"><a href="#1161">1161: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'whitelist'</span>)
+</span><span id="1162" class="l"><a href="#1162">1162: </a>            {
+</span><span id="1163" class="l"><a href="#1163">1163: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
 </span><span id="1164" class="l"><a href="#1164">1164: </a>
-</span><span id="1165" class="l"><a href="#1165">1165: </a>            <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1166" class="l"><a href="#1166">1166: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'digest'</span>)
-</span><span id="1167" class="l"><a href="#1167">1167: </a>            {
-</span><span id="1168" class="l"><a href="#1168">1168: </a>                <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1169" class="l"><a href="#1169">1169: </a>
-</span><span id="1170" class="l"><a href="#1170">1170: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1171" class="l"><a href="#1171">1171: </a>            }
-</span><span id="1172" class="l"><a href="#1172">1172: </a>
-</span><span id="1173" class="l"><a href="#1173">1173: </a>            <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1174" class="l"><a href="#1174">1174: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'whitelist'</span>)
-</span><span id="1175" class="l"><a href="#1175">1175: </a>            {
-</span><span id="1176" class="l"><a href="#1176">1176: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1177" class="l"><a href="#1177">1177: </a>
-</span><span id="1178" class="l"><a href="#1178">1178: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1179" class="l"><a href="#1179">1179: </a>            }
-</span><span id="1180" class="l"><a href="#1180">1180: </a>        }
-</span><span id="1181" class="l"><a href="#1181">1181: </a>
-</span><span id="1182" class="l"><a href="#1182">1182: </a>        <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
-</span><span id="1183" class="l"><a href="#1183">1183: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
-</span><span id="1184" class="l"><a href="#1184">1184: </a>        {
-</span><span id="1185" class="l"><a href="#1185">1185: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1186" class="l"><a href="#1186">1186: </a>        }
-</span><span id="1187" class="l"><a href="#1187">1187: </a>
-</span><span id="1188" class="l"><a href="#1188">1188: </a>        <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1189" class="l"><a href="#1189">1189: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'none'</span>)
-</span><span id="1190" class="l"><a href="#1190">1190: </a>        {
-</span><span id="1191" class="l"><a href="#1191">1191: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1192" class="l"><a href="#1192">1192: </a>        }
+</span><span id="1165" class="l"><a href="#1165">1165: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1166" class="l"><a href="#1166">1166: </a>            }
+</span><span id="1167" class="l"><a href="#1167">1167: </a>        }
+</span><span id="1168" class="l"><a href="#1168">1168: </a>
+</span><span id="1169" class="l"><a href="#1169">1169: </a>        <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
+</span><span id="1170" class="l"><a href="#1170">1170: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
+</span><span id="1171" class="l"><a href="#1171">1171: </a>        {
+</span><span id="1172" class="l"><a href="#1172">1172: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1173" class="l"><a href="#1173">1173: </a>        }
+</span><span id="1174" class="l"><a href="#1174">1174: </a>
+</span><span id="1175" class="l"><a href="#1175">1175: </a>        <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1176" class="l"><a href="#1176">1176: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'none'</span>)
+</span><span id="1177" class="l"><a href="#1177">1177: </a>        {
+</span><span id="1178" class="l"><a href="#1178">1178: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1179" class="l"><a href="#1179">1179: </a>        }
+</span><span id="1180" class="l"><a href="#1180">1180: </a>
+</span><span id="1181" class="l"><a href="#1181">1181: </a>        <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1182" class="l"><a href="#1182">1182: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'basic'</span>)
+</span><span id="1183" class="l"><a href="#1183">1183: </a>        {
+</span><span id="1184" class="l"><a href="#1184">1184: </a>            <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1185" class="l"><a href="#1185">1185: </a>
+</span><span id="1186" class="l"><a href="#1186">1186: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1187" class="l"><a href="#1187">1187: </a>        }
+</span><span id="1188" class="l"><a href="#1188">1188: </a>
+</span><span id="1189" class="l"><a href="#1189">1189: </a>        <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1190" class="l"><a href="#1190">1190: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'digest'</span>)
+</span><span id="1191" class="l"><a href="#1191">1191: </a>        {
+</span><span id="1192" class="l"><a href="#1192">1192: </a>            <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
 </span><span id="1193" class="l"><a href="#1193">1193: </a>
-</span><span id="1194" class="l"><a href="#1194">1194: </a>        <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1195" class="l"><a href="#1195">1195: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'basic'</span>)
-</span><span id="1196" class="l"><a href="#1196">1196: </a>        {
-</span><span id="1197" class="l"><a href="#1197">1197: </a>            <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1198" class="l"><a href="#1198">1198: </a>
-</span><span id="1199" class="l"><a href="#1199">1199: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1200" class="l"><a href="#1200">1200: </a>        }
+</span><span id="1194" class="l"><a href="#1194">1194: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1195" class="l"><a href="#1195">1195: </a>        }
+</span><span id="1196" class="l"><a href="#1196">1196: </a>
+</span><span id="1197" class="l"><a href="#1197">1197: </a>        <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1198" class="l"><a href="#1198">1198: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'whitelist'</span>)
+</span><span id="1199" class="l"><a href="#1199">1199: </a>        {
+</span><span id="1200" class="l"><a href="#1200">1200: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
 </span><span id="1201" class="l"><a href="#1201">1201: </a>
-</span><span id="1202" class="l"><a href="#1202">1202: </a>        <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1203" class="l"><a href="#1203">1203: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'digest'</span>)
-</span><span id="1204" class="l"><a href="#1204">1204: </a>        {
-</span><span id="1205" class="l"><a href="#1205">1205: </a>            <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1206" class="l"><a href="#1206">1206: </a>
-</span><span id="1207" class="l"><a href="#1207">1207: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1208" class="l"><a href="#1208">1208: </a>        }
+</span><span id="1202" class="l"><a href="#1202">1202: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1203" class="l"><a href="#1203">1203: </a>        }
+</span><span id="1204" class="l"><a href="#1204">1204: </a>
+</span><span id="1205" class="l"><a href="#1205">1205: </a>        <span class="php-comment">// Return FALSE when there is an override value set but it does not match</span>
+</span><span id="1206" class="l"><a href="#1206">1206: </a>        <span class="php-comment">// 'basic', 'digest', or 'none'. (the value was misspelled)</span>
+</span><span id="1207" class="l"><a href="#1207">1207: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1208" class="l"><a href="#1208">1208: </a>    }
 </span><span id="1209" class="l"><a href="#1209">1209: </a>
-</span><span id="1210" class="l"><a href="#1210">1210: </a>        <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1211" class="l"><a href="#1211">1211: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'whitelist'</span>)
-</span><span id="1212" class="l"><a href="#1212">1212: </a>        {
-</span><span id="1213" class="l"><a href="#1213">1213: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1214" class="l"><a href="#1214">1214: </a>
-</span><span id="1215" class="l"><a href="#1215">1215: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1216" class="l"><a href="#1216">1216: </a>        }
-</span><span id="1217" class="l"><a href="#1217">1217: </a>
-</span><span id="1218" class="l"><a href="#1218">1218: </a>        <span class="php-comment">// Return FALSE when there is an override value set but it does not match</span>
-</span><span id="1219" class="l"><a href="#1219">1219: </a>        <span class="php-comment">// 'basic', 'digest', or 'none'. (the value was misspelled)</span>
-</span><span id="1220" class="l"><a href="#1220">1220: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1221" class="l"><a href="#1221">1221: </a>    }
-</span><span id="1222" class="l"><a href="#1222">1222: </a>
-</span><span id="1223" class="l"><a href="#1223">1223: </a>    <span class="php-comment">/**
-</span></span><span id="1224" class="l"><a href="#1224">1224: </a><span class="php-comment">     * Parse the GET request arguments
-</span></span><span id="1225" class="l"><a href="#1225">1225: </a><span class="php-comment">     *
-</span></span><span id="1226" class="l"><a href="#1226">1226: </a><span class="php-comment">     * @access protected
-</span></span><span id="1227" class="l"><a href="#1227">1227: </a><span class="php-comment">     * @return void
-</span></span><span id="1228" class="l"><a href="#1228">1228: </a><span class="php-comment">     */</span>
-</span><span id="1229" class="l"><a href="#1229">1229: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
-</span><span id="1230" class="l"><a href="#1230">1230: </a>    {
-</span><span id="1231" class="l"><a href="#1231">1231: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
-</span><span id="1232" class="l"><a href="#1232">1232: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
-</span><span id="1233" class="l"><a href="#1233">1233: </a>    }
-</span><span id="1234" class="l"><a href="#1234">1234: </a>
-</span><span id="1235" class="l"><a href="#1235">1235: </a>    <span class="php-comment">/**
-</span></span><span id="1236" class="l"><a href="#1236">1236: </a><span class="php-comment">     * Parse the POST request arguments
-</span></span><span id="1237" class="l"><a href="#1237">1237: </a><span class="php-comment">     *
-</span></span><span id="1238" class="l"><a href="#1238">1238: </a><span class="php-comment">     * @access protected
-</span></span><span id="1239" class="l"><a href="#1239">1239: </a><span class="php-comment">     * @return void
-</span></span><span id="1240" class="l"><a href="#1240">1240: </a><span class="php-comment">     */</span>
-</span><span id="1241" class="l"><a href="#1241">1241: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
-</span><span id="1242" class="l"><a href="#1242">1242: </a>    {
-</span><span id="1243" class="l"><a href="#1243">1243: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
-</span><span id="1244" class="l"><a href="#1244">1244: </a>
-</span><span id="1245" class="l"><a href="#1245">1245: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1246" class="l"><a href="#1246">1246: </a>        {
-</span><span id="1247" class="l"><a href="#1247">1247: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1248" class="l"><a href="#1248">1248: </a>        }
-</span><span id="1249" class="l"><a href="#1249">1249: </a>    }
-</span><span id="1250" class="l"><a href="#1250">1250: </a>
-</span><span id="1251" class="l"><a href="#1251">1251: </a>    <span class="php-comment">/**
-</span></span><span id="1252" class="l"><a href="#1252">1252: </a><span class="php-comment">     * Parse the PUT request arguments
-</span></span><span id="1253" class="l"><a href="#1253">1253: </a><span class="php-comment">     *
-</span></span><span id="1254" class="l"><a href="#1254">1254: </a><span class="php-comment">     * @access protected
-</span></span><span id="1255" class="l"><a href="#1255">1255: </a><span class="php-comment">     * @return void
-</span></span><span id="1256" class="l"><a href="#1256">1256: </a><span class="php-comment">     */</span>
-</span><span id="1257" class="l"><a href="#1257">1257: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
-</span><span id="1258" class="l"><a href="#1258">1258: </a>    {
-</span><span id="1259" class="l"><a href="#1259">1259: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1260" class="l"><a href="#1260">1260: </a>        {
-</span><span id="1261" class="l"><a href="#1261">1261: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1262" class="l"><a href="#1262">1262: </a>        }
-</span><span id="1263" class="l"><a href="#1263">1263: </a>        <span class="php-keyword1">else</span>
-</span><span id="1264" class="l"><a href="#1264">1264: </a>        {
-</span><span id="1265" class="l"><a href="#1265">1265: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1266" class="l"><a href="#1266">1266: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
-</span><span id="1267" class="l"><a href="#1267">1267: </a>            {
-</span><span id="1268" class="l"><a href="#1268">1268: </a>                <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1269" class="l"><a href="#1269">1269: </a>            }
-</span><span id="1270" class="l"><a href="#1270">1270: </a>        }
-</span><span id="1271" class="l"><a href="#1271">1271: </a>    }
-</span><span id="1272" class="l"><a href="#1272">1272: </a>
-</span><span id="1273" class="l"><a href="#1273">1273: </a>    <span class="php-comment">/**
-</span></span><span id="1274" class="l"><a href="#1274">1274: </a><span class="php-comment">     * Parse the HEAD request arguments
-</span></span><span id="1275" class="l"><a href="#1275">1275: </a><span class="php-comment">     *
-</span></span><span id="1276" class="l"><a href="#1276">1276: </a><span class="php-comment">     * @access protected
-</span></span><span id="1277" class="l"><a href="#1277">1277: </a><span class="php-comment">     * @return void
-</span></span><span id="1278" class="l"><a href="#1278">1278: </a><span class="php-comment">     */</span>
-</span><span id="1279" class="l"><a href="#1279">1279: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
-</span><span id="1280" class="l"><a href="#1280">1280: </a>    {
-</span><span id="1281" class="l"><a href="#1281">1281: </a>        <span class="php-comment">// Parse the HEAD variables</span>
-</span><span id="1282" class="l"><a href="#1282">1282: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
-</span><span id="1283" class="l"><a href="#1283">1283: </a>
-</span><span id="1284" class="l"><a href="#1284">1284: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
-</span><span id="1285" class="l"><a href="#1285">1285: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
-</span><span id="1286" class="l"><a href="#1286">1286: </a>    }
-</span><span id="1287" class="l"><a href="#1287">1287: </a>
-</span><span id="1288" class="l"><a href="#1288">1288: </a>    <span class="php-comment">/**
-</span></span><span id="1289" class="l"><a href="#1289">1289: </a><span class="php-comment">     * Parse the OPTIONS request arguments
-</span></span><span id="1290" class="l"><a href="#1290">1290: </a><span class="php-comment">     *
-</span></span><span id="1291" class="l"><a href="#1291">1291: </a><span class="php-comment">     * @access protected
-</span></span><span id="1292" class="l"><a href="#1292">1292: </a><span class="php-comment">     * @return void
-</span></span><span id="1293" class="l"><a href="#1293">1293: </a><span class="php-comment">     */</span>
-</span><span id="1294" class="l"><a href="#1294">1294: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
-</span><span id="1295" class="l"><a href="#1295">1295: </a>    {
-</span><span id="1296" class="l"><a href="#1296">1296: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
-</span><span id="1297" class="l"><a href="#1297">1297: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
-</span><span id="1298" class="l"><a href="#1298">1298: </a>
-</span><span id="1299" class="l"><a href="#1299">1299: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
-</span><span id="1300" class="l"><a href="#1300">1300: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
-</span><span id="1301" class="l"><a href="#1301">1301: </a>    }
-</span><span id="1302" class="l"><a href="#1302">1302: </a>
-</span><span id="1303" class="l"><a href="#1303">1303: </a>    <span class="php-comment">/**
-</span></span><span id="1304" class="l"><a href="#1304">1304: </a><span class="php-comment">     * Parse the PATCH request arguments
-</span></span><span id="1305" class="l"><a href="#1305">1305: </a><span class="php-comment">     *
-</span></span><span id="1306" class="l"><a href="#1306">1306: </a><span class="php-comment">     * @access protected
-</span></span><span id="1307" class="l"><a href="#1307">1307: </a><span class="php-comment">     * @return void
-</span></span><span id="1308" class="l"><a href="#1308">1308: </a><span class="php-comment">     */</span>
-</span><span id="1309" class="l"><a href="#1309">1309: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
-</span><span id="1310" class="l"><a href="#1310">1310: </a>    {
-</span><span id="1311" class="l"><a href="#1311">1311: </a>        <span class="php-comment">// It might be a HTTP body</span>
-</span><span id="1312" class="l"><a href="#1312">1312: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1313" class="l"><a href="#1313">1313: </a>        {
-</span><span id="1314" class="l"><a href="#1314">1314: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1315" class="l"><a href="#1315">1315: </a>        }
-</span><span id="1316" class="l"><a href="#1316">1316: </a>        <span class="php-keyword1">else</span>
-</span><span id="1317" class="l"><a href="#1317">1317: </a>        {
-</span><span id="1318" class="l"><a href="#1318">1318: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1319" class="l"><a href="#1319">1319: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
-</span><span id="1320" class="l"><a href="#1320">1320: </a>            {
-</span><span id="1321" class="l"><a href="#1321">1321: </a>                <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1322" class="l"><a href="#1322">1322: </a>            }
-</span><span id="1323" class="l"><a href="#1323">1323: </a>        }
-</span><span id="1324" class="l"><a href="#1324">1324: </a>    }
-</span><span id="1325" class="l"><a href="#1325">1325: </a>
-</span><span id="1326" class="l"><a href="#1326">1326: </a>    <span class="php-comment">/**
-</span></span><span id="1327" class="l"><a href="#1327">1327: </a><span class="php-comment">     * Parse the DELETE request arguments
-</span></span><span id="1328" class="l"><a href="#1328">1328: </a><span class="php-comment">     *
-</span></span><span id="1329" class="l"><a href="#1329">1329: </a><span class="php-comment">     * @access protected
-</span></span><span id="1330" class="l"><a href="#1330">1330: </a><span class="php-comment">     * @return void
-</span></span><span id="1331" class="l"><a href="#1331">1331: </a><span class="php-comment">     */</span>
-</span><span id="1332" class="l"><a href="#1332">1332: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
-</span><span id="1333" class="l"><a href="#1333">1333: </a>    {
-</span><span id="1334" class="l"><a href="#1334">1334: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
-</span><span id="1335" class="l"><a href="#1335">1335: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
-</span><span id="1336" class="l"><a href="#1336">1336: </a>        {
-</span><span id="1337" class="l"><a href="#1337">1337: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1338" class="l"><a href="#1338">1338: </a>        }
-</span><span id="1339" class="l"><a href="#1339">1339: </a>    }
-</span><span id="1340" class="l"><a href="#1340">1340: </a>
-</span><span id="1341" class="l"><a href="#1341">1341: </a>    <span class="php-comment">/**
-</span></span><span id="1342" class="l"><a href="#1342">1342: </a><span class="php-comment">     * Parse the query parameters
-</span></span><span id="1343" class="l"><a href="#1343">1343: </a><span class="php-comment">     *
-</span></span><span id="1344" class="l"><a href="#1344">1344: </a><span class="php-comment">     * @access protected
-</span></span><span id="1345" class="l"><a href="#1345">1345: </a><span class="php-comment">     * @return void
-</span></span><span id="1346" class="l"><a href="#1346">1346: </a><span class="php-comment">     */</span>
-</span><span id="1347" class="l"><a href="#1347">1347: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
-</span><span id="1348" class="l"><a href="#1348">1348: </a>    {
-</span><span id="1349" class="l"><a href="#1349">1349: </a>        <span class="php-comment">// Declare a variable that will hold the REQUEST_URI</span>
-</span><span id="1350" class="l"><a href="#1350">1350: </a>        <span class="php-var">$request_uri</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1351" class="l"><a href="#1351">1351: </a>
-</span><span id="1352" class="l"><a href="#1352">1352: </a>        <span class="php-comment">// If using the commandline version</span>
-</span><span id="1353" class="l"><a href="#1353">1353: </a>        <span class="php-keyword1">if</span> (is_cli())
+</span><span id="1210" class="l"><a href="#1210">1210: </a>    <span class="php-comment">/**
+</span></span><span id="1211" class="l"><a href="#1211">1211: </a><span class="php-comment">     * Parse the GET request arguments
+</span></span><span id="1212" class="l"><a href="#1212">1212: </a><span class="php-comment">     *
+</span></span><span id="1213" class="l"><a href="#1213">1213: </a><span class="php-comment">     * @access protected
+</span></span><span id="1214" class="l"><a href="#1214">1214: </a><span class="php-comment">     * @return void
+</span></span><span id="1215" class="l"><a href="#1215">1215: </a><span class="php-comment">     */</span>
+</span><span id="1216" class="l"><a href="#1216">1216: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
+</span><span id="1217" class="l"><a href="#1217">1217: </a>    {
+</span><span id="1218" class="l"><a href="#1218">1218: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
+</span><span id="1219" class="l"><a href="#1219">1219: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
+</span><span id="1220" class="l"><a href="#1220">1220: </a>    }
+</span><span id="1221" class="l"><a href="#1221">1221: </a>
+</span><span id="1222" class="l"><a href="#1222">1222: </a>    <span class="php-comment">/**
+</span></span><span id="1223" class="l"><a href="#1223">1223: </a><span class="php-comment">     * Parse the POST request arguments
+</span></span><span id="1224" class="l"><a href="#1224">1224: </a><span class="php-comment">     *
+</span></span><span id="1225" class="l"><a href="#1225">1225: </a><span class="php-comment">     * @access protected
+</span></span><span id="1226" class="l"><a href="#1226">1226: </a><span class="php-comment">     * @return void
+</span></span><span id="1227" class="l"><a href="#1227">1227: </a><span class="php-comment">     */</span>
+</span><span id="1228" class="l"><a href="#1228">1228: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
+</span><span id="1229" class="l"><a href="#1229">1229: </a>    {
+</span><span id="1230" class="l"><a href="#1230">1230: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
+</span><span id="1231" class="l"><a href="#1231">1231: </a>
+</span><span id="1232" class="l"><a href="#1232">1232: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1233" class="l"><a href="#1233">1233: </a>        {
+</span><span id="1234" class="l"><a href="#1234">1234: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1235" class="l"><a href="#1235">1235: </a>        }
+</span><span id="1236" class="l"><a href="#1236">1236: </a>    }
+</span><span id="1237" class="l"><a href="#1237">1237: </a>
+</span><span id="1238" class="l"><a href="#1238">1238: </a>    <span class="php-comment">/**
+</span></span><span id="1239" class="l"><a href="#1239">1239: </a><span class="php-comment">     * Parse the PUT request arguments
+</span></span><span id="1240" class="l"><a href="#1240">1240: </a><span class="php-comment">     *
+</span></span><span id="1241" class="l"><a href="#1241">1241: </a><span class="php-comment">     * @access protected
+</span></span><span id="1242" class="l"><a href="#1242">1242: </a><span class="php-comment">     * @return void
+</span></span><span id="1243" class="l"><a href="#1243">1243: </a><span class="php-comment">     */</span>
+</span><span id="1244" class="l"><a href="#1244">1244: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
+</span><span id="1245" class="l"><a href="#1245">1245: </a>    {
+</span><span id="1246" class="l"><a href="#1246">1246: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1247" class="l"><a href="#1247">1247: </a>        {
+</span><span id="1248" class="l"><a href="#1248">1248: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1249" class="l"><a href="#1249">1249: </a>        }
+</span><span id="1250" class="l"><a href="#1250">1250: </a>        <span class="php-keyword1">else</span>
+</span><span id="1251" class="l"><a href="#1251">1251: </a>        {
+</span><span id="1252" class="l"><a href="#1252">1252: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1253" class="l"><a href="#1253">1253: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
+</span><span id="1254" class="l"><a href="#1254">1254: </a>            {
+</span><span id="1255" class="l"><a href="#1255">1255: </a>                <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1256" class="l"><a href="#1256">1256: </a>            }
+</span><span id="1257" class="l"><a href="#1257">1257: </a>        }
+</span><span id="1258" class="l"><a href="#1258">1258: </a>    }
+</span><span id="1259" class="l"><a href="#1259">1259: </a>
+</span><span id="1260" class="l"><a href="#1260">1260: </a>    <span class="php-comment">/**
+</span></span><span id="1261" class="l"><a href="#1261">1261: </a><span class="php-comment">     * Parse the HEAD request arguments
+</span></span><span id="1262" class="l"><a href="#1262">1262: </a><span class="php-comment">     *
+</span></span><span id="1263" class="l"><a href="#1263">1263: </a><span class="php-comment">     * @access protected
+</span></span><span id="1264" class="l"><a href="#1264">1264: </a><span class="php-comment">     * @return void
+</span></span><span id="1265" class="l"><a href="#1265">1265: </a><span class="php-comment">     */</span>
+</span><span id="1266" class="l"><a href="#1266">1266: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
+</span><span id="1267" class="l"><a href="#1267">1267: </a>    {
+</span><span id="1268" class="l"><a href="#1268">1268: </a>        <span class="php-comment">// Parse the HEAD variables</span>
+</span><span id="1269" class="l"><a href="#1269">1269: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
+</span><span id="1270" class="l"><a href="#1270">1270: </a>
+</span><span id="1271" class="l"><a href="#1271">1271: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
+</span><span id="1272" class="l"><a href="#1272">1272: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
+</span><span id="1273" class="l"><a href="#1273">1273: </a>    }
+</span><span id="1274" class="l"><a href="#1274">1274: </a>
+</span><span id="1275" class="l"><a href="#1275">1275: </a>    <span class="php-comment">/**
+</span></span><span id="1276" class="l"><a href="#1276">1276: </a><span class="php-comment">     * Parse the OPTIONS request arguments
+</span></span><span id="1277" class="l"><a href="#1277">1277: </a><span class="php-comment">     *
+</span></span><span id="1278" class="l"><a href="#1278">1278: </a><span class="php-comment">     * @access protected
+</span></span><span id="1279" class="l"><a href="#1279">1279: </a><span class="php-comment">     * @return void
+</span></span><span id="1280" class="l"><a href="#1280">1280: </a><span class="php-comment">     */</span>
+</span><span id="1281" class="l"><a href="#1281">1281: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
+</span><span id="1282" class="l"><a href="#1282">1282: </a>    {
+</span><span id="1283" class="l"><a href="#1283">1283: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
+</span><span id="1284" class="l"><a href="#1284">1284: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
+</span><span id="1285" class="l"><a href="#1285">1285: </a>
+</span><span id="1286" class="l"><a href="#1286">1286: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
+</span><span id="1287" class="l"><a href="#1287">1287: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
+</span><span id="1288" class="l"><a href="#1288">1288: </a>    }
+</span><span id="1289" class="l"><a href="#1289">1289: </a>
+</span><span id="1290" class="l"><a href="#1290">1290: </a>    <span class="php-comment">/**
+</span></span><span id="1291" class="l"><a href="#1291">1291: </a><span class="php-comment">     * Parse the PATCH request arguments
+</span></span><span id="1292" class="l"><a href="#1292">1292: </a><span class="php-comment">     *
+</span></span><span id="1293" class="l"><a href="#1293">1293: </a><span class="php-comment">     * @access protected
+</span></span><span id="1294" class="l"><a href="#1294">1294: </a><span class="php-comment">     * @return void
+</span></span><span id="1295" class="l"><a href="#1295">1295: </a><span class="php-comment">     */</span>
+</span><span id="1296" class="l"><a href="#1296">1296: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
+</span><span id="1297" class="l"><a href="#1297">1297: </a>    {
+</span><span id="1298" class="l"><a href="#1298">1298: </a>        <span class="php-comment">// It might be a HTTP body</span>
+</span><span id="1299" class="l"><a href="#1299">1299: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1300" class="l"><a href="#1300">1300: </a>        {
+</span><span id="1301" class="l"><a href="#1301">1301: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1302" class="l"><a href="#1302">1302: </a>        }
+</span><span id="1303" class="l"><a href="#1303">1303: </a>        <span class="php-keyword1">else</span>
+</span><span id="1304" class="l"><a href="#1304">1304: </a>        {
+</span><span id="1305" class="l"><a href="#1305">1305: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1306" class="l"><a href="#1306">1306: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
+</span><span id="1307" class="l"><a href="#1307">1307: </a>            {
+</span><span id="1308" class="l"><a href="#1308">1308: </a>                <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1309" class="l"><a href="#1309">1309: </a>            }
+</span><span id="1310" class="l"><a href="#1310">1310: </a>        }
+</span><span id="1311" class="l"><a href="#1311">1311: </a>    }
+</span><span id="1312" class="l"><a href="#1312">1312: </a>
+</span><span id="1313" class="l"><a href="#1313">1313: </a>    <span class="php-comment">/**
+</span></span><span id="1314" class="l"><a href="#1314">1314: </a><span class="php-comment">     * Parse the DELETE request arguments
+</span></span><span id="1315" class="l"><a href="#1315">1315: </a><span class="php-comment">     *
+</span></span><span id="1316" class="l"><a href="#1316">1316: </a><span class="php-comment">     * @access protected
+</span></span><span id="1317" class="l"><a href="#1317">1317: </a><span class="php-comment">     * @return void
+</span></span><span id="1318" class="l"><a href="#1318">1318: </a><span class="php-comment">     */</span>
+</span><span id="1319" class="l"><a href="#1319">1319: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
+</span><span id="1320" class="l"><a href="#1320">1320: </a>    {
+</span><span id="1321" class="l"><a href="#1321">1321: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
+</span><span id="1322" class="l"><a href="#1322">1322: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
+</span><span id="1323" class="l"><a href="#1323">1323: </a>        {
+</span><span id="1324" class="l"><a href="#1324">1324: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1325" class="l"><a href="#1325">1325: </a>        }
+</span><span id="1326" class="l"><a href="#1326">1326: </a>    }
+</span><span id="1327" class="l"><a href="#1327">1327: </a>
+</span><span id="1328" class="l"><a href="#1328">1328: </a>    <span class="php-comment">/**
+</span></span><span id="1329" class="l"><a href="#1329">1329: </a><span class="php-comment">     * Parse the query parameters
+</span></span><span id="1330" class="l"><a href="#1330">1330: </a><span class="php-comment">     *
+</span></span><span id="1331" class="l"><a href="#1331">1331: </a><span class="php-comment">     * @access protected
+</span></span><span id="1332" class="l"><a href="#1332">1332: </a><span class="php-comment">     * @return void
+</span></span><span id="1333" class="l"><a href="#1333">1333: </a><span class="php-comment">     */</span>
+</span><span id="1334" class="l"><a href="#1334">1334: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
+</span><span id="1335" class="l"><a href="#1335">1335: </a>    {
+</span><span id="1336" class="l"><a href="#1336">1336: </a>        <span class="php-comment">// Declare a variable that will hold the REQUEST_URI</span>
+</span><span id="1337" class="l"><a href="#1337">1337: </a>        <span class="php-var">$request_uri</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1338" class="l"><a href="#1338">1338: </a>
+</span><span id="1339" class="l"><a href="#1339">1339: </a>        <span class="php-comment">// If using the commandline version</span>
+</span><span id="1340" class="l"><a href="#1340">1340: </a>        <span class="php-keyword1">if</span> (is_cli())
+</span><span id="1341" class="l"><a href="#1341">1341: </a>        {
+</span><span id="1342" class="l"><a href="#1342">1342: </a>            <span class="php-var">$args</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'argv'</span>);
+</span><span id="1343" class="l"><a href="#1343">1343: </a>            <span class="php-keyword1">unset</span>(<span class="php-var">$args</span>[<span class="php-num">0</span>]);
+</span><span id="1344" class="l"><a href="#1344">1344: </a>
+</span><span id="1345" class="l"><a href="#1345">1345: </a>            <span class="php-comment">// Combine the arguments using '/' as the delimiter</span>
+</span><span id="1346" class="l"><a href="#1346">1346: </a>            <span class="php-var">$request_uri</span> = <span class="php-quote">'/'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'/'</span>, <span class="php-var">$args</span>) . <span class="php-quote">'/'</span>;
+</span><span id="1347" class="l"><a href="#1347">1347: </a>
+</span><span id="1348" class="l"><a href="#1348">1348: </a>            <span class="php-comment">// Set the following server variables (perhaps not required anymore?)</span>
+</span><span id="1349" class="l"><a href="#1349">1349: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1350" class="l"><a href="#1350">1350: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'PATH_INFO'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1351" class="l"><a href="#1351">1351: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'QUERY_STRING'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1352" class="l"><a href="#1352">1352: </a>        }
+</span><span id="1353" class="l"><a href="#1353">1353: </a>        <span class="php-keyword1">else</span>
 </span><span id="1354" class="l"><a href="#1354">1354: </a>        {
-</span><span id="1355" class="l"><a href="#1355">1355: </a>            <span class="php-var">$args</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'argv'</span>);
-</span><span id="1356" class="l"><a href="#1356">1356: </a>            <span class="php-keyword1">unset</span>(<span class="php-var">$args</span>[<span class="php-num">0</span>]);
+</span><span id="1355" class="l"><a href="#1355">1355: </a>            <span class="php-var">$request_uri</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>);
+</span><span id="1356" class="l"><a href="#1356">1356: </a>        }
 </span><span id="1357" class="l"><a href="#1357">1357: </a>
-</span><span id="1358" class="l"><a href="#1358">1358: </a>            <span class="php-comment">// Combine the arguments using '/' as the delimiter</span>
-</span><span id="1359" class="l"><a href="#1359">1359: </a>            <span class="php-var">$request_uri</span> = <span class="php-quote">'/'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'/'</span>, <span class="php-var">$args</span>) . <span class="php-quote">'/'</span>;
-</span><span id="1360" class="l"><a href="#1360">1360: </a>
-</span><span id="1361" class="l"><a href="#1361">1361: </a>            <span class="php-comment">// Set the following server variables (perhaps not required anymore?)</span>
-</span><span id="1362" class="l"><a href="#1362">1362: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1363" class="l"><a href="#1363">1363: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'PATH_INFO'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1364" class="l"><a href="#1364">1364: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'QUERY_STRING'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1365" class="l"><a href="#1365">1365: </a>        }
-</span><span id="1366" class="l"><a href="#1366">1366: </a>        <span class="php-keyword1">else</span>
-</span><span id="1367" class="l"><a href="#1367">1367: </a>        {
-</span><span id="1368" class="l"><a href="#1368">1368: </a>            <span class="php-var">$request_uri</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>);
-</span><span id="1369" class="l"><a href="#1369">1369: </a>        }
-</span><span id="1370" class="l"><a href="#1370">1370: </a>
-</span><span id="1371" class="l"><a href="#1371">1371: </a>        <span class="php-comment">// Parse the query parameters from the query string</span>
-</span><span id="1372" class="l"><a href="#1372">1372: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$request_uri</span>, PHP_URL_QUERY), <span class="php-var">$this</span>-&gt;_query_args);
-</span><span id="1373" class="l"><a href="#1373">1373: </a>    }
-</span><span id="1374" class="l"><a href="#1374">1374: </a>
-</span><span id="1375" class="l"><a href="#1375">1375: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
-</span><span id="1376" class="l"><a href="#1376">1376: </a>
-</span><span id="1377" class="l"><a href="#1377">1377: </a>    <span class="php-comment">/**
-</span></span><span id="1378" class="l"><a href="#1378">1378: </a><span class="php-comment">     * Retrieve a value from a GET request
-</span></span><span id="1379" class="l"><a href="#1379">1379: </a><span class="php-comment">     *
-</span></span><span id="1380" class="l"><a href="#1380">1380: </a><span class="php-comment">     * @access public
-</span></span><span id="1381" class="l"><a href="#1381">1381: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
-</span></span><span id="1382" class="l"><a href="#1382">1382: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1383" class="l"><a href="#1383">1383: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1384" class="l"><a href="#1384">1384: </a><span class="php-comment">     * @return array|string|FALSE Value from the GET request; otherwise, FALSE
-</span></span><span id="1385" class="l"><a href="#1385">1385: </a><span class="php-comment">     */</span>
-</span><span id="1386" class="l"><a href="#1386">1386: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1387" class="l"><a href="#1387">1387: </a>    {
-</span><span id="1388" class="l"><a href="#1388">1388: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1389" class="l"><a href="#1389">1389: </a>        {
-</span><span id="1390" class="l"><a href="#1390">1390: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
-</span><span id="1391" class="l"><a href="#1391">1391: </a>        }
-</span><span id="1392" class="l"><a href="#1392">1392: </a>
-</span><span id="1393" class="l"><a href="#1393">1393: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_get_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1394" class="l"><a href="#1394">1394: </a>    }
-</span><span id="1395" class="l"><a href="#1395">1395: </a>
-</span><span id="1396" class="l"><a href="#1396">1396: </a>    <span class="php-comment">/**
-</span></span><span id="1397" class="l"><a href="#1397">1397: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
-</span></span><span id="1398" class="l"><a href="#1398">1398: </a><span class="php-comment">     *
-</span></span><span id="1399" class="l"><a href="#1399">1399: </a><span class="php-comment">     * @access public
-</span></span><span id="1400" class="l"><a href="#1400">1400: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
-</span></span><span id="1401" class="l"><a href="#1401">1401: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1402" class="l"><a href="#1402">1402: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1403" class="l"><a href="#1403">1403: </a><span class="php-comment">     * @return array|string|FALSE Value from the OPTIONS request; otherwise, FALSE
-</span></span><span id="1404" class="l"><a href="#1404">1404: </a><span class="php-comment">     */</span>
-</span><span id="1405" class="l"><a href="#1405">1405: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1406" class="l"><a href="#1406">1406: </a>    {
-</span><span id="1407" class="l"><a href="#1407">1407: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1408" class="l"><a href="#1408">1408: </a>        {
-</span><span id="1409" class="l"><a href="#1409">1409: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
-</span><span id="1410" class="l"><a href="#1410">1410: </a>        }
-</span><span id="1411" class="l"><a href="#1411">1411: </a>
-</span><span id="1412" class="l"><a href="#1412">1412: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_options_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1413" class="l"><a href="#1413">1413: </a>    }
-</span><span id="1414" class="l"><a href="#1414">1414: </a>
-</span><span id="1415" class="l"><a href="#1415">1415: </a>    <span class="php-comment">/**
-</span></span><span id="1416" class="l"><a href="#1416">1416: </a><span class="php-comment">     * Retrieve a value from a HEAD request
-</span></span><span id="1417" class="l"><a href="#1417">1417: </a><span class="php-comment">     *
-</span></span><span id="1418" class="l"><a href="#1418">1418: </a><span class="php-comment">     * @access public
-</span></span><span id="1419" class="l"><a href="#1419">1419: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
-</span></span><span id="1420" class="l"><a href="#1420">1420: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1421" class="l"><a href="#1421">1421: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1422" class="l"><a href="#1422">1422: </a><span class="php-comment">     * @return array|string|FALSE Value from the HEAD request; otherwise, FALSE
-</span></span><span id="1423" class="l"><a href="#1423">1423: </a><span class="php-comment">     */</span>
-</span><span id="1424" class="l"><a href="#1424">1424: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1425" class="l"><a href="#1425">1425: </a>    {
-</span><span id="1426" class="l"><a href="#1426">1426: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1427" class="l"><a href="#1427">1427: </a>        {
-</span><span id="1428" class="l"><a href="#1428">1428: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;head_args;
-</span><span id="1429" class="l"><a href="#1429">1429: </a>        }
-</span><span id="1430" class="l"><a href="#1430">1430: </a>
-</span><span id="1431" class="l"><a href="#1431">1431: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;head_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1432" class="l"><a href="#1432">1432: </a>    }
-</span><span id="1433" class="l"><a href="#1433">1433: </a>
-</span><span id="1434" class="l"><a href="#1434">1434: </a>    <span class="php-comment">/**
-</span></span><span id="1435" class="l"><a href="#1435">1435: </a><span class="php-comment">     * Retrieve a value from a POST request
-</span></span><span id="1436" class="l"><a href="#1436">1436: </a><span class="php-comment">     *
-</span></span><span id="1437" class="l"><a href="#1437">1437: </a><span class="php-comment">     * @access public
-</span></span><span id="1438" class="l"><a href="#1438">1438: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
-</span></span><span id="1439" class="l"><a href="#1439">1439: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1440" class="l"><a href="#1440">1440: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1441" class="l"><a href="#1441">1441: </a><span class="php-comment">     * @return array|string|FALSE Value from the POST request; otherwise, FALSE
-</span></span><span id="1442" class="l"><a href="#1442">1442: </a><span class="php-comment">     */</span>
-</span><span id="1443" class="l"><a href="#1443">1443: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1444" class="l"><a href="#1444">1444: </a>    {
-</span><span id="1445" class="l"><a href="#1445">1445: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1446" class="l"><a href="#1446">1446: </a>        {
-</span><span id="1447" class="l"><a href="#1447">1447: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
-</span><span id="1448" class="l"><a href="#1448">1448: </a>        }
-</span><span id="1449" class="l"><a href="#1449">1449: </a>
-</span><span id="1450" class="l"><a href="#1450">1450: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_post_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1451" class="l"><a href="#1451">1451: </a>    }
-</span><span id="1452" class="l"><a href="#1452">1452: </a>
-</span><span id="1453" class="l"><a href="#1453">1453: </a>    <span class="php-comment">/**
-</span></span><span id="1454" class="l"><a href="#1454">1454: </a><span class="php-comment">     * Retrieve a value from a PUT request
-</span></span><span id="1455" class="l"><a href="#1455">1455: </a><span class="php-comment">     *
-</span></span><span id="1456" class="l"><a href="#1456">1456: </a><span class="php-comment">     * @access public
-</span></span><span id="1457" class="l"><a href="#1457">1457: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
-</span></span><span id="1458" class="l"><a href="#1458">1458: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1459" class="l"><a href="#1459">1459: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1460" class="l"><a href="#1460">1460: </a><span class="php-comment">     * @return array|string|FALSE Value from the PUT request; otherwise, FALSE
-</span></span><span id="1461" class="l"><a href="#1461">1461: </a><span class="php-comment">     */</span>
-</span><span id="1462" class="l"><a href="#1462">1462: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1463" class="l"><a href="#1463">1463: </a>    {
-</span><span id="1464" class="l"><a href="#1464">1464: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1465" class="l"><a href="#1465">1465: </a>        {
-</span><span id="1466" class="l"><a href="#1466">1466: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
-</span><span id="1467" class="l"><a href="#1467">1467: </a>        }
-</span><span id="1468" class="l"><a href="#1468">1468: </a>
-</span><span id="1469" class="l"><a href="#1469">1469: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_put_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1470" class="l"><a href="#1470">1470: </a>    }
-</span><span id="1471" class="l"><a href="#1471">1471: </a>
-</span><span id="1472" class="l"><a href="#1472">1472: </a>    <span class="php-comment">/**
-</span></span><span id="1473" class="l"><a href="#1473">1473: </a><span class="php-comment">     * Retrieve a value from a DELETE request
-</span></span><span id="1474" class="l"><a href="#1474">1474: </a><span class="php-comment">     *
-</span></span><span id="1475" class="l"><a href="#1475">1475: </a><span class="php-comment">     * @access public
-</span></span><span id="1476" class="l"><a href="#1476">1476: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
-</span></span><span id="1477" class="l"><a href="#1477">1477: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1478" class="l"><a href="#1478">1478: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1479" class="l"><a href="#1479">1479: </a><span class="php-comment">     * @return array|string|FALSE Value from the DELETE request; otherwise, FALSE
-</span></span><span id="1480" class="l"><a href="#1480">1480: </a><span class="php-comment">     */</span>
-</span><span id="1481" class="l"><a href="#1481">1481: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1482" class="l"><a href="#1482">1482: </a>    {
-</span><span id="1483" class="l"><a href="#1483">1483: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1484" class="l"><a href="#1484">1484: </a>        {
-</span><span id="1485" class="l"><a href="#1485">1485: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
-</span><span id="1486" class="l"><a href="#1486">1486: </a>        }
-</span><span id="1487" class="l"><a href="#1487">1487: </a>
-</span><span id="1488" class="l"><a href="#1488">1488: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_delete_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1489" class="l"><a href="#1489">1489: </a>    }
-</span><span id="1490" class="l"><a href="#1490">1490: </a>
-</span><span id="1491" class="l"><a href="#1491">1491: </a>    <span class="php-comment">/**
-</span></span><span id="1492" class="l"><a href="#1492">1492: </a><span class="php-comment">     * Retrieve a value from a PATCH request
-</span></span><span id="1493" class="l"><a href="#1493">1493: </a><span class="php-comment">     *
-</span></span><span id="1494" class="l"><a href="#1494">1494: </a><span class="php-comment">     * @access public
-</span></span><span id="1495" class="l"><a href="#1495">1495: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
-</span></span><span id="1496" class="l"><a href="#1496">1496: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1497" class="l"><a href="#1497">1497: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1498" class="l"><a href="#1498">1498: </a><span class="php-comment">     * @return array|string|FALSE Value from the PATCH request; otherwise, FALSE
-</span></span><span id="1499" class="l"><a href="#1499">1499: </a><span class="php-comment">     */</span>
-</span><span id="1500" class="l"><a href="#1500">1500: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1501" class="l"><a href="#1501">1501: </a>    {
-</span><span id="1502" class="l"><a href="#1502">1502: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1503" class="l"><a href="#1503">1503: </a>        {
-</span><span id="1504" class="l"><a href="#1504">1504: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
-</span><span id="1505" class="l"><a href="#1505">1505: </a>        }
-</span><span id="1506" class="l"><a href="#1506">1506: </a>
-</span><span id="1507" class="l"><a href="#1507">1507: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_patch_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1508" class="l"><a href="#1508">1508: </a>    }
-</span><span id="1509" class="l"><a href="#1509">1509: </a>
-</span><span id="1510" class="l"><a href="#1510">1510: </a>    <span class="php-comment">/**
-</span></span><span id="1511" class="l"><a href="#1511">1511: </a><span class="php-comment">     * Retrieve a value from the query parameters
-</span></span><span id="1512" class="l"><a href="#1512">1512: </a><span class="php-comment">     *
-</span></span><span id="1513" class="l"><a href="#1513">1513: </a><span class="php-comment">     * @access public
-</span></span><span id="1514" class="l"><a href="#1514">1514: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
-</span></span><span id="1515" class="l"><a href="#1515">1515: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1516" class="l"><a href="#1516">1516: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1517" class="l"><a href="#1517">1517: </a><span class="php-comment">     * @return array|string|FALSE Value from the query parameters; otherwise, FALSE
-</span></span><span id="1518" class="l"><a href="#1518">1518: </a><span class="php-comment">     */</span>
-</span><span id="1519" class="l"><a href="#1519">1519: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1520" class="l"><a href="#1520">1520: </a>    {
-</span><span id="1521" class="l"><a href="#1521">1521: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1522" class="l"><a href="#1522">1522: </a>        {
-</span><span id="1523" class="l"><a href="#1523">1523: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
-</span><span id="1524" class="l"><a href="#1524">1524: </a>        }
-</span><span id="1525" class="l"><a href="#1525">1525: </a>
-</span><span id="1526" class="l"><a href="#1526">1526: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">array_key_exists</span>(<span class="php-var">$key</span>, <span class="php-var">$this</span>-&gt;_query_args) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">FALSE</span>;
-</span><span id="1527" class="l"><a href="#1527">1527: </a>    }
+</span><span id="1358" class="l"><a href="#1358">1358: </a>        <span class="php-comment">// Parse the query parameters from the query string</span>
+</span><span id="1359" class="l"><a href="#1359">1359: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$request_uri</span>, PHP_URL_QUERY), <span class="php-var">$this</span>-&gt;_query_args);
+</span><span id="1360" class="l"><a href="#1360">1360: </a>    }
+</span><span id="1361" class="l"><a href="#1361">1361: </a>
+</span><span id="1362" class="l"><a href="#1362">1362: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
+</span><span id="1363" class="l"><a href="#1363">1363: </a>
+</span><span id="1364" class="l"><a href="#1364">1364: </a>    <span class="php-comment">/**
+</span></span><span id="1365" class="l"><a href="#1365">1365: </a><span class="php-comment">     * Retrieve a value from a GET request
+</span></span><span id="1366" class="l"><a href="#1366">1366: </a><span class="php-comment">     *
+</span></span><span id="1367" class="l"><a href="#1367">1367: </a><span class="php-comment">     * @access public
+</span></span><span id="1368" class="l"><a href="#1368">1368: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
+</span></span><span id="1369" class="l"><a href="#1369">1369: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1370" class="l"><a href="#1370">1370: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1371" class="l"><a href="#1371">1371: </a><span class="php-comment">     * @return array|string|NULL Value from the GET request; otherwise, NULL
+</span></span><span id="1372" class="l"><a href="#1372">1372: </a><span class="php-comment">     */</span>
+</span><span id="1373" class="l"><a href="#1373">1373: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1374" class="l"><a href="#1374">1374: </a>    {
+</span><span id="1375" class="l"><a href="#1375">1375: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1376" class="l"><a href="#1376">1376: </a>        {
+</span><span id="1377" class="l"><a href="#1377">1377: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
+</span><span id="1378" class="l"><a href="#1378">1378: </a>        }
+</span><span id="1379" class="l"><a href="#1379">1379: </a>
+</span><span id="1380" class="l"><a href="#1380">1380: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1381" class="l"><a href="#1381">1381: </a>    }
+</span><span id="1382" class="l"><a href="#1382">1382: </a>
+</span><span id="1383" class="l"><a href="#1383">1383: </a>    <span class="php-comment">/**
+</span></span><span id="1384" class="l"><a href="#1384">1384: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
+</span></span><span id="1385" class="l"><a href="#1385">1385: </a><span class="php-comment">     *
+</span></span><span id="1386" class="l"><a href="#1386">1386: </a><span class="php-comment">     * @access public
+</span></span><span id="1387" class="l"><a href="#1387">1387: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
+</span></span><span id="1388" class="l"><a href="#1388">1388: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1389" class="l"><a href="#1389">1389: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1390" class="l"><a href="#1390">1390: </a><span class="php-comment">     * @return array|string|NULL Value from the OPTIONS request; otherwise, NULL
+</span></span><span id="1391" class="l"><a href="#1391">1391: </a><span class="php-comment">     */</span>
+</span><span id="1392" class="l"><a href="#1392">1392: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1393" class="l"><a href="#1393">1393: </a>    {
+</span><span id="1394" class="l"><a href="#1394">1394: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1395" class="l"><a href="#1395">1395: </a>        {
+</span><span id="1396" class="l"><a href="#1396">1396: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
+</span><span id="1397" class="l"><a href="#1397">1397: </a>        }
+</span><span id="1398" class="l"><a href="#1398">1398: </a>
+</span><span id="1399" class="l"><a href="#1399">1399: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1400" class="l"><a href="#1400">1400: </a>    }
+</span><span id="1401" class="l"><a href="#1401">1401: </a>
+</span><span id="1402" class="l"><a href="#1402">1402: </a>    <span class="php-comment">/**
+</span></span><span id="1403" class="l"><a href="#1403">1403: </a><span class="php-comment">     * Retrieve a value from a HEAD request
+</span></span><span id="1404" class="l"><a href="#1404">1404: </a><span class="php-comment">     *
+</span></span><span id="1405" class="l"><a href="#1405">1405: </a><span class="php-comment">     * @access public
+</span></span><span id="1406" class="l"><a href="#1406">1406: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
+</span></span><span id="1407" class="l"><a href="#1407">1407: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1408" class="l"><a href="#1408">1408: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1409" class="l"><a href="#1409">1409: </a><span class="php-comment">     * @return array|string|NULL Value from the HEAD request; otherwise, NULL
+</span></span><span id="1410" class="l"><a href="#1410">1410: </a><span class="php-comment">     */</span>
+</span><span id="1411" class="l"><a href="#1411">1411: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1412" class="l"><a href="#1412">1412: </a>    {
+</span><span id="1413" class="l"><a href="#1413">1413: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1414" class="l"><a href="#1414">1414: </a>        {
+</span><span id="1415" class="l"><a href="#1415">1415: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;head_args;
+</span><span id="1416" class="l"><a href="#1416">1416: </a>        }
+</span><span id="1417" class="l"><a href="#1417">1417: </a>
+</span><span id="1418" class="l"><a href="#1418">1418: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1419" class="l"><a href="#1419">1419: </a>    }
+</span><span id="1420" class="l"><a href="#1420">1420: </a>
+</span><span id="1421" class="l"><a href="#1421">1421: </a>    <span class="php-comment">/**
+</span></span><span id="1422" class="l"><a href="#1422">1422: </a><span class="php-comment">     * Retrieve a value from a POST request
+</span></span><span id="1423" class="l"><a href="#1423">1423: </a><span class="php-comment">     *
+</span></span><span id="1424" class="l"><a href="#1424">1424: </a><span class="php-comment">     * @access public
+</span></span><span id="1425" class="l"><a href="#1425">1425: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
+</span></span><span id="1426" class="l"><a href="#1426">1426: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1427" class="l"><a href="#1427">1427: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1428" class="l"><a href="#1428">1428: </a><span class="php-comment">     * @return array|string|NULL Value from the POST request; otherwise, NULL
+</span></span><span id="1429" class="l"><a href="#1429">1429: </a><span class="php-comment">     */</span>
+</span><span id="1430" class="l"><a href="#1430">1430: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1431" class="l"><a href="#1431">1431: </a>    {
+</span><span id="1432" class="l"><a href="#1432">1432: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1433" class="l"><a href="#1433">1433: </a>        {
+</span><span id="1434" class="l"><a href="#1434">1434: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
+</span><span id="1435" class="l"><a href="#1435">1435: </a>        }
+</span><span id="1436" class="l"><a href="#1436">1436: </a>
+</span><span id="1437" class="l"><a href="#1437">1437: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1438" class="l"><a href="#1438">1438: </a>    }
+</span><span id="1439" class="l"><a href="#1439">1439: </a>
+</span><span id="1440" class="l"><a href="#1440">1440: </a>    <span class="php-comment">/**
+</span></span><span id="1441" class="l"><a href="#1441">1441: </a><span class="php-comment">     * Retrieve a value from a PUT request
+</span></span><span id="1442" class="l"><a href="#1442">1442: </a><span class="php-comment">     *
+</span></span><span id="1443" class="l"><a href="#1443">1443: </a><span class="php-comment">     * @access public
+</span></span><span id="1444" class="l"><a href="#1444">1444: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
+</span></span><span id="1445" class="l"><a href="#1445">1445: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1446" class="l"><a href="#1446">1446: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1447" class="l"><a href="#1447">1447: </a><span class="php-comment">     * @return array|string|NULL Value from the PUT request; otherwise, NULL
+</span></span><span id="1448" class="l"><a href="#1448">1448: </a><span class="php-comment">     */</span>
+</span><span id="1449" class="l"><a href="#1449">1449: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1450" class="l"><a href="#1450">1450: </a>    {
+</span><span id="1451" class="l"><a href="#1451">1451: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1452" class="l"><a href="#1452">1452: </a>        {
+</span><span id="1453" class="l"><a href="#1453">1453: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
+</span><span id="1454" class="l"><a href="#1454">1454: </a>        }
+</span><span id="1455" class="l"><a href="#1455">1455: </a>
+</span><span id="1456" class="l"><a href="#1456">1456: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1457" class="l"><a href="#1457">1457: </a>    }
+</span><span id="1458" class="l"><a href="#1458">1458: </a>
+</span><span id="1459" class="l"><a href="#1459">1459: </a>    <span class="php-comment">/**
+</span></span><span id="1460" class="l"><a href="#1460">1460: </a><span class="php-comment">     * Retrieve a value from a DELETE request
+</span></span><span id="1461" class="l"><a href="#1461">1461: </a><span class="php-comment">     *
+</span></span><span id="1462" class="l"><a href="#1462">1462: </a><span class="php-comment">     * @access public
+</span></span><span id="1463" class="l"><a href="#1463">1463: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
+</span></span><span id="1464" class="l"><a href="#1464">1464: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1465" class="l"><a href="#1465">1465: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1466" class="l"><a href="#1466">1466: </a><span class="php-comment">     * @return array|string|NULL Value from the DELETE request; otherwise, NULL
+</span></span><span id="1467" class="l"><a href="#1467">1467: </a><span class="php-comment">     */</span>
+</span><span id="1468" class="l"><a href="#1468">1468: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1469" class="l"><a href="#1469">1469: </a>    {
+</span><span id="1470" class="l"><a href="#1470">1470: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1471" class="l"><a href="#1471">1471: </a>        {
+</span><span id="1472" class="l"><a href="#1472">1472: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
+</span><span id="1473" class="l"><a href="#1473">1473: </a>        }
+</span><span id="1474" class="l"><a href="#1474">1474: </a>
+</span><span id="1475" class="l"><a href="#1475">1475: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1476" class="l"><a href="#1476">1476: </a>    }
+</span><span id="1477" class="l"><a href="#1477">1477: </a>
+</span><span id="1478" class="l"><a href="#1478">1478: </a>    <span class="php-comment">/**
+</span></span><span id="1479" class="l"><a href="#1479">1479: </a><span class="php-comment">     * Retrieve a value from a PATCH request
+</span></span><span id="1480" class="l"><a href="#1480">1480: </a><span class="php-comment">     *
+</span></span><span id="1481" class="l"><a href="#1481">1481: </a><span class="php-comment">     * @access public
+</span></span><span id="1482" class="l"><a href="#1482">1482: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
+</span></span><span id="1483" class="l"><a href="#1483">1483: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1484" class="l"><a href="#1484">1484: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1485" class="l"><a href="#1485">1485: </a><span class="php-comment">     * @return array|string|NULL Value from the PATCH request; otherwise, NULL
+</span></span><span id="1486" class="l"><a href="#1486">1486: </a><span class="php-comment">     */</span>
+</span><span id="1487" class="l"><a href="#1487">1487: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1488" class="l"><a href="#1488">1488: </a>    {
+</span><span id="1489" class="l"><a href="#1489">1489: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1490" class="l"><a href="#1490">1490: </a>        {
+</span><span id="1491" class="l"><a href="#1491">1491: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
+</span><span id="1492" class="l"><a href="#1492">1492: </a>        }
+</span><span id="1493" class="l"><a href="#1493">1493: </a>
+</span><span id="1494" class="l"><a href="#1494">1494: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1495" class="l"><a href="#1495">1495: </a>    }
+</span><span id="1496" class="l"><a href="#1496">1496: </a>
+</span><span id="1497" class="l"><a href="#1497">1497: </a>    <span class="php-comment">/**
+</span></span><span id="1498" class="l"><a href="#1498">1498: </a><span class="php-comment">     * Retrieve a value from the query parameters
+</span></span><span id="1499" class="l"><a href="#1499">1499: </a><span class="php-comment">     *
+</span></span><span id="1500" class="l"><a href="#1500">1500: </a><span class="php-comment">     * @access public
+</span></span><span id="1501" class="l"><a href="#1501">1501: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
+</span></span><span id="1502" class="l"><a href="#1502">1502: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1503" class="l"><a href="#1503">1503: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1504" class="l"><a href="#1504">1504: </a><span class="php-comment">     * @return array|string|NULL Value from the query parameters; otherwise, NULL
+</span></span><span id="1505" class="l"><a href="#1505">1505: </a><span class="php-comment">     */</span>
+</span><span id="1506" class="l"><a href="#1506">1506: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1507" class="l"><a href="#1507">1507: </a>    {
+</span><span id="1508" class="l"><a href="#1508">1508: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1509" class="l"><a href="#1509">1509: </a>        {
+</span><span id="1510" class="l"><a href="#1510">1510: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
+</span><span id="1511" class="l"><a href="#1511">1511: </a>        }
+</span><span id="1512" class="l"><a href="#1512">1512: </a>
+</span><span id="1513" class="l"><a href="#1513">1513: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1514" class="l"><a href="#1514">1514: </a>    }
+</span><span id="1515" class="l"><a href="#1515">1515: </a>
+</span><span id="1516" class="l"><a href="#1516">1516: </a>    <span class="php-comment">/**
+</span></span><span id="1517" class="l"><a href="#1517">1517: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
+</span></span><span id="1518" class="l"><a href="#1518">1518: </a><span class="php-comment">     * prevented.
+</span></span><span id="1519" class="l"><a href="#1519">1519: </a><span class="php-comment">     *
+</span></span><span id="1520" class="l"><a href="#1520">1520: </a><span class="php-comment">     * @access protected
+</span></span><span id="1521" class="l"><a href="#1521">1521: </a><span class="php-comment">     * @param  string $value Input data
+</span></span><span id="1522" class="l"><a href="#1522">1522: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
+</span></span><span id="1523" class="l"><a href="#1523">1523: </a><span class="php-comment">     * @return string
+</span></span><span id="1524" class="l"><a href="#1524">1524: </a><span class="php-comment">     */</span>
+</span><span id="1525" class="l"><a href="#1525">1525: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
+</span><span id="1526" class="l"><a href="#1526">1526: </a>    {
+</span><span id="1527" class="l"><a href="#1527">1527: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) <span class="php-keyword1">OR</span> <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
 </span><span id="1528" class="l"><a href="#1528">1528: </a>
-</span><span id="1529" class="l"><a href="#1529">1529: </a>    <span class="php-comment">/**
-</span></span><span id="1530" class="l"><a href="#1530">1530: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
-</span></span><span id="1531" class="l"><a href="#1531">1531: </a><span class="php-comment">     * prevented.
-</span></span><span id="1532" class="l"><a href="#1532">1532: </a><span class="php-comment">     *
-</span></span><span id="1533" class="l"><a href="#1533">1533: </a><span class="php-comment">     * @access protected
-</span></span><span id="1534" class="l"><a href="#1534">1534: </a><span class="php-comment">     * @param  string $value Input data
-</span></span><span id="1535" class="l"><a href="#1535">1535: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
-</span></span><span id="1536" class="l"><a href="#1536">1536: </a><span class="php-comment">     * @return string
+</span><span id="1529" class="l"><a href="#1529">1529: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
+</span><span id="1530" class="l"><a href="#1530">1530: </a>    }
+</span><span id="1531" class="l"><a href="#1531">1531: </a>
+</span><span id="1532" class="l"><a href="#1532">1532: </a>    <span class="php-comment">/**
+</span></span><span id="1533" class="l"><a href="#1533">1533: </a><span class="php-comment">     * Retrieve the validation errors
+</span></span><span id="1534" class="l"><a href="#1534">1534: </a><span class="php-comment">     *
+</span></span><span id="1535" class="l"><a href="#1535">1535: </a><span class="php-comment">     * @access public
+</span></span><span id="1536" class="l"><a href="#1536">1536: </a><span class="php-comment">     * @return array
 </span></span><span id="1537" class="l"><a href="#1537">1537: </a><span class="php-comment">     */</span>
-</span><span id="1538" class="l"><a href="#1538">1538: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
+</span><span id="1538" class="l"><a href="#1538">1538: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
 </span><span id="1539" class="l"><a href="#1539">1539: </a>    {
-</span><span id="1540" class="l"><a href="#1540">1540: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) <span class="php-keyword1">OR</span> <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
+</span><span id="1540" class="l"><a href="#1540">1540: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
 </span><span id="1541" class="l"><a href="#1541">1541: </a>
-</span><span id="1542" class="l"><a href="#1542">1542: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
+</span><span id="1542" class="l"><a href="#1542">1542: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
 </span><span id="1543" class="l"><a href="#1543">1543: </a>    }
 </span><span id="1544" class="l"><a href="#1544">1544: </a>
-</span><span id="1545" class="l"><a href="#1545">1545: </a>    <span class="php-comment">/**
-</span></span><span id="1546" class="l"><a href="#1546">1546: </a><span class="php-comment">     * Retrieve the validation errors
-</span></span><span id="1547" class="l"><a href="#1547">1547: </a><span class="php-comment">     *
-</span></span><span id="1548" class="l"><a href="#1548">1548: </a><span class="php-comment">     * @access public
-</span></span><span id="1549" class="l"><a href="#1549">1549: </a><span class="php-comment">     * @return array
-</span></span><span id="1550" class="l"><a href="#1550">1550: </a><span class="php-comment">     */</span>
-</span><span id="1551" class="l"><a href="#1551">1551: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
-</span><span id="1552" class="l"><a href="#1552">1552: </a>    {
-</span><span id="1553" class="l"><a href="#1553">1553: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
-</span><span id="1554" class="l"><a href="#1554">1554: </a>
-</span><span id="1555" class="l"><a href="#1555">1555: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
-</span><span id="1556" class="l"><a href="#1556">1556: </a>    }
-</span><span id="1557" class="l"><a href="#1557">1557: </a>
-</span><span id="1558" class="l"><a href="#1558">1558: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
-</span><span id="1559" class="l"><a href="#1559">1559: </a>
-</span><span id="1560" class="l"><a href="#1560">1560: </a>    <span class="php-comment">/**
-</span></span><span id="1561" class="l"><a href="#1561">1561: </a><span class="php-comment">     * Perform LDAP Authentication
-</span></span><span id="1562" class="l"><a href="#1562">1562: </a><span class="php-comment">     *
-</span></span><span id="1563" class="l"><a href="#1563">1563: </a><span class="php-comment">     * @access protected
-</span></span><span id="1564" class="l"><a href="#1564">1564: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1565" class="l"><a href="#1565">1565: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1566" class="l"><a href="#1566">1566: </a><span class="php-comment">     * @return bool
-</span></span><span id="1567" class="l"><a href="#1567">1567: </a><span class="php-comment">     */</span>
-</span><span id="1568" class="l"><a href="#1568">1568: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1569" class="l"><a href="#1569">1569: </a>    {
-</span><span id="1570" class="l"><a href="#1570">1570: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1571" class="l"><a href="#1571">1571: </a>        {
-</span><span id="1572" class="l"><a href="#1572">1572: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
-</span><span id="1573" class="l"><a href="#1573">1573: </a>
-</span><span id="1574" class="l"><a href="#1574">1574: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1575" class="l"><a href="#1575">1575: </a>        }
+</span><span id="1545" class="l"><a href="#1545">1545: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
+</span><span id="1546" class="l"><a href="#1546">1546: </a>
+</span><span id="1547" class="l"><a href="#1547">1547: </a>    <span class="php-comment">/**
+</span></span><span id="1548" class="l"><a href="#1548">1548: </a><span class="php-comment">     * Perform LDAP Authentication
+</span></span><span id="1549" class="l"><a href="#1549">1549: </a><span class="php-comment">     *
+</span></span><span id="1550" class="l"><a href="#1550">1550: </a><span class="php-comment">     * @access protected
+</span></span><span id="1551" class="l"><a href="#1551">1551: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1552" class="l"><a href="#1552">1552: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1553" class="l"><a href="#1553">1553: </a><span class="php-comment">     * @return bool
+</span></span><span id="1554" class="l"><a href="#1554">1554: </a><span class="php-comment">     */</span>
+</span><span id="1555" class="l"><a href="#1555">1555: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1556" class="l"><a href="#1556">1556: </a>    {
+</span><span id="1557" class="l"><a href="#1557">1557: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1558" class="l"><a href="#1558">1558: </a>        {
+</span><span id="1559" class="l"><a href="#1559">1559: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
+</span><span id="1560" class="l"><a href="#1560">1560: </a>
+</span><span id="1561" class="l"><a href="#1561">1561: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1562" class="l"><a href="#1562">1562: </a>        }
+</span><span id="1563" class="l"><a href="#1563">1563: </a>
+</span><span id="1564" class="l"><a href="#1564">1564: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading Config'</span>);
+</span><span id="1565" class="l"><a href="#1565">1565: </a>
+</span><span id="1566" class="l"><a href="#1566">1566: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="1567" class="l"><a href="#1567">1567: </a>
+</span><span id="1568" class="l"><a href="#1568">1568: </a>        <span class="php-var">$ldap</span> = [
+</span><span id="1569" class="l"><a href="#1569">1569: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1570" class="l"><a href="#1570">1570: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1571" class="l"><a href="#1571">1571: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1572" class="l"><a href="#1572">1572: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1573" class="l"><a href="#1573">1573: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1574" class="l"><a href="#1574">1574: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1575" class="l"><a href="#1575">1575: </a>        ];
 </span><span id="1576" class="l"><a href="#1576">1576: </a>
-</span><span id="1577" class="l"><a href="#1577">1577: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading Config'</span>);
+</span><span id="1577" class="l"><a href="#1577">1577: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
 </span><span id="1578" class="l"><a href="#1578">1578: </a>
-</span><span id="1579" class="l"><a href="#1579">1579: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="1580" class="l"><a href="#1580">1580: </a>
-</span><span id="1581" class="l"><a href="#1581">1581: </a>        <span class="php-var">$ldap</span> = [
-</span><span id="1582" class="l"><a href="#1582">1582: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1583" class="l"><a href="#1583">1583: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1584" class="l"><a href="#1584">1584: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1585" class="l"><a href="#1585">1585: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1586" class="l"><a href="#1586">1586: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1587" class="l"><a href="#1587">1587: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1588" class="l"><a href="#1588">1588: </a>        ];
-</span><span id="1589" class="l"><a href="#1589">1589: </a>
-</span><span id="1590" class="l"><a href="#1590">1590: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
-</span><span id="1591" class="l"><a href="#1591">1591: </a>
-</span><span id="1592" class="l"><a href="#1592">1592: </a>        <span class="php-comment">// Appears to be unused</span>
-</span><span id="1593" class="l"><a href="#1593">1593: </a>        <span class="php-comment">// $ldapconfig['authrealm'] = $this-&gt;config-&gt;item('domain', 'ldap');</span>
-</span><span id="1594" class="l"><a href="#1594">1594: </a>
-</span><span id="1595" class="l"><a href="#1595">1595: </a>        <span class="php-comment">// connect to ldap server</span>
-</span><span id="1596" class="l"><a href="#1596">1596: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
-</span><span id="1597" class="l"><a href="#1597">1597: </a>
-</span><span id="1598" class="l"><a href="#1598">1598: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
-</span><span id="1599" class="l"><a href="#1599">1599: </a>        {
-</span><span id="1600" class="l"><a href="#1600">1600: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>] . <span class="php-quote">' seconds'</span>);
-</span><span id="1601" class="l"><a href="#1601">1601: </a>
-</span><span id="1602" class="l"><a href="#1602">1602: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
-</span><span id="1603" class="l"><a href="#1603">1603: </a>
-</span><span id="1604" class="l"><a href="#1604">1604: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>] . <span class="php-quote">' with dn '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
-</span><span id="1605" class="l"><a href="#1605">1605: </a>
-</span><span id="1606" class="l"><a href="#1606">1606: </a>            <span class="php-comment">// binding to ldap server</span>
-</span><span id="1607" class="l"><a href="#1607">1607: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
+</span><span id="1579" class="l"><a href="#1579">1579: </a>        <span class="php-comment">// Appears to be unused</span>
+</span><span id="1580" class="l"><a href="#1580">1580: </a>        <span class="php-comment">// $ldapconfig['authrealm'] = $this-&gt;config-&gt;item('domain', 'ldap');</span>
+</span><span id="1581" class="l"><a href="#1581">1581: </a>
+</span><span id="1582" class="l"><a href="#1582">1582: </a>        <span class="php-comment">// connect to ldap server</span>
+</span><span id="1583" class="l"><a href="#1583">1583: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
+</span><span id="1584" class="l"><a href="#1584">1584: </a>
+</span><span id="1585" class="l"><a href="#1585">1585: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
+</span><span id="1586" class="l"><a href="#1586">1586: </a>        {
+</span><span id="1587" class="l"><a href="#1587">1587: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>] . <span class="php-quote">' seconds'</span>);
+</span><span id="1588" class="l"><a href="#1588">1588: </a>
+</span><span id="1589" class="l"><a href="#1589">1589: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
+</span><span id="1590" class="l"><a href="#1590">1590: </a>
+</span><span id="1591" class="l"><a href="#1591">1591: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>] . <span class="php-quote">' with dn '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
+</span><span id="1592" class="l"><a href="#1592">1592: </a>
+</span><span id="1593" class="l"><a href="#1593">1593: </a>            <span class="php-comment">// binding to ldap server</span>
+</span><span id="1594" class="l"><a href="#1594">1594: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
+</span><span id="1595" class="l"><a href="#1595">1595: </a>
+</span><span id="1596" class="l"><a href="#1596">1596: </a>            <span class="php-comment">// verify binding</span>
+</span><span id="1597" class="l"><a href="#1597">1597: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span>)
+</span><span id="1598" class="l"><a href="#1598">1598: </a>            {
+</span><span id="1599" class="l"><a href="#1599">1599: </a>                log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
+</span><span id="1600" class="l"><a href="#1600">1600: </a>            }
+</span><span id="1601" class="l"><a href="#1601">1601: </a>            <span class="php-keyword1">else</span>
+</span><span id="1602" class="l"><a href="#1602">1602: </a>            {
+</span><span id="1603" class="l"><a href="#1603">1603: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind unsuccessful'</span>);
+</span><span id="1604" class="l"><a href="#1604">1604: </a>
+</span><span id="1605" class="l"><a href="#1605">1605: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1606" class="l"><a href="#1606">1606: </a>            }
+</span><span id="1607" class="l"><a href="#1607">1607: </a>        }
 </span><span id="1608" class="l"><a href="#1608">1608: </a>
-</span><span id="1609" class="l"><a href="#1609">1609: </a>            <span class="php-comment">// verify binding</span>
-</span><span id="1610" class="l"><a href="#1610">1610: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span>)
-</span><span id="1611" class="l"><a href="#1611">1611: </a>            {
-</span><span id="1612" class="l"><a href="#1612">1612: </a>                log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
-</span><span id="1613" class="l"><a href="#1613">1613: </a>            }
-</span><span id="1614" class="l"><a href="#1614">1614: </a>            <span class="php-keyword1">else</span>
-</span><span id="1615" class="l"><a href="#1615">1615: </a>            {
-</span><span id="1616" class="l"><a href="#1616">1616: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind unsuccessful'</span>);
-</span><span id="1617" class="l"><a href="#1617">1617: </a>
-</span><span id="1618" class="l"><a href="#1618">1618: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1619" class="l"><a href="#1619">1619: </a>            }
-</span><span id="1620" class="l"><a href="#1620">1620: </a>        }
-</span><span id="1621" class="l"><a href="#1621">1621: </a>
-</span><span id="1622" class="l"><a href="#1622">1622: </a>        <span class="php-comment">// search for user</span>
-</span><span id="1623" class="l"><a href="#1623">1623: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) == <span class="php-keyword1">FALSE</span>)
-</span><span id="1624" class="l"><a href="#1624">1624: </a>        {
-</span><span id="1625" class="l"><a href="#1625">1625: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span> . <span class="php-var">$username</span> . <span class="php-quote">' not found in search'</span>);
-</span><span id="1626" class="l"><a href="#1626">1626: </a>
-</span><span id="1627" class="l"><a href="#1627">1627: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1628" class="l"><a href="#1628">1628: </a>        }
-</span><span id="1629" class="l"><a href="#1629">1629: </a>
-</span><span id="1630" class="l"><a href="#1630">1630: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
-</span><span id="1631" class="l"><a href="#1631">1631: </a>        {
-</span><span id="1632" class="l"><a href="#1632">1632: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username '</span> . <span class="php-var">$username</span> . <span class="php-quote">'found more than once'</span>);
-</span><span id="1633" class="l"><a href="#1633">1633: </a>
-</span><span id="1634" class="l"><a href="#1634">1634: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1635" class="l"><a href="#1635">1635: </a>        }
-</span><span id="1636" class="l"><a href="#1636">1636: </a>
-</span><span id="1637" class="l"><a href="#1637">1637: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) == <span class="php-keyword1">FALSE</span>)
-</span><span id="1638" class="l"><a href="#1638">1638: </a>        {
-</span><span id="1639" class="l"><a href="#1639">1639: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, entry of searchresult could not be fetched'</span>);
-</span><span id="1640" class="l"><a href="#1640">1640: </a>
-</span><span id="1641" class="l"><a href="#1641">1641: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1642" class="l"><a href="#1642">1642: </a>        }
-</span><span id="1643" class="l"><a href="#1643">1643: </a>
-</span><span id="1644" class="l"><a href="#1644">1644: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) == <span class="php-keyword1">FALSE</span>)
-</span><span id="1645" class="l"><a href="#1645">1645: </a>        {
-</span><span id="1646" class="l"><a href="#1646">1646: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, user-dn could not be fetched'</span>);
+</span><span id="1609" class="l"><a href="#1609">1609: </a>        <span class="php-comment">// search for user</span>
+</span><span id="1610" class="l"><a href="#1610">1610: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) == <span class="php-keyword1">FALSE</span>)
+</span><span id="1611" class="l"><a href="#1611">1611: </a>        {
+</span><span id="1612" class="l"><a href="#1612">1612: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span> . <span class="php-var">$username</span> . <span class="php-quote">' not found in search'</span>);
+</span><span id="1613" class="l"><a href="#1613">1613: </a>
+</span><span id="1614" class="l"><a href="#1614">1614: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1615" class="l"><a href="#1615">1615: </a>        }
+</span><span id="1616" class="l"><a href="#1616">1616: </a>
+</span><span id="1617" class="l"><a href="#1617">1617: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
+</span><span id="1618" class="l"><a href="#1618">1618: </a>        {
+</span><span id="1619" class="l"><a href="#1619">1619: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username '</span> . <span class="php-var">$username</span> . <span class="php-quote">'found more than once'</span>);
+</span><span id="1620" class="l"><a href="#1620">1620: </a>
+</span><span id="1621" class="l"><a href="#1621">1621: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1622" class="l"><a href="#1622">1622: </a>        }
+</span><span id="1623" class="l"><a href="#1623">1623: </a>
+</span><span id="1624" class="l"><a href="#1624">1624: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) == <span class="php-keyword1">FALSE</span>)
+</span><span id="1625" class="l"><a href="#1625">1625: </a>        {
+</span><span id="1626" class="l"><a href="#1626">1626: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, entry of searchresult could not be fetched'</span>);
+</span><span id="1627" class="l"><a href="#1627">1627: </a>
+</span><span id="1628" class="l"><a href="#1628">1628: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1629" class="l"><a href="#1629">1629: </a>        }
+</span><span id="1630" class="l"><a href="#1630">1630: </a>
+</span><span id="1631" class="l"><a href="#1631">1631: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) == <span class="php-keyword1">FALSE</span>)
+</span><span id="1632" class="l"><a href="#1632">1632: </a>        {
+</span><span id="1633" class="l"><a href="#1633">1633: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, user-dn could not be fetched'</span>);
+</span><span id="1634" class="l"><a href="#1634">1634: </a>
+</span><span id="1635" class="l"><a href="#1635">1635: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1636" class="l"><a href="#1636">1636: </a>        }
+</span><span id="1637" class="l"><a href="#1637">1637: </a>
+</span><span id="1638" class="l"><a href="#1638">1638: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
+</span><span id="1639" class="l"><a href="#1639">1639: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) == <span class="php-keyword1">FALSE</span>)
+</span><span id="1640" class="l"><a href="#1640">1640: </a>        {
+</span><span id="1641" class="l"><a href="#1641">1641: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
+</span><span id="1642" class="l"><a href="#1642">1642: </a>
+</span><span id="1643" class="l"><a href="#1643">1643: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1644" class="l"><a href="#1644">1644: </a>        }
+</span><span id="1645" class="l"><a href="#1645">1645: </a>
+</span><span id="1646" class="l"><a href="#1646">1646: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span> . <span class="php-var">$user_dn</span> . <span class="php-quote">' authenticated successfully'</span>);
 </span><span id="1647" class="l"><a href="#1647">1647: </a>
-</span><span id="1648" class="l"><a href="#1648">1648: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1649" class="l"><a href="#1649">1649: </a>        }
+</span><span id="1648" class="l"><a href="#1648">1648: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
+</span><span id="1649" class="l"><a href="#1649">1649: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
 </span><span id="1650" class="l"><a href="#1650">1650: </a>
-</span><span id="1651" class="l"><a href="#1651">1651: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
-</span><span id="1652" class="l"><a href="#1652">1652: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) == <span class="php-keyword1">FALSE</span>)
-</span><span id="1653" class="l"><a href="#1653">1653: </a>        {
-</span><span id="1654" class="l"><a href="#1654">1654: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
-</span><span id="1655" class="l"><a href="#1655">1655: </a>
-</span><span id="1656" class="l"><a href="#1656">1656: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1657" class="l"><a href="#1657">1657: </a>        }
-</span><span id="1658" class="l"><a href="#1658">1658: </a>
-</span><span id="1659" class="l"><a href="#1659">1659: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span> . <span class="php-var">$user_dn</span> . <span class="php-quote">' authenticated successfully'</span>);
-</span><span id="1660" class="l"><a href="#1660">1660: </a>
-</span><span id="1661" class="l"><a href="#1661">1661: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
-</span><span id="1662" class="l"><a href="#1662">1662: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
-</span><span id="1663" class="l"><a href="#1663">1663: </a>
-</span><span id="1664" class="l"><a href="#1664">1664: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1665" class="l"><a href="#1665">1665: </a>    }
-</span><span id="1666" class="l"><a href="#1666">1666: </a>
-</span><span id="1667" class="l"><a href="#1667">1667: </a>    <span class="php-comment">/**
-</span></span><span id="1668" class="l"><a href="#1668">1668: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
-</span></span><span id="1669" class="l"><a href="#1669">1669: </a><span class="php-comment">     *
-</span></span><span id="1670" class="l"><a href="#1670">1670: </a><span class="php-comment">     * @access protected
-</span></span><span id="1671" class="l"><a href="#1671">1671: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1672" class="l"><a href="#1672">1672: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1673" class="l"><a href="#1673">1673: </a><span class="php-comment">     * @return bool
-</span></span><span id="1674" class="l"><a href="#1674">1674: </a><span class="php-comment">     */</span>
-</span><span id="1675" class="l"><a href="#1675">1675: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1676" class="l"><a href="#1676">1676: </a>    {
-</span><span id="1677" class="l"><a href="#1677">1677: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1678" class="l"><a href="#1678">1678: </a>        {
-</span><span id="1679" class="l"><a href="#1679">1679: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: failure, empty username'</span>);
+</span><span id="1651" class="l"><a href="#1651">1651: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1652" class="l"><a href="#1652">1652: </a>    }
+</span><span id="1653" class="l"><a href="#1653">1653: </a>
+</span><span id="1654" class="l"><a href="#1654">1654: </a>    <span class="php-comment">/**
+</span></span><span id="1655" class="l"><a href="#1655">1655: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
+</span></span><span id="1656" class="l"><a href="#1656">1656: </a><span class="php-comment">     *
+</span></span><span id="1657" class="l"><a href="#1657">1657: </a><span class="php-comment">     * @access protected
+</span></span><span id="1658" class="l"><a href="#1658">1658: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1659" class="l"><a href="#1659">1659: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1660" class="l"><a href="#1660">1660: </a><span class="php-comment">     * @return bool
+</span></span><span id="1661" class="l"><a href="#1661">1661: </a><span class="php-comment">     */</span>
+</span><span id="1662" class="l"><a href="#1662">1662: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1663" class="l"><a href="#1663">1663: </a>    {
+</span><span id="1664" class="l"><a href="#1664">1664: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1665" class="l"><a href="#1665">1665: </a>        {
+</span><span id="1666" class="l"><a href="#1666">1666: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: failure, empty username'</span>);
+</span><span id="1667" class="l"><a href="#1667">1667: </a>
+</span><span id="1668" class="l"><a href="#1668">1668: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1669" class="l"><a href="#1669">1669: </a>        }
+</span><span id="1670" class="l"><a href="#1670">1670: </a>
+</span><span id="1671" class="l"><a href="#1671">1671: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
+</span><span id="1672" class="l"><a href="#1672">1672: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
+</span><span id="1673" class="l"><a href="#1673">1673: </a>
+</span><span id="1674" class="l"><a href="#1674">1674: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
+</span><span id="1675" class="l"><a href="#1675">1675: </a>        {
+</span><span id="1676" class="l"><a href="#1676">1676: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_class'</span>);
+</span><span id="1677" class="l"><a href="#1677">1677: </a>
+</span><span id="1678" class="l"><a href="#1678">1678: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1679" class="l"><a href="#1679">1679: </a>        }
 </span><span id="1680" class="l"><a href="#1680">1680: </a>
-</span><span id="1681" class="l"><a href="#1681">1681: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1682" class="l"><a href="#1682">1682: </a>        }
-</span><span id="1683" class="l"><a href="#1683">1683: </a>
-</span><span id="1684" class="l"><a href="#1684">1684: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
-</span><span id="1685" class="l"><a href="#1685">1685: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
-</span><span id="1686" class="l"><a href="#1686">1686: </a>
-</span><span id="1687" class="l"><a href="#1687">1687: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
-</span><span id="1688" class="l"><a href="#1688">1688: </a>        {
-</span><span id="1689" class="l"><a href="#1689">1689: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_class'</span>);
-</span><span id="1690" class="l"><a href="#1690">1690: </a>
-</span><span id="1691" class="l"><a href="#1691">1691: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1692" class="l"><a href="#1692">1692: </a>        }
-</span><span id="1693" class="l"><a href="#1693">1693: </a>
-</span><span id="1694" class="l"><a href="#1694">1694: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
-</span><span id="1695" class="l"><a href="#1695">1695: </a>        {
-</span><span id="1696" class="l"><a href="#1696">1696: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_function'</span>);
-</span><span id="1697" class="l"><a href="#1697">1697: </a>
-</span><span id="1698" class="l"><a href="#1698">1698: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1699" class="l"><a href="#1699">1699: </a>        }
-</span><span id="1700" class="l"><a href="#1700">1700: </a>
-</span><span id="1701" class="l"><a href="#1701">1701: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1702" class="l"><a href="#1702">1702: </a>        {
-</span><span id="1703" class="l"><a href="#1703">1703: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
-</span><span id="1704" class="l"><a href="#1704">1704: </a>        }
-</span><span id="1705" class="l"><a href="#1705">1705: </a>
-</span><span id="1706" class="l"><a href="#1706">1706: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1707" class="l"><a href="#1707">1707: </a>    }
-</span><span id="1708" class="l"><a href="#1708">1708: </a>
-</span><span id="1709" class="l"><a href="#1709">1709: </a>    <span class="php-comment">/**
-</span></span><span id="1710" class="l"><a href="#1710">1710: </a><span class="php-comment">     * Check if the user is logged in
-</span></span><span id="1711" class="l"><a href="#1711">1711: </a><span class="php-comment">     *
-</span></span><span id="1712" class="l"><a href="#1712">1712: </a><span class="php-comment">     * @access protected
-</span></span><span id="1713" class="l"><a href="#1713">1713: </a><span class="php-comment">     * @param  string $username The user's name
-</span></span><span id="1714" class="l"><a href="#1714">1714: </a><span class="php-comment">     * @param  bool|string $password The user's password
-</span></span><span id="1715" class="l"><a href="#1715">1715: </a><span class="php-comment">     * @return bool
-</span></span><span id="1716" class="l"><a href="#1716">1716: </a><span class="php-comment">     */</span>
-</span><span id="1717" class="l"><a href="#1717">1717: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1718" class="l"><a href="#1718">1718: </a>    {
-</span><span id="1719" class="l"><a href="#1719">1719: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1720" class="l"><a href="#1720">1720: </a>        {
-</span><span id="1721" class="l"><a href="#1721">1721: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1722" class="l"><a href="#1722">1722: </a>        }
-</span><span id="1723" class="l"><a href="#1723">1723: </a>
-</span><span id="1724" class="l"><a href="#1724">1724: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
-</span><span id="1725" class="l"><a href="#1725">1725: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="1726" class="l"><a href="#1726">1726: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
-</span><span id="1727" class="l"><a href="#1727">1727: </a>
-</span><span id="1728" class="l"><a href="#1728">1728: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
-</span><span id="1729" class="l"><a href="#1729">1729: </a>        {
-</span><span id="1730" class="l"><a href="#1730">1730: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
-</span><span id="1731" class="l"><a href="#1731">1731: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>) . <span class="php-quote">':'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
-</span><span id="1732" class="l"><a href="#1732">1732: </a>        }
-</span><span id="1733" class="l"><a href="#1733">1733: </a>
-</span><span id="1734" class="l"><a href="#1734">1734: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1735" class="l"><a href="#1735">1735: </a>        {
-</span><span id="1736" class="l"><a href="#1736">1736: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1737" class="l"><a href="#1737">1737: </a>        }
-</span><span id="1738" class="l"><a href="#1738">1738: </a>
-</span><span id="1739" class="l"><a href="#1739">1739: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
-</span><span id="1740" class="l"><a href="#1740">1740: </a>        {
-</span><span id="1741" class="l"><a href="#1741">1741: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
-</span><span id="1742" class="l"><a href="#1742">1742: </a>
-</span><span id="1743" class="l"><a href="#1743">1743: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1744" class="l"><a href="#1744">1744: </a>        }
-</span><span id="1745" class="l"><a href="#1745">1745: </a>
-</span><span id="1746" class="l"><a href="#1746">1746: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
-</span><span id="1747" class="l"><a href="#1747">1747: </a>        {
-</span><span id="1748" class="l"><a href="#1748">1748: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1681" class="l"><a href="#1681">1681: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
+</span><span id="1682" class="l"><a href="#1682">1682: </a>        {
+</span><span id="1683" class="l"><a href="#1683">1683: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_function'</span>);
+</span><span id="1684" class="l"><a href="#1684">1684: </a>
+</span><span id="1685" class="l"><a href="#1685">1685: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1686" class="l"><a href="#1686">1686: </a>        }
+</span><span id="1687" class="l"><a href="#1687">1687: </a>
+</span><span id="1688" class="l"><a href="#1688">1688: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1689" class="l"><a href="#1689">1689: </a>        {
+</span><span id="1690" class="l"><a href="#1690">1690: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
+</span><span id="1691" class="l"><a href="#1691">1691: </a>        }
+</span><span id="1692" class="l"><a href="#1692">1692: </a>
+</span><span id="1693" class="l"><a href="#1693">1693: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1694" class="l"><a href="#1694">1694: </a>    }
+</span><span id="1695" class="l"><a href="#1695">1695: </a>
+</span><span id="1696" class="l"><a href="#1696">1696: </a>    <span class="php-comment">/**
+</span></span><span id="1697" class="l"><a href="#1697">1697: </a><span class="php-comment">     * Check if the user is logged in
+</span></span><span id="1698" class="l"><a href="#1698">1698: </a><span class="php-comment">     *
+</span></span><span id="1699" class="l"><a href="#1699">1699: </a><span class="php-comment">     * @access protected
+</span></span><span id="1700" class="l"><a href="#1700">1700: </a><span class="php-comment">     * @param  string $username The user's name
+</span></span><span id="1701" class="l"><a href="#1701">1701: </a><span class="php-comment">     * @param  bool|string $password The user's password
+</span></span><span id="1702" class="l"><a href="#1702">1702: </a><span class="php-comment">     * @return bool
+</span></span><span id="1703" class="l"><a href="#1703">1703: </a><span class="php-comment">     */</span>
+</span><span id="1704" class="l"><a href="#1704">1704: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="1705" class="l"><a href="#1705">1705: </a>    {
+</span><span id="1706" class="l"><a href="#1706">1706: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1707" class="l"><a href="#1707">1707: </a>        {
+</span><span id="1708" class="l"><a href="#1708">1708: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1709" class="l"><a href="#1709">1709: </a>        }
+</span><span id="1710" class="l"><a href="#1710">1710: </a>
+</span><span id="1711" class="l"><a href="#1711">1711: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
+</span><span id="1712" class="l"><a href="#1712">1712: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="1713" class="l"><a href="#1713">1713: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
+</span><span id="1714" class="l"><a href="#1714">1714: </a>
+</span><span id="1715" class="l"><a href="#1715">1715: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
+</span><span id="1716" class="l"><a href="#1716">1716: </a>        {
+</span><span id="1717" class="l"><a href="#1717">1717: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
+</span><span id="1718" class="l"><a href="#1718">1718: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>) . <span class="php-quote">':'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
+</span><span id="1719" class="l"><a href="#1719">1719: </a>        }
+</span><span id="1720" class="l"><a href="#1720">1720: </a>
+</span><span id="1721" class="l"><a href="#1721">1721: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1722" class="l"><a href="#1722">1722: </a>        {
+</span><span id="1723" class="l"><a href="#1723">1723: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1724" class="l"><a href="#1724">1724: </a>        }
+</span><span id="1725" class="l"><a href="#1725">1725: </a>
+</span><span id="1726" class="l"><a href="#1726">1726: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
+</span><span id="1727" class="l"><a href="#1727">1727: </a>        {
+</span><span id="1728" class="l"><a href="#1728">1728: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1729" class="l"><a href="#1729">1729: </a>
+</span><span id="1730" class="l"><a href="#1730">1730: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1731" class="l"><a href="#1731">1731: </a>        }
+</span><span id="1732" class="l"><a href="#1732">1732: </a>
+</span><span id="1733" class="l"><a href="#1733">1733: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
+</span><span id="1734" class="l"><a href="#1734">1734: </a>        {
+</span><span id="1735" class="l"><a href="#1735">1735: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1736" class="l"><a href="#1736">1736: </a>
+</span><span id="1737" class="l"><a href="#1737">1737: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1738" class="l"><a href="#1738">1738: </a>        }
+</span><span id="1739" class="l"><a href="#1739">1739: </a>
+</span><span id="1740" class="l"><a href="#1740">1740: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1741" class="l"><a href="#1741">1741: </a>        {
+</span><span id="1742" class="l"><a href="#1742">1742: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1743" class="l"><a href="#1743">1743: </a>        }
+</span><span id="1744" class="l"><a href="#1744">1744: </a>
+</span><span id="1745" class="l"><a href="#1745">1745: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
+</span><span id="1746" class="l"><a href="#1746">1746: </a>        {
+</span><span id="1747" class="l"><a href="#1747">1747: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1748" class="l"><a href="#1748">1748: </a>        }
 </span><span id="1749" class="l"><a href="#1749">1749: </a>
-</span><span id="1750" class="l"><a href="#1750">1750: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1751" class="l"><a href="#1751">1751: </a>        }
+</span><span id="1750" class="l"><a href="#1750">1750: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1751" class="l"><a href="#1751">1751: </a>    }
 </span><span id="1752" class="l"><a href="#1752">1752: </a>
-</span><span id="1753" class="l"><a href="#1753">1753: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1754" class="l"><a href="#1754">1754: </a>        {
-</span><span id="1755" class="l"><a href="#1755">1755: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1756" class="l"><a href="#1756">1756: </a>        }
-</span><span id="1757" class="l"><a href="#1757">1757: </a>
-</span><span id="1758" class="l"><a href="#1758">1758: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
-</span><span id="1759" class="l"><a href="#1759">1759: </a>        {
-</span><span id="1760" class="l"><a href="#1760">1760: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1761" class="l"><a href="#1761">1761: </a>        }
-</span><span id="1762" class="l"><a href="#1762">1762: </a>
-</span><span id="1763" class="l"><a href="#1763">1763: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1764" class="l"><a href="#1764">1764: </a>    }
-</span><span id="1765" class="l"><a href="#1765">1765: </a>
-</span><span id="1766" class="l"><a href="#1766">1766: </a>    <span class="php-comment">/**
-</span></span><span id="1767" class="l"><a href="#1767">1767: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
-</span></span><span id="1768" class="l"><a href="#1768">1768: </a><span class="php-comment">     *
-</span></span><span id="1769" class="l"><a href="#1769">1769: </a><span class="php-comment">     * @access protected
-</span></span><span id="1770" class="l"><a href="#1770">1770: </a><span class="php-comment">     * @return void
-</span></span><span id="1771" class="l"><a href="#1771">1771: </a><span class="php-comment">     */</span>
-</span><span id="1772" class="l"><a href="#1772">1772: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
-</span><span id="1773" class="l"><a href="#1773">1773: </a>    {
-</span><span id="1774" class="l"><a href="#1774">1774: </a>        <span class="php-comment">// Get the auth_source config item</span>
-</span><span id="1775" class="l"><a href="#1775">1775: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
-</span><span id="1776" class="l"><a href="#1776">1776: </a>
-</span><span id="1777" class="l"><a href="#1777">1777: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
-</span><span id="1778" class="l"><a href="#1778">1778: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
-</span><span id="1779" class="l"><a href="#1779">1779: </a>        {
-</span><span id="1780" class="l"><a href="#1780">1780: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1781" class="l"><a href="#1781">1781: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1782" class="l"><a href="#1782">1782: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1783" class="l"><a href="#1783">1783: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not Authorized'</span>
-</span><span id="1784" class="l"><a href="#1784">1784: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="1785" class="l"><a href="#1785">1785: </a>        }
-</span><span id="1786" class="l"><a href="#1786">1786: </a>    }
-</span><span id="1787" class="l"><a href="#1787">1787: </a>
-</span><span id="1788" class="l"><a href="#1788">1788: </a>    <span class="php-comment">/**
-</span></span><span id="1789" class="l"><a href="#1789">1789: </a><span class="php-comment">     * Prepares for basic authentication
-</span></span><span id="1790" class="l"><a href="#1790">1790: </a><span class="php-comment">     *
-</span></span><span id="1791" class="l"><a href="#1791">1791: </a><span class="php-comment">     * @access protected
-</span></span><span id="1792" class="l"><a href="#1792">1792: </a><span class="php-comment">     * @return void
-</span></span><span id="1793" class="l"><a href="#1793">1793: </a><span class="php-comment">     */</span>
-</span><span id="1794" class="l"><a href="#1794">1794: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
-</span><span id="1795" class="l"><a href="#1795">1795: </a>    {
-</span><span id="1796" class="l"><a href="#1796">1796: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1797" class="l"><a href="#1797">1797: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
-</span><span id="1798" class="l"><a href="#1798">1798: </a>        {
-</span><span id="1799" class="l"><a href="#1799">1799: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1800" class="l"><a href="#1800">1800: </a>        }
-</span><span id="1801" class="l"><a href="#1801">1801: </a>
-</span><span id="1802" class="l"><a href="#1802">1802: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
-</span><span id="1803" class="l"><a href="#1803">1803: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
-</span><span id="1804" class="l"><a href="#1804">1804: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
-</span><span id="1805" class="l"><a href="#1805">1805: </a>
-</span><span id="1806" class="l"><a href="#1806">1806: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1807" class="l"><a href="#1807">1807: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1808" class="l"><a href="#1808">1808: </a>        {
-</span><span id="1809" class="l"><a href="#1809">1809: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
-</span><span id="1810" class="l"><a href="#1810">1810: </a>        }
-</span><span id="1811" class="l"><a href="#1811">1811: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1812" class="l"><a href="#1812">1812: </a>        {
-</span><span id="1813" class="l"><a href="#1813">1813: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
-</span><span id="1814" class="l"><a href="#1814">1814: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
-</span><span id="1815" class="l"><a href="#1815">1815: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
-</span><span id="1816" class="l"><a href="#1816">1816: </a>            {
-</span><span id="1817" class="l"><a href="#1817">1817: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
-</span><span id="1818" class="l"><a href="#1818">1818: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
-</span><span id="1819" class="l"><a href="#1819">1819: </a>            }
-</span><span id="1820" class="l"><a href="#1820">1820: </a>        }
-</span><span id="1821" class="l"><a href="#1821">1821: </a>
-</span><span id="1822" class="l"><a href="#1822">1822: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
-</span><span id="1823" class="l"><a href="#1823">1823: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1824" class="l"><a href="#1824">1824: </a>        {
-</span><span id="1825" class="l"><a href="#1825">1825: </a>            <span class="php-var">$this</span>-&gt;_force_login();
-</span><span id="1826" class="l"><a href="#1826">1826: </a>        }
-</span><span id="1827" class="l"><a href="#1827">1827: </a>    }
-</span><span id="1828" class="l"><a href="#1828">1828: </a>
-</span><span id="1829" class="l"><a href="#1829">1829: </a>    <span class="php-comment">/**
-</span></span><span id="1830" class="l"><a href="#1830">1830: </a><span class="php-comment">     * Prepares for digest authentication
-</span></span><span id="1831" class="l"><a href="#1831">1831: </a><span class="php-comment">     *
-</span></span><span id="1832" class="l"><a href="#1832">1832: </a><span class="php-comment">     * @access protected
-</span></span><span id="1833" class="l"><a href="#1833">1833: </a><span class="php-comment">     * @return void
-</span></span><span id="1834" class="l"><a href="#1834">1834: </a><span class="php-comment">     */</span>
-</span><span id="1835" class="l"><a href="#1835">1835: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
-</span><span id="1836" class="l"><a href="#1836">1836: </a>    {
-</span><span id="1837" class="l"><a href="#1837">1837: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1838" class="l"><a href="#1838">1838: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
-</span><span id="1839" class="l"><a href="#1839">1839: </a>        {
-</span><span id="1840" class="l"><a href="#1840">1840: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1841" class="l"><a href="#1841">1841: </a>        }
-</span><span id="1842" class="l"><a href="#1842">1842: </a>
-</span><span id="1843" class="l"><a href="#1843">1843: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
-</span><span id="1844" class="l"><a href="#1844">1844: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
-</span><span id="1845" class="l"><a href="#1845">1845: </a>        <span class="php-var">$digest_string</span> = <span class="php-quote">''</span>;
-</span><span id="1846" class="l"><a href="#1846">1846: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>))
+</span><span id="1753" class="l"><a href="#1753">1753: </a>    <span class="php-comment">/**
+</span></span><span id="1754" class="l"><a href="#1754">1754: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
+</span></span><span id="1755" class="l"><a href="#1755">1755: </a><span class="php-comment">     *
+</span></span><span id="1756" class="l"><a href="#1756">1756: </a><span class="php-comment">     * @access protected
+</span></span><span id="1757" class="l"><a href="#1757">1757: </a><span class="php-comment">     * @return void
+</span></span><span id="1758" class="l"><a href="#1758">1758: </a><span class="php-comment">     */</span>
+</span><span id="1759" class="l"><a href="#1759">1759: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
+</span><span id="1760" class="l"><a href="#1760">1760: </a>    {
+</span><span id="1761" class="l"><a href="#1761">1761: </a>        <span class="php-comment">// Get the auth_source config item</span>
+</span><span id="1762" class="l"><a href="#1762">1762: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
+</span><span id="1763" class="l"><a href="#1763">1763: </a>
+</span><span id="1764" class="l"><a href="#1764">1764: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
+</span><span id="1765" class="l"><a href="#1765">1765: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
+</span><span id="1766" class="l"><a href="#1766">1766: </a>        {
+</span><span id="1767" class="l"><a href="#1767">1767: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1768" class="l"><a href="#1768">1768: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1769" class="l"><a href="#1769">1769: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1770" class="l"><a href="#1770">1770: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not Authorized'</span>
+</span><span id="1771" class="l"><a href="#1771">1771: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="1772" class="l"><a href="#1772">1772: </a>        }
+</span><span id="1773" class="l"><a href="#1773">1773: </a>    }
+</span><span id="1774" class="l"><a href="#1774">1774: </a>
+</span><span id="1775" class="l"><a href="#1775">1775: </a>    <span class="php-comment">/**
+</span></span><span id="1776" class="l"><a href="#1776">1776: </a><span class="php-comment">     * Prepares for basic authentication
+</span></span><span id="1777" class="l"><a href="#1777">1777: </a><span class="php-comment">     *
+</span></span><span id="1778" class="l"><a href="#1778">1778: </a><span class="php-comment">     * @access protected
+</span></span><span id="1779" class="l"><a href="#1779">1779: </a><span class="php-comment">     * @return void
+</span></span><span id="1780" class="l"><a href="#1780">1780: </a><span class="php-comment">     */</span>
+</span><span id="1781" class="l"><a href="#1781">1781: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
+</span><span id="1782" class="l"><a href="#1782">1782: </a>    {
+</span><span id="1783" class="l"><a href="#1783">1783: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1784" class="l"><a href="#1784">1784: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1785" class="l"><a href="#1785">1785: </a>        {
+</span><span id="1786" class="l"><a href="#1786">1786: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1787" class="l"><a href="#1787">1787: </a>        }
+</span><span id="1788" class="l"><a href="#1788">1788: </a>
+</span><span id="1789" class="l"><a href="#1789">1789: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
+</span><span id="1790" class="l"><a href="#1790">1790: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
+</span><span id="1791" class="l"><a href="#1791">1791: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
+</span><span id="1792" class="l"><a href="#1792">1792: </a>
+</span><span id="1793" class="l"><a href="#1793">1793: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1794" class="l"><a href="#1794">1794: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1795" class="l"><a href="#1795">1795: </a>        {
+</span><span id="1796" class="l"><a href="#1796">1796: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
+</span><span id="1797" class="l"><a href="#1797">1797: </a>        }
+</span><span id="1798" class="l"><a href="#1798">1798: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1799" class="l"><a href="#1799">1799: </a>        {
+</span><span id="1800" class="l"><a href="#1800">1800: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
+</span><span id="1801" class="l"><a href="#1801">1801: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
+</span><span id="1802" class="l"><a href="#1802">1802: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
+</span><span id="1803" class="l"><a href="#1803">1803: </a>            {
+</span><span id="1804" class="l"><a href="#1804">1804: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
+</span><span id="1805" class="l"><a href="#1805">1805: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
+</span><span id="1806" class="l"><a href="#1806">1806: </a>            }
+</span><span id="1807" class="l"><a href="#1807">1807: </a>        }
+</span><span id="1808" class="l"><a href="#1808">1808: </a>
+</span><span id="1809" class="l"><a href="#1809">1809: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
+</span><span id="1810" class="l"><a href="#1810">1810: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1811" class="l"><a href="#1811">1811: </a>        {
+</span><span id="1812" class="l"><a href="#1812">1812: </a>            <span class="php-var">$this</span>-&gt;_force_login();
+</span><span id="1813" class="l"><a href="#1813">1813: </a>        }
+</span><span id="1814" class="l"><a href="#1814">1814: </a>    }
+</span><span id="1815" class="l"><a href="#1815">1815: </a>
+</span><span id="1816" class="l"><a href="#1816">1816: </a>    <span class="php-comment">/**
+</span></span><span id="1817" class="l"><a href="#1817">1817: </a><span class="php-comment">     * Prepares for digest authentication
+</span></span><span id="1818" class="l"><a href="#1818">1818: </a><span class="php-comment">     *
+</span></span><span id="1819" class="l"><a href="#1819">1819: </a><span class="php-comment">     * @access protected
+</span></span><span id="1820" class="l"><a href="#1820">1820: </a><span class="php-comment">     * @return void
+</span></span><span id="1821" class="l"><a href="#1821">1821: </a><span class="php-comment">     */</span>
+</span><span id="1822" class="l"><a href="#1822">1822: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
+</span><span id="1823" class="l"><a href="#1823">1823: </a>    {
+</span><span id="1824" class="l"><a href="#1824">1824: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1825" class="l"><a href="#1825">1825: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1826" class="l"><a href="#1826">1826: </a>        {
+</span><span id="1827" class="l"><a href="#1827">1827: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1828" class="l"><a href="#1828">1828: </a>        }
+</span><span id="1829" class="l"><a href="#1829">1829: </a>
+</span><span id="1830" class="l"><a href="#1830">1830: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
+</span><span id="1831" class="l"><a href="#1831">1831: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
+</span><span id="1832" class="l"><a href="#1832">1832: </a>        <span class="php-var">$digest_string</span> = <span class="php-quote">''</span>;
+</span><span id="1833" class="l"><a href="#1833">1833: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>))
+</span><span id="1834" class="l"><a href="#1834">1834: </a>        {
+</span><span id="1835" class="l"><a href="#1835">1835: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
+</span><span id="1836" class="l"><a href="#1836">1836: </a>        }
+</span><span id="1837" class="l"><a href="#1837">1837: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>))
+</span><span id="1838" class="l"><a href="#1838">1838: </a>        {
+</span><span id="1839" class="l"><a href="#1839">1839: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
+</span><span id="1840" class="l"><a href="#1840">1840: </a>        }
+</span><span id="1841" class="l"><a href="#1841">1841: </a>
+</span><span id="1842" class="l"><a href="#1842">1842: </a>        <span class="php-var">$uniqueId</span> = <span class="php-keyword2">uniqid</span>();
+</span><span id="1843" class="l"><a href="#1843">1843: </a>
+</span><span id="1844" class="l"><a href="#1844">1844: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
+</span><span id="1845" class="l"><a href="#1845">1845: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
+</span><span id="1846" class="l"><a href="#1846">1846: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
 </span><span id="1847" class="l"><a href="#1847">1847: </a>        {
-</span><span id="1848" class="l"><a href="#1848">1848: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
+</span><span id="1848" class="l"><a href="#1848">1848: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqueId</span>);
 </span><span id="1849" class="l"><a href="#1849">1849: </a>        }
-</span><span id="1850" class="l"><a href="#1850">1850: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>))
-</span><span id="1851" class="l"><a href="#1851">1851: </a>        {
-</span><span id="1852" class="l"><a href="#1852">1852: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
-</span><span id="1853" class="l"><a href="#1853">1853: </a>        }
-</span><span id="1854" class="l"><a href="#1854">1854: </a>
-</span><span id="1855" class="l"><a href="#1855">1855: </a>        <span class="php-var">$uniqueId</span> = <span class="php-keyword2">uniqid</span>();
-</span><span id="1856" class="l"><a href="#1856">1856: </a>
-</span><span id="1857" class="l"><a href="#1857">1857: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
-</span><span id="1858" class="l"><a href="#1858">1858: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
-</span><span id="1859" class="l"><a href="#1859">1859: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
-</span><span id="1860" class="l"><a href="#1860">1860: </a>        {
-</span><span id="1861" class="l"><a href="#1861">1861: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqueId</span>);
-</span><span id="1862" class="l"><a href="#1862">1862: </a>        }
-</span><span id="1863" class="l"><a href="#1863">1863: </a>
-</span><span id="1864" class="l"><a href="#1864">1864: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
-</span><span id="1865" class="l"><a href="#1865">1865: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="1866" class="l"><a href="#1866">1866: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
-</span><span id="1867" class="l"><a href="#1867">1867: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
-</span><span id="1868" class="l"><a href="#1868">1868: </a>
-</span><span id="1869" class="l"><a href="#1869">1869: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config</span>
-</span><span id="1870" class="l"><a href="#1870">1870: </a>        <span class="php-var">$A1</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
-</span><span id="1871" class="l"><a href="#1871">1871: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$A1</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1872" class="l"><a href="#1872">1872: </a>        {
-</span><span id="1873" class="l"><a href="#1873">1873: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqueId</span>);
+</span><span id="1850" class="l"><a href="#1850">1850: </a>
+</span><span id="1851" class="l"><a href="#1851">1851: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
+</span><span id="1852" class="l"><a href="#1852">1852: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="1853" class="l"><a href="#1853">1853: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
+</span><span id="1854" class="l"><a href="#1854">1854: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
+</span><span id="1855" class="l"><a href="#1855">1855: </a>
+</span><span id="1856" class="l"><a href="#1856">1856: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config</span>
+</span><span id="1857" class="l"><a href="#1857">1857: </a>        <span class="php-var">$A1</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
+</span><span id="1858" class="l"><a href="#1858">1858: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$A1</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1859" class="l"><a href="#1859">1859: </a>        {
+</span><span id="1860" class="l"><a href="#1860">1860: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqueId</span>);
+</span><span id="1861" class="l"><a href="#1861">1861: </a>        }
+</span><span id="1862" class="l"><a href="#1862">1862: </a>
+</span><span id="1863" class="l"><a href="#1863">1863: </a>        <span class="php-var">$A2</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method) . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
+</span><span id="1864" class="l"><a href="#1864">1864: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$A1</span> . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$A2</span>);
+</span><span id="1865" class="l"><a href="#1865">1865: </a>
+</span><span id="1866" class="l"><a href="#1866">1866: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
+</span><span id="1867" class="l"><a href="#1867">1867: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
+</span><span id="1868" class="l"><a href="#1868">1868: </a>        {
+</span><span id="1869" class="l"><a href="#1869">1869: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1870" class="l"><a href="#1870">1870: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1871" class="l"><a href="#1871">1871: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-num">0</span>,
+</span><span id="1872" class="l"><a href="#1872">1872: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid credentials'</span>
+</span><span id="1873" class="l"><a href="#1873">1873: </a>                ], self::HTTP_UNAUTHORIZED);
 </span><span id="1874" class="l"><a href="#1874">1874: </a>        }
-</span><span id="1875" class="l"><a href="#1875">1875: </a>
-</span><span id="1876" class="l"><a href="#1876">1876: </a>        <span class="php-var">$A2</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method) . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
-</span><span id="1877" class="l"><a href="#1877">1877: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$A1</span> . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$A2</span>);
-</span><span id="1878" class="l"><a href="#1878">1878: </a>
-</span><span id="1879" class="l"><a href="#1879">1879: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
-</span><span id="1880" class="l"><a href="#1880">1880: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
-</span><span id="1881" class="l"><a href="#1881">1881: </a>        {
-</span><span id="1882" class="l"><a href="#1882">1882: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1883" class="l"><a href="#1883">1883: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1884" class="l"><a href="#1884">1884: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-num">0</span>,
-</span><span id="1885" class="l"><a href="#1885">1885: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid credentials'</span>
-</span><span id="1886" class="l"><a href="#1886">1886: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="1887" class="l"><a href="#1887">1887: </a>        }
-</span><span id="1888" class="l"><a href="#1888">1888: </a>    }
-</span><span id="1889" class="l"><a href="#1889">1889: </a>
-</span><span id="1890" class="l"><a href="#1890">1890: </a>    <span class="php-comment">/**
-</span></span><span id="1891" class="l"><a href="#1891">1891: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
-</span></span><span id="1892" class="l"><a href="#1892">1892: </a><span class="php-comment">     *
-</span></span><span id="1893" class="l"><a href="#1893">1893: </a><span class="php-comment">     * @access protected
-</span></span><span id="1894" class="l"><a href="#1894">1894: </a><span class="php-comment">     * @return void
-</span></span><span id="1895" class="l"><a href="#1895">1895: </a><span class="php-comment">     */</span>
-</span><span id="1896" class="l"><a href="#1896">1896: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
-</span><span id="1897" class="l"><a href="#1897">1897: </a>    {
-</span><span id="1898" class="l"><a href="#1898">1898: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
-</span><span id="1899" class="l"><a href="#1899">1899: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
-</span><span id="1900" class="l"><a href="#1900">1900: </a>
-</span><span id="1901" class="l"><a href="#1901">1901: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
-</span><span id="1902" class="l"><a href="#1902">1902: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
-</span><span id="1903" class="l"><a href="#1903">1903: </a>        {
-</span><span id="1904" class="l"><a href="#1904">1904: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1905" class="l"><a href="#1905">1905: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1906" class="l"><a href="#1906">1906: </a>                    <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1907" class="l"><a href="#1907">1907: </a>                    <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'IP Denied'</span>
-</span><span id="1908" class="l"><a href="#1908">1908: </a>                ],
-</span><span id="1909" class="l"><a href="#1909">1909: </a>                self::HTTP_UNAUTHORIZED);
-</span><span id="1910" class="l"><a href="#1910">1910: </a>        }
-</span><span id="1911" class="l"><a href="#1911">1911: </a>    }
-</span><span id="1912" class="l"><a href="#1912">1912: </a>
-</span><span id="1913" class="l"><a href="#1913">1913: </a>    <span class="php-comment">/**
-</span></span><span id="1914" class="l"><a href="#1914">1914: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
-</span></span><span id="1915" class="l"><a href="#1915">1915: </a><span class="php-comment">     *
-</span></span><span id="1916" class="l"><a href="#1916">1916: </a><span class="php-comment">     * @access protected
-</span></span><span id="1917" class="l"><a href="#1917">1917: </a><span class="php-comment">     * @return void
-</span></span><span id="1918" class="l"><a href="#1918">1918: </a><span class="php-comment">     */</span>
-</span><span id="1919" class="l"><a href="#1919">1919: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
-</span><span id="1920" class="l"><a href="#1920">1920: </a>    {
-</span><span id="1921" class="l"><a href="#1921">1921: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
+</span><span id="1875" class="l"><a href="#1875">1875: </a>    }
+</span><span id="1876" class="l"><a href="#1876">1876: </a>
+</span><span id="1877" class="l"><a href="#1877">1877: </a>    <span class="php-comment">/**
+</span></span><span id="1878" class="l"><a href="#1878">1878: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
+</span></span><span id="1879" class="l"><a href="#1879">1879: </a><span class="php-comment">     *
+</span></span><span id="1880" class="l"><a href="#1880">1880: </a><span class="php-comment">     * @access protected
+</span></span><span id="1881" class="l"><a href="#1881">1881: </a><span class="php-comment">     * @return void
+</span></span><span id="1882" class="l"><a href="#1882">1882: </a><span class="php-comment">     */</span>
+</span><span id="1883" class="l"><a href="#1883">1883: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
+</span><span id="1884" class="l"><a href="#1884">1884: </a>    {
+</span><span id="1885" class="l"><a href="#1885">1885: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
+</span><span id="1886" class="l"><a href="#1886">1886: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
+</span><span id="1887" class="l"><a href="#1887">1887: </a>
+</span><span id="1888" class="l"><a href="#1888">1888: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
+</span><span id="1889" class="l"><a href="#1889">1889: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
+</span><span id="1890" class="l"><a href="#1890">1890: </a>        {
+</span><span id="1891" class="l"><a href="#1891">1891: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1892" class="l"><a href="#1892">1892: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1893" class="l"><a href="#1893">1893: </a>                    <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1894" class="l"><a href="#1894">1894: </a>                    <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'IP Denied'</span>
+</span><span id="1895" class="l"><a href="#1895">1895: </a>                ],
+</span><span id="1896" class="l"><a href="#1896">1896: </a>                self::HTTP_UNAUTHORIZED);
+</span><span id="1897" class="l"><a href="#1897">1897: </a>        }
+</span><span id="1898" class="l"><a href="#1898">1898: </a>    }
+</span><span id="1899" class="l"><a href="#1899">1899: </a>
+</span><span id="1900" class="l"><a href="#1900">1900: </a>    <span class="php-comment">/**
+</span></span><span id="1901" class="l"><a href="#1901">1901: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
+</span></span><span id="1902" class="l"><a href="#1902">1902: </a><span class="php-comment">     *
+</span></span><span id="1903" class="l"><a href="#1903">1903: </a><span class="php-comment">     * @access protected
+</span></span><span id="1904" class="l"><a href="#1904">1904: </a><span class="php-comment">     * @return void
+</span></span><span id="1905" class="l"><a href="#1905">1905: </a><span class="php-comment">     */</span>
+</span><span id="1906" class="l"><a href="#1906">1906: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
+</span><span id="1907" class="l"><a href="#1907">1907: </a>    {
+</span><span id="1908" class="l"><a href="#1908">1908: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
+</span><span id="1909" class="l"><a href="#1909">1909: </a>
+</span><span id="1910" class="l"><a href="#1910">1910: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
+</span><span id="1911" class="l"><a href="#1911">1911: </a>
+</span><span id="1912" class="l"><a href="#1912">1912: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">AS</span> &amp;<span class="php-var">$ip</span>)
+</span><span id="1913" class="l"><a href="#1913">1913: </a>        {
+</span><span id="1914" class="l"><a href="#1914">1914: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
+</span><span id="1915" class="l"><a href="#1915">1915: </a>        }
+</span><span id="1916" class="l"><a href="#1916">1916: </a>
+</span><span id="1917" class="l"><a href="#1917">1917: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1918" class="l"><a href="#1918">1918: </a>        {
+</span><span id="1919" class="l"><a href="#1919">1919: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'IP not authorized'</span>], self::HTTP_UNAUTHORIZED);
+</span><span id="1920" class="l"><a href="#1920">1920: </a>        }
+</span><span id="1921" class="l"><a href="#1921">1921: </a>    }
 </span><span id="1922" class="l"><a href="#1922">1922: </a>
-</span><span id="1923" class="l"><a href="#1923">1923: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
-</span><span id="1924" class="l"><a href="#1924">1924: </a>
-</span><span id="1925" class="l"><a href="#1925">1925: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">AS</span> &amp;<span class="php-var">$ip</span>)
-</span><span id="1926" class="l"><a href="#1926">1926: </a>        {
-</span><span id="1927" class="l"><a href="#1927">1927: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
-</span><span id="1928" class="l"><a href="#1928">1928: </a>        }
-</span><span id="1929" class="l"><a href="#1929">1929: </a>
-</span><span id="1930" class="l"><a href="#1930">1930: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1931" class="l"><a href="#1931">1931: </a>        {
-</span><span id="1932" class="l"><a href="#1932">1932: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'IP not authorized'</span>], self::HTTP_UNAUTHORIZED);
-</span><span id="1933" class="l"><a href="#1933">1933: </a>        }
-</span><span id="1934" class="l"><a href="#1934">1934: </a>    }
-</span><span id="1935" class="l"><a href="#1935">1935: </a>
-</span><span id="1936" class="l"><a href="#1936">1936: </a>    <span class="php-comment">/**
-</span></span><span id="1937" class="l"><a href="#1937">1937: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
-</span></span><span id="1938" class="l"><a href="#1938">1938: </a><span class="php-comment">     *
-</span></span><span id="1939" class="l"><a href="#1939">1939: </a><span class="php-comment">     * @access protected
-</span></span><span id="1940" class="l"><a href="#1940">1940: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
-</span></span><span id="1941" class="l"><a href="#1941">1941: </a><span class="php-comment">     * each time
-</span></span><span id="1942" class="l"><a href="#1942">1942: </a><span class="php-comment">     * @return void
-</span></span><span id="1943" class="l"><a href="#1943">1943: </a><span class="php-comment">     */</span>
-</span><span id="1944" class="l"><a href="#1944">1944: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
-</span><span id="1945" class="l"><a href="#1945">1945: </a>    {
-</span><span id="1946" class="l"><a href="#1946">1946: </a>        <span class="php-var">$restAuth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
-</span><span id="1947" class="l"><a href="#1947">1947: </a>        <span class="php-var">$restRealm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
-</span><span id="1948" class="l"><a href="#1948">1948: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'basic'</span>)
-</span><span id="1949" class="l"><a href="#1949">1949: </a>        {
-</span><span id="1950" class="l"><a href="#1950">1950: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
-</span><span id="1951" class="l"><a href="#1951">1951: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span> . <span class="php-var">$restRealm</span> . <span class="php-quote">'&quot;'</span>);
-</span><span id="1952" class="l"><a href="#1952">1952: </a>        }
-</span><span id="1953" class="l"><a href="#1953">1953: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'digest'</span>)
-</span><span id="1954" class="l"><a href="#1954">1954: </a>        {
-</span><span id="1955" class="l"><a href="#1955">1955: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
-</span><span id="1956" class="l"><a href="#1956">1956: </a>            <span class="php-keyword2">header</span>(
-</span><span id="1957" class="l"><a href="#1957">1957: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span> . <span class="php-var">$restRealm</span>
-</span><span id="1958" class="l"><a href="#1958">1958: </a>                . <span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span> . <span class="php-var">$nonce</span>
-</span><span id="1959" class="l"><a href="#1959">1959: </a>                . <span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$restRealm</span>) . <span class="php-quote">'&quot;'</span>);
-</span><span id="1960" class="l"><a href="#1960">1960: </a>        }
-</span><span id="1961" class="l"><a href="#1961">1961: </a>
-</span><span id="1962" class="l"><a href="#1962">1962: </a>        <span class="php-comment">// Display an error response</span>
-</span><span id="1963" class="l"><a href="#1963">1963: </a>        <span class="php-var">$this</span>-&gt;response([
-</span><span id="1964" class="l"><a href="#1964">1964: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1965" class="l"><a href="#1965">1965: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not authorized'</span>
-</span><span id="1966" class="l"><a href="#1966">1966: </a>            ], self::HTTP_UNAUTHORIZED);
-</span><span id="1967" class="l"><a href="#1967">1967: </a>    }
-</span><span id="1968" class="l"><a href="#1968">1968: </a>
-</span><span id="1969" class="l"><a href="#1969">1969: </a>    <span class="php-comment">/**
-</span></span><span id="1970" class="l"><a href="#1970">1970: </a><span class="php-comment">     * Updates the log table with the total access time
-</span></span><span id="1971" class="l"><a href="#1971">1971: </a><span class="php-comment">     *
-</span></span><span id="1972" class="l"><a href="#1972">1972: </a><span class="php-comment">     * @access protected
-</span></span><span id="1973" class="l"><a href="#1973">1973: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="1974" class="l"><a href="#1974">1974: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="1975" class="l"><a href="#1975">1975: </a><span class="php-comment">     */</span>
-</span><span id="1976" class="l"><a href="#1976">1976: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
-</span><span id="1977" class="l"><a href="#1977">1977: </a>    {
-</span><span id="1978" class="l"><a href="#1978">1978: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
-</span><span id="1979" class="l"><a href="#1979">1979: </a>
-</span><span id="1980" class="l"><a href="#1980">1980: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1981" class="l"><a href="#1981">1981: </a>            -&gt;update(
-</span><span id="1982" class="l"><a href="#1982">1982: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="1983" class="l"><a href="#1983">1983: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="1984" class="l"><a href="#1984">1984: </a>            ]);
-</span><span id="1985" class="l"><a href="#1985">1985: </a>    }
-</span><span id="1986" class="l"><a href="#1986">1986: </a>
-</span><span id="1987" class="l"><a href="#1987">1987: </a>    <span class="php-comment">/**
-</span></span><span id="1988" class="l"><a href="#1988">1988: </a><span class="php-comment">     * Updates the log table with HTTP response code
-</span></span><span id="1989" class="l"><a href="#1989">1989: </a><span class="php-comment">     *
-</span></span><span id="1990" class="l"><a href="#1990">1990: </a><span class="php-comment">     * @access protected
-</span></span><span id="1991" class="l"><a href="#1991">1991: </a><span class="php-comment">     * @author Justin Chen
-</span></span><span id="1992" class="l"><a href="#1992">1992: </a><span class="php-comment">     * @param $http_code int HTTP status code
-</span></span><span id="1993" class="l"><a href="#1993">1993: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="1994" class="l"><a href="#1994">1994: </a><span class="php-comment">     */</span>
-</span><span id="1995" class="l"><a href="#1995">1995: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
-</span><span id="1996" class="l"><a href="#1996">1996: </a>    {
-</span><span id="1997" class="l"><a href="#1997">1997: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
-</span><span id="1998" class="l"><a href="#1998">1998: </a>
-</span><span id="1999" class="l"><a href="#1999">1999: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
-</span><span id="2000" class="l"><a href="#2000">2000: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="2001" class="l"><a href="#2001">2001: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="2002" class="l"><a href="#2002">2002: </a>        ]);
-</span><span id="2003" class="l"><a href="#2003">2003: </a>    }
-</span><span id="2004" class="l"><a href="#2004">2004: </a>
-</span><span id="2005" class="l"><a href="#2005">2005: </a>    <span class="php-comment">/**
-</span></span><span id="2006" class="l"><a href="#2006">2006: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
-</span></span><span id="2007" class="l"><a href="#2007">2007: </a><span class="php-comment">     *
-</span></span><span id="2008" class="l"><a href="#2008">2008: </a><span class="php-comment">     * @access protected
-</span></span><span id="2009" class="l"><a href="#2009">2009: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
-</span></span><span id="2010" class="l"><a href="#2010">2010: </a><span class="php-comment">     */</span>
-</span><span id="2011" class="l"><a href="#2011">2011: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
-</span><span id="2012" class="l"><a href="#2012">2012: </a>    {
-</span><span id="2013" class="l"><a href="#2013">2013: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
-</span><span id="2014" class="l"><a href="#2014">2014: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="2015" class="l"><a href="#2015">2015: </a>        {
-</span><span id="2016" class="l"><a href="#2016">2016: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="2017" class="l"><a href="#2017">2017: </a>        }
-</span><span id="2018" class="l"><a href="#2018">2018: </a>
-</span><span id="2019" class="l"><a href="#2019">2019: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
-</span><span id="2020" class="l"><a href="#2020">2020: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
-</span><span id="2021" class="l"><a href="#2021">2021: </a>            <span class="php-quote">'/'</span>, [
-</span><span id="2022" class="l"><a href="#2022">2022: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
-</span><span id="2023" class="l"><a href="#2023">2023: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
-</span><span id="2024" class="l"><a href="#2024">2024: </a>        ]);
-</span><span id="2025" class="l"><a href="#2025">2025: </a>
-</span><span id="2026" class="l"><a href="#2026">2026: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
-</span><span id="2027" class="l"><a href="#2027">2027: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
-</span><span id="2028" class="l"><a href="#2028">2028: </a>
-</span><span id="2029" class="l"><a href="#2029">2029: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
-</span><span id="2030" class="l"><a href="#2030">2030: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="2031" class="l"><a href="#2031">2031: </a>                   -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="2032" class="l"><a href="#2032">2032: </a>                   -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
-</span><span id="2033" class="l"><a href="#2033">2033: </a>                   -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
-</span><span id="2034" class="l"><a href="#2034">2034: </a>                   -&gt;num_rows() &gt; <span class="php-num">0</span>;
-</span><span id="2035" class="l"><a href="#2035">2035: </a>    }
-</span><span id="2036" class="l"><a href="#2036">2036: </a>
-</span><span id="2037" class="l"><a href="#2037">2037: </a>}
-</span><span id="2038" class="l"><a href="#2038">2038: </a></span></code></pre>
+</span><span id="1923" class="l"><a href="#1923">1923: </a>    <span class="php-comment">/**
+</span></span><span id="1924" class="l"><a href="#1924">1924: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
+</span></span><span id="1925" class="l"><a href="#1925">1925: </a><span class="php-comment">     *
+</span></span><span id="1926" class="l"><a href="#1926">1926: </a><span class="php-comment">     * @access protected
+</span></span><span id="1927" class="l"><a href="#1927">1927: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
+</span></span><span id="1928" class="l"><a href="#1928">1928: </a><span class="php-comment">     * each time
+</span></span><span id="1929" class="l"><a href="#1929">1929: </a><span class="php-comment">     * @return void
+</span></span><span id="1930" class="l"><a href="#1930">1930: </a><span class="php-comment">     */</span>
+</span><span id="1931" class="l"><a href="#1931">1931: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
+</span><span id="1932" class="l"><a href="#1932">1932: </a>    {
+</span><span id="1933" class="l"><a href="#1933">1933: </a>        <span class="php-var">$restAuth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
+</span><span id="1934" class="l"><a href="#1934">1934: </a>        <span class="php-var">$restRealm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
+</span><span id="1935" class="l"><a href="#1935">1935: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'basic'</span>)
+</span><span id="1936" class="l"><a href="#1936">1936: </a>        {
+</span><span id="1937" class="l"><a href="#1937">1937: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
+</span><span id="1938" class="l"><a href="#1938">1938: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span> . <span class="php-var">$restRealm</span> . <span class="php-quote">'&quot;'</span>);
+</span><span id="1939" class="l"><a href="#1939">1939: </a>        }
+</span><span id="1940" class="l"><a href="#1940">1940: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'digest'</span>)
+</span><span id="1941" class="l"><a href="#1941">1941: </a>        {
+</span><span id="1942" class="l"><a href="#1942">1942: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
+</span><span id="1943" class="l"><a href="#1943">1943: </a>            <span class="php-keyword2">header</span>(
+</span><span id="1944" class="l"><a href="#1944">1944: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span> . <span class="php-var">$restRealm</span>
+</span><span id="1945" class="l"><a href="#1945">1945: </a>                . <span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span> . <span class="php-var">$nonce</span>
+</span><span id="1946" class="l"><a href="#1946">1946: </a>                . <span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$restRealm</span>) . <span class="php-quote">'&quot;'</span>);
+</span><span id="1947" class="l"><a href="#1947">1947: </a>        }
+</span><span id="1948" class="l"><a href="#1948">1948: </a>
+</span><span id="1949" class="l"><a href="#1949">1949: </a>        <span class="php-comment">// Display an error response</span>
+</span><span id="1950" class="l"><a href="#1950">1950: </a>        <span class="php-var">$this</span>-&gt;response([
+</span><span id="1951" class="l"><a href="#1951">1951: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1952" class="l"><a href="#1952">1952: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not authorized'</span>
+</span><span id="1953" class="l"><a href="#1953">1953: </a>            ], self::HTTP_UNAUTHORIZED);
+</span><span id="1954" class="l"><a href="#1954">1954: </a>    }
+</span><span id="1955" class="l"><a href="#1955">1955: </a>
+</span><span id="1956" class="l"><a href="#1956">1956: </a>    <span class="php-comment">/**
+</span></span><span id="1957" class="l"><a href="#1957">1957: </a><span class="php-comment">     * Updates the log table with the total access time
+</span></span><span id="1958" class="l"><a href="#1958">1958: </a><span class="php-comment">     *
+</span></span><span id="1959" class="l"><a href="#1959">1959: </a><span class="php-comment">     * @access protected
+</span></span><span id="1960" class="l"><a href="#1960">1960: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="1961" class="l"><a href="#1961">1961: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="1962" class="l"><a href="#1962">1962: </a><span class="php-comment">     */</span>
+</span><span id="1963" class="l"><a href="#1963">1963: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
+</span><span id="1964" class="l"><a href="#1964">1964: </a>    {
+</span><span id="1965" class="l"><a href="#1965">1965: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
+</span><span id="1966" class="l"><a href="#1966">1966: </a>
+</span><span id="1967" class="l"><a href="#1967">1967: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1968" class="l"><a href="#1968">1968: </a>            -&gt;update(
+</span><span id="1969" class="l"><a href="#1969">1969: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="1970" class="l"><a href="#1970">1970: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="1971" class="l"><a href="#1971">1971: </a>            ]);
+</span><span id="1972" class="l"><a href="#1972">1972: </a>    }
+</span><span id="1973" class="l"><a href="#1973">1973: </a>
+</span><span id="1974" class="l"><a href="#1974">1974: </a>    <span class="php-comment">/**
+</span></span><span id="1975" class="l"><a href="#1975">1975: </a><span class="php-comment">     * Updates the log table with HTTP response code
+</span></span><span id="1976" class="l"><a href="#1976">1976: </a><span class="php-comment">     *
+</span></span><span id="1977" class="l"><a href="#1977">1977: </a><span class="php-comment">     * @access protected
+</span></span><span id="1978" class="l"><a href="#1978">1978: </a><span class="php-comment">     * @author Justin Chen
+</span></span><span id="1979" class="l"><a href="#1979">1979: </a><span class="php-comment">     * @param $http_code int HTTP status code
+</span></span><span id="1980" class="l"><a href="#1980">1980: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="1981" class="l"><a href="#1981">1981: </a><span class="php-comment">     */</span>
+</span><span id="1982" class="l"><a href="#1982">1982: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
+</span><span id="1983" class="l"><a href="#1983">1983: </a>    {
+</span><span id="1984" class="l"><a href="#1984">1984: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
+</span><span id="1985" class="l"><a href="#1985">1985: </a>
+</span><span id="1986" class="l"><a href="#1986">1986: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
+</span><span id="1987" class="l"><a href="#1987">1987: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="1988" class="l"><a href="#1988">1988: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="1989" class="l"><a href="#1989">1989: </a>        ]);
+</span><span id="1990" class="l"><a href="#1990">1990: </a>    }
+</span><span id="1991" class="l"><a href="#1991">1991: </a>
+</span><span id="1992" class="l"><a href="#1992">1992: </a>    <span class="php-comment">/**
+</span></span><span id="1993" class="l"><a href="#1993">1993: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
+</span></span><span id="1994" class="l"><a href="#1994">1994: </a><span class="php-comment">     *
+</span></span><span id="1995" class="l"><a href="#1995">1995: </a><span class="php-comment">     * @access protected
+</span></span><span id="1996" class="l"><a href="#1996">1996: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
+</span></span><span id="1997" class="l"><a href="#1997">1997: </a><span class="php-comment">     */</span>
+</span><span id="1998" class="l"><a href="#1998">1998: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
+</span><span id="1999" class="l"><a href="#1999">1999: </a>    {
+</span><span id="2000" class="l"><a href="#2000">2000: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
+</span><span id="2001" class="l"><a href="#2001">2001: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="2002" class="l"><a href="#2002">2002: </a>        {
+</span><span id="2003" class="l"><a href="#2003">2003: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="2004" class="l"><a href="#2004">2004: </a>        }
+</span><span id="2005" class="l"><a href="#2005">2005: </a>
+</span><span id="2006" class="l"><a href="#2006">2006: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
+</span><span id="2007" class="l"><a href="#2007">2007: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
+</span><span id="2008" class="l"><a href="#2008">2008: </a>            <span class="php-quote">'/'</span>, [
+</span><span id="2009" class="l"><a href="#2009">2009: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
+</span><span id="2010" class="l"><a href="#2010">2010: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
+</span><span id="2011" class="l"><a href="#2011">2011: </a>        ]);
+</span><span id="2012" class="l"><a href="#2012">2012: </a>
+</span><span id="2013" class="l"><a href="#2013">2013: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
+</span><span id="2014" class="l"><a href="#2014">2014: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
+</span><span id="2015" class="l"><a href="#2015">2015: </a>
+</span><span id="2016" class="l"><a href="#2016">2016: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
+</span><span id="2017" class="l"><a href="#2017">2017: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="2018" class="l"><a href="#2018">2018: </a>                   -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="2019" class="l"><a href="#2019">2019: </a>                   -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
+</span><span id="2020" class="l"><a href="#2020">2020: </a>                   -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
+</span><span id="2021" class="l"><a href="#2021">2021: </a>                   -&gt;num_rows() &gt; <span class="php-num">0</span>;
+</span><span id="2022" class="l"><a href="#2022">2022: </a>    }
+</span><span id="2023" class="l"><a href="#2023">2023: </a>
+</span><span id="2024" class="l"><a href="#2024">2024: </a>}
+</span><span id="2025" class="l"><a href="#2025">2025: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?c307d3f582643e506053410b19f11f1e77f36f99"></script>
+<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
 <script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
 </body>
 </html>

From 6096d93ecd7535c37f1dea7a0d4bbc7d0871189c Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 19 Jul 2015 11:24:23 +0300
Subject: [PATCH 074/354] Fixed removal for formatting line

---
 application/libraries/REST_Controller.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index c987fc14..730f038f 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -689,6 +689,7 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
             {
                 // Set the format header
                 $this->output->set_content_type($this->_supported_formats[$this->response->format], strtolower($this->config->item('charset')));
+                $output = $this->format->factory($data)->{'to_' . $this->response->format}();
 
                 // An array must be parsed as a string, so as not to cause an array to string error.
                 // Json is the most appropriate form for such a datatype

From c2e5849518d6786c18c21aea589c3ebc5b1354f5 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 19 Jul 2015 22:22:44 +0300
Subject: [PATCH 075/354] Various cosmetic changes :lipstick:

---
 application/libraries/REST_Controller.php | 63 +++++++++--------------
 1 file changed, 24 insertions(+), 39 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 730f038f..c6c87bfd 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1054,7 +1054,7 @@ protected function _check_limit($controller_method)
             return TRUE;
         }
 
-        // How many times can you get to this method in a defined timelimit (default: 1hr)?
+        // How many times can you get to this method in a defined time_limit (default: 1 hour)?
         $limit = $this->methods[$controller_method]['limit'];
 
         $uri_noext = $this->uri->uri_string();
@@ -1070,7 +1070,7 @@ protected function _check_limit($controller_method)
             ->get($this->config->item('rest_limits_table'))
             ->row();
 
-        $timelimit = (isset($this->methods[$controller_method]['time']) ? $this->methods[$controller_method]['time'] : 60 * 60);
+        $time_limit = (isset($this->methods[$controller_method]['time']) ? $this->methods[$controller_method]['time'] : 3600);
 
         // No calls have been made for this key
         if ($result === NULL)
@@ -1085,7 +1085,7 @@ protected function _check_limit($controller_method)
         }
 
         // Been a time limit (or by default an hour) since they called
-        elseif ($result->hour_started < (time() - $timelimit))
+        elseif ($result->hour_started < (time() - $time_limit))
         {
             // Reset the started period and count
             $this->rest->db
@@ -1558,11 +1558,10 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
         if (empty($username))
         {
             log_message('debug', 'LDAP Auth: failure, empty username');
-
             return FALSE;
         }
 
-        log_message('debug', 'LDAP Auth: Loading Config');
+        log_message('debug', 'LDAP Auth: Loading configuration');
 
         $this->config->load('ldap.php', TRUE);
 
@@ -1577,12 +1576,8 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
 
         log_message('debug', 'LDAP Auth: Connect to ' . (isset($ldaphost) ? $ldaphost : '[ldap not configured]'));
 
-        // Appears to be unused
-        // $ldapconfig['authrealm'] = $this->config->item('domain', 'ldap');
-
-        // connect to ldap server
+        // Connect to the ldap server
         $ldapconn = ldap_connect($ldap['host'], $ldap['port']);
-
         if ($ldapconn)
         {
             log_message('debug', 'Setting timeout to ' . $ldap['timeout'] . ' seconds');
@@ -1591,62 +1586,55 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
 
             log_message('debug', 'LDAP Auth: Binding to ' . $ldap['host'] . ' with dn ' . $ldap['rdn']);
 
-            // binding to ldap server
+            // Binding to the ldap server
             $ldapbind = ldap_bind($ldapconn, $ldap['rdn'], $ldap['pass']);
 
-            // verify binding
-            if ($ldapbind)
+            // Verify the binding
+            if ($ldapbind === FALSE)
             {
-                log_message('debug', 'LDAP Auth: bind successful');
-            }
-            else
-            {
-                log_message('error', 'LDAP Auth: bind unsuccessful');
-
+                log_message('error', 'LDAP Auth: bind was unsuccessful');
                 return FALSE;
             }
+
+            log_message('debug', 'LDAP Auth: bind successful');
         }
 
-        // search for user
-        if (($res_id = ldap_search($ldapconn, $ldap['basedn'], "uid=$username")) == FALSE)
+        // Search for user
+        if (($res_id = ldap_search($ldapconn, $ldap['basedn'], "uid=$username")) === FALSE)
         {
             log_message('error', 'LDAP Auth: User ' . $username . ' not found in search');
-
             return FALSE;
         }
 
         if (ldap_count_entries($ldapconn, $res_id) !== 1)
         {
-            log_message('error', 'LDAP Auth: failure, username ' . $username . 'found more than once');
-
+            log_message('error', 'LDAP Auth: Failure, username ' . $username . 'found more than once');
             return FALSE;
         }
 
-        if (($entry_id = ldap_first_entry($ldapconn, $res_id)) == FALSE)
+        if (($entry_id = ldap_first_entry($ldapconn, $res_id)) === FALSE)
         {
-            log_message('error', 'LDAP Auth: failure, entry of searchresult could not be fetched');
-
+            log_message('error', 'LDAP Auth: Failure, entry of search result could not be fetched');
             return FALSE;
         }
 
-        if (($user_dn = ldap_get_dn($ldapconn, $entry_id)) == FALSE)
+        if (($user_dn = ldap_get_dn($ldapconn, $entry_id)) === FALSE)
         {
-            log_message('error', 'LDAP Auth: failure, user-dn could not be fetched');
-
+            log_message('error', 'LDAP Auth: Failure, user-dn could not be fetched');
             return FALSE;
         }
 
         // User found, could not authenticate as user
-        if (($link_id = ldap_bind($ldapconn, $user_dn, $password)) == FALSE)
+        if (($link_id = ldap_bind($ldapconn, $user_dn, $password)) === FALSE)
         {
-            log_message('error', 'LDAP Auth: failure, username/password did not match: ' . $user_dn);
-
+            log_message('error', 'LDAP Auth: Failure, username/password did not match: ' . $user_dn);
             return FALSE;
         }
 
         log_message('debug', 'LDAP Auth: Success ' . $user_dn . ' authenticated successfully');
 
         $this->_user_ldap_dn = $user_dn;
+
         ldap_close($ldapconn);
 
         return TRUE;
@@ -1664,8 +1652,7 @@ protected function _perform_library_auth($username = '', $password = NULL)
     {
         if (empty($username))
         {
-            log_message('error', 'Library Auth: failure, empty username');
-
+            log_message('error', 'Library Auth: Failure, empty username');
             return FALSE;
         }
 
@@ -1674,15 +1661,13 @@ protected function _perform_library_auth($username = '', $password = NULL)
 
         if (empty($auth_library_class))
         {
-            log_message('debug', 'Library Auth: failure, empty auth_library_class');
-
+            log_message('debug', 'Library Auth: Failure, empty auth_library_class');
             return FALSE;
         }
 
         if (empty($auth_library_function))
         {
-            log_message('debug', 'Library Auth: failure, empty auth_library_function');
-
+            log_message('debug', 'Library Auth: Failure, empty auth_library_function');
             return FALSE;
         }
 

From fac9f2c362c8ba6e3b095cc5d8b26fe8e81d4430 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 19 Jul 2015 22:24:30 +0300
Subject: [PATCH 076/354] Comparison of value and type (===)

---
 application/libraries/REST_Controller.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index c6c87bfd..151a4ff4 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -570,10 +570,10 @@ public function _remap($object_called, $arguments)
         $controller_method = $object_called . '_' . $this->request->method;
 
         // Do we want to log this method (if allowed by config)?
-        $log_method = !(isset($this->methods[$controller_method]['log']) && $this->methods[$controller_method]['log'] == FALSE);
+        $log_method = !(isset($this->methods[$controller_method]['log']) && $this->methods[$controller_method]['log'] === FALSE);
 
         // Use keys for this method?
-        $use_key = !(isset($this->methods[$controller_method]['key']) && $this->methods[$controller_method]['key'] == FALSE);
+        $use_key = !(isset($this->methods[$controller_method]['key']) && $this->methods[$controller_method]['key'] === FALSE);
 
         // They provided a key, but it wasn't valid, so get them out of here.
         if ($this->config->item('rest_enable_keys') && $use_key && $this->_allow === FALSE)
@@ -953,7 +953,7 @@ protected function _detect_api_key()
 
                     foreach ($list_ip_addresses as $ip_address)
                     {
-                        if ($this->input->ip_address() == trim($ip_address))
+                        if ($this->input->ip_address() === trim($ip_address))
                         {
                             // there is a match, set the the value to TRUE and break out of the loop
                             $found_address = TRUE;

From b22c885cb7659134fea23f0067b8744885dd7518 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 19 Jul 2015 22:25:25 +0300
Subject: [PATCH 077/354] Fixed whitespace

---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 151a4ff4..48f6d687 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1060,7 +1060,7 @@ protected function _check_limit($controller_method)
         $uri_noext = $this->uri->uri_string();
         if (strpos(strrev($this->uri->uri_string()), strrev($this->response->format)) === 0)
         {
-            $uri_noext = substr($this->uri->uri_string(),0, -strlen($this->response->format)-1);
+            $uri_noext = substr($this->uri->uri_string(),0, -strlen($this->response->format) - 1);
         }
 
         // Get data about a keys' usage and limit to one row

From 2b70059849b2b0e627aed63f93ef0c9f32fb513b Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 19 Jul 2015 22:28:39 +0300
Subject: [PATCH 078/354] Updated license year

---
 LICENSE.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE.txt b/LICENSE.txt
index 365ffb87..f9121e51 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2012 - 2014 Phil Sturgeon, Chris Kacerguis
+Copyright (c) 2012 - 2015 Phil Sturgeon, Chris Kacerguis
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

From bb2cd5e2c7fed6e2dad4f115cade615999e6330f Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 20 Jul 2015 08:51:00 +0300
Subject: [PATCH 079/354] Removed outdated comment

---
 application/libraries/REST_Controller.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 48f6d687..aa4f5397 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -806,7 +806,6 @@ protected function _detect_output_format()
         // Check if a file extension is used
         elseif ($this->_get_args && is_array(end($this->_get_args)) === FALSE && preg_match($pattern, end($this->_get_args), $matches))
         {
-            //elseif ($this->_get_args and is_array(end($this->_get_args)) === FALSE and preg_match($pattern, end(array_keys($this->_get_args)), $matches)) {
             // The key of the last argument
             $arg_keys = array_keys($this->_get_args);
             $last_key = end($arg_keys);

From 30af149639a6950dbd2201419621ef431c67861e Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 20 Jul 2015 09:32:24 +0300
Subject: [PATCH 080/354] Refactored getting the output format

---
 application/libraries/REST_Controller.php | 30 +++++++++++------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index aa4f5397..eaec4b8e 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -826,39 +826,37 @@ protected function _detect_output_format()
             return $format;
         }
 
+        // Get the HTTP_ACCEPT server variable
+        $http_accept = $this->input->server('HTTP_ACCEPT');
+
         // Otherwise, check the HTTP_ACCEPT (if it exists and we are allowed)
-        if ($this->config->item('rest_ignore_http_accept') === FALSE && $this->input->server('HTTP_ACCEPT'))
+        if ($this->config->item('rest_ignore_http_accept') === FALSE && $http_accept !== NULL)
         {
             // Check all formats against the HTTP_ACCEPT header
             foreach (array_keys($this->_supported_formats) as $format)
             {
                 // Has this format been requested?
-                if (strpos($this->input->server('HTTP_ACCEPT'), $format) !== FALSE)
+                if (strpos($http_accept, $format) !== FALSE)
                 {
-                    // If not HTML or XML assume its right and send it on its way
                     if ($format !== 'html' && $format !== 'xml')
                     {
+                        // If not HTML or XML assume it's correct
                         return $format;
                     }
-
-                    // HTML or XML have shown up as a match
-                    else
+                    elseif ($format === 'html' && strpos($http_accept, 'xml') === FALSE)
                     {
+                        // HTML or XML have shown up as a match
                         // If it is truly HTML, it wont want any XML
-                        if ($format === 'html' && strpos($this->input->server('HTTP_ACCEPT'), 'xml') === FALSE)
-                        {
-                            return $format;
-                        }
-
+                        return $format;
+                    }
+                    else if ($format === 'xml' && strpos($http_accept, 'html') === FALSE)
+                    {
                         // If it is truly XML, it wont want any HTML
-                        elseif ($format === 'xml' && strpos($this->input->server('HTTP_ACCEPT'), 'html') === FALSE)
-                        {
-                            return $format;
-                        }
+                        return $format;
                     }
                 }
             }
-        } // End HTTP_ACCEPT checking
+        }
 
         // Well, none of that has worked! Let's see if the controller has a default
         if (empty($this->rest_format) === FALSE)

From 9af236108efe166196353a76ae11982d312010fe Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 20 Jul 2015 09:39:17 +0300
Subject: [PATCH 081/354] Removed code that would strip format at the end of
 query params

This is incorrect and thus I have decided to strip out the offending
code. It fixes #442.
---
 application/libraries/REST_Controller.php | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index eaec4b8e..ff4999b4 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -798,25 +798,12 @@ protected function _detect_output_format()
 
         // Check if a file extension is used when no get arguments provided
         $matches = [];
-        if (!$this->_get_args && preg_match($pattern, $this->uri->uri_string(), $matches))
+        // Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2
+        if (preg_match($pattern, $this->uri->uri_string(), $matches))
         {
             return $matches[1];
         }
 
-        // Check if a file extension is used
-        elseif ($this->_get_args && is_array(end($this->_get_args)) === FALSE && preg_match($pattern, end($this->_get_args), $matches))
-        {
-            // The key of the last argument
-            $arg_keys = array_keys($this->_get_args);
-            $last_key = end($arg_keys);
-
-            // Remove the extension from arguments too
-            $this->_get_args[$last_key] = preg_replace($pattern, '', $this->_get_args[$last_key]);
-            $this->_args[$last_key] = preg_replace($pattern, '', $this->_args[$last_key]);
-
-            return $matches[1];
-        }
-
         // Get the format
         $format = isset($this->_get_args['format']) ? strtolower($this->_get_args['format']) : NULL;
 

From 0ee4f24cefdd84e0b93c6e11b25f4513a75e8aa8 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 20 Jul 2015 09:44:46 +0300
Subject: [PATCH 082/354] Various cosmetic tweaks :lipstick:

---
 application/libraries/REST_Controller.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index ff4999b4..6b30e167 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -794,17 +794,17 @@ protected function _detect_input_format()
      */
     protected function _detect_output_format()
     {
+        // Concatenate formats to a regex pattern e.g. \.(csv|json|xml)
         $pattern = '/\.(' . implode('|', array_keys($this->_supported_formats)) . ')$/';
 
-        // Check if a file extension is used when no get arguments provided
-        $matches = [];
         // Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2
+        $matches = [];
         if (preg_match($pattern, $this->uri->uri_string(), $matches))
         {
             return $matches[1];
         }
 
-        // Get the format
+        // Get the format via the GET parameter labelled 'format'
         $format = isset($this->_get_args['format']) ? strtolower($this->_get_args['format']) : NULL;
 
         // A format has been passed as an argument in the URL and it is supported
@@ -816,7 +816,7 @@ protected function _detect_output_format()
         // Get the HTTP_ACCEPT server variable
         $http_accept = $this->input->server('HTTP_ACCEPT');
 
-        // Otherwise, check the HTTP_ACCEPT (if it exists and we are allowed)
+        // Otherwise, check the HTTP_ACCEPT server variable
         if ($this->config->item('rest_ignore_http_accept') === FALSE && $http_accept !== NULL)
         {
             // Check all formats against the HTTP_ACCEPT header
@@ -845,13 +845,13 @@ protected function _detect_output_format()
             }
         }
 
-        // Well, none of that has worked! Let's see if the controller has a default
+        // Check if the controller has a default format
         if (empty($this->rest_format) === FALSE)
         {
             return $this->rest_format;
         }
 
-        // Just use the default format
+        // Obtain the default format from the configuration
         return $this->config->item('rest_default_format');
     }
 

From e9ea12900568f3f63efe2ac7007103ae97ae9a9f Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 20 Jul 2015 09:53:17 +0300
Subject: [PATCH 083/354] Updated comments for _detect_lang()

---
 application/libraries/REST_Controller.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 6b30e167..99e803b4 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -962,19 +962,20 @@ protected function _detect_api_key()
     }
 
     /**
-     * What language do they want it in?
+     * Preferred return language
      *
      * @access protected
-     * @return NULL|string The language code.
+     * @return string|NULL The language code
      */
     protected function _detect_lang()
     {
-        if (!$lang = $this->input->server('HTTP_ACCEPT_LANGUAGE'))
+        $lang = $this->input->server('HTTP_ACCEPT_LANGUAGE')
+        if ($lang === NULL)
         {
             return NULL;
         }
 
-        // They might have sent a few, make it an array
+        // It appears more than one language has been sent using a comma delimiter
         if (strpos($lang, ',') !== FALSE)
         {
             $langs = explode(',', $lang);
@@ -982,7 +983,7 @@ protected function _detect_lang()
             $return_langs = [];
             foreach ($langs as $lang)
             {
-                // Remove weight and strip space
+                // Remove weight and trim leading and trailing whitespace
                 list($lang) = explode(';', $lang);
                 $return_langs[] = trim($lang);
             }
@@ -990,7 +991,7 @@ protected function _detect_lang()
             return $return_langs;
         }
 
-        // Nope, just return the string
+        // Otherwise simply return as a string
         return $lang;
     }
 

From 877447c1efefc3a2717f5417a941ea1bb55adb7a Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Tue, 21 Jul 2015 08:05:05 +0300
Subject: [PATCH 084/354] Fixed missing semi-colon

Fixes #512
---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 1cb9524a..1e04a1c6 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -969,7 +969,7 @@ protected function _detect_api_key()
      */
     protected function _detect_lang()
     {
-        $lang = $this->input->server('HTTP_ACCEPT_LANGUAGE')
+        $lang = $this->input->server('HTTP_ACCEPT_LANGUAGE');
         if ($lang === NULL)
         {
             return NULL;

From 391737275947239c52d95caa51fa5a5b34cc73e8 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Tue, 21 Jul 2015 08:42:10 +0300
Subject: [PATCH 085/354] Rebased code created by @lagaisse

Closes #510
---
 application/config/rest.php               | 17 +++++++-
 application/libraries/REST_Controller.php | 48 +++++++++++++++++------
 2 files changed, 52 insertions(+), 13 deletions(-)

diff --git a/application/config/rest.php b/application/config/rest.php
index 72eddd52..d75c8696 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -270,7 +270,7 @@
 |       `id` INT(11) NOT NULL AUTO_INCREMENT,
 |       `key` VARCHAR(40) NOT NULL,
 |       `level` INT(2) NOT NULL,
-|       `ignore_limits` TINY(1) NOT NULL DEFAULT '0',
+|       `ignore_limits` TINYINT(1) NOT NULL DEFAULT '0',
 |       `is_private_key` TINYINT(1)  NOT NULL DEFAULT '0',
 |       `ip_addresses` TEXT NULL DEFAULT NULL,
 |       `date_created` INT(11) NOT NULL,
@@ -291,6 +291,21 @@
 */
 $config['rest_key_column'] = 'key';
 
+/*
+|--------------------------------------------------------------------------
+| REST API Limits method
+|--------------------------------------------------------------------------
+|
+| Specify the method used to limit the API calls
+|
+| Available methods are :
+| $config['rest_limits_method'] = 'API_KEY'; // Put a limit per api key
+| $config['rest_limits_method'] = 'METHOD_NAME'; // Put a limit on method calls
+| $config['rest_limits_method'] = 'ROUTED_URL';  // Put a limit on the routed URL
+|
+*/
+$config['rest_limits_method'] = 'ROUTED_URL';
+
 /*
 |--------------------------------------------------------------------------
 | REST Key Length
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 1e04a1c6..0f9e672c 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1033,36 +1033,60 @@ protected function _log_request($authorized = FALSE)
     protected function _check_limit($controller_method)
     {
         // They are special, or it might not even have a limit
-        if (empty($this->rest->ignore_limits) === FALSE || isset($this->methods[$controller_method]['limit']) === FALSE)
+        if (empty($this->rest->ignore_limits) === FALSE)
         {
             // Everything is fine
             return TRUE;
         }
 
-        // How many times can you get to this method in a defined time_limit (default: 1 hour)?
-        $limit = $this->methods[$controller_method]['limit'];
+        switch ($this->config->item('rest_limits_method'))
+        {
+          case 'API_KEY':
+            $limited_uri = 'api-key:' . (isset($this->rest->key) ? $this->rest->key : '');
+            $limited_method_name = isset($this->rest->key) ? $this->rest->key : '';
+            break;
+
+          case 'METHOD_NAME':
+            $limited_uri = 'method-name:' . $controller_method;
+            $limited_method_name =  $controller_method;
+            break;
+
+          case 'ROUTED_URL':
+          default:
+            $limited_uri = $this->uri->ruri_string();
+            if (strpos(strrev($limited_uri), strrev($this->response->format)) === 0)
+            {
+                $limited_uri = substr($limited_uri,0, -strlen($this->response->format) - 1);
+            }
+            $limited_uri = 'uri:' . $limited_uri . ':' . $this->request->method; // It's good to differentiate GET from PUT
+            $limited_method_name = $controller_method;
+            break;
+        }
 
-        $uri_noext = $this->uri->uri_string();
-        if (strpos(strrev($this->uri->uri_string()), strrev($this->response->format)) === 0)
+        if (isset($this->methods[$limited_method_name]['limit']) === FALSE )
         {
-            $uri_noext = substr($this->uri->uri_string(),0, -strlen($this->response->format) - 1);
+            // Everything is fine
+            return TRUE;
         }
 
+        // How many times can you get to this method in a defined time_limit (default: 1 hour)?
+        $limit = $this->methods[$limited_method_name]['limit'];
+
+        $timelimit = (isset($this->methods[$limited_method_name]['time']) ? $this->methods[$limited_method_name]['time'] : 3600); // 3600 = 60 * 60
+
         // Get data about a keys' usage and limit to one row
         $result = $this->rest->db
-            ->where('uri', $uri_noext)
+            ->where('uri', $limited_uri)
             ->where('api_key', $this->rest->key)
             ->get($this->config->item('rest_limits_table'))
             ->row();
 
-        $time_limit = (isset($this->methods[$controller_method]['time']) ? $this->methods[$controller_method]['time'] : 3600);
-
         // No calls have been made for this key
         if ($result === NULL)
         {
             // Create a new row for the following key
             $this->rest->db->insert($this->config->item('rest_limits_table'), [
-                'uri' => $this->uri->uri_string(),
+                'uri' => $limited_uri,
                 'api_key' => isset($this->rest->key) ? $this->rest->key : '',
                 'count' => 1,
                 'hour_started' => time()
@@ -1074,7 +1098,7 @@ protected function _check_limit($controller_method)
         {
             // Reset the started period and count
             $this->rest->db
-                ->where('uri', $uri_noext)
+                ->where('uri', $limited_uri)
                 ->where('api_key', isset($this->rest->key) ? $this->rest->key : '')
                 ->set('hour_started', time())
                 ->set('count', 1)
@@ -1092,7 +1116,7 @@ protected function _check_limit($controller_method)
 
             // Increase the count by one
             $this->rest->db
-                ->where('uri', $uri_noext)
+                ->where('uri', $limited_uri)
                 ->where('api_key', $this->rest->key)
                 ->set('count', 'count + 1', FALSE)
                 ->update($this->config->item('rest_limits_table'));

From 8dfdf59514409d11976d5667ff2bcbd0c544bb68 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Tue, 21 Jul 2015 20:06:34 +0300
Subject: [PATCH 086/354] Fixed undefined constants

Mentioned by @lagaisse #515
---
 application/controllers/api/Example.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 0d837d0d..8e6b994a 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -57,7 +57,7 @@ public function user_get()
             $this->set_response([
                 'status' => FALSE,
                 'error' => 'User could not be found'
-            ], REST_Controller::NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+            ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
         }
     }
 
@@ -103,7 +103,7 @@ public function users_get()
             $this->set_response([
                 'status' => FALSE,
                 'error' => 'No users were found'
-                ], REST_Controller::NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+                ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
         }
     }
 }

From c24b3caf543c40ea44d58ed3ae1ab03936c630da Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Tue, 21 Jul 2015 20:44:37 +0300
Subject: [PATCH 087/354] Fixed issue if a developer doesn't pass an array

---
 application/libraries/Format.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 8d073067..1c34ffeb 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -357,6 +357,13 @@ public function to_csv($data = NULL, $delimiter = ',', $enclosure = '"')
 
         foreach ($data as $record)
         {
+            // If the record is not an array, then break. This is because the 2nd param of
+            // fputcsv() should be an array
+            if (is_array($record) === FALSE)
+            {
+                break;
+            }
+
             // Returns the length of the string written or FALSE
             fputcsv($handle, $record, $delimiter, $enclosure);
         }

From 5085669c5397ffda7df2b97aa7907efb247ad6d0 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Tue, 21 Jul 2015 23:25:08 +0300
Subject: [PATCH 088/354] Changed || to OR as part of the CI style guide

#516
---
 application/libraries/Format.php          |  6 +++---
 application/libraries/REST_Controller.php | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 1c34ffeb..db1f6691 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -149,7 +149,7 @@ public function to_array($data = NULL)
         $array = [];
         foreach ((array) $data as $key => $value)
         {
-            if (is_object($value) === TRUE || is_array($value) === TRUE)
+            if (is_object($value) === TRUE OR is_array($value) === TRUE)
             {
                 $array[$key] = $this->to_array($value);
             }
@@ -214,7 +214,7 @@ public function to_xml($data = NULL, $structure = NULL, $basenode = 'xml')
             // replace anything not alpha numeric
             $key = preg_replace('/[^a-z_\-0-9]/i', '', $key);
 
-            if ($key === '_attributes' && (is_array($value) || is_object($value)))
+            if ($key === '_attributes' && (is_array($value) OR is_object($value)))
             {
                 $attributes = $value;
                 if (is_object($attributes))
@@ -228,7 +228,7 @@ public function to_xml($data = NULL, $structure = NULL, $basenode = 'xml')
                 }
             }
             // if there is another array found recursively call this function
-            elseif (is_array($value) || is_object($value))
+            elseif (is_array($value) OR is_object($value))
             {
                 $node = $structure->addChild($key);
 
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 0f9e672c..c055614c 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -473,7 +473,7 @@ public function __construct($config = 'rest')
         $this->early_checks();
 
         // Load DB if its enabled
-        if ($this->config->item('rest_database_group') && ($this->config->item('rest_enable_keys') || $this->config->item('rest_enable_logging')))
+        if ($this->config->item('rest_database_group') && ($this->config->item('rest_enable_keys') OR $this->config->item('rest_enable_logging')))
         {
             $this->rest->db = $this->load->database($this->config->item('rest_database_group'), TRUE);
         }
@@ -627,7 +627,7 @@ public function _remap($object_called, $arguments)
 
             // They don't have good enough perms
             $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key does not have enough permissions.'];
-            $authorized || $this->response($response, self::HTTP_UNAUTHORIZED);
+            $authorized OR $this->response($response, self::HTTP_UNAUTHORIZED);
         }
 
         // No key stuff, but record that stuff is happening
@@ -701,7 +701,7 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
             else
             {
                 // If an array or object, then parse as a json, so as to be a 'string'
-                if (is_array($data) || is_object($data))
+                if (is_array($data) OR is_object($data))
                 {
                     $data = $this->format->factory($data)->{'to_json'}();
                 }
@@ -714,7 +714,7 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
         // If not greater than zero, then set the HTTP status code as 200 by default
         // Though perhaps 500 should be set instead, for the developer not passing a
         // correct HTTP status code
-        $http_code > 0 || $http_code = self::HTTP_OK;
+        $http_code > 0 OR $http_code = self::HTTP_OK;
 
         $this->output->set_status_header($http_code);
 
@@ -1914,11 +1914,11 @@ protected function _prepare_digest_auth()
         // We need to retrieve authentication data from the $digest_string variable
         $matches = [];
         preg_match_all('@(username|nonce|uri|nc|cnonce|qop|response)=[\'"]?([^\'",]+)@', $digest_string, $matches);
-        $digest = (empty($matches[1]) || empty($matches[2])) ? [] : array_combine($matches[1], $matches[2]);
+        $digest = (empty($matches[1]) OR empty($matches[2])) ? [] : array_combine($matches[1], $matches[2]);
 
         // For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config
         $A1 = $this->_check_login($digest['username'], TRUE);
-        if (array_key_exists('username', $digest) === FALSE || $A1 === FALSE)
+        if (array_key_exists('username', $digest) === FALSE OR $A1 === FALSE)
         {
             $this->_force_login($uniqueId);
         }

From 90262afe1017287138b25cdb32fc041afd1b739e Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Tue, 21 Jul 2015 23:37:11 +0300
Subject: [PATCH 089/354] Renamed variables to adhere to the CI style guide

---
 application/libraries/Format.php          |  4 +--
 application/libraries/REST_Controller.php | 42 +++++++++++------------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index db1f6691..eac62e45 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -222,9 +222,9 @@ public function to_xml($data = NULL, $structure = NULL, $basenode = 'xml')
                     $attributes = get_object_vars($attributes);
                 }
 
-                foreach ($attributes as $attributeName => $attributeValue)
+                foreach ($attributes as $attribute_name => $attribute_value)
                 {
-                    $structure->addAttribute($attributeName, $attributeValue);
+                    $structure->addAttribute($attribute_name, $attribute_value);
                 }
             }
             // if there is another array found recursively call this function
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index c055614c..7e92c633 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -761,9 +761,9 @@ public function set_response($data = NULL, $http_code = NULL)
     protected function _detect_input_format()
     {
         // Get the CONTENT-TYPE value from the SERVER variable
-        $contentType = $this->input->server('CONTENT_TYPE');
+        $content_type = $this->input->server('CONTENT_TYPE');
 
-        if (empty($contentType) === FALSE)
+        if (empty($content_type) === FALSE)
         {
             // Check all formats against the HTTP_ACCEPT header
             foreach ($this->_supported_formats as $key => $value)
@@ -773,10 +773,10 @@ protected function _detect_input_format()
 
                 // If a semi-colon exists in the string, then explode by ; and get the value of where
                 // the current array pointer resides. This will generally be the first element of the array
-                $contentType = (strpos($contentType, ';') !== FALSE ? current(explode(';', $contentType)) : $contentType);
+                $content_type = (strpos($content_type, ';') !== FALSE ? current(explode(';', $content_type)) : $content_type);
 
                 // If both the mime types match, then return the format
-                if ($contentType === $value)
+                if ($content_type === $value)
                 {
                     return $key;
                 }
@@ -1005,7 +1005,7 @@ protected function _detect_lang()
     protected function _log_request($authorized = FALSE)
     {
         // Insert the request into the log table
-        $isInserted = $this->rest->db
+        $is_inserted = $this->rest->db
             ->insert(
                 $this->config->item('rest_logs_table'), [
                 'uri' => $this->uri->uri_string(),
@@ -1020,7 +1020,7 @@ protected function _log_request($authorized = FALSE)
         // Get the last insert id to update at a later stage of the request
         $this->_insert_id = $this->rest->db->insert_id();
 
-        return $isInserted;
+        return $is_inserted;
     }
 
     /**
@@ -1902,13 +1902,13 @@ protected function _prepare_digest_auth()
             $digest_string = $this->input->server('HTTP_AUTHORIZATION');
         }
 
-        $uniqueId = uniqid();
+        $unique_id = uniqid();
 
         // The $_SESSION['error_prompted'] variable is used to ask the password
         // again if none given or if the user enters wrong auth information
         if (empty($digest_string))
         {
-            $this->_force_login($uniqueId);
+            $this->_force_login($unique_id);
         }
 
         // We need to retrieve authentication data from the $digest_string variable
@@ -1917,14 +1917,14 @@ protected function _prepare_digest_auth()
         $digest = (empty($matches[1]) OR empty($matches[2])) ? [] : array_combine($matches[1], $matches[2]);
 
         // For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config
-        $A1 = $this->_check_login($digest['username'], TRUE);
-        if (array_key_exists('username', $digest) === FALSE OR $A1 === FALSE)
+        $username = $this->_check_login($digest['username'], TRUE);
+        if (array_key_exists('username', $digest) === FALSE OR $username === FALSE)
         {
-            $this->_force_login($uniqueId);
+            $this->_force_login($unique_id);
         }
 
-        $A2 = md5(strtoupper($this->request->method) . ':' . $digest['uri']);
-        $valid_response = md5($A1 . ':' . $digest['nonce'] . ':' . $digest['nc'] . ':' . $digest['cnonce'] . ':' . $digest['qop'] . ':' . $A2);
+        $md5 = md5(strtoupper($this->request->method) . ':' . $digest['uri']);
+        $valid_response = md5($username . ':' . $digest['nonce'] . ':' . $digest['nc'] . ':' . $digest['cnonce'] . ':' . $digest['qop'] . ':' . $md5);
 
         // Check if the string don't compare (case-insensitive)
         if (strcasecmp($digest['response'], $valid_response) !== 0)
@@ -1972,7 +1972,7 @@ protected function _check_whitelist_auth()
 
         array_push($whitelist, '127.0.0.1', '0.0.0.0');
 
-        foreach ($whitelist AS &$ip)
+        foreach ($whitelist as &$ip)
         {
             $ip = trim($ip);
         }
@@ -1993,20 +1993,20 @@ protected function _check_whitelist_auth()
      */
     protected function _force_login($nonce = '')
     {
-        $restAuth = $this->config->item('rest_auth');
-        $restRealm = $this->config->item('rest_realm');
-        if (strtolower($restAuth) === 'basic')
+        $rest_auth = $this->config->item('rest_auth');
+        $rest_realm = $this->config->item('rest_realm');
+        if (strtolower($rest_auth) === 'basic')
         {
             // See http://tools.ietf.org/html/rfc2617#page-5
-            header('WWW-Authenticate: Basic realm="' . $restRealm . '"');
+            header('WWW-Authenticate: Basic realm="' . $rest_realm . '"');
         }
-        elseif (strtolower($restAuth) === 'digest')
+        elseif (strtolower($rest_auth) === 'digest')
         {
             // See http://tools.ietf.org/html/rfc2617#page-18
             header(
-                'WWW-Authenticate: Digest realm="' . $restRealm
+                'WWW-Authenticate: Digest realm="' . $rest_realm
                 . '", qop="auth", nonce="' . $nonce
-                . '", opaque="' . md5($restRealm) . '"');
+                . '", opaque="' . md5($rest_realm) . '"');
         }
 
         // Display an error response

From bba6dffe29ed5f1443769e6534d23e6a738eb7ec Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Tue, 21 Jul 2015 23:40:10 +0300
Subject: [PATCH 090/354] Reverted OR => ||

---
 application/libraries/Format.php          |  6 +++---
 application/libraries/REST_Controller.php | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index eac62e45..e008c170 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -149,7 +149,7 @@ public function to_array($data = NULL)
         $array = [];
         foreach ((array) $data as $key => $value)
         {
-            if (is_object($value) === TRUE OR is_array($value) === TRUE)
+            if (is_object($value) === TRUE || is_array($value) === TRUE)
             {
                 $array[$key] = $this->to_array($value);
             }
@@ -214,7 +214,7 @@ public function to_xml($data = NULL, $structure = NULL, $basenode = 'xml')
             // replace anything not alpha numeric
             $key = preg_replace('/[^a-z_\-0-9]/i', '', $key);
 
-            if ($key === '_attributes' && (is_array($value) OR is_object($value)))
+            if ($key === '_attributes' && (is_array($value) || is_object($value)))
             {
                 $attributes = $value;
                 if (is_object($attributes))
@@ -228,7 +228,7 @@ public function to_xml($data = NULL, $structure = NULL, $basenode = 'xml')
                 }
             }
             // if there is another array found recursively call this function
-            elseif (is_array($value) OR is_object($value))
+            elseif (is_array($value) || is_object($value))
             {
                 $node = $structure->addChild($key);
 
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 7e92c633..e6a0cced 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -473,7 +473,7 @@ public function __construct($config = 'rest')
         $this->early_checks();
 
         // Load DB if its enabled
-        if ($this->config->item('rest_database_group') && ($this->config->item('rest_enable_keys') OR $this->config->item('rest_enable_logging')))
+        if ($this->config->item('rest_database_group') && ($this->config->item('rest_enable_keys') || $this->config->item('rest_enable_logging')))
         {
             $this->rest->db = $this->load->database($this->config->item('rest_database_group'), TRUE);
         }
@@ -627,7 +627,7 @@ public function _remap($object_called, $arguments)
 
             // They don't have good enough perms
             $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key does not have enough permissions.'];
-            $authorized OR $this->response($response, self::HTTP_UNAUTHORIZED);
+            $authorized || $this->response($response, self::HTTP_UNAUTHORIZED);
         }
 
         // No key stuff, but record that stuff is happening
@@ -701,7 +701,7 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
             else
             {
                 // If an array or object, then parse as a json, so as to be a 'string'
-                if (is_array($data) OR is_object($data))
+                if (is_array($data) || is_object($data))
                 {
                     $data = $this->format->factory($data)->{'to_json'}();
                 }
@@ -714,7 +714,7 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
         // If not greater than zero, then set the HTTP status code as 200 by default
         // Though perhaps 500 should be set instead, for the developer not passing a
         // correct HTTP status code
-        $http_code > 0 OR $http_code = self::HTTP_OK;
+        $http_code > 0 || $http_code = self::HTTP_OK;
 
         $this->output->set_status_header($http_code);
 
@@ -1602,7 +1602,7 @@ public function query($key = NULL, $xss_clean = NULL)
      */
     protected function _xss_clean($value, $xss_clean)
     {
-        is_bool($xss_clean) OR $xss_clean = $this->_enable_xss;
+        is_bool($xss_clean) || $xss_clean = $this->_enable_xss;
 
         return $xss_clean === TRUE ? $this->security->xss_clean($value) : $value;
     }
@@ -1914,11 +1914,11 @@ protected function _prepare_digest_auth()
         // We need to retrieve authentication data from the $digest_string variable
         $matches = [];
         preg_match_all('@(username|nonce|uri|nc|cnonce|qop|response)=[\'"]?([^\'",]+)@', $digest_string, $matches);
-        $digest = (empty($matches[1]) OR empty($matches[2])) ? [] : array_combine($matches[1], $matches[2]);
+        $digest = (empty($matches[1]) || empty($matches[2])) ? [] : array_combine($matches[1], $matches[2]);
 
         // For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config
         $username = $this->_check_login($digest['username'], TRUE);
-        if (array_key_exists('username', $digest) === FALSE OR $username === FALSE)
+        if (array_key_exists('username', $digest) === FALSE || $username === FALSE)
         {
             $this->_force_login($unique_id);
         }

From 170c41bb53332b542080e9b5c073ea8800688969 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Tue, 21 Jul 2015 23:50:05 +0300
Subject: [PATCH 091/354] Unified response lines

---
 application/controllers/api/Example.php   |  4 +--
 application/libraries/REST_Controller.php | 36 ++++++++++++++++-------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 8e6b994a..2fafbc6c 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -101,8 +101,8 @@ public function users_get()
         else
         {
             $this->set_response([
-                'status' => FALSE,
-                'error' => 'No users were found'
+                    'status' => FALSE,
+                    'error' => 'No users were found'
                 ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
         }
     }
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index e6a0cced..885c4837 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -561,7 +561,10 @@ public function _remap($object_called, $arguments)
         // Should we answer if not over SSL?
         if ($this->config->item('force_https') && $this->request->ssl === FALSE)
         {
-            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Unsupported protocol'], self::HTTP_FORBIDDEN);
+            $this->response([
+                    $this->config->item('rest_status_field_name') => FALSE,
+                    $this->config->item('rest_message_field_name') => 'Unsupported protocol'
+                ], self::HTTP_FORBIDDEN);
         }
 
         // Remove the supported format from the function name e.g. index.json => index
@@ -583,7 +586,10 @@ public function _remap($object_called, $arguments)
                 $this->_log_request();
             }
 
-            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Invalid API Key ' . $this->rest->key], self::HTTP_FORBIDDEN);
+            $this->response([
+                    $this->config->item('rest_status_field_name') => FALSE,
+                    $this->config->item('rest_message_field_name') => 'Invalid API Key ' . $this->rest->key
+                ], self::HTTP_FORBIDDEN);
         }
 
         // Check to see if this key has access to the requested controller.
@@ -594,13 +600,19 @@ public function _remap($object_called, $arguments)
                 $this->_log_request();
             }
 
-            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key does not have access to the requested controller.'], self::HTTP_UNAUTHORIZED);
+            $this->response([
+                    $this->config->item('rest_status_field_name') => FALSE,
+                    $this->config->item('rest_message_field_name') => 'This API key does not have access to the requested controller.'
+                ], self::HTTP_UNAUTHORIZED);
         }
 
         // Sure it exists, but can they do anything with it?
         if (method_exists($this, $controller_method) === FALSE)
         {
-            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'Unknown method.'], self::HTTP_NOT_FOUND);
+            $this->response([
+                    $this->config->item('rest_status_field_name') => FALSE,
+                    $this->config->item('rest_message_field_name') => 'Unknown method.'
+                ], self::HTTP_NOT_FOUND);
         }
 
         // Doing key related stuff? Can only do it if they have a key right?
@@ -645,10 +657,10 @@ public function _remap($object_called, $arguments)
         {
             // If the method doesn't exist, then the error will be caught and an error response shown
             $this->response([
-                    $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => [
-                        'classname' => get_class($ex),
-                        'message' => $ex->getMessage()
+                        $this->config->item('rest_status_field_name') => FALSE,
+                        $this->config->item('rest_message_field_name') => [
+                            'classname' => get_class($ex),
+                            'message' => $ex->getMessage()
                     ]
                 ], self::HTTP_INTERNAL_SERVER_ERROR);
         }
@@ -1955,8 +1967,7 @@ protected function _check_blacklist_auth()
             $this->response([
                     'status' => FALSE,
                     'error' => 'IP Denied'
-                ],
-                self::HTTP_UNAUTHORIZED);
+                ], self::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -1979,7 +1990,10 @@ protected function _check_whitelist_auth()
 
         if (in_array($this->input->ip_address(), $whitelist) === FALSE)
         {
-            $this->response([$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'IP not authorized'], self::HTTP_UNAUTHORIZED);
+            $this->response([
+                    $this->config->item('rest_status_field_name') => FALSE,
+                    $this->config->item('rest_message_field_name') => 'IP not authorized'
+                ], self::HTTP_UNAUTHORIZED);
         }
     }
 

From 8122c829f3371a9d62a9314c7b3837b6eea77a60 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Tue, 21 Jul 2015 23:58:14 +0300
Subject: [PATCH 092/354] Added comment and fixed indentation

---
 application/libraries/REST_Controller.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 885c4837..c2b794e1 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1985,6 +1985,8 @@ protected function _check_whitelist_auth()
 
         foreach ($whitelist as &$ip)
         {
+            // As $ip is a reference, trim leading and trailing whitespace, then store the new value
+            // using the reference
             $ip = trim($ip);
         }
 
@@ -2041,8 +2043,7 @@ protected function _log_access_time()
     {
         $payload['rtime'] = $this->_end_rtime - $this->_start_rtime;
 
-        return $this->rest->db
-            ->update(
+        return $this->rest->db->update(
                 $this->config->item('rest_logs_table'), $payload, [
                 'id' => $this->_insert_id
             ]);

From fd8bf1cbc4fb23a8a6fa5ddd74f6fb991eadbcd1 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Wed, 22 Jul 2015 00:01:07 +0300
Subject: [PATCH 093/354] Changed calling input->server() function twice

---
 application/libraries/REST_Controller.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index c2b794e1..51e27390 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1904,12 +1904,8 @@ protected function _prepare_digest_auth()
 
         // We need to test which server authentication variable to use,
         // because the PHP ISAPI module in IIS acts different from CGI
-        $digest_string = '';
-        if ($this->input->server('PHP_AUTH_DIGEST'))
-        {
-            $digest_string = $this->input->server('PHP_AUTH_DIGEST');
-        }
-        elseif ($this->input->server('HTTP_AUTHORIZATION'))
+        $digest_string = $this->input->server('PHP_AUTH_DIGEST');
+        if ($digest_string === NULL)
         {
             $digest_string = $this->input->server('HTTP_AUTHORIZATION');
         }

From 0f3502563bc1b3f177c5c7b1aced3ab680a8337d Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Wed, 22 Jul 2015 01:02:59 +0300
Subject: [PATCH 094/354] Fixed incorrect comment

---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 51e27390..98b3c9ce 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -466,7 +466,7 @@ public function __construct($config = 'rest')
         // Which format should the data be returned in?
         $this->response->format = $this->_detect_output_format();
 
-        // Which format should the data be returned in?
+        // Which language should the data be returned in?
         $this->response->lang = $this->_detect_lang();
 
         // Extend this function to apply additional checking early on in the process

From 5b415bcaf98cbb6912ed044391cc2403c7b68c87 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Wed, 22 Jul 2015 01:42:33 +0300
Subject: [PATCH 095/354] Code by @lagaisse to fix #515

---
 application/libraries/REST_Controller.php | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 98b3c9ce..f4efc6a6 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -807,13 +807,27 @@ protected function _detect_input_format()
     protected function _detect_output_format()
     {
         // Concatenate formats to a regex pattern e.g. \.(csv|json|xml)
-        $pattern = '/\.(' . implode('|', array_keys($this->_supported_formats)) . ')$/';
+        $pattern = '/([^\/]+)\.(' . implode('|', array_keys($this->_supported_formats)) . ')$/';
 
-        // Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2
+        // Check if a file extension is used e.g. http://example.com/api/resource/1.json?param1=param2 => http://example.com/api/resource/id/1.json?param1=param2
+        // Match[0] = Full match i.e. value.format
+        // match[1] = value
+        // Match[2] = Format (with no dot)
         $matches = [];
         if (preg_match($pattern, $this->uri->uri_string(), $matches))
         {
-            return $matches[1];
+            // If GET params exist
+            if ($this->_get_args)
+            {
+                // array_slice() or saving _get_args_only when calling _parse_get
+                $only_get_args = array_diff($this->_get_args,$this->_query_args);
+                $arg_keys = array_keys($only_get_args);
+                $last_key = end($arg_keys);
+                $this->_get_args[$last_key] = $matches[1];
+                $this->_args[$last_key] = $matches[1];
+            }
+
+            return $matches[2];
         }
 
         // Get the format via the GET parameter labelled 'format'

From 470fcee4536d88c428c0dfb333363091ded1e389 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Wed, 22 Jul 2015 01:44:02 +0300
Subject: [PATCH 096/354] Fixed whitespace missing between comma

---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index f4efc6a6..c170dca6 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -820,7 +820,7 @@ protected function _detect_output_format()
             if ($this->_get_args)
             {
                 // array_slice() or saving _get_args_only when calling _parse_get
-                $only_get_args = array_diff($this->_get_args,$this->_query_args);
+                $only_get_args = array_diff($this->_get_args, $this->_query_args);
                 $arg_keys = array_keys($only_get_args);
                 $last_key = end($arg_keys);
                 $this->_get_args[$last_key] = $matches[1];

From f28a9c9285b87dec8dab15741da5add5285aafea Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Wed, 22 Jul 2015 07:12:14 +0300
Subject: [PATCH 097/354] Re-tweaked the example

Contribution partially from @ivantcholakov
---
 application/controllers/api/Example.php | 44 ++++++++++++++++++++-----
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 2fafbc6c..3a09c699 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -30,15 +30,26 @@ function __construct()
         $this->methods['user_delete']['limit'] = 50; // 50 requests per hour per user/key
     }
 
-    public function user_get()
+    public function user_get($id = NULL)
     {
-        if (!$this->get('id'))
+        // If the id has not been passed via the URL e.g. example/user/:id, then
+        // check the id query parameter id=? instead
+        if ($id === NULL)
+        {
+            $id = $this->get('id');
+        }
+
+        // Cast as an int
+        $id = (int) $id;
+
+        // If not a valid id
+        if ($id <= 0)
         {
             // Set the response and exit
             $this->response(NULL, REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
-        // $user = $this->some_model->getSomething($this->get('id'));
+        // $user = $this->some_model->getSomething($id);
         $users = [
             1 => ['id' => 1, 'name' => 'John', 'email' => 'john@example.com', 'fact' => 'Loves coding'],
             2 => ['id' => 2, 'name' => 'Jim', 'email' => 'jim@example.com', 'fact' => 'Developed on CodeIgniter'],
@@ -46,7 +57,7 @@ public function user_get()
         ];
 
         // Get the user from the array, by retrieving the id from the GET request
-        $user = isset($users[$this->get('id')]) ? $users[$this->get('id')] : NULL;
+        $user = isset($users[$id]) ? $users[$id] : NULL;
 
         if ($user)
         {
@@ -63,9 +74,9 @@ public function user_get()
 
     public function user_post()
     {
-        // $this->some_model->update_user($this->get('id'));
+        // $this->some_model->update_user( ... );
         $message = [
-            'id' => $this->get('id'),
+            'id' => 100, // Automatically generated by the model
             'name' => $this->post('name'),
             'email' => $this->post('email'),
             'message' => 'Added a resource'
@@ -76,9 +87,26 @@ public function user_post()
 
     public function user_delete()
     {
-        // $this->some_model->delete_something($this->get());
+        // If the id has not been passed via the URL e.g. example/user/:id, then
+        // check the id query parameter id=? instead
+        if ($id === NULL)
+        {
+            $id = $this->get('id');
+        }
+
+        // Cast as an int
+        $id = (int) $id;
+
+        // If not a valid id
+        if ($id <= 0)
+        {
+            // Set the response and exit
+            $this->response(NULL, REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
+        }
+
+        // $this->some_model->delete_something($id);
         $message = [
-            'id' => $this->get('id'),
+            'id' => $id,
             'message' => 'Deleted the resource'
         ];
 

From 805b82c035b57188f1ed3594b33afe7411513faf Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Wed, 22 Jul 2015 09:17:06 +0300
Subject: [PATCH 098/354] Implemented code by @ivantcholakov

Finally fixes #515
---
 application/libraries/REST_Controller.php | 49 ++++++++++++-----------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index c170dca6..ebbc64b8 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -807,36 +807,39 @@ protected function _detect_input_format()
     protected function _detect_output_format()
     {
         // Concatenate formats to a regex pattern e.g. \.(csv|json|xml)
-        $pattern = '/([^\/]+)\.(' . implode('|', array_keys($this->_supported_formats)) . ')$/';
-
-        // Check if a file extension is used e.g. http://example.com/api/resource/1.json?param1=param2 => http://example.com/api/resource/id/1.json?param1=param2
-        // Match[0] = Full match i.e. value.format
-        // match[1] = value
-        // Match[2] = Format (with no dot)
+        $pattern = '/\.(' . implode('|', array_keys($this->_supported_formats)) . ')($|\/)/';
         $matches = [];
+
+        // Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2
         if (preg_match($pattern, $this->uri->uri_string(), $matches))
         {
-            // If GET params exist
-            if ($this->_get_args)
+            return $matches[1];
+        }
+
+        if (empty($this->_get_args) === FALSE)
+        {
+            // Get the format parameter named as 'format'
+            if (isset($this->_get_args['format']) === TRUE)
             {
-                // array_slice() or saving _get_args_only when calling _parse_get
-                $only_get_args = array_diff($this->_get_args, $this->_query_args);
-                $arg_keys = array_keys($only_get_args);
-                $last_key = end($arg_keys);
-                $this->_get_args[$last_key] = $matches[1];
-                $this->_args[$last_key] = $matches[1];
-            }
+                $format = strtolower($this->_get_args['format']);
 
-            return $matches[2];
-        }
+                if (isset($this->_supported_formats[$format]) === TRUE)
+                {
+                    return $format;
+                }
+            }
 
-        // Get the format via the GET parameter labelled 'format'
-        $format = isset($this->_get_args['format']) ? strtolower($this->_get_args['format']) : NULL;
+            // A special case: users/1.json
+            elseif (count($this->_get_args) === 1 && reset($this->_get_args) === NULL)
+            {
+                $pattern = '/\.(' . implode('|', array_keys($this->_supported_formats)) . ')$/';
+                $matches = [];
 
-        // A format has been passed as an argument in the URL and it is supported
-        if ($format !== NULL && isset($this->_supported_formats[$format]))
-        {
-            return $format;
+                if (preg_match($pattern, key($this->_get_args), $matches))
+                {
+                    return $matches[1];
+                }
+            }
         }
 
         // Get the HTTP_ACCEPT server variable

From 44a92e5dd64ab76090c79c9b19d262e63895a659 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Wed, 22 Jul 2015 16:24:27 +0300
Subject: [PATCH 099/354] Re-wrote example to be on par with the RESTful
 approach

---
 application/controllers/api/Example.php | 68 +++++++++++++------------
 1 file changed, 35 insertions(+), 33 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 3a09c699..3d75c156 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -30,9 +30,38 @@ function __construct()
         $this->methods['user_delete']['limit'] = 50; // 50 requests per hour per user/key
     }
 
-    public function user_get($id = NULL)
+    public function users_get($id = NULL)
     {
-        // If the id has not been passed via the URL e.g. example/user/:id, then
+        // Users from a data store e.g. database
+        // $user = $this->some_model->getSomething($id);
+        $users = [
+            ['id' => 1, 'name' => 'John', 'email' => 'john@example.com', 'fact' => 'Loves coding'],
+            ['id' => 2, 'name' => 'Jim', 'email' => 'jim@example.com', 'fact' => 'Developed on CodeIgniter'],
+            ['id' => 3, 'name' => 'Jane', 'email' => 'jane@example.com', 'fact' => 'Lives in the USA', ['hobbies' => ['guitar', 'cycling']]],
+        ];
+
+        // If the id parameter and query parameter don't exist, return all users instead
+        if ($id === NULL && $this->get('id') === NULL)
+        {
+            // Check if the users data store contains users (in case the database result returns NULL)
+            if ($users)
+            {
+                // Set the response and exit
+                $this->response($users, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
+            }
+            else
+            {
+                // Set the response and exit
+                $this->response([
+                    'status' => FALSE,
+                    'error' => 'No users were found'
+                ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
+            }
+
+        }
+
+
+        // If the id has not been passed via the URL e.g. example/users/:id, then
         // check the id query parameter id=? instead
         if ($id === NULL)
         {
@@ -49,16 +78,10 @@ public function user_get($id = NULL)
             $this->response(NULL, REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
-        // $user = $this->some_model->getSomething($id);
-        $users = [
-            1 => ['id' => 1, 'name' => 'John', 'email' => 'john@example.com', 'fact' => 'Loves coding'],
-            2 => ['id' => 2, 'name' => 'Jim', 'email' => 'jim@example.com', 'fact' => 'Developed on CodeIgniter'],
-            3 => ['id' => 3, 'name' => 'Jane', 'email' => 'jane@example.com', 'fact' => 'Lives in the USA', ['hobbies' => ['guitar', 'cycling']]],
-        ];
-
         // Get the user from the array, by retrieving the id from the GET request
         $user = isset($users[$id]) ? $users[$id] : NULL;
 
+        // If a user exists in the data store e.g. database
         if ($user)
         {
             $this->set_response($user, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
@@ -72,7 +95,7 @@ public function user_get($id = NULL)
         }
     }
 
-    public function user_post()
+    public function users_post()
     {
         // $this->some_model->update_user( ... );
         $message = [
@@ -85,9 +108,9 @@ public function user_post()
         $this->set_response($message, REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
     }
 
-    public function user_delete()
+    public function users_delete()
     {
-        // If the id has not been passed via the URL e.g. example/user/:id, then
+        // If the id has not been passed via the URL e.g. example/users/:id, then
         // check the id query parameter id=? instead
         if ($id === NULL)
         {
@@ -113,25 +136,4 @@ public function user_delete()
         $this->set_response($message, REST_Controller::HTTP_NO_CONTENT); // NO_CONTENT (204) being the HTTP response code
     }
 
-    public function users_get()
-    {
-        // $users = $this->some_model->get_something($this->get('limit'));
-        $users = [
-            ['id' => 1, 'name' => 'John', 'email' => 'john@example.com', 'fact' => 'Loves coding'],
-            ['id' => 2, 'name' => 'Jim', 'email' => 'jim@example.com', 'fact' => 'Developed on CodeIgniter'],
-            3 => ['id' => 3, 'name' => 'Jane', 'email' => 'jane@example.com', 'fact' => 'Lives in the USA', ['hobbies' => ['guitar', 'cycling']]],
-        ];
-
-        if ($users)
-        {
-            $this->set_response($users, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
-        }
-        else
-        {
-            $this->set_response([
-                    'status' => FALSE,
-                    'error' => 'No users were found'
-                ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
-        }
-    }
 }

From 43cb19affaf4bde0bc6dbd9df8da03c2d8c9b4cd Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Wed, 22 Jul 2015 20:33:11 +0300
Subject: [PATCH 100/354] Tidied comments and removed whitespace

---
 application/controllers/api/Key.php | 46 +++++++----------------------
 1 file changed, 11 insertions(+), 35 deletions(-)

diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
index 2eccab14..0e97016c 100644
--- a/application/controllers/api/Key.php
+++ b/application/controllers/api/Key.php
@@ -26,11 +26,10 @@ class Key extends REST_Controller {
         ];
 
     /**
-     * Key Create
      * Insert a key into the database
      *
-     * @access    public
-     * @return    void
+     * @access public
+     * @return void
      */
     public function index_put()
     {
@@ -58,14 +57,11 @@ public function index_put()
         }
     }
 
-    // --------------------------------------------------------------------
-
     /**
-     * Key Delete
      * Remove a key from the database to stop it working
      *
-     * @access    public
-     * @return    void
+     * @access public
+     * @return void
      */
     public function index_delete()
     {
@@ -91,14 +87,11 @@ public function index_delete()
             ], REST_Controller::HTTP_NO_CONTENT); // NO_CONTENT (204) being the HTTP response code
     }
 
-    // --------------------------------------------------------------------
-
     /**
-     * Update Key
      * Change the level
      *
-     * @access    public
-     * @return    void
+     * @access public
+     * @return void
      */
     public function level_post()
     {
@@ -132,14 +125,11 @@ public function level_post()
         }
     }
 
-    // --------------------------------------------------------------------
-
     /**
-     * Update Key
      * Change the level
      *
-     * @access    public
-     * @return    void
+     * @access public
+     * @return void
      */
     public function suspend_post()
     {
@@ -172,14 +162,11 @@ public function suspend_post()
         }
     }
 
-    // --------------------------------------------------------------------
-
     /**
-     * Regenerate Key
      * Remove a key from the database to stop it working
      *
-     * @access    public
-     * @return    void
+     * @access public
+     * @return void
      */
     public function regenerate_post()
     {
@@ -219,8 +206,6 @@ public function regenerate_post()
         }
     }
 
-    // --------------------------------------------------------------------
-
     /* Helper Methods */
 
     private function _generate_key()
@@ -243,8 +228,6 @@ private function _generate_key()
         return $new_key;
     }
 
-    // --------------------------------------------------------------------
-
     /* Private Data Methods */
 
     private function _get_key($key)
@@ -255,8 +238,6 @@ private function _get_key($key)
 			->row();
     }
 
-    // --------------------------------------------------------------------
-
     private function _key_exists($key)
     {
         return $this->db
@@ -264,8 +245,6 @@ private function _key_exists($key)
 			->count_all_results(config_item('rest_keys_table')) > 0;
     }
 
-    // --------------------------------------------------------------------
-
     private function _insert_key($key, $data)
     {
         $data[config_item('rest_key_column')] = $key;
@@ -276,8 +255,6 @@ private function _insert_key($key, $data)
             ->insert(config_item('rest_keys_table'));
     }
 
-    // --------------------------------------------------------------------
-
     private function _update_key($key, $data)
     {
         return $this->db
@@ -285,12 +262,11 @@ private function _update_key($key, $data)
             ->update(config_item('rest_keys_table'), $data);
     }
 
-    // --------------------------------------------------------------------
-
     private function _delete_key($key)
     {
         return $this->db
             ->where(config_item('rest_key_column'), $key)
             ->delete(config_item('rest_keys_table'));
     }
+
 }

From df382cb222f8edcb9499020848853e569dac416c Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Wed, 22 Jul 2015 20:57:28 +0300
Subject: [PATCH 101/354] Index values match id values so as not to cause
 confusion

---
 application/controllers/api/Example.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 3d75c156..c0627015 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -35,9 +35,9 @@ public function users_get($id = NULL)
         // Users from a data store e.g. database
         // $user = $this->some_model->getSomething($id);
         $users = [
-            ['id' => 1, 'name' => 'John', 'email' => 'john@example.com', 'fact' => 'Loves coding'],
-            ['id' => 2, 'name' => 'Jim', 'email' => 'jim@example.com', 'fact' => 'Developed on CodeIgniter'],
-            ['id' => 3, 'name' => 'Jane', 'email' => 'jane@example.com', 'fact' => 'Lives in the USA', ['hobbies' => ['guitar', 'cycling']]],
+            1 => ['id' => 1, 'name' => 'John', 'email' => 'john@example.com', 'fact' => 'Loves coding'],
+            2 => ['id' => 2, 'name' => 'Jim', 'email' => 'jim@example.com', 'fact' => 'Developed on CodeIgniter'],
+            3 => ['id' => 3, 'name' => 'Jane', 'email' => 'jane@example.com', 'fact' => 'Lives in the USA', ['hobbies' => ['guitar', 'cycling']]],
         ];
 
         // If the id parameter and query parameter don't exist, return all users instead

From 4e4afa12d06a79f39c34ddaed9a21b612758e6cb Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Wed, 22 Jul 2015 21:12:25 +0300
Subject: [PATCH 102/354] Integer type checking

---
 application/controllers/api/Example.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index c0627015..2b0c5633 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -60,10 +60,9 @@ public function users_get($id = NULL)
 
         }
 
-
         // If the id has not been passed via the URL e.g. example/users/:id, then
         // check the id query parameter id=? instead
-        if ($id === NULL)
+        if ($id === NULL || ctype_digit($id) === FALSE)
         {
             $id = $this->get('id');
         }

From 7962955cb84418cf0321eb3bd2dbd2b774060519 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Wed, 22 Jul 2015 21:26:59 +0300
Subject: [PATCH 103/354] Re-tweaked example (again)

This should take into consideration many forms
---
 application/controllers/api/Example.php | 42 ++++++++++++++++---------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 2b0c5633..c221ea9c 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -30,7 +30,7 @@ function __construct()
         $this->methods['user_delete']['limit'] = 50; // 50 requests per hour per user/key
     }
 
-    public function users_get($id = NULL)
+    public function users_get($id_param = NULL)
     {
         // Users from a data store e.g. database
         // $user = $this->some_model->getSomething($id);
@@ -40,8 +40,17 @@ public function users_get($id = NULL)
             3 => ['id' => 3, 'name' => 'Jane', 'email' => 'jane@example.com', 'fact' => 'Lives in the USA', ['hobbies' => ['guitar', 'cycling']]],
         ];
 
+        // Get the id parameter value
+        $id = $this->get('id');
+
+        // If NULL, then check the id passed as users/:id
+        if ($id === NULL)
+        {
+            $id = $id_param;
+        }
+
         // If the id parameter and query parameter don't exist, return all users instead
-        if ($id === NULL && $this->get('id') === NULL)
+        if ($id === NULL)
         {
             // Check if the users data store contains users (in case the database result returns NULL)
             if ($users)
@@ -60,16 +69,13 @@ public function users_get($id = NULL)
 
         }
 
-        // If the id has not been passed via the URL e.g. example/users/:id, then
-        // check the id query parameter id=? instead
-        if ($id === NULL || ctype_digit($id) === FALSE)
+        // Check if the id is a valid integer
+        if (ctype_digit($id))
         {
-            $id = $this->get('id');
+            // Cast as an int
+            $id = (int) $id;
         }
 
-        // Cast as an int
-        $id = (int) $id;
-
         // If not a valid id
         if ($id <= 0)
         {
@@ -107,17 +113,23 @@ public function users_post()
         $this->set_response($message, REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
     }
 
-    public function users_delete()
+    public function users_delete($id_param = NULL)
     {
-        // If the id has not been passed via the URL e.g. example/users/:id, then
-        // check the id query parameter id=? instead
+        // Get the id parameter value
+        $id = $this->get('id');
+
+        // If NULL, then check the id passed as users/:id
         if ($id === NULL)
         {
-            $id = $this->get('id');
+            $id = $id_param;
         }
 
-        // Cast as an int
-        $id = (int) $id;
+        // Check if the id is a valid integer
+        if (ctype_digit($id))
+        {
+            // Cast as an int
+            $id = (int) $id;
+        }
 
         // If not a valid id
         if ($id <= 0)

From 7c1c7ba64d45f024f8b85655b0c29cbda9964cac Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 23 Jul 2015 16:45:04 +0300
Subject: [PATCH 104/354] A variable name fix: $timelimit -> $time_limit

---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index ebbc64b8..74f6491f 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1101,7 +1101,7 @@ protected function _check_limit($controller_method)
         // How many times can you get to this method in a defined time_limit (default: 1 hour)?
         $limit = $this->methods[$limited_method_name]['limit'];
 
-        $timelimit = (isset($this->methods[$limited_method_name]['time']) ? $this->methods[$limited_method_name]['time'] : 3600); // 3600 = 60 * 60
+        $time_limit = (isset($this->methods[$limited_method_name]['time']) ? $this->methods[$limited_method_name]['time'] : 3600); // 3600 = 60 * 60
 
         // Get data about a keys' usage and limit to one row
         $result = $this->rest->db

From 1a4fe2765ed2b6fbafdbfc23ff8d29976ce87f94 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 23 Jul 2015 16:51:00 +0300
Subject: [PATCH 105/354] Format library: Suppressing the "array to string
 conversion" notice.

---
 application/libraries/Format.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index e008c170..6615e2cf 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -289,6 +289,10 @@ public function to_html($data = NULL)
 
         foreach ($data as $row)
         {
+            // Suppressing the "array to string conversion" notice.
+            // Keep the "evil" @ here.
+            $row = @ array_map('strval', $row);
+
             $this->_ci->table->add_row($row);
         }
 
@@ -364,6 +368,10 @@ public function to_csv($data = NULL, $delimiter = ',', $enclosure = '"')
                 break;
             }
 
+            // Suppressing the "array to string conversion" notice.
+            // Keep the "evil" @ here.
+            $record = @ array_map('strval', $record);
+
             // Returns the length of the string written or FALSE
             fputcsv($handle, $record, $delimiter, $enclosure);
         }

From fa147a62f1f41a2e251464e89c31c7a9c44291da Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 23 Jul 2015 16:53:59 +0300
Subject: [PATCH 106/354] REST_Controller: Whitespace tunning.

---
 application/libraries/REST_Controller.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 74f6491f..d73176a7 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -180,7 +180,7 @@ abstract class REST_Controller extends CI_Controller {
      */
     protected $request = NULL;
 
-        /**
+    /**
      * Contains details about the response
      * Fields: format, lang
      * Note: This is a dynamic object (stdClass)
@@ -2106,10 +2106,10 @@ protected function _check_access()
 
         // Query the access table and get the number of results
         return $this->rest->db
-                   ->where('key', $this->rest->key)
-                   ->where('controller', $controller)
-                   ->get($this->config->item('rest_access_table'))
-                   ->num_rows() > 0;
+            ->where('key', $this->rest->key)
+            ->where('controller', $controller)
+            ->get($this->config->item('rest_access_table'))
+            ->num_rows() > 0;
     }
 
 }

From 1c7aec58b7e6692bfd6fa020be9e5a41d6eaafc7 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 23 Jul 2015 16:59:19 +0300
Subject: [PATCH 107/354] REST_Controller: Removing a bad fragment of code of
 mine, the idea was wrong.

---
 application/libraries/REST_Controller.php | 25 +++++------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index d73176a7..bf8d9362 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -816,29 +816,14 @@ protected function _detect_output_format()
             return $matches[1];
         }
 
-        if (empty($this->_get_args) === FALSE)
+        // Get the format parameter named as 'format'
+        if (isset($this->_get_args['format']))
         {
-            // Get the format parameter named as 'format'
-            if (isset($this->_get_args['format']) === TRUE)
-            {
-                $format = strtolower($this->_get_args['format']);
-
-                if (isset($this->_supported_formats[$format]) === TRUE)
-                {
-                    return $format;
-                }
-            }
+            $format = strtolower($this->_get_args['format']);
 
-            // A special case: users/1.json
-            elseif (count($this->_get_args) === 1 && reset($this->_get_args) === NULL)
+            if (isset($this->_supported_formats[$format]) === TRUE)
             {
-                $pattern = '/\.(' . implode('|', array_keys($this->_supported_formats)) . ')$/';
-                $matches = [];
-
-                if (preg_match($pattern, key($this->_get_args), $matches))
-                {
-                    return $matches[1];
-                }
+                return $format;
             }
         }
 

From e545523dcb202ba117c4c69c095220a0420ef4e6 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 23 Jul 2015 17:06:48 +0300
Subject: [PATCH 108/354] Updating the example API.

---
 application/controllers/api/Example.php | 67 ++++++++++---------------
 1 file changed, 26 insertions(+), 41 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index c221ea9c..72da4cc2 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -30,25 +30,18 @@ function __construct()
         $this->methods['user_delete']['limit'] = 50; // 50 requests per hour per user/key
     }
 
-    public function users_get($id_param = NULL)
+    public function users_get()
     {
         // Users from a data store e.g. database
         // $user = $this->some_model->getSomething($id);
         $users = [
-            1 => ['id' => 1, 'name' => 'John', 'email' => 'john@example.com', 'fact' => 'Loves coding'],
-            2 => ['id' => 2, 'name' => 'Jim', 'email' => 'jim@example.com', 'fact' => 'Developed on CodeIgniter'],
-            3 => ['id' => 3, 'name' => 'Jane', 'email' => 'jane@example.com', 'fact' => 'Lives in the USA', ['hobbies' => ['guitar', 'cycling']]],
+            ['id' => 1, 'name' => 'John', 'email' => 'john@example.com', 'fact' => 'Loves coding'],
+            ['id' => 2, 'name' => 'Jim', 'email' => 'jim@example.com', 'fact' => 'Developed on CodeIgniter'],
+            ['id' => 3, 'name' => 'Jane', 'email' => 'jane@example.com', 'fact' => 'Lives in the USA', ['hobbies' => ['guitar', 'cycling']]],
         ];
 
-        // Get the id parameter value
         $id = $this->get('id');
 
-        // If NULL, then check the id passed as users/:id
-        if ($id === NULL)
-        {
-            $id = $id_param;
-        }
-
         // If the id parameter and query parameter don't exist, return all users instead
         if ($id === NULL)
         {
@@ -66,28 +59,34 @@ public function users_get($id_param = NULL)
                     'error' => 'No users were found'
                 ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
             }
-
         }
 
-        // Check if the id is a valid integer
-        if (ctype_digit($id))
-        {
-            // Cast as an int
-            $id = (int) $id;
-        }
+        $id = (int) $id;
 
-        // If not a valid id
+        // Validate the id.
         if ($id <= 0)
         {
-            // Set the response and exit
+            // Invalid id, set the response and exit.
             $this->response(NULL, REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
-        // Get the user from the array, by retrieving the id from the GET request
-        $user = isset($users[$id]) ? $users[$id] : NULL;
+        // Get the user from the array, using the id as key for retreival.
+        // Usually a model is to be used for this.
+
+        $user = NULL;
+
+        if (!empty($users))
+        {
+            foreach ($users as $key => $value)
+            {
+                if (isset($value['id']) && $value['id'] === $id)
+                {
+                    $user = $value;
+                }
+            }
+        }
 
-        // If a user exists in the data store e.g. database
-        if ($user)
+        if (!empty($user))
         {
             $this->set_response($user, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
@@ -113,25 +112,11 @@ public function users_post()
         $this->set_response($message, REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
     }
 
-    public function users_delete($id_param = NULL)
+    public function users_delete()
     {
-        // Get the id parameter value
-        $id = $this->get('id');
-
-        // If NULL, then check the id passed as users/:id
-        if ($id === NULL)
-        {
-            $id = $id_param;
-        }
-
-        // Check if the id is a valid integer
-        if (ctype_digit($id))
-        {
-            // Cast as an int
-            $id = (int) $id;
-        }
+        $id = (int) $this->get('id');
 
-        // If not a valid id
+        // Validate the id.
         if ($id <= 0)
         {
             // Set the response and exit

From 61938ec5c2028338acf871ac8195307c71d31b5c Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 23 Jul 2015 17:08:36 +0300
Subject: [PATCH 109/354] Key.php: Tunning whitespace.

---
 application/controllers/api/Key.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
index 0e97016c..bfc7f6fe 100644
--- a/application/controllers/api/Key.php
+++ b/application/controllers/api/Key.php
@@ -218,7 +218,7 @@ private function _generate_key()
             // If an error occurred, then fall back to the previous method
             if ($salt === FALSE)
             {
-				$salt = hash('sha256', time() . mt_rand());
+                $salt = hash('sha256', time() . mt_rand());
             }
             $new_key = substr($salt, 0, config_item('rest_key_length'));
         }
@@ -233,16 +233,16 @@ private function _generate_key()
     private function _get_key($key)
     {
         return $this->db
-			->where(config_item('rest_key_column'), $key)
-			->get(config_item('rest_keys_table'))
-			->row();
+            ->where(config_item('rest_key_column'), $key)
+            ->get(config_item('rest_keys_table'))
+            ->row();
     }
 
     private function _key_exists($key)
     {
         return $this->db
-			->where(config_item('rest_key_column'), $key)
-			->count_all_results(config_item('rest_keys_table')) > 0;
+            ->where(config_item('rest_key_column'), $key)
+            ->count_all_results(config_item('rest_keys_table')) > 0;
     }
 
     private function _insert_key($key, $data)

From 7be0147172b96ee3fdc5bd0b8fc66e625d65a2f0 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 23 Jul 2015 17:12:11 +0300
Subject: [PATCH 110/354] Key.php: Some comment corrections.

---
 application/controllers/api/Key.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
index bfc7f6fe..a986569f 100644
--- a/application/controllers/api/Key.php
+++ b/application/controllers/api/Key.php
@@ -126,7 +126,7 @@ public function level_post()
     }
 
     /**
-     * Change the level
+     * Suspent a key
      *
      * @access public
      * @return void
@@ -163,7 +163,7 @@ public function suspend_post()
     }
 
     /**
-     * Remove a key from the database to stop it working
+     * Regenerate a key
      *
      * @access public
      * @return void

From dc397bfac22fe78b71f74de4b9d240bab4c889e2 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 23 Jul 2015 17:17:31 +0300
Subject: [PATCH 111/354] Adding some index.html files for protection.

---
 application/config/index.html          | 11 +++++++++++
 application/controllers/api/index.html | 11 +++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 application/config/index.html
 create mode 100644 application/controllers/api/index.html

diff --git a/application/config/index.html b/application/config/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/config/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/controllers/api/index.html b/application/controllers/api/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/controllers/api/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>

From cee599d24ebb2a32ae3fc0cf9830ecc9d330ab72 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 23 Jul 2015 17:21:22 +0300
Subject: [PATCH 112/354] Adding routes.php configuration file.

---
 application/config/routes.php | 62 +++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 application/config/routes.php

diff --git a/application/config/routes.php b/application/config/routes.php
new file mode 100644
index 00000000..a56d21f6
--- /dev/null
+++ b/application/config/routes.php
@@ -0,0 +1,62 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+| -------------------------------------------------------------------------
+| URI ROUTING
+| -------------------------------------------------------------------------
+| This file lets you re-map URI requests to specific controller functions.
+|
+| Typically there is a one-to-one relationship between a URL string
+| and its corresponding controller class/method. The segments in a
+| URL normally follow this pattern:
+|
+|	example.com/class/method/id/
+|
+| In some instances, however, you may want to remap this relationship
+| so that a different class/function is called than the one
+| corresponding to the URL.
+|
+| Please see the user guide for complete details:
+|
+|	http://codeigniter.com/user_guide/general/routing.html
+|
+| -------------------------------------------------------------------------
+| RESERVED ROUTES
+| -------------------------------------------------------------------------
+|
+| There are three reserved routes:
+|
+|	$route['default_controller'] = 'welcome';
+|
+| This route indicates which controller class should be loaded if the
+| URI contains no data. In the above example, the "welcome" class
+| would be loaded.
+|
+|	$route['404_override'] = 'errors/page_missing';
+|
+| This route will tell the Router which controller/method to use if those
+| provided in the URL cannot be matched to a valid route.
+|
+|	$route['translate_uri_dashes'] = FALSE;
+|
+| This is not exactly a route, but allows you to automatically route
+| controller and method names that contain dashes. '-' isn't a valid
+| class or method name character, so it requires translation.
+| When you set this option to TRUE, it will replace ALL dashes in the
+| controller and method URI segments.
+|
+| Examples:	my-controller/index	-> my_controller/index
+|		my-controller/my-method	-> my_controller/my_method
+*/
+$route['default_controller'] = 'welcome';
+$route['404_override'] = '';
+$route['translate_uri_dashes'] = TRUE;
+
+/*
+| -------------------------------------------------------------------------
+| Sample REST API Routes
+| -------------------------------------------------------------------------
+*/
+$route['api/example/users/(:num)'] = 'api/example/users/id/$1'; // Example 4
+$route['api/example/users/(:num)(\.)([a-zA-Z0-9_-]+)(.*)'] = 'api/example/users/id/$1/format/$3$4'; // Example 8

From 1da1b9fbe183d5ced9d22c7c6cbc7b431adf19c7 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 23 Jul 2015 17:24:49 +0300
Subject: [PATCH 113/354] Adding a modified "Welcome" page and a homepage for
 quick tests.

---
 application/controllers/Rest_server.php |  12 ++
 application/controllers/Welcome.php     |  27 +++++
 application/controllers/index.html      |  11 ++
 application/views/index.html            |  11 ++
 application/views/rest_server.php       | 155 ++++++++++++++++++++++++
 application/views/welcome_message.php   |  92 ++++++++++++++
 6 files changed, 308 insertions(+)
 create mode 100644 application/controllers/Rest_server.php
 create mode 100644 application/controllers/Welcome.php
 create mode 100644 application/controllers/index.html
 create mode 100644 application/views/index.html
 create mode 100644 application/views/rest_server.php
 create mode 100644 application/views/welcome_message.php

diff --git a/application/controllers/Rest_server.php b/application/controllers/Rest_server.php
new file mode 100644
index 00000000..7ceef858
--- /dev/null
+++ b/application/controllers/Rest_server.php
@@ -0,0 +1,12 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+class Rest_server extends CI_Controller {
+
+    public function index()
+    {
+        $this->load->helper('url');
+
+        $this->load->view('rest_server');
+    }
+}
diff --git a/application/controllers/Welcome.php b/application/controllers/Welcome.php
new file mode 100644
index 00000000..aa64c8d4
--- /dev/null
+++ b/application/controllers/Welcome.php
@@ -0,0 +1,27 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+class Welcome extends CI_Controller {
+
+    /**
+     * Index Page for this controller.
+     *
+     * Maps to the following URL
+     * http://example.com/index.php/welcome
+     *    - or -
+     * http://example.com/index.php/welcome/index
+     *    - or -
+     * Since this controller is set as the default controller in
+     * config/routes.php, it's displayed at http://example.com/
+     *
+     * So any other public methods not prefixed with an underscore will
+     * map to /index.php/welcome/<method_name>
+     * @see http://codeigniter.com/user_guide/general/urls.html
+     */
+    public function index()
+    {
+        $this->load->helper('url');
+
+        $this->load->view('welcome_message');
+    }
+}
diff --git a/application/controllers/index.html b/application/controllers/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/controllers/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/views/index.html b/application/views/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/views/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/views/rest_server.php b/application/views/rest_server.php
new file mode 100644
index 00000000..8387dbda
--- /dev/null
+++ b/application/views/rest_server.php
@@ -0,0 +1,155 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+?><!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>REST Server Tests</title>
+
+    <style type="text/css">
+
+    ::selection { background-color: #E13300; color: white; }
+    ::-moz-selection { background-color: #E13300; color: white; }
+
+    body {
+        background-color: #fff;
+        margin: 40px;
+        font: 16px/20px normal Helvetica, Arial, sans-serif;
+        color: #4F5155;
+    }
+
+    a {
+        color: #003399;
+        background-color: transparent;
+        font-weight: normal;
+    }
+
+    h1 {
+        color: #444;
+        background-color: transparent;
+        border-bottom: 1px solid #D0D0D0;
+        font-size: 24px;
+        font-weight: normal;
+        margin: 0 0 14px 0;
+        padding: 14px 15px 10px 15px;
+    }
+
+    code {
+        font-family: Consolas, Monaco, Courier New, Courier, monospace;
+        font-size: 16px;
+        background-color: #f9f9f9;
+        border: 1px solid #D0D0D0;
+        color: #002166;
+        display: block;
+        margin: 14px 0 14px 0;
+        padding: 12px 10px 12px 10px;
+    }
+
+    #body {
+        margin: 0 15px 0 15px;
+    }
+
+    p.footer {
+        text-align: right;
+        font-size: 16px;
+        border-top: 1px solid #D0D0D0;
+        line-height: 32px;
+        padding: 0 10px 0 10px;
+        margin: 20px 0 0 0;
+    }
+
+    #container {
+        margin: 10px;
+        border: 1px solid #D0D0D0;
+        box-shadow: 0 0 8px #D0D0D0;
+    }
+    </style>
+</head>
+<body>
+
+<div id="container">
+    <h1>REST Server Tests</h1>
+
+    <div id="body">
+
+        <h2><a href="http://github.com/%3C?php%20echo%20site_url();%20?%3E">Home</a></h2>
+
+        <p>
+            See the article
+            <a href="http://net.tutsplus.com/tutorials/php/working-with-restful-services-in-codeigniter-2/" target="_blank">
+                http://net.tutsplus.com/tutorials/php/working-with-restful-services-in-codeigniter-2/
+            </a>
+        </p>
+
+        <p>
+            The master project repository is
+            <a href="https://github.com/chriskacerguis/codeigniter-restserver" target="_blank">
+                https://github.com/chriskacerguis/codeigniter-restserver
+            </a>
+        </p>
+
+        <p>
+            Click on the links to check whether the REST server is working.
+        </p>
+
+        <ol>
+            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users'); ?>">Users</a> - defaulting to JSON</li>
+            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/format/csv'); ?>">Users</a> - get it in CSV</li>
+            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/id/1'); ?>">User #1</a> - defaulting to JSON  (users/id/1)</li>
+            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/1'); ?>">User #1</a> - defaulting to JSON  (users/1)</li>
+            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/id/1.xml'); ?>">User #1</a> - get it in XML (users/id/1.xml)</li>
+            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/id/1/format/xml'); ?>">User #1</a> - get it in XML (users/id/1/format/xml)</li>
+            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/id/1?format=xml'); ?>">User #1</a> - get it in XML (users/id/1?format=xml)</li>
+            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/1.xml'); ?>">User #1</a> - get it in XML (users/1.xml)</li>
+            <li><a id="ajax" href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/format/json'); ?>">Users</a> - get it in JSON (AJAX request)</li>
+            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users.html'); ?>">Users</a> - get it in HTML (users.html)</li>
+            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/format/html'); ?>">Users</a> - get it in HTML (users/format/html)</li>
+            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users?format=html'); ?>">Users</a> - get it in HTML (users?format=html)</li>
+        </ol>
+
+    </div>
+
+    <p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>' . CI_VERSION . '</strong>' : '' ?></p>
+</div>
+
+<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+
+<script type="text/javascript">
+//<![CDATA[
+
+    $(function() {
+
+        $("#ajax").on("click", function(evt) {
+
+            evt.preventDefault();
+
+            $.ajax({
+
+                url: $(this).attr("href"), // URL from the link that was clicked on.
+
+                success: function(data, textStatus, jqXHR) {
+
+                    // The 'data' parameter is an array of objects that can be looped over.
+
+                    if (window.JSON && window.JSON.stringify) {
+
+                        // Let us display data in this example
+                        // in a relatively friendly manner.
+                        data = window.JSON.stringify(data);
+                    }
+
+                    alert(data);
+                },
+
+                error: function(jqXHR, textStatus, errorThrown) {
+                    alert('Oh no! A problem with the AJAX request!');
+                }
+            });
+        });
+    });
+
+//]]>
+</script>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php
new file mode 100644
index 00000000..33c29458
--- /dev/null
+++ b/application/views/welcome_message.php
@@ -0,0 +1,92 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+?><!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <title>Welcome to CodeIgniter</title>
+
+    <style type="text/css">
+
+    ::selection { background-color: #E13300; color: white; }
+    ::-moz-selection { background-color: #E13300; color: white; }
+
+    body {
+        background-color: #fff;
+        margin: 40px;
+        font: 16px/20px normal Helvetica, Arial, sans-serif;
+        color: #4F5155;
+    }
+
+    a {
+        color: #003399;
+        background-color: transparent;
+        font-weight: normal;
+    }
+
+    h1 {
+        color: #444;
+        background-color: transparent;
+        border-bottom: 1px solid #D0D0D0;
+        font-size: 24px;
+        font-weight: normal;
+        margin: 0 0 14px 0;
+        padding: 14px 15px 10px 15px;
+    }
+
+    code {
+        font-family: Consolas, Monaco, Courier New, Courier, monospace;
+        font-size: 16px;
+        background-color: #f9f9f9;
+        border: 1px solid #D0D0D0;
+        color: #002166;
+        display: block;
+        margin: 14px 0 14px 0;
+        padding: 12px 10px 12px 10px;
+    }
+
+    #body {
+        margin: 0 15px 0 15px;
+    }
+
+    p.footer {
+        text-align: right;
+        font-size: 16px;
+        border-top: 1px solid #D0D0D0;
+        line-height: 32px;
+        padding: 0 10px 0 10px;
+        margin: 20px 0 0 0;
+    }
+
+    #container {
+        margin: 10px;
+        border: 1px solid #D0D0D0;
+        box-shadow: 0 0 8px #D0D0D0;
+    }
+    </style>
+</head>
+<body>
+
+<div id="container">
+    <h1>Welcome to CodeIgniter!</h1>
+
+    <div id="body">
+
+        <h2><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/rest-server'); ?>">REST Server Tests</a></h2>
+
+        <p>The page you are looking at is being generated dynamically by CodeIgniter.</p>
+
+        <p>If you would like to edit this page you'll find it located at:</p>
+        <code>application/views/welcome_message.php</code>
+
+        <p>The corresponding controller for this page is found at:</p>
+        <code>application/controllers/Welcome.php</code>
+
+        <p>If you are exploring CodeIgniter for the very first time, you should start by reading the <a href="http://github.com/user_guide/">User Guide</a>.</p>
+    </div>
+
+    <p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>' . CI_VERSION . '</strong>' : '' ?></p>
+</div>
+
+</body>
+</html>
\ No newline at end of file

From b44d815113fbeb5e2dc8234dd8259e7a914710c8 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 23 Jul 2015 17:45:41 +0300
Subject: [PATCH 114/354] Key.php: Replacing (self::) usages with ($this->) The
 context is not static.

---
 application/controllers/api/Key.php | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
index a986569f..0f9cb07c 100644
--- a/application/controllers/api/Key.php
+++ b/application/controllers/api/Key.php
@@ -34,14 +34,14 @@ class Key extends REST_Controller {
     public function index_put()
     {
         // Build a new key
-        $key = self::_generate_key();
+        $key = $this->_generate_key();
 
         // If no key level provided, provide a generic key
         $level = $this->put('level') ? $this->put('level') : 1;
         $ignore_limits = ctype_digit($this->put('ignore_limits')) ? (int) $this->put('ignore_limits') : 1;
 
         // Insert the new key
-        if (self::_insert_key($key, ['level' => $level, 'ignore_limits' => $ignore_limits]))
+        if ($this->_insert_key($key, ['level' => $level, 'ignore_limits' => $ignore_limits]))
         {
             $this->response([
                 'status' => TRUE,
@@ -68,7 +68,7 @@ public function index_delete()
         $key = $this->delete('key');
 
         // Does this key exist?
-        if (!self::_key_exists($key))
+        if (!$this->_key_exists($key))
         {
             // It doesn't appear the key exists
             $this->response([
@@ -78,7 +78,7 @@ public function index_delete()
         }
 
         // Destroy it
-        self::_delete_key($key);
+        $this->_delete_key($key);
 
         // Respond that the key was destroyed
         $this->response([
@@ -99,7 +99,7 @@ public function level_post()
         $new_level = $this->post('level');
 
         // Does this key exist?
-        if (!self::_key_exists($key))
+        if (!$this->_key_exists($key))
         {
             // It doesn't appear the key exists
             $this->response([
@@ -109,7 +109,7 @@ public function level_post()
         }
 
         // Update the key level
-        if (self::_update_key($key, ['level' => $new_level]))
+        if ($this->_update_key($key, ['level' => $new_level]))
         {
             $this->response([
                 'status' => TRUE,
@@ -136,7 +136,7 @@ public function suspend_post()
         $key = $this->post('key');
 
         // Does this key exist?
-        if (!self::_key_exists($key))
+        if (!$this->_key_exists($key))
         {
             // It doesn't appear the key exists
             $this->response([
@@ -146,7 +146,7 @@ public function suspend_post()
         }
 
         // Update the key level
-        if (self::_update_key($key, ['level' => 0]))
+        if ($this->_update_key($key, ['level' => 0]))
         {
             $this->response([
                 'status' => TRUE,
@@ -171,7 +171,7 @@ public function suspend_post()
     public function regenerate_post()
     {
         $old_key = $this->post('key');
-        $key_details = self::_get_key($old_key);
+        $key_details = $this->_get_key($old_key);
 
         // Does this key exist?
         if (!$key_details)
@@ -184,13 +184,13 @@ public function regenerate_post()
         }
 
         // Build a new key
-        $new_key = self::_generate_key();
+        $new_key = $this->_generate_key();
 
         // Insert the new key
-        if (self::_insert_key($new_key, ['level' => $key_details->level, 'ignore_limits' => $key_details->ignore_limits]))
+        if ($this->_insert_key($new_key, ['level' => $key_details->level, 'ignore_limits' => $key_details->ignore_limits]))
         {
             // Suspend old key
-            self::_update_key($old_key, ['level' => 0]);
+            $this->_update_key($old_key, ['level' => 0]);
 
             $this->response([
                 'status' => TRUE,
@@ -220,10 +220,10 @@ private function _generate_key()
             {
                 $salt = hash('sha256', time() . mt_rand());
             }
+
             $new_key = substr($salt, 0, config_item('rest_key_length'));
         }
-        while (self::_key_exists($new_key));
-        // Already in the DB? Fail. Try again
+        while ($this->_key_exists($new_key));
 
         return $new_key;
     }

From 9d87d1355da6eef7c546506c429035153b815ade Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 23 Jul 2015 18:26:52 +0300
Subject: [PATCH 115/354] Fixing a typo.

---
 application/controllers/api/Key.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
index 0f9cb07c..e2510764 100644
--- a/application/controllers/api/Key.php
+++ b/application/controllers/api/Key.php
@@ -126,7 +126,7 @@ public function level_post()
     }
 
     /**
-     * Suspent a key
+     * Suspend a key
      *
      * @access public
      * @return void

From 1c8cd8fa93d93d3cfe97a7042e960e24f6973bbf Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 23 Jul 2015 18:57:06 +0300
Subject: [PATCH 116/354] Contemporary code for an AJAX call.

---
 application/views/rest_server.php | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/application/views/rest_server.php b/application/views/rest_server.php
index 8387dbda..aef7702e 100644
--- a/application/views/rest_server.php
+++ b/application/views/rest_server.php
@@ -127,23 +127,22 @@
 
                 url: $(this).attr("href"), // URL from the link that was clicked on.
 
-                success: function(data, textStatus, jqXHR) {
+            }).done(function (data) {
 
-                    // The 'data' parameter is an array of objects that can be looped over.
+                // The 'data' parameter is an array of objects that can be looped over.
 
-                    if (window.JSON && window.JSON.stringify) {
+                if (window.JSON && window.JSON.stringify) {
 
-                        // Let us display data in this example
-                        // in a relatively friendly manner.
-                        data = window.JSON.stringify(data);
-                    }
+                    // Let us display data in this example
+                    // in a relatively friendly manner.
+                    data = window.JSON.stringify(data);
+                }
 
-                    alert(data);
-                },
+                alert(data);
 
-                error: function(jqXHR, textStatus, errorThrown) {
-                    alert('Oh no! A problem with the AJAX request!');
-                }
+            }).fail(function () {
+
+                alert('Oh no! A problem with the AJAX request!');
             });
         });
     });

From de4d8d17884998b302e3f95c4b3fd87c55b33c33 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 23 Jul 2015 19:05:05 +0300
Subject: [PATCH 117/354] window.JSON.stringify() exist in all normal browsers,
 removing the ckeck.

---
 application/views/rest_server.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/application/views/rest_server.php b/application/views/rest_server.php
index aef7702e..ffcdd7d8 100644
--- a/application/views/rest_server.php
+++ b/application/views/rest_server.php
@@ -131,14 +131,7 @@
 
                 // The 'data' parameter is an array of objects that can be looped over.
 
-                if (window.JSON && window.JSON.stringify) {
-
-                    // Let us display data in this example
-                    // in a relatively friendly manner.
-                    data = window.JSON.stringify(data);
-                }
-
-                alert(data);
+                alert(window.JSON.stringify(data));
 
             }).fail(function () {
 

From 913d0741545288c4ad373bc48ae063d4d83851d7 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 23 Jul 2015 20:52:04 +0300
Subject: [PATCH 118/354] config/rest.php: Whitespace tunning.

---
 application/config/rest.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/config/rest.php b/application/config/rest.php
index d75c8696..2e914fe6 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -160,9 +160,9 @@
 |
 | example:
 |
-|			$config['auth_override_class_method_http']['deals']['view']['get'] = 'none';
-|			$config['auth_override_class_method_http']['deals']['insert']['post'] = 'none';
-|			$config['auth_override_class_method_http']['deals']['*']['options'] = 'none';
+|            $config['auth_override_class_method_http']['deals']['view']['get'] = 'none';
+|            $config['auth_override_class_method_http']['deals']['insert']['post'] = 'none';
+|            $config['auth_override_class_method_http']['deals']['*']['options'] = 'none';
 */
 
 // ---Uncomment list line for the wildard unit test

From 83f0c1c820bd6e25ac8bbaec33162dcf2b9aa32c Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 23 Jul 2015 21:16:03 +0300
Subject: [PATCH 119/354] REST_Controller.php: Whitespace tuning.

---
 application/libraries/REST_Controller.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index bf8d9362..5ebe05e9 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -657,10 +657,10 @@ public function _remap($object_called, $arguments)
         {
             // If the method doesn't exist, then the error will be caught and an error response shown
             $this->response([
-                        $this->config->item('rest_status_field_name') => FALSE,
-                        $this->config->item('rest_message_field_name') => [
-                            'classname' => get_class($ex),
-                            'message' => $ex->getMessage()
+                    $this->config->item('rest_status_field_name') => FALSE,
+                    $this->config->item('rest_message_field_name') => [
+                        'classname' => get_class($ex),
+                        'message' => $ex->getMessage()
                     ]
                 ], self::HTTP_INTERNAL_SERVER_ERROR);
         }

From c82d05ef502fb1fcc130a83e8d553f6fb1b9f95f Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Thu, 23 Jul 2015 21:35:02 +0300
Subject: [PATCH 120/354] Example.php: Some comment modifications.

---
 application/controllers/api/Example.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 72da4cc2..479d790c 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -33,7 +33,6 @@ function __construct()
     public function users_get()
     {
         // Users from a data store e.g. database
-        // $user = $this->some_model->getSomething($id);
         $users = [
             ['id' => 1, 'name' => 'John', 'email' => 'john@example.com', 'fact' => 'Loves coding'],
             ['id' => 2, 'name' => 'Jim', 'email' => 'jim@example.com', 'fact' => 'Developed on CodeIgniter'],
@@ -42,7 +41,8 @@ public function users_get()
 
         $id = $this->get('id');
 
-        // If the id parameter and query parameter don't exist, return all users instead
+        // If the id parameter doesn't exist return all the users
+
         if ($id === NULL)
         {
             // Check if the users data store contains users (in case the database result returns NULL)
@@ -61,6 +61,8 @@ public function users_get()
             }
         }
 
+        // Find and return a single record for a particular user.
+
         $id = (int) $id;
 
         // Validate the id.

From f1bf85bba0e94f9fc62766445814a24d3d851d4e Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Fri, 24 Jul 2015 15:23:20 +0300
Subject: [PATCH 121/354] Updated documentation

---
 documentation/404.html                        |    4 +-
 documentation/class-Example.html              |   50 +-
 documentation/class-Format.html               |   24 +-
 documentation/class-Key.html                  |   42 +-
 documentation/class-REST_Controller.html      |   94 +-
 documentation/class-Rest_server.html          |  190 ++
 documentation/class-Welcome.html              |  203 ++
 documentation/elementlist.js                  |    2 +-
 documentation/index.html                      |    6 +-
 .../package-CodeIgniter.Libraries.html        |    4 +-
 documentation/package-CodeIgniter.Rest.html   |    4 +-
 documentation/package-CodeIgniter.html        |    4 +-
 documentation/package-None.html               |   14 +-
 documentation/source-class-Example.html       |  186 +-
 documentation/source-class-Format.html        |  473 +--
 documentation/source-class-Key.html           |  494 ++-
 .../source-class-REST_Controller.html         | 2760 +++++++++--------
 documentation/source-class-Rest_server.html   |  117 +
 documentation/source-class-Welcome.html       |  132 +
 19 files changed, 2762 insertions(+), 2041 deletions(-)
 create mode 100644 documentation/class-Rest_server.html
 create mode 100644 documentation/class-Welcome.html
 create mode 100644 documentation/source-class-Rest_server.html
 create mode 100644 documentation/source-class-Welcome.html

diff --git a/documentation/404.html b/documentation/404.html
index 20c44e08..8a6b8ffa 100644
--- a/documentation/404.html
+++ b/documentation/404.html
@@ -54,6 +54,8 @@ <h3>Classes</h3>
 				<li><a href="http://github.com/class-Format.html">Format</a></li>
 				<li><a href="http://github.com/class-Key.html">Key</a></li>
 				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
+				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
+				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
 			</ul>
 
 
@@ -102,7 +104,7 @@ <h1>Page not found</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
+<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
 <script src="http://github.com/elementlist.js"></script>
 </body>
 </html>
diff --git a/documentation/class-Example.html b/documentation/class-Example.html
index e7ca3ccf..e8af6477 100644
--- a/documentation/class-Example.html
+++ b/documentation/class-Example.html
@@ -138,7 +138,7 @@ <h1>Class Example</h1>
 				Phil Sturgeon, Chris Kacerguis<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-Example.html#8-109" title="Go to source code">controllers/api/Example.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-Example.html#8-137" title="Go to source code">controllers/api/Example.php</a>
 		<br>
 	</div>
 
@@ -184,37 +184,7 @@ <h4>Overrides</h4>
 		</div>
 		</div></td>
 	</tr>
-	<tr data-order="user_get" id="_user_get">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_user_get">#</a>
-		<code><a href="http://github.com/source-class-Example.html#33-62" title="Go to source code">user_get</a>( )</code>
-
-		<div class="description short">
-			
-		</div>
-
-		<div class="description detailed hidden">
-			
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="user_post" id="_user_post">
+	<tr data-order="users_get" id="_users_get">
 
 		<td class="attributes"><code>
 			 public 
@@ -225,8 +195,8 @@ <h4>Overrides</h4>
 		</td>
 
 		<td class="name"><div>
-		<a class="anchor" href="#_user_post">#</a>
-		<code><a href="http://github.com/source-class-Example.html#64-75" title="Go to source code">user_post</a>( )</code>
+		<a class="anchor" href="#_users_get">#</a>
+		<code><a href="http://github.com/source-class-Example.html#33-102" title="Go to source code">users_get</a>( )</code>
 
 		<div class="description short">
 			
@@ -244,7 +214,7 @@ <h4>Overrides</h4>
 		</div>
 		</div></td>
 	</tr>
-	<tr data-order="user_delete" id="_user_delete">
+	<tr data-order="users_post" id="_users_post">
 
 		<td class="attributes"><code>
 			 public 
@@ -255,8 +225,8 @@ <h4>Overrides</h4>
 		</td>
 
 		<td class="name"><div>
-		<a class="anchor" href="#_user_delete">#</a>
-		<code><a href="http://github.com/source-class-Example.html#77-86" title="Go to source code">user_delete</a>( )</code>
+		<a class="anchor" href="#_users_post">#</a>
+		<code><a href="http://github.com/source-class-Example.html#104-115" title="Go to source code">users_post</a>( )</code>
 
 		<div class="description short">
 			
@@ -274,7 +244,7 @@ <h4>Overrides</h4>
 		</div>
 		</div></td>
 	</tr>
-	<tr data-order="users_get" id="_users_get">
+	<tr data-order="users_delete" id="_users_delete">
 
 		<td class="attributes"><code>
 			 public 
@@ -285,8 +255,8 @@ <h4>Overrides</h4>
 		</td>
 
 		<td class="name"><div>
-		<a class="anchor" href="#_users_get">#</a>
-		<code><a href="http://github.com/source-class-Example.html#88-108" title="Go to source code">users_get</a>( )</code>
+		<a class="anchor" href="#_users_delete">#</a>
+		<code><a href="http://github.com/source-class-Example.html#117-135" title="Go to source code">users_delete</a>( )</code>
 
 		<div class="description short">
 			
diff --git a/documentation/class-Format.html b/documentation/class-Format.html
index 6474f07c..07d2a5df 100644
--- a/documentation/class-Format.html
+++ b/documentation/class-Format.html
@@ -50,6 +50,8 @@ <h3>Packages</h3>
 			<h3>Classes</h3>
 			<ul>
 				<li class="active"><a href="http://github.com/class-Format.html">Format</a></li>
+				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
+				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
 			</ul>
 
 
@@ -113,7 +115,7 @@ <h1>Class Format</h1>
 				<a href="http://www.dbad-license.org/">http://www.dbad-license.org/</a><br>
 				<b>Author:</b>
 				Phil Sturgeon, Chris Kacerguis, @softwarespot<br>
-			<b>Located at</b> <a href="http://github.com/source-class-Format.html#5-516" title="Go to source code">libraries/Format.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-Format.html#5-531" title="Go to source code">libraries/Format.php</a>
 		<br>
 	</div>
 
@@ -301,7 +303,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_html">#</a>
-		<code><a href="http://github.com/source-class-Format.html#250-296" title="Go to source code">to_html</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#250-300" title="Go to source code">to_html</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Format data as HTML</p>
@@ -341,7 +343,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_csv">#</a>
-		<code><a href="http://github.com/source-class-Format.html#298-374" title="Go to source code">to_csv</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>string <var>$delimiter</var> = <span class="php-quote">','</span></span>, <span>string <var>$enclosure</var> = <span class="php-quote">'&quot;'</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#302-389" title="Go to source code">to_csv</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>string <var>$delimiter</var> = <span class="php-quote">','</span></span>, <span>string <var>$enclosure</var> = <span class="php-quote">'&quot;'</span></span> )</code>
 
 		<div class="description short">
 			
@@ -391,7 +393,7 @@ <h4>Link</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_json">#</a>
-		<code><a href="http://github.com/source-class-Format.html#376-412" title="Go to source code">to_json</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#391-427" title="Go to source code">to_json</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Encode data as json</p>
@@ -431,7 +433,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_serialized">#</a>
-		<code><a href="http://github.com/source-class-Format.html#414-431" title="Go to source code">to_serialized</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#429-446" title="Go to source code">to_serialized</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Encode data as a serialized array</p>
@@ -471,7 +473,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_to_php">#</a>
-		<code><a href="http://github.com/source-class-Format.html#433-450" title="Go to source code">to_php</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#448-465" title="Go to source code">to_php</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Format data using a PHP structure</p>
@@ -511,7 +513,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__from_xml">#</a>
-		<code><a href="http://github.com/source-class-Format.html#454-461" title="Go to source code">_from_xml</a>( <span> <var>$data</var></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#469-476" title="Go to source code">_from_xml</a>( <span> <var>$data</var></span> )</code>
 
 		<div class="description short">
 			
@@ -550,7 +552,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__from_csv">#</a>
-		<code><a href="http://github.com/source-class-Format.html#463-487" title="Go to source code">_from_csv</a>( <span>string <var>$data</var></span>, <span>string <var>$delimiter</var> = <span class="php-quote">','</span></span>, <span>string <var>$enclosure</var> = <span class="php-quote">'&quot;'</span></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#478-502" title="Go to source code">_from_csv</a>( <span>string <var>$data</var></span>, <span>string <var>$delimiter</var> = <span class="php-quote">','</span></span>, <span>string <var>$enclosure</var> = <span class="php-quote">'&quot;'</span></span> )</code>
 
 		<div class="description short">
 			
@@ -596,7 +598,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__from_json">#</a>
-		<code><a href="http://github.com/source-class-Format.html#489-496" title="Go to source code">_from_json</a>( <span> <var>$data</var></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#504-511" title="Go to source code">_from_json</a>( <span> <var>$data</var></span> )</code>
 
 		<div class="description short">
 			
@@ -635,7 +637,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__from_serialize">#</a>
-		<code><a href="http://github.com/source-class-Format.html#498-505" title="Go to source code">_from_serialize</a>( <span>string <var>$data</var></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#513-520" title="Go to source code">_from_serialize</a>( <span>string <var>$data</var></span> )</code>
 
 		<div class="description short">
 			
@@ -674,7 +676,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__from_php">#</a>
-		<code><a href="http://github.com/source-class-Format.html#507-514" title="Go to source code">_from_php</a>( <span> <var>$data</var></span> )</code>
+		<code><a href="http://github.com/source-class-Format.html#522-529" title="Go to source code">_from_php</a>( <span> <var>$data</var></span> )</code>
 
 		<div class="description short">
 			
diff --git a/documentation/class-Key.html b/documentation/class-Key.html
index 4a96e21d..540d7d3e 100644
--- a/documentation/class-Key.html
+++ b/documentation/class-Key.html
@@ -138,7 +138,7 @@ <h1>Class Key</h1>
 				Phil Sturgeon, Chris Kacerguis<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-Key.html#8-296" title="Go to source code">controllers/api/Key.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-Key.html#8-272" title="Go to source code">controllers/api/Key.php</a>
 		<br>
 	</div>
 
@@ -158,16 +158,14 @@ <h1>Class Key</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_index_put">#</a>
-		<code><a href="http://github.com/source-class-Key.html#28-59" title="Go to source code">index_put</a>( )</code>
+		<code><a href="http://github.com/source-class-Key.html#28-58" title="Go to source code">index_put</a>( )</code>
 
 		<div class="description short">
-			<p>Key Create
-Insert a key into the database</p>
+			<p>Insert a key into the database</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Key Create
-Insert a key into the database</p>
+			<p>Insert a key into the database</p>
 
 
 
@@ -190,16 +188,14 @@ <h1>Class Key</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_index_delete">#</a>
-		<code><a href="http://github.com/source-class-Key.html#63-92" title="Go to source code">index_delete</a>( )</code>
+		<code><a href="http://github.com/source-class-Key.html#60-88" title="Go to source code">index_delete</a>( )</code>
 
 		<div class="description short">
-			<p>Key Delete
-Remove a key from the database to stop it working</p>
+			<p>Remove a key from the database to stop it working</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Key Delete
-Remove a key from the database to stop it working</p>
+			<p>Remove a key from the database to stop it working</p>
 
 
 
@@ -222,16 +218,14 @@ <h1>Class Key</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_level_post">#</a>
-		<code><a href="http://github.com/source-class-Key.html#96-133" title="Go to source code">level_post</a>( )</code>
+		<code><a href="http://github.com/source-class-Key.html#90-126" title="Go to source code">level_post</a>( )</code>
 
 		<div class="description short">
-			<p>Update Key
-Change the level</p>
+			<p>Change the level</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Update Key
-Change the level</p>
+			<p>Change the level</p>
 
 
 
@@ -254,16 +248,14 @@ <h1>Class Key</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_suspend_post">#</a>
-		<code><a href="http://github.com/source-class-Key.html#137-173" title="Go to source code">suspend_post</a>( )</code>
+		<code><a href="http://github.com/source-class-Key.html#128-163" title="Go to source code">suspend_post</a>( )</code>
 
 		<div class="description short">
-			<p>Update Key
-Change the level</p>
+			<p>Suspend a key</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Update Key
-Change the level</p>
+			<p>Suspend a key</p>
 
 
 
@@ -286,16 +278,14 @@ <h1>Class Key</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_regenerate_post">#</a>
-		<code><a href="http://github.com/source-class-Key.html#177-220" title="Go to source code">regenerate_post</a>( )</code>
+		<code><a href="http://github.com/source-class-Key.html#165-207" title="Go to source code">regenerate_post</a>( )</code>
 
 		<div class="description short">
-			<p>Regenerate Key
-Remove a key from the database to stop it working</p>
+			<p>Regenerate a key</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Regenerate Key
-Remove a key from the database to stop it working</p>
+			<p>Regenerate a key</p>
 
 
 
diff --git a/documentation/class-REST_Controller.html b/documentation/class-REST_Controller.html
index 2c26dc68..67ca8676 100644
--- a/documentation/class-REST_Controller.html
+++ b/documentation/class-REST_Controller.html
@@ -137,7 +137,7 @@ <h4>Direct known subclasses</h4>
 				3.0.0<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-2024" title="Go to source code">libraries/REST_Controller.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-2100" title="Go to source code">libraries/REST_Controller.php</a>
 		<br>
 	</div>
 
@@ -257,7 +257,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__remap">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#550-655" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#550-667" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var></span> )</code>
 
 		<div class="description short">
 			<p>Requests are not made to methods directly, the request will be for
@@ -298,7 +298,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#657-737" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#669-750" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Takes mixed data and optionally a status code, then creates the response</p>
@@ -338,7 +338,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_set_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#739-752" title="Go to source code">set_response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#752-765" title="Go to source code">set_response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Takes mixed data and optionally a status code, then creates the response
@@ -381,7 +381,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_input_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#754-786" title="Go to source code">_detect_input_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#767-799" title="Go to source code">_detect_input_format</a>( )</code>
 
 		<div class="description short">
 			<p>Get the input format e.g. json or xml</p>
@@ -415,7 +415,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_output_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#788-871" title="Go to source code">_detect_output_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#801-870" title="Go to source code">_detect_output_format</a>( )</code>
 
 		<div class="description short">
 			<p>Detect which format should be used to output the data</p>
@@ -449,7 +449,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_method">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#873-903" title="Go to source code">_detect_method</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#872-902" title="Go to source code">_detect_method</a>( )</code>
 
 		<div class="description short">
 			<p>Get the HTTP request string e.g. get or post</p>
@@ -483,7 +483,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_api_key">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#905-977" title="Go to source code">_detect_api_key</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#904-976" title="Go to source code">_detect_api_key</a>( )</code>
 
 		<div class="description short">
 			<p>See if the user has provided an API key</p>
@@ -510,27 +510,27 @@ <h4>Returns</h4>
 		<td class="attributes"><code>
 			 protected 
 
-			null|string
+			string|null
 			
 			</code>
 		</td>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_lang">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#979-1010" title="Go to source code">_detect_lang</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#978-1010" title="Go to source code">_detect_lang</a>( )</code>
 
 		<div class="description short">
-			<p>What language do they want it in?</p>
+			<p>Preferred return language</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>What language do they want it in?</p>
+			<p>Preferred return language</p>
 
 
 
 				<h4>Returns</h4>
 				<div class="list">
-					null|string<br>The language code.
+					string|null<br>The language code
 				</div>
 
 
@@ -590,7 +590,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_limit">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1040-1116" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1040-1140" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
 
 		<div class="description short">
 			<p>Check if the requests to a controller method exceed a limit</p>
@@ -629,14 +629,14 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__auth_override_check">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1118-1208" title="Go to source code">_auth_override_check</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1142-1300" title="Go to source code">_auth_override_check</a>( )</code>
 
 		<div class="description short">
-			<p>Check if there is a specific auth type set for the current class/method being called</p>
+			<p>Check if there is a specific auth type set for the current class/method/HTTP-method being called</p>
 		</div>
 
 		<div class="description detailed hidden">
-			<p>Check if there is a specific auth type set for the current class/method being called</p>
+			<p>Check if there is a specific auth type set for the current class/method/HTTP-method being called</p>
 
 
 
@@ -663,7 +663,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1210-1220" title="Go to source code">_parse_get</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1302-1312" title="Go to source code">_parse_get</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the GET request arguments</p>
@@ -693,7 +693,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1222-1236" title="Go to source code">_parse_post</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1314-1328" title="Go to source code">_parse_post</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the POST request arguments</p>
@@ -723,7 +723,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1238-1258" title="Go to source code">_parse_put</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1330-1350" title="Go to source code">_parse_put</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PUT request arguments</p>
@@ -753,7 +753,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1260-1273" title="Go to source code">_parse_head</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1352-1365" title="Go to source code">_parse_head</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the HEAD request arguments</p>
@@ -783,7 +783,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1275-1288" title="Go to source code">_parse_options</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1367-1380" title="Go to source code">_parse_options</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the OPTIONS request arguments</p>
@@ -813,7 +813,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1290-1311" title="Go to source code">_parse_patch</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1382-1403" title="Go to source code">_parse_patch</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PATCH request arguments</p>
@@ -843,7 +843,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1313-1326" title="Go to source code">_parse_delete</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1405-1418" title="Go to source code">_parse_delete</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the DELETE request arguments</p>
@@ -873,7 +873,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1328-1360" title="Go to source code">_parse_query</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1420-1452" title="Go to source code">_parse_query</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the query parameters</p>
@@ -903,7 +903,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1364-1381" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1456-1473" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a GET request</p>
@@ -945,7 +945,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1383-1400" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1475-1492" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a OPTIONS request</p>
@@ -987,7 +987,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1402-1419" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1494-1511" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a HEAD request</p>
@@ -1029,7 +1029,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1421-1438" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1513-1530" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a POST request</p>
@@ -1071,7 +1071,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1440-1457" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1532-1549" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PUT request</p>
@@ -1113,7 +1113,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1459-1476" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1551-1568" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a DELETE request</p>
@@ -1155,7 +1155,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1478-1495" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1570-1587" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PATCH request</p>
@@ -1197,7 +1197,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1497-1514" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1589-1606" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from the query parameters</p>
@@ -1239,7 +1239,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__xss_clean">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1516-1530" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1608-1622" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
 
 		<div class="description short">
 			<p>Sanitizes data so that Cross Site Scripting Hacks can be
@@ -1282,7 +1282,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_validation_errors">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1532-1543" title="Go to source code">validation_errors</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1624-1635" title="Go to source code">validation_errors</a>( )</code>
 
 		<div class="description short">
 			<p>Retrieve the validation errors</p>
@@ -1316,7 +1316,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_ldap_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1547-1652" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1639-1732" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform LDAP Authentication</p>
@@ -1357,7 +1357,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_library_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1654-1694" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1734-1771" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform Library Authentication - Override this function to change the way the library is called</p>
@@ -1398,7 +1398,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1696-1751" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1773-1828" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Check if the user is logged in</p>
@@ -1439,7 +1439,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_php_session">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1753-1773" title="Go to source code">_check_php_session</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1830-1850" title="Go to source code">_check_php_session</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the user is logged in with a PHP session key</p>
@@ -1469,7 +1469,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_basic_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1775-1814" title="Go to source code">_prepare_basic_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1852-1891" title="Go to source code">_prepare_basic_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for basic authentication</p>
@@ -1499,7 +1499,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_digest_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1816-1875" title="Go to source code">_prepare_digest_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1893-1948" title="Go to source code">_prepare_digest_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for digest authentication</p>
@@ -1529,7 +1529,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_blacklist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1877-1898" title="Go to source code">_check_blacklist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1950-1970" title="Go to source code">_check_blacklist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response</p>
@@ -1559,7 +1559,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_whitelist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1900-1921" title="Go to source code">_check_whitelist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1972-1998" title="Go to source code">_check_whitelist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response</p>
@@ -1589,7 +1589,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__force_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1923-1954" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2000-2031" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
 
 		<div class="description short">
 			<p>Force logging in by setting the WWW-Authenticate header</p>
@@ -1625,7 +1625,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_access_time">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1956-1972" title="Go to source code">_log_access_time</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2033-2048" title="Go to source code">_log_access_time</a>( )</code>
 
 		<div class="description short">
 			<p>Updates the log table with the total access time</p>
@@ -1663,7 +1663,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_response_code">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1974-1990" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2050-2066" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
 
 		<div class="description short">
 			<p>Updates the log table with HTTP response code</p>
@@ -1706,7 +1706,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_access">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1992-2022" title="Go to source code">_check_access</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2068-2098" title="Go to source code">_check_access</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the API key has access to the controller and methods</p>
diff --git a/documentation/class-Rest_server.html b/documentation/class-Rest_server.html
new file mode 100644
index 00000000..d414d461
--- /dev/null
+++ b/documentation/class-Rest_server.html
@@ -0,0 +1,190 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+
+	<title>Class Rest_server</title>
+
+	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
+
+</head>
+
+<body>
+<div id="left">
+	<div id="menu">
+		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
+
+
+		<div id="groups">
+				<h3>Packages</h3>
+			<ul>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.html">
+						CodeIgniter<span></span>
+					</a>
+
+						<ul>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Libraries.html">
+						Libraries					</a>
+
+						</li>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
+						</li>
+							</ul></li>
+				<li>
+					<a href="http://github.com/package-None.html">
+						None					</a>
+
+						</li>
+			</ul>
+		</div>
+
+		<hr>
+
+
+		<div id="elements">
+			<h3>Classes</h3>
+			<ul>
+				<li><a href="http://github.com/class-Format.html">Format</a></li>
+				<li class="active"><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
+				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
+			</ul>
+
+
+
+
+
+		</div>
+	</div>
+</div>
+
+<div id="splitter"></div>
+
+<div id="right">
+<div id="rightInner">
+	<form id="search">
+		<input type="hidden" name="cx" value="">
+		<input type="hidden" name="ie" value="UTF-8">
+		<input type="text" name="q" class="text" placeholder="Search">
+	</form>
+
+	<div id="navigation">
+		<ul>
+			<li>
+				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
+			</li>
+			<li>
+<span>Package</span>			</li>
+			<li class="active">
+<span>Class</span>			</li>
+		</ul>
+		<ul>
+		</ul>
+		<ul>
+		</ul>
+	</div>
+
+<div id="content" class="class">
+	<h1>Class Rest_server</h1>
+
+
+
+	<dl class="tree">
+		<dd style="padding-left:0px">
+CI_Controller
+			
+			
+		</dd>
+		<dd style="padding-left:30px">
+			<img src="http://github.com/resources/inherit.png" alt="Extended by">
+<b><span>Rest_server</span></b>			
+			
+			
+		</dd>
+	</dl>
+
+
+
+
+
+
+
+
+	<div class="info">
+		
+		
+		
+		
+
+			<b>Located at</b> <a href="http://github.com/source-class-Rest_server.html#4-12" title="Go to source code">controllers/Rest_server.php</a>
+		<br>
+	</div>
+
+
+
+	<table class="summary methods" id="methods">
+	<caption>Methods summary</caption>
+	<tr data-order="index" id="_index">
+
+		<td class="attributes"><code>
+			 public 
+
+			
+			
+			</code>
+		</td>
+
+		<td class="name"><div>
+		<a class="anchor" href="#_index">#</a>
+		<code><a href="http://github.com/source-class-Rest_server.html#6-11" title="Go to source code">index</a>( )</code>
+
+		<div class="description short">
+			
+		</div>
+
+		<div class="description detailed hidden">
+			
+
+
+
+
+
+
+
+		</div>
+		</div></td>
+	</tr>
+	</table>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</div>
+
+	<div id="footer">
+		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
+	</div>
+</div>
+</div>
+<script src="http://github.com/resources/combined.js"></script>
+<script src="http://github.com/elementlist.js"></script>
+</body>
+</html>
diff --git a/documentation/class-Welcome.html b/documentation/class-Welcome.html
new file mode 100644
index 00000000..2ba710ee
--- /dev/null
+++ b/documentation/class-Welcome.html
@@ -0,0 +1,203 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+
+	<title>Class Welcome</title>
+
+	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
+
+</head>
+
+<body>
+<div id="left">
+	<div id="menu">
+		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
+
+
+		<div id="groups">
+				<h3>Packages</h3>
+			<ul>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.html">
+						CodeIgniter<span></span>
+					</a>
+
+						<ul>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Libraries.html">
+						Libraries					</a>
+
+						</li>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
+						</li>
+							</ul></li>
+				<li>
+					<a href="http://github.com/package-None.html">
+						None					</a>
+
+						</li>
+			</ul>
+		</div>
+
+		<hr>
+
+
+		<div id="elements">
+			<h3>Classes</h3>
+			<ul>
+				<li><a href="http://github.com/class-Format.html">Format</a></li>
+				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
+				<li class="active"><a href="http://github.com/class-Welcome.html">Welcome</a></li>
+			</ul>
+
+
+
+
+
+		</div>
+	</div>
+</div>
+
+<div id="splitter"></div>
+
+<div id="right">
+<div id="rightInner">
+	<form id="search">
+		<input type="hidden" name="cx" value="">
+		<input type="hidden" name="ie" value="UTF-8">
+		<input type="text" name="q" class="text" placeholder="Search">
+	</form>
+
+	<div id="navigation">
+		<ul>
+			<li>
+				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
+			</li>
+			<li>
+<span>Package</span>			</li>
+			<li class="active">
+<span>Class</span>			</li>
+		</ul>
+		<ul>
+		</ul>
+		<ul>
+		</ul>
+	</div>
+
+<div id="content" class="class">
+	<h1>Class Welcome</h1>
+
+
+
+	<dl class="tree">
+		<dd style="padding-left:0px">
+CI_Controller
+			
+			
+		</dd>
+		<dd style="padding-left:30px">
+			<img src="http://github.com/resources/inherit.png" alt="Extended by">
+<b><span>Welcome</span></b>			
+			
+			
+		</dd>
+	</dl>
+
+
+
+
+
+
+
+
+	<div class="info">
+		
+		
+		
+		
+
+			<b>Located at</b> <a href="http://github.com/source-class-Welcome.html#4-27" title="Go to source code">controllers/Welcome.php</a>
+		<br>
+	</div>
+
+
+
+	<table class="summary methods" id="methods">
+	<caption>Methods summary</caption>
+	<tr data-order="index" id="_index">
+
+		<td class="attributes"><code>
+			 public 
+
+			
+			
+			</code>
+		</td>
+
+		<td class="name"><div>
+		<a class="anchor" href="#_index">#</a>
+		<code><a href="http://github.com/source-class-Welcome.html#6-26" title="Go to source code">index</a>( )</code>
+
+		<div class="description short">
+			<p>Index Page for this controller.</p>
+		</div>
+
+		<div class="description detailed hidden">
+			<p>Index Page for this controller.</p>
+
+<p>Maps to the following URL
+http://example.com/index.php/welcome - or -
+http://example.com/index.php/welcome/index - or -
+Since this controller is set as the default controller in
+config/routes.php, it's displayed at http://example.com/</p>
+
+<p>So any other public methods not prefixed with an underscore will
+map to /index.php/welcome/<method_name></p>
+
+
+
+
+
+				<h4>See</h4>
+				<div class="list">
+						http://codeigniter.com/user_guide/general/urls.html<br>
+				</div>
+
+
+		</div>
+		</div></td>
+	</tr>
+	</table>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</div>
+
+	<div id="footer">
+		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
+	</div>
+</div>
+</div>
+<script src="http://github.com/resources/combined.js"></script>
+<script src="http://github.com/elementlist.js"></script>
+</body>
+</html>
diff --git a/documentation/elementlist.js b/documentation/elementlist.js
index 7fd9a1d3..b52ccbf6 100644
--- a/documentation/elementlist.js
+++ b/documentation/elementlist.js
@@ -1,3 +1,3 @@
 
 var ApiGen = ApiGen || {};
-ApiGen.elements = [["c","Example"],["c","Format"],["c","Key"],["c","REST_Controller"]];
+ApiGen.elements = [["c","Example"],["c","Format"],["c","Key"],["c","REST_Controller"],["c","Rest_server"],["c","Welcome"]];
diff --git a/documentation/index.html b/documentation/index.html
index c9d6a443..64a7cab9 100644
--- a/documentation/index.html
+++ b/documentation/index.html
@@ -52,6 +52,8 @@ <h3>Classes</h3>
 				<li><a href="http://github.com/class-Format.html">Format</a></li>
 				<li><a href="http://github.com/class-Key.html">Key</a></li>
 				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
+				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
+				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
 			</ul>
 
 
@@ -123,7 +125,7 @@ <h1>Overview</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
-<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
+<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/package-CodeIgniter.Libraries.html b/documentation/package-CodeIgniter.Libraries.html
index 1331a2de..4d4833cd 100644
--- a/documentation/package-CodeIgniter.Libraries.html
+++ b/documentation/package-CodeIgniter.Libraries.html
@@ -111,7 +111,7 @@ <h1>Package <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\Libraries</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
-<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
+<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/package-CodeIgniter.Rest.html b/documentation/package-CodeIgniter.Rest.html
index 4e3e736a..c532fa4d 100644
--- a/documentation/package-CodeIgniter.Rest.html
+++ b/documentation/package-CodeIgniter.Rest.html
@@ -117,7 +117,7 @@ <h1>Package <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\Rest</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
-<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
+<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/package-CodeIgniter.html b/documentation/package-CodeIgniter.html
index e15e4310..f2ec181d 100644
--- a/documentation/package-CodeIgniter.html
+++ b/documentation/package-CodeIgniter.html
@@ -107,7 +107,7 @@ <h1>Package CodeIgniter</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
-<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
+<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/package-None.html b/documentation/package-None.html
index d9a36338..7d10ab75 100644
--- a/documentation/package-None.html
+++ b/documentation/package-None.html
@@ -50,6 +50,8 @@ <h3>Packages</h3>
 			<h3>Classes</h3>
 			<ul>
 				<li><a href="http://github.com/class-Format.html">Format</a></li>
+				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
+				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
 			</ul>
 
 
@@ -98,6 +100,14 @@ <h1>No package</h1>
 	<td><p>Format class
 Help convert between various formats such as XML, JSON, CSV, etc.</p></td>
 </tr>
+<tr>
+	<td class="name"><a href="http://github.com/class-Rest_server.html">Rest_server</a></td>
+	<td></td>
+</tr>
+<tr>
+	<td class="name"><a href="http://github.com/class-Welcome.html">Welcome</a></td>
+	<td></td>
+</tr>
 </table>
 
 
@@ -111,7 +121,7 @@ <h1>No package</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
-<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
+<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Example.html b/documentation/source-class-Example.html
index c9490664..73786431 100644
--- a/documentation/source-class-Example.html
+++ b/documentation/source-class-Example.html
@@ -54,6 +54,8 @@ <h3>Classes</h3>
 				<li><a href="http://github.com/class-Format.html">Format</a></li>
 				<li><a href="http://github.com/class-Key.html">Key</a></li>
 				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
+				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
+				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
 			</ul>
 
 
@@ -122,91 +124,119 @@ <h3>Classes</h3>
 </span><span id="30" class="l"><a href="#30"> 30: </a>        <span class="php-var">$this</span>-&gt;methods[<span class="php-quote">'user_delete'</span>][<span class="php-quote">'limit'</span>] = <span class="php-num">50</span>; <span class="php-comment">// 50 requests per hour per user/key</span>
 </span><span id="31" class="l"><a href="#31"> 31: </a>    }
 </span><span id="32" class="l"><a href="#32"> 32: </a>
-</span><span id="33" class="l"><a href="#33"> 33: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> user_get()
+</span><span id="33" class="l"><a href="#33"> 33: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> users_get()
 </span><span id="34" class="l"><a href="#34"> 34: </a>    {
-</span><span id="35" class="l"><a href="#35"> 35: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>))
-</span><span id="36" class="l"><a href="#36"> 36: </a>        {
-</span><span id="37" class="l"><a href="#37"> 37: </a>            <span class="php-comment">// Set the response and exit</span>
-</span><span id="38" class="l"><a href="#38"> 38: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">NULL</span>, REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
-</span><span id="39" class="l"><a href="#39"> 39: </a>        }
-</span><span id="40" class="l"><a href="#40"> 40: </a>
-</span><span id="41" class="l"><a href="#41"> 41: </a>        <span class="php-comment">// $user = $this-&gt;some_model-&gt;getSomething($this-&gt;get('id'));</span>
-</span><span id="42" class="l"><a href="#42"> 42: </a>        <span class="php-var">$users</span> = [
-</span><span id="43" class="l"><a href="#43"> 43: </a>            <span class="php-num">1</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'John'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'john@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Loves coding'</span>],
-</span><span id="44" class="l"><a href="#44"> 44: </a>            <span class="php-num">2</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">2</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jim'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jim@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Developed on CodeIgniter'</span>],
-</span><span id="45" class="l"><a href="#45"> 45: </a>            <span class="php-num">3</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">3</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jane'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jane@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Lives in the USA'</span>, [<span class="php-quote">'hobbies'</span> =&gt; [<span class="php-quote">'guitar'</span>, <span class="php-quote">'cycling'</span>]]],
-</span><span id="46" class="l"><a href="#46"> 46: </a>        ];
-</span><span id="47" class="l"><a href="#47"> 47: </a>
-</span><span id="48" class="l"><a href="#48"> 48: </a>        <span class="php-comment">// Get the user from the array, by retrieving the id from the GET request</span>
-</span><span id="49" class="l"><a href="#49"> 49: </a>        <span class="php-var">$user</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$users</span>[<span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>)]) ? <span class="php-var">$users</span>[<span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>)] : <span class="php-keyword1">NULL</span>;
-</span><span id="50" class="l"><a href="#50"> 50: </a>
-</span><span id="51" class="l"><a href="#51"> 51: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$user</span>)
-</span><span id="52" class="l"><a href="#52"> 52: </a>        {
-</span><span id="53" class="l"><a href="#53"> 53: </a>            <span class="php-var">$this</span>-&gt;set_response(<span class="php-var">$user</span>, REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
-</span><span id="54" class="l"><a href="#54"> 54: </a>        }
-</span><span id="55" class="l"><a href="#55"> 55: </a>        <span class="php-keyword1">else</span>
-</span><span id="56" class="l"><a href="#56"> 56: </a>        {
-</span><span id="57" class="l"><a href="#57"> 57: </a>            <span class="php-var">$this</span>-&gt;set_response([
-</span><span id="58" class="l"><a href="#58"> 58: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="59" class="l"><a href="#59"> 59: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'User could not be found'</span>
-</span><span id="60" class="l"><a href="#60"> 60: </a>            ], REST_Controller::NOT_FOUND); <span class="php-comment">// NOT_FOUND (404) being the HTTP response code</span>
-</span><span id="61" class="l"><a href="#61"> 61: </a>        }
-</span><span id="62" class="l"><a href="#62"> 62: </a>    }
+</span><span id="35" class="l"><a href="#35"> 35: </a>        <span class="php-comment">// Users from a data store e.g. database</span>
+</span><span id="36" class="l"><a href="#36"> 36: </a>        <span class="php-var">$users</span> = [
+</span><span id="37" class="l"><a href="#37"> 37: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'John'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'john@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Loves coding'</span>],
+</span><span id="38" class="l"><a href="#38"> 38: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">2</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jim'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jim@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Developed on CodeIgniter'</span>],
+</span><span id="39" class="l"><a href="#39"> 39: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">3</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jane'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jane@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Lives in the USA'</span>, [<span class="php-quote">'hobbies'</span> =&gt; [<span class="php-quote">'guitar'</span>, <span class="php-quote">'cycling'</span>]]],
+</span><span id="40" class="l"><a href="#40"> 40: </a>        ];
+</span><span id="41" class="l"><a href="#41"> 41: </a>
+</span><span id="42" class="l"><a href="#42"> 42: </a>        <span class="php-var">$id</span> = <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>);
+</span><span id="43" class="l"><a href="#43"> 43: </a>
+</span><span id="44" class="l"><a href="#44"> 44: </a>        <span class="php-comment">// If the id parameter doesn't exist return all the users</span>
+</span><span id="45" class="l"><a href="#45"> 45: </a>
+</span><span id="46" class="l"><a href="#46"> 46: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$id</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="47" class="l"><a href="#47"> 47: </a>        {
+</span><span id="48" class="l"><a href="#48"> 48: </a>            <span class="php-comment">// Check if the users data store contains users (in case the database result returns NULL)</span>
+</span><span id="49" class="l"><a href="#49"> 49: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$users</span>)
+</span><span id="50" class="l"><a href="#50"> 50: </a>            {
+</span><span id="51" class="l"><a href="#51"> 51: </a>                <span class="php-comment">// Set the response and exit</span>
+</span><span id="52" class="l"><a href="#52"> 52: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$users</span>, REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
+</span><span id="53" class="l"><a href="#53"> 53: </a>            }
+</span><span id="54" class="l"><a href="#54"> 54: </a>            <span class="php-keyword1">else</span>
+</span><span id="55" class="l"><a href="#55"> 55: </a>            {
+</span><span id="56" class="l"><a href="#56"> 56: </a>                <span class="php-comment">// Set the response and exit</span>
+</span><span id="57" class="l"><a href="#57"> 57: </a>                <span class="php-var">$this</span>-&gt;response([
+</span><span id="58" class="l"><a href="#58"> 58: </a>                    <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="59" class="l"><a href="#59"> 59: </a>                    <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'No users were found'</span>
+</span><span id="60" class="l"><a href="#60"> 60: </a>                ], REST_Controller::HTTP_NOT_FOUND); <span class="php-comment">// NOT_FOUND (404) being the HTTP response code</span>
+</span><span id="61" class="l"><a href="#61"> 61: </a>            }
+</span><span id="62" class="l"><a href="#62"> 62: </a>        }
 </span><span id="63" class="l"><a href="#63"> 63: </a>
-</span><span id="64" class="l"><a href="#64"> 64: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> user_post()
-</span><span id="65" class="l"><a href="#65"> 65: </a>    {
-</span><span id="66" class="l"><a href="#66"> 66: </a>        <span class="php-comment">// $this-&gt;some_model-&gt;update_user($this-&gt;get('id'));</span>
-</span><span id="67" class="l"><a href="#67"> 67: </a>        <span class="php-var">$message</span> = [
-</span><span id="68" class="l"><a href="#68"> 68: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>),
-</span><span id="69" class="l"><a href="#69"> 69: </a>            <span class="php-quote">'name'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'name'</span>),
-</span><span id="70" class="l"><a href="#70"> 70: </a>            <span class="php-quote">'email'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'email'</span>),
-</span><span id="71" class="l"><a href="#71"> 71: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Added a resource'</span>
-</span><span id="72" class="l"><a href="#72"> 72: </a>        ];
-</span><span id="73" class="l"><a href="#73"> 73: </a>
-</span><span id="74" class="l"><a href="#74"> 74: </a>        <span class="php-var">$this</span>-&gt;set_response(<span class="php-var">$message</span>, REST_Controller::HTTP_CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
-</span><span id="75" class="l"><a href="#75"> 75: </a>    }
-</span><span id="76" class="l"><a href="#76"> 76: </a>
-</span><span id="77" class="l"><a href="#77"> 77: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> user_delete()
-</span><span id="78" class="l"><a href="#78"> 78: </a>    {
-</span><span id="79" class="l"><a href="#79"> 79: </a>        <span class="php-comment">// $this-&gt;some_model-&gt;delete_something($this-&gt;get());</span>
-</span><span id="80" class="l"><a href="#80"> 80: </a>        <span class="php-var">$message</span> = [
-</span><span id="81" class="l"><a href="#81"> 81: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>),
-</span><span id="82" class="l"><a href="#82"> 82: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Deleted the resource'</span>
-</span><span id="83" class="l"><a href="#83"> 83: </a>        ];
-</span><span id="84" class="l"><a href="#84"> 84: </a>
-</span><span id="85" class="l"><a href="#85"> 85: </a>        <span class="php-var">$this</span>-&gt;set_response(<span class="php-var">$message</span>, REST_Controller::HTTP_NO_CONTENT); <span class="php-comment">// NO_CONTENT (204) being the HTTP response code</span>
-</span><span id="86" class="l"><a href="#86"> 86: </a>    }
-</span><span id="87" class="l"><a href="#87"> 87: </a>
-</span><span id="88" class="l"><a href="#88"> 88: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> users_get()
-</span><span id="89" class="l"><a href="#89"> 89: </a>    {
-</span><span id="90" class="l"><a href="#90"> 90: </a>        <span class="php-comment">// $users = $this-&gt;some_model-&gt;get_something($this-&gt;get('limit'));</span>
-</span><span id="91" class="l"><a href="#91"> 91: </a>        <span class="php-var">$users</span> = [
-</span><span id="92" class="l"><a href="#92"> 92: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'John'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'john@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Loves coding'</span>],
-</span><span id="93" class="l"><a href="#93"> 93: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">2</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jim'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jim@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Developed on CodeIgniter'</span>],
-</span><span id="94" class="l"><a href="#94"> 94: </a>            <span class="php-num">3</span> =&gt; [<span class="php-quote">'id'</span> =&gt; <span class="php-num">3</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jane'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jane@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Lives in the USA'</span>, [<span class="php-quote">'hobbies'</span> =&gt; [<span class="php-quote">'guitar'</span>, <span class="php-quote">'cycling'</span>]]],
-</span><span id="95" class="l"><a href="#95"> 95: </a>        ];
-</span><span id="96" class="l"><a href="#96"> 96: </a>
-</span><span id="97" class="l"><a href="#97"> 97: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$users</span>)
-</span><span id="98" class="l"><a href="#98"> 98: </a>        {
-</span><span id="99" class="l"><a href="#99"> 99: </a>            <span class="php-var">$this</span>-&gt;set_response(<span class="php-var">$users</span>, REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
-</span><span id="100" class="l"><a href="#100">100: </a>        }
-</span><span id="101" class="l"><a href="#101">101: </a>        <span class="php-keyword1">else</span>
-</span><span id="102" class="l"><a href="#102">102: </a>        {
-</span><span id="103" class="l"><a href="#103">103: </a>            <span class="php-var">$this</span>-&gt;set_response([
-</span><span id="104" class="l"><a href="#104">104: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="105" class="l"><a href="#105">105: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'No users were found'</span>
-</span><span id="106" class="l"><a href="#106">106: </a>                ], REST_Controller::NOT_FOUND); <span class="php-comment">// NOT_FOUND (404) being the HTTP response code</span>
-</span><span id="107" class="l"><a href="#107">107: </a>        }
-</span><span id="108" class="l"><a href="#108">108: </a>    }
-</span><span id="109" class="l"><a href="#109">109: </a>}
-</span><span id="110" class="l"><a href="#110">110: </a></span></code></pre>
+</span><span id="64" class="l"><a href="#64"> 64: </a>        <span class="php-comment">// Find and return a single record for a particular user.</span>
+</span><span id="65" class="l"><a href="#65"> 65: </a>
+</span><span id="66" class="l"><a href="#66"> 66: </a>        <span class="php-var">$id</span> = (int) <span class="php-var">$id</span>;
+</span><span id="67" class="l"><a href="#67"> 67: </a>
+</span><span id="68" class="l"><a href="#68"> 68: </a>        <span class="php-comment">// Validate the id.</span>
+</span><span id="69" class="l"><a href="#69"> 69: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$id</span> &lt;= <span class="php-num">0</span>)
+</span><span id="70" class="l"><a href="#70"> 70: </a>        {
+</span><span id="71" class="l"><a href="#71"> 71: </a>            <span class="php-comment">// Invalid id, set the response and exit.</span>
+</span><span id="72" class="l"><a href="#72"> 72: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">NULL</span>, REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
+</span><span id="73" class="l"><a href="#73"> 73: </a>        }
+</span><span id="74" class="l"><a href="#74"> 74: </a>
+</span><span id="75" class="l"><a href="#75"> 75: </a>        <span class="php-comment">// Get the user from the array, using the id as key for retreival.</span>
+</span><span id="76" class="l"><a href="#76"> 76: </a>        <span class="php-comment">// Usually a model is to be used for this.</span>
+</span><span id="77" class="l"><a href="#77"> 77: </a>
+</span><span id="78" class="l"><a href="#78"> 78: </a>        <span class="php-var">$user</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="79" class="l"><a href="#79"> 79: </a>
+</span><span id="80" class="l"><a href="#80"> 80: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$users</span>))
+</span><span id="81" class="l"><a href="#81"> 81: </a>        {
+</span><span id="82" class="l"><a href="#82"> 82: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$users</span> <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
+</span><span id="83" class="l"><a href="#83"> 83: </a>            {
+</span><span id="84" class="l"><a href="#84"> 84: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$value</span>[<span class="php-quote">'id'</span>]) &amp;&amp; <span class="php-var">$value</span>[<span class="php-quote">'id'</span>] === <span class="php-var">$id</span>)
+</span><span id="85" class="l"><a href="#85"> 85: </a>                {
+</span><span id="86" class="l"><a href="#86"> 86: </a>                    <span class="php-var">$user</span> = <span class="php-var">$value</span>;
+</span><span id="87" class="l"><a href="#87"> 87: </a>                }
+</span><span id="88" class="l"><a href="#88"> 88: </a>            }
+</span><span id="89" class="l"><a href="#89"> 89: </a>        }
+</span><span id="90" class="l"><a href="#90"> 90: </a>
+</span><span id="91" class="l"><a href="#91"> 91: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$user</span>))
+</span><span id="92" class="l"><a href="#92"> 92: </a>        {
+</span><span id="93" class="l"><a href="#93"> 93: </a>            <span class="php-var">$this</span>-&gt;set_response(<span class="php-var">$user</span>, REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
+</span><span id="94" class="l"><a href="#94"> 94: </a>        }
+</span><span id="95" class="l"><a href="#95"> 95: </a>        <span class="php-keyword1">else</span>
+</span><span id="96" class="l"><a href="#96"> 96: </a>        {
+</span><span id="97" class="l"><a href="#97"> 97: </a>            <span class="php-var">$this</span>-&gt;set_response([
+</span><span id="98" class="l"><a href="#98"> 98: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="99" class="l"><a href="#99"> 99: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'User could not be found'</span>
+</span><span id="100" class="l"><a href="#100">100: </a>            ], REST_Controller::HTTP_NOT_FOUND); <span class="php-comment">// NOT_FOUND (404) being the HTTP response code</span>
+</span><span id="101" class="l"><a href="#101">101: </a>        }
+</span><span id="102" class="l"><a href="#102">102: </a>    }
+</span><span id="103" class="l"><a href="#103">103: </a>
+</span><span id="104" class="l"><a href="#104">104: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> users_post()
+</span><span id="105" class="l"><a href="#105">105: </a>    {
+</span><span id="106" class="l"><a href="#106">106: </a>        <span class="php-comment">// $this-&gt;some_model-&gt;update_user( ... );</span>
+</span><span id="107" class="l"><a href="#107">107: </a>        <span class="php-var">$message</span> = [
+</span><span id="108" class="l"><a href="#108">108: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-num">100</span>, <span class="php-comment">// Automatically generated by the model</span>
+</span><span id="109" class="l"><a href="#109">109: </a>            <span class="php-quote">'name'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'name'</span>),
+</span><span id="110" class="l"><a href="#110">110: </a>            <span class="php-quote">'email'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'email'</span>),
+</span><span id="111" class="l"><a href="#111">111: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Added a resource'</span>
+</span><span id="112" class="l"><a href="#112">112: </a>        ];
+</span><span id="113" class="l"><a href="#113">113: </a>
+</span><span id="114" class="l"><a href="#114">114: </a>        <span class="php-var">$this</span>-&gt;set_response(<span class="php-var">$message</span>, REST_Controller::HTTP_CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
+</span><span id="115" class="l"><a href="#115">115: </a>    }
+</span><span id="116" class="l"><a href="#116">116: </a>
+</span><span id="117" class="l"><a href="#117">117: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> users_delete()
+</span><span id="118" class="l"><a href="#118">118: </a>    {
+</span><span id="119" class="l"><a href="#119">119: </a>        <span class="php-var">$id</span> = (int) <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>);
+</span><span id="120" class="l"><a href="#120">120: </a>
+</span><span id="121" class="l"><a href="#121">121: </a>        <span class="php-comment">// Validate the id.</span>
+</span><span id="122" class="l"><a href="#122">122: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$id</span> &lt;= <span class="php-num">0</span>)
+</span><span id="123" class="l"><a href="#123">123: </a>        {
+</span><span id="124" class="l"><a href="#124">124: </a>            <span class="php-comment">// Set the response and exit</span>
+</span><span id="125" class="l"><a href="#125">125: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">NULL</span>, REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
+</span><span id="126" class="l"><a href="#126">126: </a>        }
+</span><span id="127" class="l"><a href="#127">127: </a>
+</span><span id="128" class="l"><a href="#128">128: </a>        <span class="php-comment">// $this-&gt;some_model-&gt;delete_something($id);</span>
+</span><span id="129" class="l"><a href="#129">129: </a>        <span class="php-var">$message</span> = [
+</span><span id="130" class="l"><a href="#130">130: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$id</span>,
+</span><span id="131" class="l"><a href="#131">131: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Deleted the resource'</span>
+</span><span id="132" class="l"><a href="#132">132: </a>        ];
+</span><span id="133" class="l"><a href="#133">133: </a>
+</span><span id="134" class="l"><a href="#134">134: </a>        <span class="php-var">$this</span>-&gt;set_response(<span class="php-var">$message</span>, REST_Controller::HTTP_NO_CONTENT); <span class="php-comment">// NO_CONTENT (204) being the HTTP response code</span>
+</span><span id="135" class="l"><a href="#135">135: </a>    }
+</span><span id="136" class="l"><a href="#136">136: </a>
+</span><span id="137" class="l"><a href="#137">137: </a>}
+</span><span id="138" class="l"><a href="#138">138: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
-<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
+<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Format.html b/documentation/source-class-Format.html
index 014615b7..935100d0 100644
--- a/documentation/source-class-Format.html
+++ b/documentation/source-class-Format.html
@@ -54,6 +54,8 @@ <h3>Classes</h3>
 				<li><a href="http://github.com/class-Format.html">Format</a></li>
 				<li><a href="http://github.com/class-Key.html">Key</a></li>
 				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
+				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
+				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
 			</ul>
 
 
@@ -314,9 +316,9 @@ <h3>Classes</h3>
 </span><span id="222" class="l"><a href="#222">222: </a>                    <span class="php-var">$attributes</span> = <span class="php-keyword2">get_object_vars</span>(<span class="php-var">$attributes</span>);
 </span><span id="223" class="l"><a href="#223">223: </a>                }
 </span><span id="224" class="l"><a href="#224">224: </a>
-</span><span id="225" class="l"><a href="#225">225: </a>                <span class="php-keyword1">foreach</span> (<span class="php-var">$attributes</span> <span class="php-keyword1">as</span> <span class="php-var">$attributeName</span> =&gt; <span class="php-var">$attributeValue</span>)
+</span><span id="225" class="l"><a href="#225">225: </a>                <span class="php-keyword1">foreach</span> (<span class="php-var">$attributes</span> <span class="php-keyword1">as</span> <span class="php-var">$attribute_name</span> =&gt; <span class="php-var">$attribute_value</span>)
 </span><span id="226" class="l"><a href="#226">226: </a>                {
-</span><span id="227" class="l"><a href="#227">227: </a>                    <span class="php-var">$structure</span>-&gt;addAttribute(<span class="php-var">$attributeName</span>, <span class="php-var">$attributeValue</span>);
+</span><span id="227" class="l"><a href="#227">227: </a>                    <span class="php-var">$structure</span>-&gt;addAttribute(<span class="php-var">$attribute_name</span>, <span class="php-var">$attribute_value</span>);
 </span><span id="228" class="l"><a href="#228">228: </a>                }
 </span><span id="229" class="l"><a href="#229">229: </a>            }
 </span><span id="230" class="l"><a href="#230">230: </a>            <span class="php-comment">// if there is another array found recursively call this function</span>
@@ -381,239 +383,254 @@ <h3>Classes</h3>
 </span><span id="289" class="l"><a href="#289">289: </a>
 </span><span id="290" class="l"><a href="#290">290: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$row</span>)
 </span><span id="291" class="l"><a href="#291">291: </a>        {
-</span><span id="292" class="l"><a href="#292">292: </a>            <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;add_row(<span class="php-var">$row</span>);
-</span><span id="293" class="l"><a href="#293">293: </a>        }
-</span><span id="294" class="l"><a href="#294">294: </a>
-</span><span id="295" class="l"><a href="#295">295: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;generate();
-</span><span id="296" class="l"><a href="#296">296: </a>    }
-</span><span id="297" class="l"><a href="#297">297: </a>
-</span><span id="298" class="l"><a href="#298">298: </a>    <span class="php-comment">/**
-</span></span><span id="299" class="l"><a href="#299">299: </a><span class="php-comment">     * @link http://www.metashock.de/2014/02/create-csv-file-in-memory-php/
-</span></span><span id="300" class="l"><a href="#300">300: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="301" class="l"><a href="#301">301: </a><span class="php-comment">     * to the constructor
-</span></span><span id="302" class="l"><a href="#302">302: </a><span class="php-comment">     * @param string $delimiter The optional delimiter parameter sets the field
-</span></span><span id="303" class="l"><a href="#303">303: </a><span class="php-comment">     * delimiter (one character only). NULL will use the default value (,)
-</span></span><span id="304" class="l"><a href="#304">304: </a><span class="php-comment">     * @param string $enclosure The optional enclosure parameter sets the field
-</span></span><span id="305" class="l"><a href="#305">305: </a><span class="php-comment">     * enclosure (one character only). NULL will use the default value (&quot;)
-</span></span><span id="306" class="l"><a href="#306">306: </a><span class="php-comment">     * @return string A csv string
-</span></span><span id="307" class="l"><a href="#307">307: </a><span class="php-comment">     */</span>
-</span><span id="308" class="l"><a href="#308">308: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_csv(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>, <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>)
-</span><span id="309" class="l"><a href="#309">309: </a>    {
-</span><span id="310" class="l"><a href="#310">310: </a>        <span class="php-comment">// Use a threshold of 1 MB (1024 * 1024)</span>
-</span><span id="311" class="l"><a href="#311">311: </a>        <span class="php-var">$handle</span> = <span class="php-keyword2">fopen</span>(<span class="php-quote">'php://temp/maxmemory:1048576'</span>, <span class="php-quote">'w'</span>);
-</span><span id="312" class="l"><a href="#312">312: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$handle</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="313" class="l"><a href="#313">313: </a>        {
-</span><span id="314" class="l"><a href="#314">314: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="315" class="l"><a href="#315">315: </a>        }
-</span><span id="316" class="l"><a href="#316">316: </a>
-</span><span id="317" class="l"><a href="#317">317: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="318" class="l"><a href="#318">318: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="319" class="l"><a href="#319">319: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="320" class="l"><a href="#320">320: </a>        {
-</span><span id="321" class="l"><a href="#321">321: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="322" class="l"><a href="#322">322: </a>        }
-</span><span id="323" class="l"><a href="#323">323: </a>
-</span><span id="324" class="l"><a href="#324">324: </a>        <span class="php-comment">// If NULL, then set as the default delimiter</span>
-</span><span id="325" class="l"><a href="#325">325: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$delimiter</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="326" class="l"><a href="#326">326: </a>        {
-</span><span id="327" class="l"><a href="#327">327: </a>            <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>;
-</span><span id="328" class="l"><a href="#328">328: </a>        }
-</span><span id="329" class="l"><a href="#329">329: </a>
-</span><span id="330" class="l"><a href="#330">330: </a>        <span class="php-comment">// If NULL, then set as the default enclosure</span>
-</span><span id="331" class="l"><a href="#331">331: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$enclosure</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="332" class="l"><a href="#332">332: </a>        {
-</span><span id="333" class="l"><a href="#333">333: </a>            <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>;
-</span><span id="334" class="l"><a href="#334">334: </a>        }
-</span><span id="335" class="l"><a href="#335">335: </a>
-</span><span id="336" class="l"><a href="#336">336: </a>        <span class="php-comment">// Cast as an array if not already</span>
-</span><span id="337" class="l"><a href="#337">337: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="338" class="l"><a href="#338">338: </a>        {
-</span><span id="339" class="l"><a href="#339">339: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
-</span><span id="340" class="l"><a href="#340">340: </a>        }
-</span><span id="341" class="l"><a href="#341">341: </a>
-</span><span id="342" class="l"><a href="#342">342: </a>        <span class="php-comment">// Check if it's a multi-dimensional array</span>
-</span><span id="343" class="l"><a href="#343">343: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]) &amp;&amp; <span class="php-keyword2">count</span>(<span class="php-var">$data</span>) !== <span class="php-keyword2">count</span>(<span class="php-var">$data</span>, COUNT_RECURSIVE))
-</span><span id="344" class="l"><a href="#344">344: </a>        {
-</span><span id="345" class="l"><a href="#345">345: </a>            <span class="php-comment">// Multi-dimensional array</span>
-</span><span id="346" class="l"><a href="#346">346: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]);
-</span><span id="347" class="l"><a href="#347">347: </a>        }
-</span><span id="348" class="l"><a href="#348">348: </a>        <span class="php-keyword1">else</span>
-</span><span id="349" class="l"><a href="#349">349: </a>        {
-</span><span id="350" class="l"><a href="#350">350: </a>            <span class="php-comment">// Single array</span>
-</span><span id="351" class="l"><a href="#351">351: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>);
-</span><span id="352" class="l"><a href="#352">352: </a>            <span class="php-var">$data</span> = [<span class="php-var">$data</span>];
-</span><span id="353" class="l"><a href="#353">353: </a>        }
-</span><span id="354" class="l"><a href="#354">354: </a>
-</span><span id="355" class="l"><a href="#355">355: </a>        <span class="php-comment">// Apply the headings</span>
-</span><span id="356" class="l"><a href="#356">356: </a>        <span class="php-keyword2">fputcsv</span>(<span class="php-var">$handle</span>, <span class="php-var">$headings</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
-</span><span id="357" class="l"><a href="#357">357: </a>
-</span><span id="358" class="l"><a href="#358">358: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$record</span>)
-</span><span id="359" class="l"><a href="#359">359: </a>        {
-</span><span id="360" class="l"><a href="#360">360: </a>            <span class="php-comment">// Returns the length of the string written or FALSE</span>
-</span><span id="361" class="l"><a href="#361">361: </a>            <span class="php-keyword2">fputcsv</span>(<span class="php-var">$handle</span>, <span class="php-var">$record</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
-</span><span id="362" class="l"><a href="#362">362: </a>        }
-</span><span id="363" class="l"><a href="#363">363: </a>
-</span><span id="364" class="l"><a href="#364">364: </a>        <span class="php-comment">// Reset the file pointer</span>
-</span><span id="365" class="l"><a href="#365">365: </a>        <span class="php-keyword2">rewind</span>(<span class="php-var">$handle</span>);
-</span><span id="366" class="l"><a href="#366">366: </a>
-</span><span id="367" class="l"><a href="#367">367: </a>        <span class="php-comment">// Retrieve the csv contents</span>
-</span><span id="368" class="l"><a href="#368">368: </a>        <span class="php-var">$csv</span> = <span class="php-keyword2">stream_get_contents</span>(<span class="php-var">$handle</span>);
-</span><span id="369" class="l"><a href="#369">369: </a>
-</span><span id="370" class="l"><a href="#370">370: </a>        <span class="php-comment">// Close the handle</span>
-</span><span id="371" class="l"><a href="#371">371: </a>        <span class="php-keyword2">fclose</span>(<span class="php-var">$handle</span>);
-</span><span id="372" class="l"><a href="#372">372: </a>
-</span><span id="373" class="l"><a href="#373">373: </a>        <span class="php-keyword1">return</span> <span class="php-var">$csv</span>;
-</span><span id="374" class="l"><a href="#374">374: </a>    }
-</span><span id="375" class="l"><a href="#375">375: </a>
-</span><span id="376" class="l"><a href="#376">376: </a>    <span class="php-comment">/**
-</span></span><span id="377" class="l"><a href="#377">377: </a><span class="php-comment">     * Encode data as json
-</span></span><span id="378" class="l"><a href="#378">378: </a><span class="php-comment">     *
-</span></span><span id="379" class="l"><a href="#379">379: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="380" class="l"><a href="#380">380: </a><span class="php-comment">     * to the constructor
-</span></span><span id="381" class="l"><a href="#381">381: </a><span class="php-comment">     * @return string Json representation of a value
-</span></span><span id="382" class="l"><a href="#382">382: </a><span class="php-comment">     */</span>
-</span><span id="383" class="l"><a href="#383">383: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_json(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="384" class="l"><a href="#384">384: </a>    {
-</span><span id="385" class="l"><a href="#385">385: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="386" class="l"><a href="#386">386: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="387" class="l"><a href="#387">387: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="388" class="l"><a href="#388">388: </a>        {
-</span><span id="389" class="l"><a href="#389">389: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="390" class="l"><a href="#390">390: </a>        }
-</span><span id="391" class="l"><a href="#391">391: </a>
-</span><span id="392" class="l"><a href="#392">392: </a>        <span class="php-comment">// Get the callback parameter (if set)</span>
-</span><span id="393" class="l"><a href="#393">393: </a>        <span class="php-var">$callback</span> = <span class="php-var">$this</span>-&gt;_ci-&gt;input-&gt;get(<span class="php-quote">'callback'</span>);
-</span><span id="394" class="l"><a href="#394">394: </a>
-</span><span id="395" class="l"><a href="#395">395: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$callback</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="396" class="l"><a href="#396">396: </a>        {
-</span><span id="397" class="l"><a href="#397">397: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
-</span><span id="398" class="l"><a href="#398">398: </a>        }
-</span><span id="399" class="l"><a href="#399">399: </a>
-</span><span id="400" class="l"><a href="#400">400: </a>        <span class="php-comment">// We only honour a jsonp callback which are valid javascript identifiers</span>
-</span><span id="401" class="l"><a href="#401">401: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">preg_match</span>(<span class="php-quote">'/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i'</span>, <span class="php-var">$callback</span>))
-</span><span id="402" class="l"><a href="#402">402: </a>        {
-</span><span id="403" class="l"><a href="#403">403: </a>            <span class="php-comment">// Return the data as encoded json with a callback</span>
-</span><span id="404" class="l"><a href="#404">404: </a>            <span class="php-keyword1">return</span> <span class="php-var">$callback</span> . <span class="php-quote">'('</span> . <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>) . <span class="php-quote">');'</span>;
+</span><span id="292" class="l"><a href="#292">292: </a>            <span class="php-comment">// Suppressing the &quot;array to string conversion&quot; notice.</span>
+</span><span id="293" class="l"><a href="#293">293: </a>            <span class="php-comment">// Keep the &quot;evil&quot; @ here.</span>
+</span><span id="294" class="l"><a href="#294">294: </a>            <span class="php-var">$row</span> = @ <span class="php-keyword2">array_map</span>(<span class="php-quote">'strval'</span>, <span class="php-var">$row</span>);
+</span><span id="295" class="l"><a href="#295">295: </a>
+</span><span id="296" class="l"><a href="#296">296: </a>            <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;add_row(<span class="php-var">$row</span>);
+</span><span id="297" class="l"><a href="#297">297: </a>        }
+</span><span id="298" class="l"><a href="#298">298: </a>
+</span><span id="299" class="l"><a href="#299">299: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;generate();
+</span><span id="300" class="l"><a href="#300">300: </a>    }
+</span><span id="301" class="l"><a href="#301">301: </a>
+</span><span id="302" class="l"><a href="#302">302: </a>    <span class="php-comment">/**
+</span></span><span id="303" class="l"><a href="#303">303: </a><span class="php-comment">     * @link http://www.metashock.de/2014/02/create-csv-file-in-memory-php/
+</span></span><span id="304" class="l"><a href="#304">304: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="305" class="l"><a href="#305">305: </a><span class="php-comment">     * to the constructor
+</span></span><span id="306" class="l"><a href="#306">306: </a><span class="php-comment">     * @param string $delimiter The optional delimiter parameter sets the field
+</span></span><span id="307" class="l"><a href="#307">307: </a><span class="php-comment">     * delimiter (one character only). NULL will use the default value (,)
+</span></span><span id="308" class="l"><a href="#308">308: </a><span class="php-comment">     * @param string $enclosure The optional enclosure parameter sets the field
+</span></span><span id="309" class="l"><a href="#309">309: </a><span class="php-comment">     * enclosure (one character only). NULL will use the default value (&quot;)
+</span></span><span id="310" class="l"><a href="#310">310: </a><span class="php-comment">     * @return string A csv string
+</span></span><span id="311" class="l"><a href="#311">311: </a><span class="php-comment">     */</span>
+</span><span id="312" class="l"><a href="#312">312: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_csv(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>, <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>)
+</span><span id="313" class="l"><a href="#313">313: </a>    {
+</span><span id="314" class="l"><a href="#314">314: </a>        <span class="php-comment">// Use a threshold of 1 MB (1024 * 1024)</span>
+</span><span id="315" class="l"><a href="#315">315: </a>        <span class="php-var">$handle</span> = <span class="php-keyword2">fopen</span>(<span class="php-quote">'php://temp/maxmemory:1048576'</span>, <span class="php-quote">'w'</span>);
+</span><span id="316" class="l"><a href="#316">316: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$handle</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="317" class="l"><a href="#317">317: </a>        {
+</span><span id="318" class="l"><a href="#318">318: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="319" class="l"><a href="#319">319: </a>        }
+</span><span id="320" class="l"><a href="#320">320: </a>
+</span><span id="321" class="l"><a href="#321">321: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="322" class="l"><a href="#322">322: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="323" class="l"><a href="#323">323: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="324" class="l"><a href="#324">324: </a>        {
+</span><span id="325" class="l"><a href="#325">325: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="326" class="l"><a href="#326">326: </a>        }
+</span><span id="327" class="l"><a href="#327">327: </a>
+</span><span id="328" class="l"><a href="#328">328: </a>        <span class="php-comment">// If NULL, then set as the default delimiter</span>
+</span><span id="329" class="l"><a href="#329">329: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$delimiter</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="330" class="l"><a href="#330">330: </a>        {
+</span><span id="331" class="l"><a href="#331">331: </a>            <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>;
+</span><span id="332" class="l"><a href="#332">332: </a>        }
+</span><span id="333" class="l"><a href="#333">333: </a>
+</span><span id="334" class="l"><a href="#334">334: </a>        <span class="php-comment">// If NULL, then set as the default enclosure</span>
+</span><span id="335" class="l"><a href="#335">335: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$enclosure</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="336" class="l"><a href="#336">336: </a>        {
+</span><span id="337" class="l"><a href="#337">337: </a>            <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>;
+</span><span id="338" class="l"><a href="#338">338: </a>        }
+</span><span id="339" class="l"><a href="#339">339: </a>
+</span><span id="340" class="l"><a href="#340">340: </a>        <span class="php-comment">// Cast as an array if not already</span>
+</span><span id="341" class="l"><a href="#341">341: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="342" class="l"><a href="#342">342: </a>        {
+</span><span id="343" class="l"><a href="#343">343: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
+</span><span id="344" class="l"><a href="#344">344: </a>        }
+</span><span id="345" class="l"><a href="#345">345: </a>
+</span><span id="346" class="l"><a href="#346">346: </a>        <span class="php-comment">// Check if it's a multi-dimensional array</span>
+</span><span id="347" class="l"><a href="#347">347: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]) &amp;&amp; <span class="php-keyword2">count</span>(<span class="php-var">$data</span>) !== <span class="php-keyword2">count</span>(<span class="php-var">$data</span>, COUNT_RECURSIVE))
+</span><span id="348" class="l"><a href="#348">348: </a>        {
+</span><span id="349" class="l"><a href="#349">349: </a>            <span class="php-comment">// Multi-dimensional array</span>
+</span><span id="350" class="l"><a href="#350">350: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]);
+</span><span id="351" class="l"><a href="#351">351: </a>        }
+</span><span id="352" class="l"><a href="#352">352: </a>        <span class="php-keyword1">else</span>
+</span><span id="353" class="l"><a href="#353">353: </a>        {
+</span><span id="354" class="l"><a href="#354">354: </a>            <span class="php-comment">// Single array</span>
+</span><span id="355" class="l"><a href="#355">355: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>);
+</span><span id="356" class="l"><a href="#356">356: </a>            <span class="php-var">$data</span> = [<span class="php-var">$data</span>];
+</span><span id="357" class="l"><a href="#357">357: </a>        }
+</span><span id="358" class="l"><a href="#358">358: </a>
+</span><span id="359" class="l"><a href="#359">359: </a>        <span class="php-comment">// Apply the headings</span>
+</span><span id="360" class="l"><a href="#360">360: </a>        <span class="php-keyword2">fputcsv</span>(<span class="php-var">$handle</span>, <span class="php-var">$headings</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
+</span><span id="361" class="l"><a href="#361">361: </a>
+</span><span id="362" class="l"><a href="#362">362: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$record</span>)
+</span><span id="363" class="l"><a href="#363">363: </a>        {
+</span><span id="364" class="l"><a href="#364">364: </a>            <span class="php-comment">// If the record is not an array, then break. This is because the 2nd param of</span>
+</span><span id="365" class="l"><a href="#365">365: </a>            <span class="php-comment">// fputcsv() should be an array</span>
+</span><span id="366" class="l"><a href="#366">366: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$record</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="367" class="l"><a href="#367">367: </a>            {
+</span><span id="368" class="l"><a href="#368">368: </a>                <span class="php-keyword1">break</span>;
+</span><span id="369" class="l"><a href="#369">369: </a>            }
+</span><span id="370" class="l"><a href="#370">370: </a>
+</span><span id="371" class="l"><a href="#371">371: </a>            <span class="php-comment">// Suppressing the &quot;array to string conversion&quot; notice.</span>
+</span><span id="372" class="l"><a href="#372">372: </a>            <span class="php-comment">// Keep the &quot;evil&quot; @ here.</span>
+</span><span id="373" class="l"><a href="#373">373: </a>            <span class="php-var">$record</span> = @ <span class="php-keyword2">array_map</span>(<span class="php-quote">'strval'</span>, <span class="php-var">$record</span>);
+</span><span id="374" class="l"><a href="#374">374: </a>
+</span><span id="375" class="l"><a href="#375">375: </a>            <span class="php-comment">// Returns the length of the string written or FALSE</span>
+</span><span id="376" class="l"><a href="#376">376: </a>            <span class="php-keyword2">fputcsv</span>(<span class="php-var">$handle</span>, <span class="php-var">$record</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
+</span><span id="377" class="l"><a href="#377">377: </a>        }
+</span><span id="378" class="l"><a href="#378">378: </a>
+</span><span id="379" class="l"><a href="#379">379: </a>        <span class="php-comment">// Reset the file pointer</span>
+</span><span id="380" class="l"><a href="#380">380: </a>        <span class="php-keyword2">rewind</span>(<span class="php-var">$handle</span>);
+</span><span id="381" class="l"><a href="#381">381: </a>
+</span><span id="382" class="l"><a href="#382">382: </a>        <span class="php-comment">// Retrieve the csv contents</span>
+</span><span id="383" class="l"><a href="#383">383: </a>        <span class="php-var">$csv</span> = <span class="php-keyword2">stream_get_contents</span>(<span class="php-var">$handle</span>);
+</span><span id="384" class="l"><a href="#384">384: </a>
+</span><span id="385" class="l"><a href="#385">385: </a>        <span class="php-comment">// Close the handle</span>
+</span><span id="386" class="l"><a href="#386">386: </a>        <span class="php-keyword2">fclose</span>(<span class="php-var">$handle</span>);
+</span><span id="387" class="l"><a href="#387">387: </a>
+</span><span id="388" class="l"><a href="#388">388: </a>        <span class="php-keyword1">return</span> <span class="php-var">$csv</span>;
+</span><span id="389" class="l"><a href="#389">389: </a>    }
+</span><span id="390" class="l"><a href="#390">390: </a>
+</span><span id="391" class="l"><a href="#391">391: </a>    <span class="php-comment">/**
+</span></span><span id="392" class="l"><a href="#392">392: </a><span class="php-comment">     * Encode data as json
+</span></span><span id="393" class="l"><a href="#393">393: </a><span class="php-comment">     *
+</span></span><span id="394" class="l"><a href="#394">394: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="395" class="l"><a href="#395">395: </a><span class="php-comment">     * to the constructor
+</span></span><span id="396" class="l"><a href="#396">396: </a><span class="php-comment">     * @return string Json representation of a value
+</span></span><span id="397" class="l"><a href="#397">397: </a><span class="php-comment">     */</span>
+</span><span id="398" class="l"><a href="#398">398: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_json(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="399" class="l"><a href="#399">399: </a>    {
+</span><span id="400" class="l"><a href="#400">400: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="401" class="l"><a href="#401">401: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="402" class="l"><a href="#402">402: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="403" class="l"><a href="#403">403: </a>        {
+</span><span id="404" class="l"><a href="#404">404: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
 </span><span id="405" class="l"><a href="#405">405: </a>        }
 </span><span id="406" class="l"><a href="#406">406: </a>
-</span><span id="407" class="l"><a href="#407">407: </a>        <span class="php-comment">// An invalid jsonp callback function provided.</span>
-</span><span id="408" class="l"><a href="#408">408: </a>        <span class="php-comment">// Though I don't believe this should be hardcoded here</span>
-</span><span id="409" class="l"><a href="#409">409: </a>        <span class="php-var">$data</span>[<span class="php-quote">'warning'</span>] = <span class="php-quote">'INVALID JSONP CALLBACK: '</span> . <span class="php-var">$callback</span>;
-</span><span id="410" class="l"><a href="#410">410: </a>
-</span><span id="411" class="l"><a href="#411">411: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
-</span><span id="412" class="l"><a href="#412">412: </a>    }
-</span><span id="413" class="l"><a href="#413">413: </a>
-</span><span id="414" class="l"><a href="#414">414: </a>    <span class="php-comment">/**
-</span></span><span id="415" class="l"><a href="#415">415: </a><span class="php-comment">     * Encode data as a serialized array
-</span></span><span id="416" class="l"><a href="#416">416: </a><span class="php-comment">     *
-</span></span><span id="417" class="l"><a href="#417">417: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="418" class="l"><a href="#418">418: </a><span class="php-comment">     * to the constructor
-</span></span><span id="419" class="l"><a href="#419">419: </a><span class="php-comment">     * @return string Serialized data
-</span></span><span id="420" class="l"><a href="#420">420: </a><span class="php-comment">     */</span>
-</span><span id="421" class="l"><a href="#421">421: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_serialized(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="422" class="l"><a href="#422">422: </a>    {
-</span><span id="423" class="l"><a href="#423">423: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="424" class="l"><a href="#424">424: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="425" class="l"><a href="#425">425: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="426" class="l"><a href="#426">426: </a>        {
-</span><span id="427" class="l"><a href="#427">427: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="428" class="l"><a href="#428">428: </a>        }
-</span><span id="429" class="l"><a href="#429">429: </a>
-</span><span id="430" class="l"><a href="#430">430: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">serialize</span>(<span class="php-var">$data</span>);
-</span><span id="431" class="l"><a href="#431">431: </a>    }
-</span><span id="432" class="l"><a href="#432">432: </a>
-</span><span id="433" class="l"><a href="#433">433: </a>    <span class="php-comment">/**
-</span></span><span id="434" class="l"><a href="#434">434: </a><span class="php-comment">     * Format data using a PHP structure
-</span></span><span id="435" class="l"><a href="#435">435: </a><span class="php-comment">     *
-</span></span><span id="436" class="l"><a href="#436">436: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="437" class="l"><a href="#437">437: </a><span class="php-comment">     * to the constructor
-</span></span><span id="438" class="l"><a href="#438">438: </a><span class="php-comment">     * @return mixed String representation of a variable
-</span></span><span id="439" class="l"><a href="#439">439: </a><span class="php-comment">     */</span>
-</span><span id="440" class="l"><a href="#440">440: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_php(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="441" class="l"><a href="#441">441: </a>    {
-</span><span id="442" class="l"><a href="#442">442: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="443" class="l"><a href="#443">443: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="444" class="l"><a href="#444">444: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="445" class="l"><a href="#445">445: </a>        {
-</span><span id="446" class="l"><a href="#446">446: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="447" class="l"><a href="#447">447: </a>        }
-</span><span id="448" class="l"><a href="#448">448: </a>
-</span><span id="449" class="l"><a href="#449">449: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">var_export</span>(<span class="php-var">$data</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="450" class="l"><a href="#450">450: </a>    }
-</span><span id="451" class="l"><a href="#451">451: </a>
-</span><span id="452" class="l"><a href="#452">452: </a>    <span class="php-comment">// INTERNAL FUNCTIONS</span>
-</span><span id="453" class="l"><a href="#453">453: </a>
-</span><span id="454" class="l"><a href="#454">454: </a>    <span class="php-comment">/**
-</span></span><span id="455" class="l"><a href="#455">455: </a><span class="php-comment">     * @param $data XML string
-</span></span><span id="456" class="l"><a href="#456">456: </a><span class="php-comment">     * @return SimpleXMLElement XML element object; otherwise, empty array
-</span></span><span id="457" class="l"><a href="#457">457: </a><span class="php-comment">     */</span>
-</span><span id="458" class="l"><a href="#458">458: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_xml(<span class="php-var">$data</span>)
-</span><span id="459" class="l"><a href="#459">459: </a>    {
-</span><span id="460" class="l"><a href="#460">460: </a>        <span class="php-keyword1">return</span> <span class="php-var">$data</span> ? (<span class="php-keyword1">array</span>) <span class="php-keyword2">simplexml_load_string</span>(<span class="php-var">$data</span>, <span class="php-quote">'SimpleXMLElement'</span>, LIBXML_NOCDATA) : [];
-</span><span id="461" class="l"><a href="#461">461: </a>    }
-</span><span id="462" class="l"><a href="#462">462: </a>
-</span><span id="463" class="l"><a href="#463">463: </a>    <span class="php-comment">/**
-</span></span><span id="464" class="l"><a href="#464">464: </a><span class="php-comment">     * @param string $data CSV string
-</span></span><span id="465" class="l"><a href="#465">465: </a><span class="php-comment">     * @param string $delimiter The optional delimiter parameter sets the field
-</span></span><span id="466" class="l"><a href="#466">466: </a><span class="php-comment">     * delimiter (one character only). NULL will use the default value (,)
-</span></span><span id="467" class="l"><a href="#467">467: </a><span class="php-comment">     * @param string $enclosure The optional enclosure parameter sets the field
-</span></span><span id="468" class="l"><a href="#468">468: </a><span class="php-comment">     * enclosure (one character only). NULL will use the default value (&quot;)
-</span></span><span id="469" class="l"><a href="#469">469: </a><span class="php-comment">     * @return array A multi-dimensional array with the outer array being the number of rows
-</span></span><span id="470" class="l"><a href="#470">470: </a><span class="php-comment">     * and the inner arrays the individual fields
-</span></span><span id="471" class="l"><a href="#471">471: </a><span class="php-comment">     */</span>
-</span><span id="472" class="l"><a href="#472">472: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_csv(<span class="php-var">$data</span>, <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>, <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>)
-</span><span id="473" class="l"><a href="#473">473: </a>    {
-</span><span id="474" class="l"><a href="#474">474: </a>        <span class="php-comment">// If NULL, then set as the default delimiter</span>
-</span><span id="475" class="l"><a href="#475">475: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$delimiter</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="476" class="l"><a href="#476">476: </a>        {
-</span><span id="477" class="l"><a href="#477">477: </a>            <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>;
-</span><span id="478" class="l"><a href="#478">478: </a>        }
-</span><span id="479" class="l"><a href="#479">479: </a>
-</span><span id="480" class="l"><a href="#480">480: </a>        <span class="php-comment">// If NULL, then set as the default enclosure</span>
-</span><span id="481" class="l"><a href="#481">481: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$enclosure</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="482" class="l"><a href="#482">482: </a>        {
-</span><span id="483" class="l"><a href="#483">483: </a>            <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>;
-</span><span id="484" class="l"><a href="#484">484: </a>        }
-</span><span id="485" class="l"><a href="#485">485: </a>
-</span><span id="486" class="l"><a href="#486">486: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">str_getcsv</span>(<span class="php-var">$data</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
-</span><span id="487" class="l"><a href="#487">487: </a>    }
-</span><span id="488" class="l"><a href="#488">488: </a>
-</span><span id="489" class="l"><a href="#489">489: </a>    <span class="php-comment">/**
-</span></span><span id="490" class="l"><a href="#490">490: </a><span class="php-comment">     * @param $data Encoded json string
-</span></span><span id="491" class="l"><a href="#491">491: </a><span class="php-comment">     * @return mixed Decoded json string with leading and trailing whitespace removed
-</span></span><span id="492" class="l"><a href="#492">492: </a><span class="php-comment">     */</span>
-</span><span id="493" class="l"><a href="#493">493: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_json(<span class="php-var">$data</span>)
-</span><span id="494" class="l"><a href="#494">494: </a>    {
-</span><span id="495" class="l"><a href="#495">495: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_decode</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
-</span><span id="496" class="l"><a href="#496">496: </a>    }
-</span><span id="497" class="l"><a href="#497">497: </a>
-</span><span id="498" class="l"><a href="#498">498: </a>    <span class="php-comment">/**
-</span></span><span id="499" class="l"><a href="#499">499: </a><span class="php-comment">     * @param string Data to unserialized
-</span></span><span id="500" class="l"><a href="#500">500: </a><span class="php-comment">     * @return mixed Unserialized data
-</span></span><span id="501" class="l"><a href="#501">501: </a><span class="php-comment">     */</span>
-</span><span id="502" class="l"><a href="#502">502: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_serialize(<span class="php-var">$data</span>)
-</span><span id="503" class="l"><a href="#503">503: </a>    {
-</span><span id="504" class="l"><a href="#504">504: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">unserialize</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
-</span><span id="505" class="l"><a href="#505">505: </a>    }
-</span><span id="506" class="l"><a href="#506">506: </a>
-</span><span id="507" class="l"><a href="#507">507: </a>    <span class="php-comment">/**
-</span></span><span id="508" class="l"><a href="#508">508: </a><span class="php-comment">     * @param $data Data to trim leading and trailing whitespace
-</span></span><span id="509" class="l"><a href="#509">509: </a><span class="php-comment">     * @return string Data with leading and trailing whitespace removed
-</span></span><span id="510" class="l"><a href="#510">510: </a><span class="php-comment">     */</span>
-</span><span id="511" class="l"><a href="#511">511: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_php(<span class="php-var">$data</span>)
-</span><span id="512" class="l"><a href="#512">512: </a>    {
-</span><span id="513" class="l"><a href="#513">513: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">trim</span>(<span class="php-var">$data</span>);
-</span><span id="514" class="l"><a href="#514">514: </a>    }
-</span><span id="515" class="l"><a href="#515">515: </a>
-</span><span id="516" class="l"><a href="#516">516: </a>}
-</span><span id="517" class="l"><a href="#517">517: </a></span></code></pre>
+</span><span id="407" class="l"><a href="#407">407: </a>        <span class="php-comment">// Get the callback parameter (if set)</span>
+</span><span id="408" class="l"><a href="#408">408: </a>        <span class="php-var">$callback</span> = <span class="php-var">$this</span>-&gt;_ci-&gt;input-&gt;get(<span class="php-quote">'callback'</span>);
+</span><span id="409" class="l"><a href="#409">409: </a>
+</span><span id="410" class="l"><a href="#410">410: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$callback</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="411" class="l"><a href="#411">411: </a>        {
+</span><span id="412" class="l"><a href="#412">412: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
+</span><span id="413" class="l"><a href="#413">413: </a>        }
+</span><span id="414" class="l"><a href="#414">414: </a>
+</span><span id="415" class="l"><a href="#415">415: </a>        <span class="php-comment">// We only honour a jsonp callback which are valid javascript identifiers</span>
+</span><span id="416" class="l"><a href="#416">416: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">preg_match</span>(<span class="php-quote">'/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i'</span>, <span class="php-var">$callback</span>))
+</span><span id="417" class="l"><a href="#417">417: </a>        {
+</span><span id="418" class="l"><a href="#418">418: </a>            <span class="php-comment">// Return the data as encoded json with a callback</span>
+</span><span id="419" class="l"><a href="#419">419: </a>            <span class="php-keyword1">return</span> <span class="php-var">$callback</span> . <span class="php-quote">'('</span> . <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>) . <span class="php-quote">');'</span>;
+</span><span id="420" class="l"><a href="#420">420: </a>        }
+</span><span id="421" class="l"><a href="#421">421: </a>
+</span><span id="422" class="l"><a href="#422">422: </a>        <span class="php-comment">// An invalid jsonp callback function provided.</span>
+</span><span id="423" class="l"><a href="#423">423: </a>        <span class="php-comment">// Though I don't believe this should be hardcoded here</span>
+</span><span id="424" class="l"><a href="#424">424: </a>        <span class="php-var">$data</span>[<span class="php-quote">'warning'</span>] = <span class="php-quote">'INVALID JSONP CALLBACK: '</span> . <span class="php-var">$callback</span>;
+</span><span id="425" class="l"><a href="#425">425: </a>
+</span><span id="426" class="l"><a href="#426">426: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
+</span><span id="427" class="l"><a href="#427">427: </a>    }
+</span><span id="428" class="l"><a href="#428">428: </a>
+</span><span id="429" class="l"><a href="#429">429: </a>    <span class="php-comment">/**
+</span></span><span id="430" class="l"><a href="#430">430: </a><span class="php-comment">     * Encode data as a serialized array
+</span></span><span id="431" class="l"><a href="#431">431: </a><span class="php-comment">     *
+</span></span><span id="432" class="l"><a href="#432">432: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="433" class="l"><a href="#433">433: </a><span class="php-comment">     * to the constructor
+</span></span><span id="434" class="l"><a href="#434">434: </a><span class="php-comment">     * @return string Serialized data
+</span></span><span id="435" class="l"><a href="#435">435: </a><span class="php-comment">     */</span>
+</span><span id="436" class="l"><a href="#436">436: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_serialized(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="437" class="l"><a href="#437">437: </a>    {
+</span><span id="438" class="l"><a href="#438">438: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="439" class="l"><a href="#439">439: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="440" class="l"><a href="#440">440: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="441" class="l"><a href="#441">441: </a>        {
+</span><span id="442" class="l"><a href="#442">442: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="443" class="l"><a href="#443">443: </a>        }
+</span><span id="444" class="l"><a href="#444">444: </a>
+</span><span id="445" class="l"><a href="#445">445: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">serialize</span>(<span class="php-var">$data</span>);
+</span><span id="446" class="l"><a href="#446">446: </a>    }
+</span><span id="447" class="l"><a href="#447">447: </a>
+</span><span id="448" class="l"><a href="#448">448: </a>    <span class="php-comment">/**
+</span></span><span id="449" class="l"><a href="#449">449: </a><span class="php-comment">     * Format data using a PHP structure
+</span></span><span id="450" class="l"><a href="#450">450: </a><span class="php-comment">     *
+</span></span><span id="451" class="l"><a href="#451">451: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
+</span></span><span id="452" class="l"><a href="#452">452: </a><span class="php-comment">     * to the constructor
+</span></span><span id="453" class="l"><a href="#453">453: </a><span class="php-comment">     * @return mixed String representation of a variable
+</span></span><span id="454" class="l"><a href="#454">454: </a><span class="php-comment">     */</span>
+</span><span id="455" class="l"><a href="#455">455: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_php(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="456" class="l"><a href="#456">456: </a>    {
+</span><span id="457" class="l"><a href="#457">457: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
+</span><span id="458" class="l"><a href="#458">458: </a>        <span class="php-comment">// via the constructor</span>
+</span><span id="459" class="l"><a href="#459">459: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
+</span><span id="460" class="l"><a href="#460">460: </a>        {
+</span><span id="461" class="l"><a href="#461">461: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
+</span><span id="462" class="l"><a href="#462">462: </a>        }
+</span><span id="463" class="l"><a href="#463">463: </a>
+</span><span id="464" class="l"><a href="#464">464: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">var_export</span>(<span class="php-var">$data</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="465" class="l"><a href="#465">465: </a>    }
+</span><span id="466" class="l"><a href="#466">466: </a>
+</span><span id="467" class="l"><a href="#467">467: </a>    <span class="php-comment">// INTERNAL FUNCTIONS</span>
+</span><span id="468" class="l"><a href="#468">468: </a>
+</span><span id="469" class="l"><a href="#469">469: </a>    <span class="php-comment">/**
+</span></span><span id="470" class="l"><a href="#470">470: </a><span class="php-comment">     * @param $data XML string
+</span></span><span id="471" class="l"><a href="#471">471: </a><span class="php-comment">     * @return SimpleXMLElement XML element object; otherwise, empty array
+</span></span><span id="472" class="l"><a href="#472">472: </a><span class="php-comment">     */</span>
+</span><span id="473" class="l"><a href="#473">473: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_xml(<span class="php-var">$data</span>)
+</span><span id="474" class="l"><a href="#474">474: </a>    {
+</span><span id="475" class="l"><a href="#475">475: </a>        <span class="php-keyword1">return</span> <span class="php-var">$data</span> ? (<span class="php-keyword1">array</span>) <span class="php-keyword2">simplexml_load_string</span>(<span class="php-var">$data</span>, <span class="php-quote">'SimpleXMLElement'</span>, LIBXML_NOCDATA) : [];
+</span><span id="476" class="l"><a href="#476">476: </a>    }
+</span><span id="477" class="l"><a href="#477">477: </a>
+</span><span id="478" class="l"><a href="#478">478: </a>    <span class="php-comment">/**
+</span></span><span id="479" class="l"><a href="#479">479: </a><span class="php-comment">     * @param string $data CSV string
+</span></span><span id="480" class="l"><a href="#480">480: </a><span class="php-comment">     * @param string $delimiter The optional delimiter parameter sets the field
+</span></span><span id="481" class="l"><a href="#481">481: </a><span class="php-comment">     * delimiter (one character only). NULL will use the default value (,)
+</span></span><span id="482" class="l"><a href="#482">482: </a><span class="php-comment">     * @param string $enclosure The optional enclosure parameter sets the field
+</span></span><span id="483" class="l"><a href="#483">483: </a><span class="php-comment">     * enclosure (one character only). NULL will use the default value (&quot;)
+</span></span><span id="484" class="l"><a href="#484">484: </a><span class="php-comment">     * @return array A multi-dimensional array with the outer array being the number of rows
+</span></span><span id="485" class="l"><a href="#485">485: </a><span class="php-comment">     * and the inner arrays the individual fields
+</span></span><span id="486" class="l"><a href="#486">486: </a><span class="php-comment">     */</span>
+</span><span id="487" class="l"><a href="#487">487: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_csv(<span class="php-var">$data</span>, <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>, <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>)
+</span><span id="488" class="l"><a href="#488">488: </a>    {
+</span><span id="489" class="l"><a href="#489">489: </a>        <span class="php-comment">// If NULL, then set as the default delimiter</span>
+</span><span id="490" class="l"><a href="#490">490: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$delimiter</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="491" class="l"><a href="#491">491: </a>        {
+</span><span id="492" class="l"><a href="#492">492: </a>            <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>;
+</span><span id="493" class="l"><a href="#493">493: </a>        }
+</span><span id="494" class="l"><a href="#494">494: </a>
+</span><span id="495" class="l"><a href="#495">495: </a>        <span class="php-comment">// If NULL, then set as the default enclosure</span>
+</span><span id="496" class="l"><a href="#496">496: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$enclosure</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="497" class="l"><a href="#497">497: </a>        {
+</span><span id="498" class="l"><a href="#498">498: </a>            <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>;
+</span><span id="499" class="l"><a href="#499">499: </a>        }
+</span><span id="500" class="l"><a href="#500">500: </a>
+</span><span id="501" class="l"><a href="#501">501: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">str_getcsv</span>(<span class="php-var">$data</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
+</span><span id="502" class="l"><a href="#502">502: </a>    }
+</span><span id="503" class="l"><a href="#503">503: </a>
+</span><span id="504" class="l"><a href="#504">504: </a>    <span class="php-comment">/**
+</span></span><span id="505" class="l"><a href="#505">505: </a><span class="php-comment">     * @param $data Encoded json string
+</span></span><span id="506" class="l"><a href="#506">506: </a><span class="php-comment">     * @return mixed Decoded json string with leading and trailing whitespace removed
+</span></span><span id="507" class="l"><a href="#507">507: </a><span class="php-comment">     */</span>
+</span><span id="508" class="l"><a href="#508">508: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_json(<span class="php-var">$data</span>)
+</span><span id="509" class="l"><a href="#509">509: </a>    {
+</span><span id="510" class="l"><a href="#510">510: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_decode</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
+</span><span id="511" class="l"><a href="#511">511: </a>    }
+</span><span id="512" class="l"><a href="#512">512: </a>
+</span><span id="513" class="l"><a href="#513">513: </a>    <span class="php-comment">/**
+</span></span><span id="514" class="l"><a href="#514">514: </a><span class="php-comment">     * @param string Data to unserialized
+</span></span><span id="515" class="l"><a href="#515">515: </a><span class="php-comment">     * @return mixed Unserialized data
+</span></span><span id="516" class="l"><a href="#516">516: </a><span class="php-comment">     */</span>
+</span><span id="517" class="l"><a href="#517">517: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_serialize(<span class="php-var">$data</span>)
+</span><span id="518" class="l"><a href="#518">518: </a>    {
+</span><span id="519" class="l"><a href="#519">519: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">unserialize</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
+</span><span id="520" class="l"><a href="#520">520: </a>    }
+</span><span id="521" class="l"><a href="#521">521: </a>
+</span><span id="522" class="l"><a href="#522">522: </a>    <span class="php-comment">/**
+</span></span><span id="523" class="l"><a href="#523">523: </a><span class="php-comment">     * @param $data Data to trim leading and trailing whitespace
+</span></span><span id="524" class="l"><a href="#524">524: </a><span class="php-comment">     * @return string Data with leading and trailing whitespace removed
+</span></span><span id="525" class="l"><a href="#525">525: </a><span class="php-comment">     */</span>
+</span><span id="526" class="l"><a href="#526">526: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_php(<span class="php-var">$data</span>)
+</span><span id="527" class="l"><a href="#527">527: </a>    {
+</span><span id="528" class="l"><a href="#528">528: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">trim</span>(<span class="php-var">$data</span>);
+</span><span id="529" class="l"><a href="#529">529: </a>    }
+</span><span id="530" class="l"><a href="#530">530: </a>
+</span><span id="531" class="l"><a href="#531">531: </a>}
+</span><span id="532" class="l"><a href="#532">532: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
-<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
+<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Key.html b/documentation/source-class-Key.html
index 4a39dcd4..a2ffbb80 100644
--- a/documentation/source-class-Key.html
+++ b/documentation/source-class-Key.html
@@ -54,6 +54,8 @@ <h3>Classes</h3>
 				<li><a href="http://github.com/class-Format.html">Format</a></li>
 				<li><a href="http://github.com/class-Key.html">Key</a></li>
 				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
+				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
+				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
 			</ul>
 
 
@@ -118,282 +120,258 @@ <h3>Classes</h3>
 </span><span id="26" class="l"><a href="#26"> 26: </a>        ];
 </span><span id="27" class="l"><a href="#27"> 27: </a>
 </span><span id="28" class="l"><a href="#28"> 28: </a>    <span class="php-comment">/**
-</span></span><span id="29" class="l"><a href="#29"> 29: </a><span class="php-comment">     * Key Create
-</span></span><span id="30" class="l"><a href="#30"> 30: </a><span class="php-comment">     * Insert a key into the database
-</span></span><span id="31" class="l"><a href="#31"> 31: </a><span class="php-comment">     *
-</span></span><span id="32" class="l"><a href="#32"> 32: </a><span class="php-comment">     * @access    public
-</span></span><span id="33" class="l"><a href="#33"> 33: </a><span class="php-comment">     * @return    void
-</span></span><span id="34" class="l"><a href="#34"> 34: </a><span class="php-comment">     */</span>
-</span><span id="35" class="l"><a href="#35"> 35: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> index_put()
-</span><span id="36" class="l"><a href="#36"> 36: </a>    {
-</span><span id="37" class="l"><a href="#37"> 37: </a>        <span class="php-comment">// Build a new key</span>
-</span><span id="38" class="l"><a href="#38"> 38: </a>        <span class="php-var">$key</span> = self::_generate_key();
-</span><span id="39" class="l"><a href="#39"> 39: </a>
-</span><span id="40" class="l"><a href="#40"> 40: </a>        <span class="php-comment">// If no key level provided, provide a generic key</span>
-</span><span id="41" class="l"><a href="#41"> 41: </a>        <span class="php-var">$level</span> = <span class="php-var">$this</span>-&gt;put(<span class="php-quote">'level'</span>) ? <span class="php-var">$this</span>-&gt;put(<span class="php-quote">'level'</span>) : <span class="php-num">1</span>;
-</span><span id="42" class="l"><a href="#42"> 42: </a>        <span class="php-var">$ignore_limits</span> = <span class="php-keyword2">ctype_digit</span>(<span class="php-var">$this</span>-&gt;put(<span class="php-quote">'ignore_limits'</span>)) ? (int) <span class="php-var">$this</span>-&gt;put(<span class="php-quote">'ignore_limits'</span>) : <span class="php-num">1</span>;
-</span><span id="43" class="l"><a href="#43"> 43: </a>
-</span><span id="44" class="l"><a href="#44"> 44: </a>        <span class="php-comment">// Insert the new key</span>
-</span><span id="45" class="l"><a href="#45"> 45: </a>        <span class="php-keyword1">if</span> (self::_insert_key(<span class="php-var">$key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-var">$level</span>, <span class="php-quote">'ignore_limits'</span> =&gt; <span class="php-var">$ignore_limits</span>]))
-</span><span id="46" class="l"><a href="#46"> 46: </a>        {
-</span><span id="47" class="l"><a href="#47"> 47: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="48" class="l"><a href="#48"> 48: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
-</span><span id="49" class="l"><a href="#49"> 49: </a>                <span class="php-quote">'key'</span> =&gt; <span class="php-var">$key</span>
-</span><span id="50" class="l"><a href="#50"> 50: </a>            ], REST_Controller::HTTP_CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
-</span><span id="51" class="l"><a href="#51"> 51: </a>        }
-</span><span id="52" class="l"><a href="#52"> 52: </a>        <span class="php-keyword1">else</span>
-</span><span id="53" class="l"><a href="#53"> 53: </a>        {
-</span><span id="54" class="l"><a href="#54"> 54: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="55" class="l"><a href="#55"> 55: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="56" class="l"><a href="#56"> 56: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
-</span><span id="57" class="l"><a href="#57"> 57: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
-</span><span id="58" class="l"><a href="#58"> 58: </a>        }
-</span><span id="59" class="l"><a href="#59"> 59: </a>    }
-</span><span id="60" class="l"><a href="#60"> 60: </a>
-</span><span id="61" class="l"><a href="#61"> 61: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="62" class="l"><a href="#62"> 62: </a>
-</span><span id="63" class="l"><a href="#63"> 63: </a>    <span class="php-comment">/**
-</span></span><span id="64" class="l"><a href="#64"> 64: </a><span class="php-comment">     * Key Delete
-</span></span><span id="65" class="l"><a href="#65"> 65: </a><span class="php-comment">     * Remove a key from the database to stop it working
-</span></span><span id="66" class="l"><a href="#66"> 66: </a><span class="php-comment">     *
-</span></span><span id="67" class="l"><a href="#67"> 67: </a><span class="php-comment">     * @access    public
-</span></span><span id="68" class="l"><a href="#68"> 68: </a><span class="php-comment">     * @return    void
-</span></span><span id="69" class="l"><a href="#69"> 69: </a><span class="php-comment">     */</span>
-</span><span id="70" class="l"><a href="#70"> 70: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> index_delete()
-</span><span id="71" class="l"><a href="#71"> 71: </a>    {
-</span><span id="72" class="l"><a href="#72"> 72: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;<span class="php-keyword2">delete</span>(<span class="php-quote">'key'</span>);
-</span><span id="73" class="l"><a href="#73"> 73: </a>
-</span><span id="74" class="l"><a href="#74"> 74: </a>        <span class="php-comment">// Does this key exist?</span>
-</span><span id="75" class="l"><a href="#75"> 75: </a>        <span class="php-keyword1">if</span> (!self::_key_exists(<span class="php-var">$key</span>))
-</span><span id="76" class="l"><a href="#76"> 76: </a>        {
-</span><span id="77" class="l"><a href="#77"> 77: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
-</span><span id="78" class="l"><a href="#78"> 78: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="79" class="l"><a href="#79"> 79: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="80" class="l"><a href="#80"> 80: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
-</span><span id="81" class="l"><a href="#81"> 81: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
-</span><span id="82" class="l"><a href="#82"> 82: </a>        }
-</span><span id="83" class="l"><a href="#83"> 83: </a>
-</span><span id="84" class="l"><a href="#84"> 84: </a>        <span class="php-comment">// Destroy it</span>
-</span><span id="85" class="l"><a href="#85"> 85: </a>        self::_delete_key(<span class="php-var">$key</span>);
-</span><span id="86" class="l"><a href="#86"> 86: </a>
-</span><span id="87" class="l"><a href="#87"> 87: </a>        <span class="php-comment">// Respond that the key was destroyed</span>
-</span><span id="88" class="l"><a href="#88"> 88: </a>        <span class="php-var">$this</span>-&gt;response([
-</span><span id="89" class="l"><a href="#89"> 89: </a>            <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
-</span><span id="90" class="l"><a href="#90"> 90: </a>            <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API key was deleted'</span>
-</span><span id="91" class="l"><a href="#91"> 91: </a>            ], REST_Controller::HTTP_NO_CONTENT); <span class="php-comment">// NO_CONTENT (204) being the HTTP response code</span>
-</span><span id="92" class="l"><a href="#92"> 92: </a>    }
-</span><span id="93" class="l"><a href="#93"> 93: </a>
-</span><span id="94" class="l"><a href="#94"> 94: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="95" class="l"><a href="#95"> 95: </a>
-</span><span id="96" class="l"><a href="#96"> 96: </a>    <span class="php-comment">/**
-</span></span><span id="97" class="l"><a href="#97"> 97: </a><span class="php-comment">     * Update Key
-</span></span><span id="98" class="l"><a href="#98"> 98: </a><span class="php-comment">     * Change the level
-</span></span><span id="99" class="l"><a href="#99"> 99: </a><span class="php-comment">     *
-</span></span><span id="100" class="l"><a href="#100">100: </a><span class="php-comment">     * @access    public
-</span></span><span id="101" class="l"><a href="#101">101: </a><span class="php-comment">     * @return    void
-</span></span><span id="102" class="l"><a href="#102">102: </a><span class="php-comment">     */</span>
-</span><span id="103" class="l"><a href="#103">103: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> level_post()
-</span><span id="104" class="l"><a href="#104">104: </a>    {
-</span><span id="105" class="l"><a href="#105">105: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
-</span><span id="106" class="l"><a href="#106">106: </a>        <span class="php-var">$new_level</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'level'</span>);
-</span><span id="107" class="l"><a href="#107">107: </a>
-</span><span id="108" class="l"><a href="#108">108: </a>        <span class="php-comment">// Does this key exist?</span>
-</span><span id="109" class="l"><a href="#109">109: </a>        <span class="php-keyword1">if</span> (!self::_key_exists(<span class="php-var">$key</span>))
-</span><span id="110" class="l"><a href="#110">110: </a>        {
-</span><span id="111" class="l"><a href="#111">111: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
-</span><span id="112" class="l"><a href="#112">112: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="113" class="l"><a href="#113">113: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="114" class="l"><a href="#114">114: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
-</span><span id="115" class="l"><a href="#115">115: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
-</span><span id="116" class="l"><a href="#116">116: </a>        }
-</span><span id="117" class="l"><a href="#117">117: </a>
-</span><span id="118" class="l"><a href="#118">118: </a>        <span class="php-comment">// Update the key level</span>
-</span><span id="119" class="l"><a href="#119">119: </a>        <span class="php-keyword1">if</span> (self::_update_key(<span class="php-var">$key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-var">$new_level</span>]))
+</span></span><span id="29" class="l"><a href="#29"> 29: </a><span class="php-comment">     * Insert a key into the database
+</span></span><span id="30" class="l"><a href="#30"> 30: </a><span class="php-comment">     *
+</span></span><span id="31" class="l"><a href="#31"> 31: </a><span class="php-comment">     * @access public
+</span></span><span id="32" class="l"><a href="#32"> 32: </a><span class="php-comment">     * @return void
+</span></span><span id="33" class="l"><a href="#33"> 33: </a><span class="php-comment">     */</span>
+</span><span id="34" class="l"><a href="#34"> 34: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> index_put()
+</span><span id="35" class="l"><a href="#35"> 35: </a>    {
+</span><span id="36" class="l"><a href="#36"> 36: </a>        <span class="php-comment">// Build a new key</span>
+</span><span id="37" class="l"><a href="#37"> 37: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;_generate_key();
+</span><span id="38" class="l"><a href="#38"> 38: </a>
+</span><span id="39" class="l"><a href="#39"> 39: </a>        <span class="php-comment">// If no key level provided, provide a generic key</span>
+</span><span id="40" class="l"><a href="#40"> 40: </a>        <span class="php-var">$level</span> = <span class="php-var">$this</span>-&gt;put(<span class="php-quote">'level'</span>) ? <span class="php-var">$this</span>-&gt;put(<span class="php-quote">'level'</span>) : <span class="php-num">1</span>;
+</span><span id="41" class="l"><a href="#41"> 41: </a>        <span class="php-var">$ignore_limits</span> = <span class="php-keyword2">ctype_digit</span>(<span class="php-var">$this</span>-&gt;put(<span class="php-quote">'ignore_limits'</span>)) ? (int) <span class="php-var">$this</span>-&gt;put(<span class="php-quote">'ignore_limits'</span>) : <span class="php-num">1</span>;
+</span><span id="42" class="l"><a href="#42"> 42: </a>
+</span><span id="43" class="l"><a href="#43"> 43: </a>        <span class="php-comment">// Insert the new key</span>
+</span><span id="44" class="l"><a href="#44"> 44: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_insert_key(<span class="php-var">$key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-var">$level</span>, <span class="php-quote">'ignore_limits'</span> =&gt; <span class="php-var">$ignore_limits</span>]))
+</span><span id="45" class="l"><a href="#45"> 45: </a>        {
+</span><span id="46" class="l"><a href="#46"> 46: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="47" class="l"><a href="#47"> 47: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
+</span><span id="48" class="l"><a href="#48"> 48: </a>                <span class="php-quote">'key'</span> =&gt; <span class="php-var">$key</span>
+</span><span id="49" class="l"><a href="#49"> 49: </a>            ], REST_Controller::HTTP_CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
+</span><span id="50" class="l"><a href="#50"> 50: </a>        }
+</span><span id="51" class="l"><a href="#51"> 51: </a>        <span class="php-keyword1">else</span>
+</span><span id="52" class="l"><a href="#52"> 52: </a>        {
+</span><span id="53" class="l"><a href="#53"> 53: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="54" class="l"><a href="#54"> 54: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="55" class="l"><a href="#55"> 55: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
+</span><span id="56" class="l"><a href="#56"> 56: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
+</span><span id="57" class="l"><a href="#57"> 57: </a>        }
+</span><span id="58" class="l"><a href="#58"> 58: </a>    }
+</span><span id="59" class="l"><a href="#59"> 59: </a>
+</span><span id="60" class="l"><a href="#60"> 60: </a>    <span class="php-comment">/**
+</span></span><span id="61" class="l"><a href="#61"> 61: </a><span class="php-comment">     * Remove a key from the database to stop it working
+</span></span><span id="62" class="l"><a href="#62"> 62: </a><span class="php-comment">     *
+</span></span><span id="63" class="l"><a href="#63"> 63: </a><span class="php-comment">     * @access public
+</span></span><span id="64" class="l"><a href="#64"> 64: </a><span class="php-comment">     * @return void
+</span></span><span id="65" class="l"><a href="#65"> 65: </a><span class="php-comment">     */</span>
+</span><span id="66" class="l"><a href="#66"> 66: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> index_delete()
+</span><span id="67" class="l"><a href="#67"> 67: </a>    {
+</span><span id="68" class="l"><a href="#68"> 68: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;<span class="php-keyword2">delete</span>(<span class="php-quote">'key'</span>);
+</span><span id="69" class="l"><a href="#69"> 69: </a>
+</span><span id="70" class="l"><a href="#70"> 70: </a>        <span class="php-comment">// Does this key exist?</span>
+</span><span id="71" class="l"><a href="#71"> 71: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_key_exists(<span class="php-var">$key</span>))
+</span><span id="72" class="l"><a href="#72"> 72: </a>        {
+</span><span id="73" class="l"><a href="#73"> 73: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
+</span><span id="74" class="l"><a href="#74"> 74: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="75" class="l"><a href="#75"> 75: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="76" class="l"><a href="#76"> 76: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
+</span><span id="77" class="l"><a href="#77"> 77: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
+</span><span id="78" class="l"><a href="#78"> 78: </a>        }
+</span><span id="79" class="l"><a href="#79"> 79: </a>
+</span><span id="80" class="l"><a href="#80"> 80: </a>        <span class="php-comment">// Destroy it</span>
+</span><span id="81" class="l"><a href="#81"> 81: </a>        <span class="php-var">$this</span>-&gt;_delete_key(<span class="php-var">$key</span>);
+</span><span id="82" class="l"><a href="#82"> 82: </a>
+</span><span id="83" class="l"><a href="#83"> 83: </a>        <span class="php-comment">// Respond that the key was destroyed</span>
+</span><span id="84" class="l"><a href="#84"> 84: </a>        <span class="php-var">$this</span>-&gt;response([
+</span><span id="85" class="l"><a href="#85"> 85: </a>            <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
+</span><span id="86" class="l"><a href="#86"> 86: </a>            <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API key was deleted'</span>
+</span><span id="87" class="l"><a href="#87"> 87: </a>            ], REST_Controller::HTTP_NO_CONTENT); <span class="php-comment">// NO_CONTENT (204) being the HTTP response code</span>
+</span><span id="88" class="l"><a href="#88"> 88: </a>    }
+</span><span id="89" class="l"><a href="#89"> 89: </a>
+</span><span id="90" class="l"><a href="#90"> 90: </a>    <span class="php-comment">/**
+</span></span><span id="91" class="l"><a href="#91"> 91: </a><span class="php-comment">     * Change the level
+</span></span><span id="92" class="l"><a href="#92"> 92: </a><span class="php-comment">     *
+</span></span><span id="93" class="l"><a href="#93"> 93: </a><span class="php-comment">     * @access public
+</span></span><span id="94" class="l"><a href="#94"> 94: </a><span class="php-comment">     * @return void
+</span></span><span id="95" class="l"><a href="#95"> 95: </a><span class="php-comment">     */</span>
+</span><span id="96" class="l"><a href="#96"> 96: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> level_post()
+</span><span id="97" class="l"><a href="#97"> 97: </a>    {
+</span><span id="98" class="l"><a href="#98"> 98: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
+</span><span id="99" class="l"><a href="#99"> 99: </a>        <span class="php-var">$new_level</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'level'</span>);
+</span><span id="100" class="l"><a href="#100">100: </a>
+</span><span id="101" class="l"><a href="#101">101: </a>        <span class="php-comment">// Does this key exist?</span>
+</span><span id="102" class="l"><a href="#102">102: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_key_exists(<span class="php-var">$key</span>))
+</span><span id="103" class="l"><a href="#103">103: </a>        {
+</span><span id="104" class="l"><a href="#104">104: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
+</span><span id="105" class="l"><a href="#105">105: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="106" class="l"><a href="#106">106: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="107" class="l"><a href="#107">107: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
+</span><span id="108" class="l"><a href="#108">108: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
+</span><span id="109" class="l"><a href="#109">109: </a>        }
+</span><span id="110" class="l"><a href="#110">110: </a>
+</span><span id="111" class="l"><a href="#111">111: </a>        <span class="php-comment">// Update the key level</span>
+</span><span id="112" class="l"><a href="#112">112: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_update_key(<span class="php-var">$key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-var">$new_level</span>]))
+</span><span id="113" class="l"><a href="#113">113: </a>        {
+</span><span id="114" class="l"><a href="#114">114: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="115" class="l"><a href="#115">115: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
+</span><span id="116" class="l"><a href="#116">116: </a>                <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API key was updated'</span>
+</span><span id="117" class="l"><a href="#117">117: </a>            ], REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
+</span><span id="118" class="l"><a href="#118">118: </a>        }
+</span><span id="119" class="l"><a href="#119">119: </a>        <span class="php-keyword1">else</span>
 </span><span id="120" class="l"><a href="#120">120: </a>        {
 </span><span id="121" class="l"><a href="#121">121: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="122" class="l"><a href="#122">122: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
-</span><span id="123" class="l"><a href="#123">123: </a>                <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API key was updated'</span>
-</span><span id="124" class="l"><a href="#124">124: </a>            ], REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
+</span><span id="122" class="l"><a href="#122">122: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="123" class="l"><a href="#123">123: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not update the key level'</span>
+</span><span id="124" class="l"><a href="#124">124: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
 </span><span id="125" class="l"><a href="#125">125: </a>        }
-</span><span id="126" class="l"><a href="#126">126: </a>        <span class="php-keyword1">else</span>
-</span><span id="127" class="l"><a href="#127">127: </a>        {
-</span><span id="128" class="l"><a href="#128">128: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="129" class="l"><a href="#129">129: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="130" class="l"><a href="#130">130: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not update the key level'</span>
-</span><span id="131" class="l"><a href="#131">131: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
-</span><span id="132" class="l"><a href="#132">132: </a>        }
-</span><span id="133" class="l"><a href="#133">133: </a>    }
-</span><span id="134" class="l"><a href="#134">134: </a>
-</span><span id="135" class="l"><a href="#135">135: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="136" class="l"><a href="#136">136: </a>
-</span><span id="137" class="l"><a href="#137">137: </a>    <span class="php-comment">/**
-</span></span><span id="138" class="l"><a href="#138">138: </a><span class="php-comment">     * Update Key
-</span></span><span id="139" class="l"><a href="#139">139: </a><span class="php-comment">     * Change the level
-</span></span><span id="140" class="l"><a href="#140">140: </a><span class="php-comment">     *
-</span></span><span id="141" class="l"><a href="#141">141: </a><span class="php-comment">     * @access    public
-</span></span><span id="142" class="l"><a href="#142">142: </a><span class="php-comment">     * @return    void
-</span></span><span id="143" class="l"><a href="#143">143: </a><span class="php-comment">     */</span>
-</span><span id="144" class="l"><a href="#144">144: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> suspend_post()
-</span><span id="145" class="l"><a href="#145">145: </a>    {
-</span><span id="146" class="l"><a href="#146">146: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
+</span><span id="126" class="l"><a href="#126">126: </a>    }
+</span><span id="127" class="l"><a href="#127">127: </a>
+</span><span id="128" class="l"><a href="#128">128: </a>    <span class="php-comment">/**
+</span></span><span id="129" class="l"><a href="#129">129: </a><span class="php-comment">     * Suspend a key
+</span></span><span id="130" class="l"><a href="#130">130: </a><span class="php-comment">     *
+</span></span><span id="131" class="l"><a href="#131">131: </a><span class="php-comment">     * @access public
+</span></span><span id="132" class="l"><a href="#132">132: </a><span class="php-comment">     * @return void
+</span></span><span id="133" class="l"><a href="#133">133: </a><span class="php-comment">     */</span>
+</span><span id="134" class="l"><a href="#134">134: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> suspend_post()
+</span><span id="135" class="l"><a href="#135">135: </a>    {
+</span><span id="136" class="l"><a href="#136">136: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
+</span><span id="137" class="l"><a href="#137">137: </a>
+</span><span id="138" class="l"><a href="#138">138: </a>        <span class="php-comment">// Does this key exist?</span>
+</span><span id="139" class="l"><a href="#139">139: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_key_exists(<span class="php-var">$key</span>))
+</span><span id="140" class="l"><a href="#140">140: </a>        {
+</span><span id="141" class="l"><a href="#141">141: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
+</span><span id="142" class="l"><a href="#142">142: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="143" class="l"><a href="#143">143: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="144" class="l"><a href="#144">144: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
+</span><span id="145" class="l"><a href="#145">145: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
+</span><span id="146" class="l"><a href="#146">146: </a>        }
 </span><span id="147" class="l"><a href="#147">147: </a>
-</span><span id="148" class="l"><a href="#148">148: </a>        <span class="php-comment">// Does this key exist?</span>
-</span><span id="149" class="l"><a href="#149">149: </a>        <span class="php-keyword1">if</span> (!self::_key_exists(<span class="php-var">$key</span>))
+</span><span id="148" class="l"><a href="#148">148: </a>        <span class="php-comment">// Update the key level</span>
+</span><span id="149" class="l"><a href="#149">149: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_update_key(<span class="php-var">$key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-num">0</span>]))
 </span><span id="150" class="l"><a href="#150">150: </a>        {
-</span><span id="151" class="l"><a href="#151">151: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
-</span><span id="152" class="l"><a href="#152">152: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="153" class="l"><a href="#153">153: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="154" class="l"><a href="#154">154: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
-</span><span id="155" class="l"><a href="#155">155: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
-</span><span id="156" class="l"><a href="#156">156: </a>        }
-</span><span id="157" class="l"><a href="#157">157: </a>
-</span><span id="158" class="l"><a href="#158">158: </a>        <span class="php-comment">// Update the key level</span>
-</span><span id="159" class="l"><a href="#159">159: </a>        <span class="php-keyword1">if</span> (self::_update_key(<span class="php-var">$key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-num">0</span>]))
-</span><span id="160" class="l"><a href="#160">160: </a>        {
-</span><span id="161" class="l"><a href="#161">161: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="162" class="l"><a href="#162">162: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
-</span><span id="163" class="l"><a href="#163">163: </a>                <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'Key was suspended'</span>
-</span><span id="164" class="l"><a href="#164">164: </a>            ], REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
-</span><span id="165" class="l"><a href="#165">165: </a>        }
-</span><span id="166" class="l"><a href="#166">166: </a>        <span class="php-keyword1">else</span>
-</span><span id="167" class="l"><a href="#167">167: </a>        {
-</span><span id="168" class="l"><a href="#168">168: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="169" class="l"><a href="#169">169: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="170" class="l"><a href="#170">170: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not suspend the user'</span>
-</span><span id="171" class="l"><a href="#171">171: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
-</span><span id="172" class="l"><a href="#172">172: </a>        }
-</span><span id="173" class="l"><a href="#173">173: </a>    }
-</span><span id="174" class="l"><a href="#174">174: </a>
-</span><span id="175" class="l"><a href="#175">175: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="176" class="l"><a href="#176">176: </a>
-</span><span id="177" class="l"><a href="#177">177: </a>    <span class="php-comment">/**
-</span></span><span id="178" class="l"><a href="#178">178: </a><span class="php-comment">     * Regenerate Key
-</span></span><span id="179" class="l"><a href="#179">179: </a><span class="php-comment">     * Remove a key from the database to stop it working
-</span></span><span id="180" class="l"><a href="#180">180: </a><span class="php-comment">     *
-</span></span><span id="181" class="l"><a href="#181">181: </a><span class="php-comment">     * @access    public
-</span></span><span id="182" class="l"><a href="#182">182: </a><span class="php-comment">     * @return    void
-</span></span><span id="183" class="l"><a href="#183">183: </a><span class="php-comment">     */</span>
-</span><span id="184" class="l"><a href="#184">184: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> regenerate_post()
-</span><span id="185" class="l"><a href="#185">185: </a>    {
-</span><span id="186" class="l"><a href="#186">186: </a>        <span class="php-var">$old_key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
-</span><span id="187" class="l"><a href="#187">187: </a>        <span class="php-var">$key_details</span> = self::_get_key(<span class="php-var">$old_key</span>);
+</span><span id="151" class="l"><a href="#151">151: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="152" class="l"><a href="#152">152: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
+</span><span id="153" class="l"><a href="#153">153: </a>                <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'Key was suspended'</span>
+</span><span id="154" class="l"><a href="#154">154: </a>            ], REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
+</span><span id="155" class="l"><a href="#155">155: </a>        }
+</span><span id="156" class="l"><a href="#156">156: </a>        <span class="php-keyword1">else</span>
+</span><span id="157" class="l"><a href="#157">157: </a>        {
+</span><span id="158" class="l"><a href="#158">158: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="159" class="l"><a href="#159">159: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="160" class="l"><a href="#160">160: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not suspend the user'</span>
+</span><span id="161" class="l"><a href="#161">161: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
+</span><span id="162" class="l"><a href="#162">162: </a>        }
+</span><span id="163" class="l"><a href="#163">163: </a>    }
+</span><span id="164" class="l"><a href="#164">164: </a>
+</span><span id="165" class="l"><a href="#165">165: </a>    <span class="php-comment">/**
+</span></span><span id="166" class="l"><a href="#166">166: </a><span class="php-comment">     * Regenerate a key
+</span></span><span id="167" class="l"><a href="#167">167: </a><span class="php-comment">     *
+</span></span><span id="168" class="l"><a href="#168">168: </a><span class="php-comment">     * @access public
+</span></span><span id="169" class="l"><a href="#169">169: </a><span class="php-comment">     * @return void
+</span></span><span id="170" class="l"><a href="#170">170: </a><span class="php-comment">     */</span>
+</span><span id="171" class="l"><a href="#171">171: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> regenerate_post()
+</span><span id="172" class="l"><a href="#172">172: </a>    {
+</span><span id="173" class="l"><a href="#173">173: </a>        <span class="php-var">$old_key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
+</span><span id="174" class="l"><a href="#174">174: </a>        <span class="php-var">$key_details</span> = <span class="php-var">$this</span>-&gt;_get_key(<span class="php-var">$old_key</span>);
+</span><span id="175" class="l"><a href="#175">175: </a>
+</span><span id="176" class="l"><a href="#176">176: </a>        <span class="php-comment">// Does this key exist?</span>
+</span><span id="177" class="l"><a href="#177">177: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$key_details</span>)
+</span><span id="178" class="l"><a href="#178">178: </a>        {
+</span><span id="179" class="l"><a href="#179">179: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
+</span><span id="180" class="l"><a href="#180">180: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="181" class="l"><a href="#181">181: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="182" class="l"><a href="#182">182: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
+</span><span id="183" class="l"><a href="#183">183: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
+</span><span id="184" class="l"><a href="#184">184: </a>        }
+</span><span id="185" class="l"><a href="#185">185: </a>
+</span><span id="186" class="l"><a href="#186">186: </a>        <span class="php-comment">// Build a new key</span>
+</span><span id="187" class="l"><a href="#187">187: </a>        <span class="php-var">$new_key</span> = <span class="php-var">$this</span>-&gt;_generate_key();
 </span><span id="188" class="l"><a href="#188">188: </a>
-</span><span id="189" class="l"><a href="#189">189: </a>        <span class="php-comment">// Does this key exist?</span>
-</span><span id="190" class="l"><a href="#190">190: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$key_details</span>)
+</span><span id="189" class="l"><a href="#189">189: </a>        <span class="php-comment">// Insert the new key</span>
+</span><span id="190" class="l"><a href="#190">190: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_insert_key(<span class="php-var">$new_key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-var">$key_details</span>-&gt;level, <span class="php-quote">'ignore_limits'</span> =&gt; <span class="php-var">$key_details</span>-&gt;ignore_limits]))
 </span><span id="191" class="l"><a href="#191">191: </a>        {
-</span><span id="192" class="l"><a href="#192">192: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
-</span><span id="193" class="l"><a href="#193">193: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="194" class="l"><a href="#194">194: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="195" class="l"><a href="#195">195: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
-</span><span id="196" class="l"><a href="#196">196: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
-</span><span id="197" class="l"><a href="#197">197: </a>        }
-</span><span id="198" class="l"><a href="#198">198: </a>
-</span><span id="199" class="l"><a href="#199">199: </a>        <span class="php-comment">// Build a new key</span>
-</span><span id="200" class="l"><a href="#200">200: </a>        <span class="php-var">$new_key</span> = self::_generate_key();
-</span><span id="201" class="l"><a href="#201">201: </a>
-</span><span id="202" class="l"><a href="#202">202: </a>        <span class="php-comment">// Insert the new key</span>
-</span><span id="203" class="l"><a href="#203">203: </a>        <span class="php-keyword1">if</span> (self::_insert_key(<span class="php-var">$new_key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-var">$key_details</span>-&gt;level, <span class="php-quote">'ignore_limits'</span> =&gt; <span class="php-var">$key_details</span>-&gt;ignore_limits]))
-</span><span id="204" class="l"><a href="#204">204: </a>        {
-</span><span id="205" class="l"><a href="#205">205: </a>            <span class="php-comment">// Suspend old key</span>
-</span><span id="206" class="l"><a href="#206">206: </a>            self::_update_key(<span class="php-var">$old_key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-num">0</span>]);
-</span><span id="207" class="l"><a href="#207">207: </a>
-</span><span id="208" class="l"><a href="#208">208: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="209" class="l"><a href="#209">209: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
-</span><span id="210" class="l"><a href="#210">210: </a>                <span class="php-quote">'key'</span> =&gt; <span class="php-var">$new_key</span>
-</span><span id="211" class="l"><a href="#211">211: </a>            ], REST_Controller::HTTP_CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
-</span><span id="212" class="l"><a href="#212">212: </a>        }
-</span><span id="213" class="l"><a href="#213">213: </a>        <span class="php-keyword1">else</span>
+</span><span id="192" class="l"><a href="#192">192: </a>            <span class="php-comment">// Suspend old key</span>
+</span><span id="193" class="l"><a href="#193">193: </a>            <span class="php-var">$this</span>-&gt;_update_key(<span class="php-var">$old_key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-num">0</span>]);
+</span><span id="194" class="l"><a href="#194">194: </a>
+</span><span id="195" class="l"><a href="#195">195: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="196" class="l"><a href="#196">196: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
+</span><span id="197" class="l"><a href="#197">197: </a>                <span class="php-quote">'key'</span> =&gt; <span class="php-var">$new_key</span>
+</span><span id="198" class="l"><a href="#198">198: </a>            ], REST_Controller::HTTP_CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
+</span><span id="199" class="l"><a href="#199">199: </a>        }
+</span><span id="200" class="l"><a href="#200">200: </a>        <span class="php-keyword1">else</span>
+</span><span id="201" class="l"><a href="#201">201: </a>        {
+</span><span id="202" class="l"><a href="#202">202: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="203" class="l"><a href="#203">203: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="204" class="l"><a href="#204">204: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
+</span><span id="205" class="l"><a href="#205">205: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
+</span><span id="206" class="l"><a href="#206">206: </a>        }
+</span><span id="207" class="l"><a href="#207">207: </a>    }
+</span><span id="208" class="l"><a href="#208">208: </a>
+</span><span id="209" class="l"><a href="#209">209: </a>    <span class="php-comment">/* Helper Methods */</span>
+</span><span id="210" class="l"><a href="#210">210: </a>
+</span><span id="211" class="l"><a href="#211">211: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _generate_key()
+</span><span id="212" class="l"><a href="#212">212: </a>    {
+</span><span id="213" class="l"><a href="#213">213: </a>        <span class="php-keyword1">do</span>
 </span><span id="214" class="l"><a href="#214">214: </a>        {
-</span><span id="215" class="l"><a href="#215">215: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="216" class="l"><a href="#216">216: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="217" class="l"><a href="#217">217: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
-</span><span id="218" class="l"><a href="#218">218: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
-</span><span id="219" class="l"><a href="#219">219: </a>        }
-</span><span id="220" class="l"><a href="#220">220: </a>    }
-</span><span id="221" class="l"><a href="#221">221: </a>
-</span><span id="222" class="l"><a href="#222">222: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="215" class="l"><a href="#215">215: </a>            <span class="php-comment">// Generate a random salt</span>
+</span><span id="216" class="l"><a href="#216">216: </a>            <span class="php-var">$salt</span> = <span class="php-var">$this</span>-&gt;security-&gt;get_random_bytes(<span class="php-num">64</span>);
+</span><span id="217" class="l"><a href="#217">217: </a>
+</span><span id="218" class="l"><a href="#218">218: </a>            <span class="php-comment">// If an error occurred, then fall back to the previous method</span>
+</span><span id="219" class="l"><a href="#219">219: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$salt</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="220" class="l"><a href="#220">220: </a>            {
+</span><span id="221" class="l"><a href="#221">221: </a>                <span class="php-var">$salt</span> = <span class="php-keyword2">hash</span>(<span class="php-quote">'sha256'</span>, <span class="php-keyword2">time</span>() . <span class="php-keyword2">mt_rand</span>());
+</span><span id="222" class="l"><a href="#222">222: </a>            }
 </span><span id="223" class="l"><a href="#223">223: </a>
-</span><span id="224" class="l"><a href="#224">224: </a>    <span class="php-comment">/* Helper Methods */</span>
-</span><span id="225" class="l"><a href="#225">225: </a>
-</span><span id="226" class="l"><a href="#226">226: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _generate_key()
-</span><span id="227" class="l"><a href="#227">227: </a>    {
-</span><span id="228" class="l"><a href="#228">228: </a>        <span class="php-keyword1">do</span>
-</span><span id="229" class="l"><a href="#229">229: </a>        {
-</span><span id="230" class="l"><a href="#230">230: </a>            <span class="php-comment">// Generate a random salt</span>
-</span><span id="231" class="l"><a href="#231">231: </a>            <span class="php-var">$salt</span> = <span class="php-var">$this</span>-&gt;security-&gt;get_random_bytes(<span class="php-num">64</span>);
+</span><span id="224" class="l"><a href="#224">224: </a>            <span class="php-var">$new_key</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$salt</span>, <span class="php-num">0</span>, config_item(<span class="php-quote">'rest_key_length'</span>));
+</span><span id="225" class="l"><a href="#225">225: </a>        }
+</span><span id="226" class="l"><a href="#226">226: </a>        <span class="php-keyword1">while</span> (<span class="php-var">$this</span>-&gt;_key_exists(<span class="php-var">$new_key</span>));
+</span><span id="227" class="l"><a href="#227">227: </a>
+</span><span id="228" class="l"><a href="#228">228: </a>        <span class="php-keyword1">return</span> <span class="php-var">$new_key</span>;
+</span><span id="229" class="l"><a href="#229">229: </a>    }
+</span><span id="230" class="l"><a href="#230">230: </a>
+</span><span id="231" class="l"><a href="#231">231: </a>    <span class="php-comment">/* Private Data Methods */</span>
 </span><span id="232" class="l"><a href="#232">232: </a>
-</span><span id="233" class="l"><a href="#233">233: </a>            <span class="php-comment">// If an error occurred, then fall back to the previous method</span>
-</span><span id="234" class="l"><a href="#234">234: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$salt</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="235" class="l"><a href="#235">235: </a>            {
-</span><span id="236" class="l"><a href="#236">236: </a>                <span class="php-var">$salt</span> = <span class="php-keyword2">hash</span>(<span class="php-quote">'sha256'</span>, <span class="php-keyword2">time</span>() . <span class="php-keyword2">mt_rand</span>());
-</span><span id="237" class="l"><a href="#237">237: </a>            }
-</span><span id="238" class="l"><a href="#238">238: </a>            <span class="php-var">$new_key</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$salt</span>, <span class="php-num">0</span>, config_item(<span class="php-quote">'rest_key_length'</span>));
-</span><span id="239" class="l"><a href="#239">239: </a>        }
-</span><span id="240" class="l"><a href="#240">240: </a>        <span class="php-keyword1">while</span> (self::_key_exists(<span class="php-var">$new_key</span>));
-</span><span id="241" class="l"><a href="#241">241: </a>        <span class="php-comment">// Already in the DB? Fail. Try again</span>
-</span><span id="242" class="l"><a href="#242">242: </a>
-</span><span id="243" class="l"><a href="#243">243: </a>        <span class="php-keyword1">return</span> <span class="php-var">$new_key</span>;
-</span><span id="244" class="l"><a href="#244">244: </a>    }
-</span><span id="245" class="l"><a href="#245">245: </a>
-</span><span id="246" class="l"><a href="#246">246: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
+</span><span id="233" class="l"><a href="#233">233: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _get_key(<span class="php-var">$key</span>)
+</span><span id="234" class="l"><a href="#234">234: </a>    {
+</span><span id="235" class="l"><a href="#235">235: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="236" class="l"><a href="#236">236: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
+</span><span id="237" class="l"><a href="#237">237: </a>            -&gt;get(config_item(<span class="php-quote">'rest_keys_table'</span>))
+</span><span id="238" class="l"><a href="#238">238: </a>            -&gt;row();
+</span><span id="239" class="l"><a href="#239">239: </a>    }
+</span><span id="240" class="l"><a href="#240">240: </a>
+</span><span id="241" class="l"><a href="#241">241: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _key_exists(<span class="php-var">$key</span>)
+</span><span id="242" class="l"><a href="#242">242: </a>    {
+</span><span id="243" class="l"><a href="#243">243: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="244" class="l"><a href="#244">244: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
+</span><span id="245" class="l"><a href="#245">245: </a>            -&gt;count_all_results(config_item(<span class="php-quote">'rest_keys_table'</span>)) &gt; <span class="php-num">0</span>;
+</span><span id="246" class="l"><a href="#246">246: </a>    }
 </span><span id="247" class="l"><a href="#247">247: </a>
-</span><span id="248" class="l"><a href="#248">248: </a>    <span class="php-comment">/* Private Data Methods */</span>
-</span><span id="249" class="l"><a href="#249">249: </a>
-</span><span id="250" class="l"><a href="#250">250: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _get_key(<span class="php-var">$key</span>)
-</span><span id="251" class="l"><a href="#251">251: </a>    {
-</span><span id="252" class="l"><a href="#252">252: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="253" class="l"><a href="#253">253: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
-</span><span id="254" class="l"><a href="#254">254: </a>            -&gt;get(config_item(<span class="php-quote">'rest_keys_table'</span>))
-</span><span id="255" class="l"><a href="#255">255: </a>            -&gt;row();
+</span><span id="248" class="l"><a href="#248">248: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _insert_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
+</span><span id="249" class="l"><a href="#249">249: </a>    {
+</span><span id="250" class="l"><a href="#250">250: </a>        <span class="php-var">$data</span>[config_item(<span class="php-quote">'rest_key_column'</span>)] = <span class="php-var">$key</span>;
+</span><span id="251" class="l"><a href="#251">251: </a>        <span class="php-var">$data</span>[<span class="php-quote">'date_created'</span>] = <span class="php-keyword2">function_exists</span>(<span class="php-quote">'now'</span>) ? now() : <span class="php-keyword2">time</span>();
+</span><span id="252" class="l"><a href="#252">252: </a>
+</span><span id="253" class="l"><a href="#253">253: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="254" class="l"><a href="#254">254: </a>            -&gt;set(<span class="php-var">$data</span>)
+</span><span id="255" class="l"><a href="#255">255: </a>            -&gt;insert(config_item(<span class="php-quote">'rest_keys_table'</span>));
 </span><span id="256" class="l"><a href="#256">256: </a>    }
 </span><span id="257" class="l"><a href="#257">257: </a>
-</span><span id="258" class="l"><a href="#258">258: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="259" class="l"><a href="#259">259: </a>
-</span><span id="260" class="l"><a href="#260">260: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _key_exists(<span class="php-var">$key</span>)
-</span><span id="261" class="l"><a href="#261">261: </a>    {
-</span><span id="262" class="l"><a href="#262">262: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="263" class="l"><a href="#263">263: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
-</span><span id="264" class="l"><a href="#264">264: </a>            -&gt;count_all_results(config_item(<span class="php-quote">'rest_keys_table'</span>)) &gt; <span class="php-num">0</span>;
-</span><span id="265" class="l"><a href="#265">265: </a>    }
-</span><span id="266" class="l"><a href="#266">266: </a>
-</span><span id="267" class="l"><a href="#267">267: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="268" class="l"><a href="#268">268: </a>
-</span><span id="269" class="l"><a href="#269">269: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _insert_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
-</span><span id="270" class="l"><a href="#270">270: </a>    {
-</span><span id="271" class="l"><a href="#271">271: </a>        <span class="php-var">$data</span>[config_item(<span class="php-quote">'rest_key_column'</span>)] = <span class="php-var">$key</span>;
-</span><span id="272" class="l"><a href="#272">272: </a>        <span class="php-var">$data</span>[<span class="php-quote">'date_created'</span>] = <span class="php-keyword2">function_exists</span>(<span class="php-quote">'now'</span>) ? now() : <span class="php-keyword2">time</span>();
-</span><span id="273" class="l"><a href="#273">273: </a>
-</span><span id="274" class="l"><a href="#274">274: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="275" class="l"><a href="#275">275: </a>            -&gt;set(<span class="php-var">$data</span>)
-</span><span id="276" class="l"><a href="#276">276: </a>            -&gt;insert(config_item(<span class="php-quote">'rest_keys_table'</span>));
-</span><span id="277" class="l"><a href="#277">277: </a>    }
-</span><span id="278" class="l"><a href="#278">278: </a>
-</span><span id="279" class="l"><a href="#279">279: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="280" class="l"><a href="#280">280: </a>
-</span><span id="281" class="l"><a href="#281">281: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _update_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
-</span><span id="282" class="l"><a href="#282">282: </a>    {
-</span><span id="283" class="l"><a href="#283">283: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="284" class="l"><a href="#284">284: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
-</span><span id="285" class="l"><a href="#285">285: </a>            -&gt;update(config_item(<span class="php-quote">'rest_keys_table'</span>), <span class="php-var">$data</span>);
-</span><span id="286" class="l"><a href="#286">286: </a>    }
-</span><span id="287" class="l"><a href="#287">287: </a>
-</span><span id="288" class="l"><a href="#288">288: </a>    <span class="php-comment">// --------------------------------------------------------------------</span>
-</span><span id="289" class="l"><a href="#289">289: </a>
-</span><span id="290" class="l"><a href="#290">290: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _delete_key(<span class="php-var">$key</span>)
-</span><span id="291" class="l"><a href="#291">291: </a>    {
-</span><span id="292" class="l"><a href="#292">292: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="293" class="l"><a href="#293">293: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
-</span><span id="294" class="l"><a href="#294">294: </a>            -&gt;<span class="php-keyword2">delete</span>(config_item(<span class="php-quote">'rest_keys_table'</span>));
-</span><span id="295" class="l"><a href="#295">295: </a>    }
-</span><span id="296" class="l"><a href="#296">296: </a>}
-</span><span id="297" class="l"><a href="#297">297: </a></span></code></pre>
+</span><span id="258" class="l"><a href="#258">258: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _update_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
+</span><span id="259" class="l"><a href="#259">259: </a>    {
+</span><span id="260" class="l"><a href="#260">260: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="261" class="l"><a href="#261">261: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
+</span><span id="262" class="l"><a href="#262">262: </a>            -&gt;update(config_item(<span class="php-quote">'rest_keys_table'</span>), <span class="php-var">$data</span>);
+</span><span id="263" class="l"><a href="#263">263: </a>    }
+</span><span id="264" class="l"><a href="#264">264: </a>
+</span><span id="265" class="l"><a href="#265">265: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _delete_key(<span class="php-var">$key</span>)
+</span><span id="266" class="l"><a href="#266">266: </a>    {
+</span><span id="267" class="l"><a href="#267">267: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
+</span><span id="268" class="l"><a href="#268">268: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
+</span><span id="269" class="l"><a href="#269">269: </a>            -&gt;<span class="php-keyword2">delete</span>(config_item(<span class="php-quote">'rest_keys_table'</span>));
+</span><span id="270" class="l"><a href="#270">270: </a>    }
+</span><span id="271" class="l"><a href="#271">271: </a>
+</span><span id="272" class="l"><a href="#272">272: </a>}
+</span><span id="273" class="l"><a href="#273">273: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
-<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
+<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/source-class-REST_Controller.html b/documentation/source-class-REST_Controller.html
index 8550f99a..4a5a2ae5 100644
--- a/documentation/source-class-REST_Controller.html
+++ b/documentation/source-class-REST_Controller.html
@@ -54,6 +54,8 @@ <h3>Classes</h3>
 				<li><a href="http://github.com/class-Format.html">Format</a></li>
 				<li><a href="http://github.com/class-Key.html">Key</a></li>
 				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
+				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
+				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
 			</ul>
 
 
@@ -272,7 +274,7 @@ <h3>Classes</h3>
 </span></span><span id="180" class="l"><a href="#180"> 180: </a><span class="php-comment">     */</span>
 </span><span id="181" class="l"><a href="#181"> 181: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$request</span> = <span class="php-keyword1">NULL</span>;
 </span><span id="182" class="l"><a href="#182"> 182: </a>
-</span><span id="183" class="l"><a href="#183"> 183: </a>        <span class="php-comment">/**
+</span><span id="183" class="l"><a href="#183"> 183: </a>    <span class="php-comment">/**
 </span></span><span id="184" class="l"><a href="#184"> 184: </a><span class="php-comment">     * Contains details about the response
 </span></span><span id="185" class="l"><a href="#185"> 185: </a><span class="php-comment">     * Fields: format, lang
 </span></span><span id="186" class="l"><a href="#186"> 186: </a><span class="php-comment">     * Note: This is a dynamic object (stdClass)
@@ -558,7 +560,7 @@ <h3>Classes</h3>
 </span><span id="466" class="l"><a href="#466"> 466: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
 </span><span id="467" class="l"><a href="#467"> 467: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
 </span><span id="468" class="l"><a href="#468"> 468: </a>
-</span><span id="469" class="l"><a href="#469"> 469: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
+</span><span id="469" class="l"><a href="#469"> 469: </a>        <span class="php-comment">// Which language should the data be returned in?</span>
 </span><span id="470" class="l"><a href="#470"> 470: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
 </span><span id="471" class="l"><a href="#471"> 471: </a>
 </span><span id="472" class="l"><a href="#472"> 472: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
@@ -653,435 +655,435 @@ <h3>Classes</h3>
 </span><span id="561" class="l"><a href="#561"> 561: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
 </span><span id="562" class="l"><a href="#562"> 562: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
 </span><span id="563" class="l"><a href="#563"> 563: </a>        {
-</span><span id="564" class="l"><a href="#564"> 564: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unsupported protocol'</span>], self::HTTP_FORBIDDEN);
-</span><span id="565" class="l"><a href="#565"> 565: </a>        }
-</span><span id="566" class="l"><a href="#566"> 566: </a>
-</span><span id="567" class="l"><a href="#567"> 567: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
-</span><span id="568" class="l"><a href="#568"> 568: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
+</span><span id="564" class="l"><a href="#564"> 564: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="565" class="l"><a href="#565"> 565: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="566" class="l"><a href="#566"> 566: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unsupported protocol'</span>
+</span><span id="567" class="l"><a href="#567"> 567: </a>                ], self::HTTP_FORBIDDEN);
+</span><span id="568" class="l"><a href="#568"> 568: </a>        }
 </span><span id="569" class="l"><a href="#569"> 569: </a>
-</span><span id="570" class="l"><a href="#570"> 570: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span> . <span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method;
-</span><span id="571" class="l"><a href="#571"> 571: </a>
-</span><span id="572" class="l"><a href="#572"> 572: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
-</span><span id="573" class="l"><a href="#573"> 573: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] == <span class="php-keyword1">FALSE</span>);
+</span><span id="570" class="l"><a href="#570"> 570: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
+</span><span id="571" class="l"><a href="#571"> 571: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
+</span><span id="572" class="l"><a href="#572"> 572: </a>
+</span><span id="573" class="l"><a href="#573"> 573: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span> . <span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method;
 </span><span id="574" class="l"><a href="#574"> 574: </a>
-</span><span id="575" class="l"><a href="#575"> 575: </a>        <span class="php-comment">// Use keys for this method?</span>
-</span><span id="576" class="l"><a href="#576"> 576: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] == <span class="php-keyword1">FALSE</span>);
+</span><span id="575" class="l"><a href="#575"> 575: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
+</span><span id="576" class="l"><a href="#576"> 576: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] === <span class="php-keyword1">FALSE</span>);
 </span><span id="577" class="l"><a href="#577"> 577: </a>
-</span><span id="578" class="l"><a href="#578"> 578: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here.</span>
-</span><span id="579" class="l"><a href="#579"> 579: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
-</span><span id="580" class="l"><a href="#580"> 580: </a>        {
-</span><span id="581" class="l"><a href="#581"> 581: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="582" class="l"><a href="#582"> 582: </a>            {
-</span><span id="583" class="l"><a href="#583"> 583: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="584" class="l"><a href="#584"> 584: </a>            }
-</span><span id="585" class="l"><a href="#585"> 585: </a>
-</span><span id="586" class="l"><a href="#586"> 586: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid API Key '</span> . <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>], self::HTTP_FORBIDDEN);
-</span><span id="587" class="l"><a href="#587"> 587: </a>        }
+</span><span id="578" class="l"><a href="#578"> 578: </a>        <span class="php-comment">// Use keys for this method?</span>
+</span><span id="579" class="l"><a href="#579"> 579: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] === <span class="php-keyword1">FALSE</span>);
+</span><span id="580" class="l"><a href="#580"> 580: </a>
+</span><span id="581" class="l"><a href="#581"> 581: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here.</span>
+</span><span id="582" class="l"><a href="#582"> 582: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
+</span><span id="583" class="l"><a href="#583"> 583: </a>        {
+</span><span id="584" class="l"><a href="#584"> 584: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="585" class="l"><a href="#585"> 585: </a>            {
+</span><span id="586" class="l"><a href="#586"> 586: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="587" class="l"><a href="#587"> 587: </a>            }
 </span><span id="588" class="l"><a href="#588"> 588: </a>
-</span><span id="589" class="l"><a href="#589"> 589: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller.</span>
-</span><span id="590" class="l"><a href="#590"> 590: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
-</span><span id="591" class="l"><a href="#591"> 591: </a>        {
-</span><span id="592" class="l"><a href="#592"> 592: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="593" class="l"><a href="#593"> 593: </a>            {
-</span><span id="594" class="l"><a href="#594"> 594: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="595" class="l"><a href="#595"> 595: </a>            }
-</span><span id="596" class="l"><a href="#596"> 596: </a>
-</span><span id="597" class="l"><a href="#597"> 597: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have access to the requested controller.'</span>], self::HTTP_UNAUTHORIZED);
-</span><span id="598" class="l"><a href="#598"> 598: </a>        }
-</span><span id="599" class="l"><a href="#599"> 599: </a>
-</span><span id="600" class="l"><a href="#600"> 600: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
-</span><span id="601" class="l"><a href="#601"> 601: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="602" class="l"><a href="#602"> 602: </a>        {
-</span><span id="603" class="l"><a href="#603"> 603: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unknown method.'</span>], self::HTTP_NOT_FOUND);
-</span><span id="604" class="l"><a href="#604"> 604: </a>        }
-</span><span id="605" class="l"><a href="#605"> 605: </a>
-</span><span id="606" class="l"><a href="#606"> 606: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
-</span><span id="607" class="l"><a href="#607"> 607: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="608" class="l"><a href="#608"> 608: </a>        {
-</span><span id="609" class="l"><a href="#609"> 609: </a>            <span class="php-comment">// Check the limit</span>
-</span><span id="610" class="l"><a href="#610"> 610: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="611" class="l"><a href="#611"> 611: </a>            {
-</span><span id="612" class="l"><a href="#612"> 612: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key has reached the time limit for this method.'</span>];
-</span><span id="613" class="l"><a href="#613"> 613: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
-</span><span id="614" class="l"><a href="#614"> 614: </a>            }
-</span><span id="615" class="l"><a href="#615"> 615: </a>
-</span><span id="616" class="l"><a href="#616"> 616: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
-</span><span id="617" class="l"><a href="#617"> 617: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
-</span><span id="618" class="l"><a href="#618"> 618: </a>
-</span><span id="619" class="l"><a href="#619"> 619: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
-</span><span id="620" class="l"><a href="#620"> 620: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
-</span><span id="621" class="l"><a href="#621"> 621: </a>
-</span><span id="622" class="l"><a href="#622"> 622: </a>            <span class="php-comment">// IM TELLIN!</span>
-</span><span id="623" class="l"><a href="#623"> 623: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="624" class="l"><a href="#624"> 624: </a>            {
-</span><span id="625" class="l"><a href="#625"> 625: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
+</span><span id="589" class="l"><a href="#589"> 589: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="590" class="l"><a href="#590"> 590: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="591" class="l"><a href="#591"> 591: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid API Key '</span> . <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>
+</span><span id="592" class="l"><a href="#592"> 592: </a>                ], self::HTTP_FORBIDDEN);
+</span><span id="593" class="l"><a href="#593"> 593: </a>        }
+</span><span id="594" class="l"><a href="#594"> 594: </a>
+</span><span id="595" class="l"><a href="#595"> 595: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller.</span>
+</span><span id="596" class="l"><a href="#596"> 596: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
+</span><span id="597" class="l"><a href="#597"> 597: </a>        {
+</span><span id="598" class="l"><a href="#598"> 598: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="599" class="l"><a href="#599"> 599: </a>            {
+</span><span id="600" class="l"><a href="#600"> 600: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="601" class="l"><a href="#601"> 601: </a>            }
+</span><span id="602" class="l"><a href="#602"> 602: </a>
+</span><span id="603" class="l"><a href="#603"> 603: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="604" class="l"><a href="#604"> 604: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="605" class="l"><a href="#605"> 605: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have access to the requested controller.'</span>
+</span><span id="606" class="l"><a href="#606"> 606: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="607" class="l"><a href="#607"> 607: </a>        }
+</span><span id="608" class="l"><a href="#608"> 608: </a>
+</span><span id="609" class="l"><a href="#609"> 609: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
+</span><span id="610" class="l"><a href="#610"> 610: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="611" class="l"><a href="#611"> 611: </a>        {
+</span><span id="612" class="l"><a href="#612"> 612: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="613" class="l"><a href="#613"> 613: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="614" class="l"><a href="#614"> 614: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unknown method.'</span>
+</span><span id="615" class="l"><a href="#615"> 615: </a>                ], self::HTTP_NOT_FOUND);
+</span><span id="616" class="l"><a href="#616"> 616: </a>        }
+</span><span id="617" class="l"><a href="#617"> 617: </a>
+</span><span id="618" class="l"><a href="#618"> 618: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
+</span><span id="619" class="l"><a href="#619"> 619: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="620" class="l"><a href="#620"> 620: </a>        {
+</span><span id="621" class="l"><a href="#621"> 621: </a>            <span class="php-comment">// Check the limit</span>
+</span><span id="622" class="l"><a href="#622"> 622: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="623" class="l"><a href="#623"> 623: </a>            {
+</span><span id="624" class="l"><a href="#624"> 624: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key has reached the time limit for this method.'</span>];
+</span><span id="625" class="l"><a href="#625"> 625: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
 </span><span id="626" class="l"><a href="#626"> 626: </a>            }
 </span><span id="627" class="l"><a href="#627"> 627: </a>
-</span><span id="628" class="l"><a href="#628"> 628: </a>            <span class="php-comment">// They don't have good enough perms</span>
-</span><span id="629" class="l"><a href="#629"> 629: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have enough permissions.'</span>];
-</span><span id="630" class="l"><a href="#630"> 630: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
-</span><span id="631" class="l"><a href="#631"> 631: </a>        }
-</span><span id="632" class="l"><a href="#632"> 632: </a>
-</span><span id="633" class="l"><a href="#633"> 633: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
-</span><span id="634" class="l"><a href="#634"> 634: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="635" class="l"><a href="#635"> 635: </a>        {
-</span><span id="636" class="l"><a href="#636"> 636: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
-</span><span id="637" class="l"><a href="#637"> 637: </a>        }
-</span><span id="638" class="l"><a href="#638"> 638: </a>
-</span><span id="639" class="l"><a href="#639"> 639: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
-</span><span id="640" class="l"><a href="#640"> 640: </a>        <span class="php-keyword1">try</span>
-</span><span id="641" class="l"><a href="#641"> 641: </a>        {
-</span><span id="642" class="l"><a href="#642"> 642: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
+</span><span id="628" class="l"><a href="#628"> 628: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
+</span><span id="629" class="l"><a href="#629"> 629: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
+</span><span id="630" class="l"><a href="#630"> 630: </a>
+</span><span id="631" class="l"><a href="#631"> 631: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
+</span><span id="632" class="l"><a href="#632"> 632: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
+</span><span id="633" class="l"><a href="#633"> 633: </a>
+</span><span id="634" class="l"><a href="#634"> 634: </a>            <span class="php-comment">// IM TELLIN!</span>
+</span><span id="635" class="l"><a href="#635"> 635: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="636" class="l"><a href="#636"> 636: </a>            {
+</span><span id="637" class="l"><a href="#637"> 637: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
+</span><span id="638" class="l"><a href="#638"> 638: </a>            }
+</span><span id="639" class="l"><a href="#639"> 639: </a>
+</span><span id="640" class="l"><a href="#640"> 640: </a>            <span class="php-comment">// They don't have good enough perms</span>
+</span><span id="641" class="l"><a href="#641"> 641: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have enough permissions.'</span>];
+</span><span id="642" class="l"><a href="#642"> 642: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
 </span><span id="643" class="l"><a href="#643"> 643: </a>        }
-</span><span id="644" class="l"><a href="#644"> 644: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
-</span><span id="645" class="l"><a href="#645"> 645: </a>        {
-</span><span id="646" class="l"><a href="#646"> 646: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
-</span><span id="647" class="l"><a href="#647"> 647: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="648" class="l"><a href="#648"> 648: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="649" class="l"><a href="#649"> 649: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
-</span><span id="650" class="l"><a href="#650"> 650: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
-</span><span id="651" class="l"><a href="#651"> 651: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
-</span><span id="652" class="l"><a href="#652"> 652: </a>                    ]
-</span><span id="653" class="l"><a href="#653"> 653: </a>                ], self::HTTP_INTERNAL_SERVER_ERROR);
-</span><span id="654" class="l"><a href="#654"> 654: </a>        }
-</span><span id="655" class="l"><a href="#655"> 655: </a>    }
-</span><span id="656" class="l"><a href="#656"> 656: </a>
-</span><span id="657" class="l"><a href="#657"> 657: </a>    <span class="php-comment">/**
-</span></span><span id="658" class="l"><a href="#658"> 658: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
-</span></span><span id="659" class="l"><a href="#659"> 659: </a><span class="php-comment">     *
-</span></span><span id="660" class="l"><a href="#660"> 660: </a><span class="php-comment">     * @access public
-</span></span><span id="661" class="l"><a href="#661"> 661: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
-</span></span><span id="662" class="l"><a href="#662"> 662: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
-</span></span><span id="663" class="l"><a href="#663"> 663: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
-</span></span><span id="664" class="l"><a href="#664"> 664: </a><span class="php-comment">     * running the script; otherwise, exit
-</span></span><span id="665" class="l"><a href="#665"> 665: </a><span class="php-comment">     */</span>
-</span><span id="666" class="l"><a href="#666"> 666: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="667" class="l"><a href="#667"> 667: </a>    {
-</span><span id="668" class="l"><a href="#668"> 668: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
-</span><span id="669" class="l"><a href="#669"> 669: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="670" class="l"><a href="#670"> 670: </a>        {
-</span><span id="671" class="l"><a href="#671"> 671: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
-</span><span id="672" class="l"><a href="#672"> 672: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
-</span><span id="673" class="l"><a href="#673"> 673: </a>        }
-</span><span id="674" class="l"><a href="#674"> 674: </a>
-</span><span id="675" class="l"><a href="#675"> 675: </a>        <span class="php-comment">// Set the output as NULL by default</span>
-</span><span id="676" class="l"><a href="#676"> 676: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="677" class="l"><a href="#677"> 677: </a>
-</span><span id="678" class="l"><a href="#678"> 678: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
-</span><span id="679" class="l"><a href="#679"> 679: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="680" class="l"><a href="#680"> 680: </a>        {
-</span><span id="681" class="l"><a href="#681"> 681: </a>            <span class="php-var">$http_code</span> = self::HTTP_NOT_FOUND;
-</span><span id="682" class="l"><a href="#682"> 682: </a>        }
-</span><span id="683" class="l"><a href="#683"> 683: </a>
-</span><span id="684" class="l"><a href="#684"> 684: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
-</span><span id="685" class="l"><a href="#685"> 685: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="686" class="l"><a href="#686"> 686: </a>        {
-</span><span id="687" class="l"><a href="#687"> 687: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
-</span><span id="688" class="l"><a href="#688"> 688: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
-</span><span id="689" class="l"><a href="#689"> 689: </a>            {
-</span><span id="690" class="l"><a href="#690"> 690: </a>                <span class="php-comment">// Set the format header</span>
-</span><span id="691" class="l"><a href="#691"> 691: </a>                <span class="php-var">$this</span>-&gt;output-&gt;set_content_type(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format], <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
-</span><span id="692" class="l"><a href="#692"> 692: </a>
-</span><span id="693" class="l"><a href="#693"> 693: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error.</span>
-</span><span id="694" class="l"><a href="#694"> 694: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
-</span><span id="695" class="l"><a href="#695"> 695: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
-</span><span id="696" class="l"><a href="#696"> 696: </a>                {
-</span><span id="697" class="l"><a href="#697"> 697: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="698" class="l"><a href="#698"> 698: </a>                }
-</span><span id="699" class="l"><a href="#699"> 699: </a>            }
-</span><span id="700" class="l"><a href="#700"> 700: </a>            <span class="php-keyword1">else</span>
+</span><span id="644" class="l"><a href="#644"> 644: </a>
+</span><span id="645" class="l"><a href="#645"> 645: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
+</span><span id="646" class="l"><a href="#646"> 646: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="647" class="l"><a href="#647"> 647: </a>        {
+</span><span id="648" class="l"><a href="#648"> 648: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
+</span><span id="649" class="l"><a href="#649"> 649: </a>        }
+</span><span id="650" class="l"><a href="#650"> 650: </a>
+</span><span id="651" class="l"><a href="#651"> 651: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
+</span><span id="652" class="l"><a href="#652"> 652: </a>        <span class="php-keyword1">try</span>
+</span><span id="653" class="l"><a href="#653"> 653: </a>        {
+</span><span id="654" class="l"><a href="#654"> 654: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
+</span><span id="655" class="l"><a href="#655"> 655: </a>        }
+</span><span id="656" class="l"><a href="#656"> 656: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
+</span><span id="657" class="l"><a href="#657"> 657: </a>        {
+</span><span id="658" class="l"><a href="#658"> 658: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
+</span><span id="659" class="l"><a href="#659"> 659: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="660" class="l"><a href="#660"> 660: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="661" class="l"><a href="#661"> 661: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
+</span><span id="662" class="l"><a href="#662"> 662: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
+</span><span id="663" class="l"><a href="#663"> 663: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
+</span><span id="664" class="l"><a href="#664"> 664: </a>                    ]
+</span><span id="665" class="l"><a href="#665"> 665: </a>                ], self::HTTP_INTERNAL_SERVER_ERROR);
+</span><span id="666" class="l"><a href="#666"> 666: </a>        }
+</span><span id="667" class="l"><a href="#667"> 667: </a>    }
+</span><span id="668" class="l"><a href="#668"> 668: </a>
+</span><span id="669" class="l"><a href="#669"> 669: </a>    <span class="php-comment">/**
+</span></span><span id="670" class="l"><a href="#670"> 670: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
+</span></span><span id="671" class="l"><a href="#671"> 671: </a><span class="php-comment">     *
+</span></span><span id="672" class="l"><a href="#672"> 672: </a><span class="php-comment">     * @access public
+</span></span><span id="673" class="l"><a href="#673"> 673: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
+</span></span><span id="674" class="l"><a href="#674"> 674: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
+</span></span><span id="675" class="l"><a href="#675"> 675: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
+</span></span><span id="676" class="l"><a href="#676"> 676: </a><span class="php-comment">     * running the script; otherwise, exit
+</span></span><span id="677" class="l"><a href="#677"> 677: </a><span class="php-comment">     */</span>
+</span><span id="678" class="l"><a href="#678"> 678: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="679" class="l"><a href="#679"> 679: </a>    {
+</span><span id="680" class="l"><a href="#680"> 680: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
+</span><span id="681" class="l"><a href="#681"> 681: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="682" class="l"><a href="#682"> 682: </a>        {
+</span><span id="683" class="l"><a href="#683"> 683: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
+</span><span id="684" class="l"><a href="#684"> 684: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
+</span><span id="685" class="l"><a href="#685"> 685: </a>        }
+</span><span id="686" class="l"><a href="#686"> 686: </a>
+</span><span id="687" class="l"><a href="#687"> 687: </a>        <span class="php-comment">// Set the output as NULL by default</span>
+</span><span id="688" class="l"><a href="#688"> 688: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="689" class="l"><a href="#689"> 689: </a>
+</span><span id="690" class="l"><a href="#690"> 690: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
+</span><span id="691" class="l"><a href="#691"> 691: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="692" class="l"><a href="#692"> 692: </a>        {
+</span><span id="693" class="l"><a href="#693"> 693: </a>            <span class="php-var">$http_code</span> = self::HTTP_NOT_FOUND;
+</span><span id="694" class="l"><a href="#694"> 694: </a>        }
+</span><span id="695" class="l"><a href="#695"> 695: </a>
+</span><span id="696" class="l"><a href="#696"> 696: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
+</span><span id="697" class="l"><a href="#697"> 697: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="698" class="l"><a href="#698"> 698: </a>        {
+</span><span id="699" class="l"><a href="#699"> 699: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
+</span><span id="700" class="l"><a href="#700"> 700: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
 </span><span id="701" class="l"><a href="#701"> 701: </a>            {
-</span><span id="702" class="l"><a href="#702"> 702: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
-</span><span id="703" class="l"><a href="#703"> 703: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
-</span><span id="704" class="l"><a href="#704"> 704: </a>                {
-</span><span id="705" class="l"><a href="#705"> 705: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="706" class="l"><a href="#706"> 706: </a>                }
-</span><span id="707" class="l"><a href="#707"> 707: </a>
-</span><span id="708" class="l"><a href="#708"> 708: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
-</span><span id="709" class="l"><a href="#709"> 709: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
-</span><span id="710" class="l"><a href="#710"> 710: </a>            }
-</span><span id="711" class="l"><a href="#711"> 711: </a>        }
-</span><span id="712" class="l"><a href="#712"> 712: </a>
-</span><span id="713" class="l"><a href="#713"> 713: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
-</span><span id="714" class="l"><a href="#714"> 714: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
-</span><span id="715" class="l"><a href="#715"> 715: </a>        <span class="php-comment">// correct HTTP status code</span>
-</span><span id="716" class="l"><a href="#716"> 716: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = self::HTTP_OK;
-</span><span id="717" class="l"><a href="#717"> 717: </a>
-</span><span id="718" class="l"><a href="#718"> 718: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_status_header(<span class="php-var">$http_code</span>);
-</span><span id="719" class="l"><a href="#719"> 719: </a>
-</span><span id="720" class="l"><a href="#720"> 720: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
-</span><span id="721" class="l"><a href="#721"> 721: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="722" class="l"><a href="#722"> 722: </a>        {
-</span><span id="723" class="l"><a href="#723"> 723: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
+</span><span id="702" class="l"><a href="#702"> 702: </a>                <span class="php-comment">// Set the format header</span>
+</span><span id="703" class="l"><a href="#703"> 703: </a>                <span class="php-var">$this</span>-&gt;output-&gt;set_content_type(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format], <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
+</span><span id="704" class="l"><a href="#704"> 704: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
+</span><span id="705" class="l"><a href="#705"> 705: </a>
+</span><span id="706" class="l"><a href="#706"> 706: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error.</span>
+</span><span id="707" class="l"><a href="#707"> 707: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
+</span><span id="708" class="l"><a href="#708"> 708: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
+</span><span id="709" class="l"><a href="#709"> 709: </a>                {
+</span><span id="710" class="l"><a href="#710"> 710: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="711" class="l"><a href="#711"> 711: </a>                }
+</span><span id="712" class="l"><a href="#712"> 712: </a>            }
+</span><span id="713" class="l"><a href="#713"> 713: </a>            <span class="php-keyword1">else</span>
+</span><span id="714" class="l"><a href="#714"> 714: </a>            {
+</span><span id="715" class="l"><a href="#715"> 715: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
+</span><span id="716" class="l"><a href="#716"> 716: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
+</span><span id="717" class="l"><a href="#717"> 717: </a>                {
+</span><span id="718" class="l"><a href="#718"> 718: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="719" class="l"><a href="#719"> 719: </a>                }
+</span><span id="720" class="l"><a href="#720"> 720: </a>
+</span><span id="721" class="l"><a href="#721"> 721: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
+</span><span id="722" class="l"><a href="#722"> 722: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
+</span><span id="723" class="l"><a href="#723"> 723: </a>            }
 </span><span id="724" class="l"><a href="#724"> 724: </a>        }
 </span><span id="725" class="l"><a href="#725"> 725: </a>
-</span><span id="726" class="l"><a href="#726"> 726: </a>        <span class="php-comment">// Output the data</span>
-</span><span id="727" class="l"><a href="#727"> 727: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_output(<span class="php-var">$output</span>);
-</span><span id="728" class="l"><a href="#728"> 728: </a>
-</span><span id="729" class="l"><a href="#729"> 729: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="730" class="l"><a href="#730"> 730: </a>        {
-</span><span id="731" class="l"><a href="#731"> 731: </a>            <span class="php-comment">// Display the data and exit execution</span>
-</span><span id="732" class="l"><a href="#732"> 732: </a>            <span class="php-var">$this</span>-&gt;output-&gt;_display();
-</span><span id="733" class="l"><a href="#733"> 733: </a>            <span class="php-keyword1">exit</span>;
-</span><span id="734" class="l"><a href="#734"> 734: </a>        }
-</span><span id="735" class="l"><a href="#735"> 735: </a>
-</span><span id="736" class="l"><a href="#736"> 736: </a>        <span class="php-comment">// Otherwise dump the output automatically</span>
-</span><span id="737" class="l"><a href="#737"> 737: </a>    }
+</span><span id="726" class="l"><a href="#726"> 726: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
+</span><span id="727" class="l"><a href="#727"> 727: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
+</span><span id="728" class="l"><a href="#728"> 728: </a>        <span class="php-comment">// correct HTTP status code</span>
+</span><span id="729" class="l"><a href="#729"> 729: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = self::HTTP_OK;
+</span><span id="730" class="l"><a href="#730"> 730: </a>
+</span><span id="731" class="l"><a href="#731"> 731: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_status_header(<span class="php-var">$http_code</span>);
+</span><span id="732" class="l"><a href="#732"> 732: </a>
+</span><span id="733" class="l"><a href="#733"> 733: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
+</span><span id="734" class="l"><a href="#734"> 734: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="735" class="l"><a href="#735"> 735: </a>        {
+</span><span id="736" class="l"><a href="#736"> 736: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
+</span><span id="737" class="l"><a href="#737"> 737: </a>        }
 </span><span id="738" class="l"><a href="#738"> 738: </a>
-</span><span id="739" class="l"><a href="#739"> 739: </a>    <span class="php-comment">/**
-</span></span><span id="740" class="l"><a href="#740"> 740: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
-</span></span><span id="741" class="l"><a href="#741"> 741: </a><span class="php-comment">     * within the buffers of the Output class. The response is sent to the client
-</span></span><span id="742" class="l"><a href="#742"> 742: </a><span class="php-comment">     * lately by the framework, after the current controller's method termination.
-</span></span><span id="743" class="l"><a href="#743"> 743: </a><span class="php-comment">     * All the hooks after the controller's method termination are executable.
-</span></span><span id="744" class="l"><a href="#744"> 744: </a><span class="php-comment">     *
-</span></span><span id="745" class="l"><a href="#745"> 745: </a><span class="php-comment">     * @access public
-</span></span><span id="746" class="l"><a href="#746"> 746: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
-</span></span><span id="747" class="l"><a href="#747"> 747: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
-</span></span><span id="748" class="l"><a href="#748"> 748: </a><span class="php-comment">     */</span>
-</span><span id="749" class="l"><a href="#749"> 749: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> set_response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="750" class="l"><a href="#750"> 750: </a>    {
-</span><span id="751" class="l"><a href="#751"> 751: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$data</span>, <span class="php-var">$http_code</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="752" class="l"><a href="#752"> 752: </a>    }
-</span><span id="753" class="l"><a href="#753"> 753: </a>
-</span><span id="754" class="l"><a href="#754"> 754: </a>    <span class="php-comment">/**
-</span></span><span id="755" class="l"><a href="#755"> 755: </a><span class="php-comment">     * Get the input format e.g. json or xml
-</span></span><span id="756" class="l"><a href="#756"> 756: </a><span class="php-comment">     *
-</span></span><span id="757" class="l"><a href="#757"> 757: </a><span class="php-comment">     * @access protected
-</span></span><span id="758" class="l"><a href="#758"> 758: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
-</span></span><span id="759" class="l"><a href="#759"> 759: </a><span class="php-comment">     */</span>
-</span><span id="760" class="l"><a href="#760"> 760: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
-</span><span id="761" class="l"><a href="#761"> 761: </a>    {
-</span><span id="762" class="l"><a href="#762"> 762: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
-</span><span id="763" class="l"><a href="#763"> 763: </a>        <span class="php-var">$contentType</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
-</span><span id="764" class="l"><a href="#764"> 764: </a>
-</span><span id="765" class="l"><a href="#765"> 765: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$contentType</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="766" class="l"><a href="#766"> 766: </a>        {
-</span><span id="767" class="l"><a href="#767"> 767: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="768" class="l"><a href="#768"> 768: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
-</span><span id="769" class="l"><a href="#769"> 769: </a>            {
-</span><span id="770" class="l"><a href="#770"> 770: </a>                <span class="php-comment">// $key = format e.g. csv</span>
-</span><span id="771" class="l"><a href="#771"> 771: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
-</span><span id="772" class="l"><a href="#772"> 772: </a>
-</span><span id="773" class="l"><a href="#773"> 773: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
-</span><span id="774" class="l"><a href="#774"> 774: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
-</span><span id="775" class="l"><a href="#775"> 775: </a>                <span class="php-var">$contentType</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$contentType</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$contentType</span>)) : <span class="php-var">$contentType</span>);
-</span><span id="776" class="l"><a href="#776"> 776: </a>
-</span><span id="777" class="l"><a href="#777"> 777: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
-</span><span id="778" class="l"><a href="#778"> 778: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$contentType</span> === <span class="php-var">$value</span>)
-</span><span id="779" class="l"><a href="#779"> 779: </a>                {
-</span><span id="780" class="l"><a href="#780"> 780: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
-</span><span id="781" class="l"><a href="#781"> 781: </a>                }
-</span><span id="782" class="l"><a href="#782"> 782: </a>            }
-</span><span id="783" class="l"><a href="#783"> 783: </a>        }
-</span><span id="784" class="l"><a href="#784"> 784: </a>
-</span><span id="785" class="l"><a href="#785"> 785: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="786" class="l"><a href="#786"> 786: </a>    }
-</span><span id="787" class="l"><a href="#787"> 787: </a>
-</span><span id="788" class="l"><a href="#788"> 788: </a>    <span class="php-comment">/**
-</span></span><span id="789" class="l"><a href="#789"> 789: </a><span class="php-comment">     * Detect which format should be used to output the data
-</span></span><span id="790" class="l"><a href="#790"> 790: </a><span class="php-comment">     *
-</span></span><span id="791" class="l"><a href="#791"> 791: </a><span class="php-comment">     * @access protected
-</span></span><span id="792" class="l"><a href="#792"> 792: </a><span class="php-comment">     * @return mixed|NULL|string Output format
-</span></span><span id="793" class="l"><a href="#793"> 793: </a><span class="php-comment">     */</span>
-</span><span id="794" class="l"><a href="#794"> 794: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
-</span><span id="795" class="l"><a href="#795"> 795: </a>    {
-</span><span id="796" class="l"><a href="#796"> 796: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>;
+</span><span id="739" class="l"><a href="#739"> 739: </a>        <span class="php-comment">// Output the data</span>
+</span><span id="740" class="l"><a href="#740"> 740: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_output(<span class="php-var">$output</span>);
+</span><span id="741" class="l"><a href="#741"> 741: </a>
+</span><span id="742" class="l"><a href="#742"> 742: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="743" class="l"><a href="#743"> 743: </a>        {
+</span><span id="744" class="l"><a href="#744"> 744: </a>            <span class="php-comment">// Display the data and exit execution</span>
+</span><span id="745" class="l"><a href="#745"> 745: </a>            <span class="php-var">$this</span>-&gt;output-&gt;_display();
+</span><span id="746" class="l"><a href="#746"> 746: </a>            <span class="php-keyword1">exit</span>;
+</span><span id="747" class="l"><a href="#747"> 747: </a>        }
+</span><span id="748" class="l"><a href="#748"> 748: </a>
+</span><span id="749" class="l"><a href="#749"> 749: </a>        <span class="php-comment">// Otherwise dump the output automatically</span>
+</span><span id="750" class="l"><a href="#750"> 750: </a>    }
+</span><span id="751" class="l"><a href="#751"> 751: </a>
+</span><span id="752" class="l"><a href="#752"> 752: </a>    <span class="php-comment">/**
+</span></span><span id="753" class="l"><a href="#753"> 753: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
+</span></span><span id="754" class="l"><a href="#754"> 754: </a><span class="php-comment">     * within the buffers of the Output class. The response is sent to the client
+</span></span><span id="755" class="l"><a href="#755"> 755: </a><span class="php-comment">     * lately by the framework, after the current controller's method termination.
+</span></span><span id="756" class="l"><a href="#756"> 756: </a><span class="php-comment">     * All the hooks after the controller's method termination are executable.
+</span></span><span id="757" class="l"><a href="#757"> 757: </a><span class="php-comment">     *
+</span></span><span id="758" class="l"><a href="#758"> 758: </a><span class="php-comment">     * @access public
+</span></span><span id="759" class="l"><a href="#759"> 759: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
+</span></span><span id="760" class="l"><a href="#760"> 760: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
+</span></span><span id="761" class="l"><a href="#761"> 761: </a><span class="php-comment">     */</span>
+</span><span id="762" class="l"><a href="#762"> 762: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> set_response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="763" class="l"><a href="#763"> 763: </a>    {
+</span><span id="764" class="l"><a href="#764"> 764: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$data</span>, <span class="php-var">$http_code</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="765" class="l"><a href="#765"> 765: </a>    }
+</span><span id="766" class="l"><a href="#766"> 766: </a>
+</span><span id="767" class="l"><a href="#767"> 767: </a>    <span class="php-comment">/**
+</span></span><span id="768" class="l"><a href="#768"> 768: </a><span class="php-comment">     * Get the input format e.g. json or xml
+</span></span><span id="769" class="l"><a href="#769"> 769: </a><span class="php-comment">     *
+</span></span><span id="770" class="l"><a href="#770"> 770: </a><span class="php-comment">     * @access protected
+</span></span><span id="771" class="l"><a href="#771"> 771: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
+</span></span><span id="772" class="l"><a href="#772"> 772: </a><span class="php-comment">     */</span>
+</span><span id="773" class="l"><a href="#773"> 773: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
+</span><span id="774" class="l"><a href="#774"> 774: </a>    {
+</span><span id="775" class="l"><a href="#775"> 775: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
+</span><span id="776" class="l"><a href="#776"> 776: </a>        <span class="php-var">$content_type</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
+</span><span id="777" class="l"><a href="#777"> 777: </a>
+</span><span id="778" class="l"><a href="#778"> 778: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$content_type</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="779" class="l"><a href="#779"> 779: </a>        {
+</span><span id="780" class="l"><a href="#780"> 780: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="781" class="l"><a href="#781"> 781: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
+</span><span id="782" class="l"><a href="#782"> 782: </a>            {
+</span><span id="783" class="l"><a href="#783"> 783: </a>                <span class="php-comment">// $key = format e.g. csv</span>
+</span><span id="784" class="l"><a href="#784"> 784: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
+</span><span id="785" class="l"><a href="#785"> 785: </a>
+</span><span id="786" class="l"><a href="#786"> 786: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
+</span><span id="787" class="l"><a href="#787"> 787: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
+</span><span id="788" class="l"><a href="#788"> 788: </a>                <span class="php-var">$content_type</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$content_type</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$content_type</span>)) : <span class="php-var">$content_type</span>);
+</span><span id="789" class="l"><a href="#789"> 789: </a>
+</span><span id="790" class="l"><a href="#790"> 790: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
+</span><span id="791" class="l"><a href="#791"> 791: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$content_type</span> === <span class="php-var">$value</span>)
+</span><span id="792" class="l"><a href="#792"> 792: </a>                {
+</span><span id="793" class="l"><a href="#793"> 793: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
+</span><span id="794" class="l"><a href="#794"> 794: </a>                }
+</span><span id="795" class="l"><a href="#795"> 795: </a>            }
+</span><span id="796" class="l"><a href="#796"> 796: </a>        }
 </span><span id="797" class="l"><a href="#797"> 797: </a>
-</span><span id="798" class="l"><a href="#798"> 798: </a>        <span class="php-comment">// Check if a file extension is used when no get arguments provided</span>
-</span><span id="799" class="l"><a href="#799"> 799: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="800" class="l"><a href="#800"> 800: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
-</span><span id="801" class="l"><a href="#801"> 801: </a>        {
-</span><span id="802" class="l"><a href="#802"> 802: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
-</span><span id="803" class="l"><a href="#803"> 803: </a>        }
-</span><span id="804" class="l"><a href="#804"> 804: </a>
-</span><span id="805" class="l"><a href="#805"> 805: </a>        <span class="php-comment">// Check if a file extension is used</span>
-</span><span id="806" class="l"><a href="#806"> 806: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;_get_args &amp;&amp; <span class="php-keyword2">is_array</span>(<span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args)) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-keyword2">end</span>(<span class="php-var">$this</span>-&gt;_get_args), <span class="php-var">$matches</span>))
-</span><span id="807" class="l"><a href="#807"> 807: </a>        {
-</span><span id="808" class="l"><a href="#808"> 808: </a>            <span class="php-comment">//elseif ($this-&gt;_get_args and is_array(end($this-&gt;_get_args)) === FALSE and preg_match($pattern, end(array_keys($this-&gt;_get_args)), $matches)) {</span>
-</span><span id="809" class="l"><a href="#809"> 809: </a>            <span class="php-comment">// The key of the last argument</span>
-</span><span id="810" class="l"><a href="#810"> 810: </a>            <span class="php-var">$arg_keys</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_get_args);
-</span><span id="811" class="l"><a href="#811"> 811: </a>            <span class="php-var">$last_key</span> = <span class="php-keyword2">end</span>(<span class="php-var">$arg_keys</span>);
+</span><span id="798" class="l"><a href="#798"> 798: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="799" class="l"><a href="#799"> 799: </a>    }
+</span><span id="800" class="l"><a href="#800"> 800: </a>
+</span><span id="801" class="l"><a href="#801"> 801: </a>    <span class="php-comment">/**
+</span></span><span id="802" class="l"><a href="#802"> 802: </a><span class="php-comment">     * Detect which format should be used to output the data
+</span></span><span id="803" class="l"><a href="#803"> 803: </a><span class="php-comment">     *
+</span></span><span id="804" class="l"><a href="#804"> 804: </a><span class="php-comment">     * @access protected
+</span></span><span id="805" class="l"><a href="#805"> 805: </a><span class="php-comment">     * @return mixed|NULL|string Output format
+</span></span><span id="806" class="l"><a href="#806"> 806: </a><span class="php-comment">     */</span>
+</span><span id="807" class="l"><a href="#807"> 807: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
+</span><span id="808" class="l"><a href="#808"> 808: </a>    {
+</span><span id="809" class="l"><a href="#809"> 809: </a>        <span class="php-comment">// Concatenate formats to a regex pattern e.g. \.(csv|json|xml)</span>
+</span><span id="810" class="l"><a href="#810"> 810: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')($|\/)/'</span>;
+</span><span id="811" class="l"><a href="#811"> 811: </a>        <span class="php-var">$matches</span> = [];
 </span><span id="812" class="l"><a href="#812"> 812: </a>
-</span><span id="813" class="l"><a href="#813"> 813: </a>            <span class="php-comment">// Remove the extension from arguments too</span>
-</span><span id="814" class="l"><a href="#814"> 814: </a>            <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>] = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$last_key</span>]);
-</span><span id="815" class="l"><a href="#815"> 815: </a>            <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>] = <span class="php-keyword2">preg_replace</span>(<span class="php-var">$pattern</span>, <span class="php-quote">''</span>, <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$last_key</span>]);
-</span><span id="816" class="l"><a href="#816"> 816: </a>
-</span><span id="817" class="l"><a href="#817"> 817: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
-</span><span id="818" class="l"><a href="#818"> 818: </a>        }
-</span><span id="819" class="l"><a href="#819"> 819: </a>
-</span><span id="820" class="l"><a href="#820"> 820: </a>        <span class="php-comment">// Get the format</span>
-</span><span id="821" class="l"><a href="#821"> 821: </a>        <span class="php-var">$format</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]) ? <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]) : <span class="php-keyword1">NULL</span>;
-</span><span id="822" class="l"><a href="#822"> 822: </a>
-</span><span id="823" class="l"><a href="#823"> 823: </a>        <span class="php-comment">// A format has been passed as an argument in the URL and it is supported</span>
-</span><span id="824" class="l"><a href="#824"> 824: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]))
-</span><span id="825" class="l"><a href="#825"> 825: </a>        {
-</span><span id="826" class="l"><a href="#826"> 826: </a>            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="827" class="l"><a href="#827"> 827: </a>        }
-</span><span id="828" class="l"><a href="#828"> 828: </a>
-</span><span id="829" class="l"><a href="#829"> 829: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT (if it exists and we are allowed)</span>
-</span><span id="830" class="l"><a href="#830"> 830: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>))
-</span><span id="831" class="l"><a href="#831"> 831: </a>        {
-</span><span id="832" class="l"><a href="#832"> 832: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="833" class="l"><a href="#833"> 833: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
-</span><span id="834" class="l"><a href="#834"> 834: </a>            {
-</span><span id="835" class="l"><a href="#835"> 835: </a>                <span class="php-comment">// Has this format been requested?</span>
-</span><span id="836" class="l"><a href="#836"> 836: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="837" class="l"><a href="#837"> 837: </a>                {
-</span><span id="838" class="l"><a href="#838"> 838: </a>                    <span class="php-comment">// If not HTML or XML assume its right and send it on its way</span>
-</span><span id="839" class="l"><a href="#839"> 839: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
-</span><span id="840" class="l"><a href="#840"> 840: </a>                    {
-</span><span id="841" class="l"><a href="#841"> 841: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="842" class="l"><a href="#842"> 842: </a>                    }
-</span><span id="843" class="l"><a href="#843"> 843: </a>
-</span><span id="844" class="l"><a href="#844"> 844: </a>                    <span class="php-comment">// HTML or XML have shown up as a match</span>
-</span><span id="845" class="l"><a href="#845"> 845: </a>                    <span class="php-keyword1">else</span>
-</span><span id="846" class="l"><a href="#846"> 846: </a>                    {
-</span><span id="847" class="l"><a href="#847"> 847: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
-</span><span id="848" class="l"><a href="#848"> 848: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="849" class="l"><a href="#849"> 849: </a>                        {
-</span><span id="850" class="l"><a href="#850"> 850: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="851" class="l"><a href="#851"> 851: </a>                        }
-</span><span id="852" class="l"><a href="#852"> 852: </a>
-</span><span id="853" class="l"><a href="#853"> 853: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
-</span><span id="854" class="l"><a href="#854"> 854: </a>                        <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>), <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="855" class="l"><a href="#855"> 855: </a>                        {
-</span><span id="856" class="l"><a href="#856"> 856: </a>                            <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="857" class="l"><a href="#857"> 857: </a>                        }
-</span><span id="858" class="l"><a href="#858"> 858: </a>                    }
-</span><span id="859" class="l"><a href="#859"> 859: </a>                }
-</span><span id="860" class="l"><a href="#860"> 860: </a>            }
-</span><span id="861" class="l"><a href="#861"> 861: </a>        } <span class="php-comment">// End HTTP_ACCEPT checking</span>
-</span><span id="862" class="l"><a href="#862"> 862: </a>
-</span><span id="863" class="l"><a href="#863"> 863: </a>        <span class="php-comment">// Well, none of that has worked! Let's see if the controller has a default</span>
-</span><span id="864" class="l"><a href="#864"> 864: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
-</span><span id="865" class="l"><a href="#865"> 865: </a>        {
-</span><span id="866" class="l"><a href="#866"> 866: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
-</span><span id="867" class="l"><a href="#867"> 867: </a>        }
-</span><span id="868" class="l"><a href="#868"> 868: </a>
-</span><span id="869" class="l"><a href="#869"> 869: </a>        <span class="php-comment">// Just use the default format</span>
-</span><span id="870" class="l"><a href="#870"> 870: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
-</span><span id="871" class="l"><a href="#871"> 871: </a>    }
-</span><span id="872" class="l"><a href="#872"> 872: </a>
-</span><span id="873" class="l"><a href="#873"> 873: </a>    <span class="php-comment">/**
-</span></span><span id="874" class="l"><a href="#874"> 874: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
-</span></span><span id="875" class="l"><a href="#875"> 875: </a><span class="php-comment">     *
-</span></span><span id="876" class="l"><a href="#876"> 876: </a><span class="php-comment">     * @access protected
-</span></span><span id="877" class="l"><a href="#877"> 877: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
-</span></span><span id="878" class="l"><a href="#878"> 878: </a><span class="php-comment">     */</span>
-</span><span id="879" class="l"><a href="#879"> 879: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
-</span><span id="880" class="l"><a href="#880"> 880: </a>    {
-</span><span id="881" class="l"><a href="#881"> 881: </a>        <span class="php-comment">// Declare a variable to store the method</span>
-</span><span id="882" class="l"><a href="#882"> 882: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="883" class="l"><a href="#883"> 883: </a>
-</span><span id="884" class="l"><a href="#884"> 884: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
-</span><span id="885" class="l"><a href="#885"> 885: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="886" class="l"><a href="#886"> 886: </a>        {
-</span><span id="887" class="l"><a href="#887"> 887: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
-</span><span id="888" class="l"><a href="#888"> 888: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="889" class="l"><a href="#889"> 889: </a>            {
-</span><span id="890" class="l"><a href="#890"> 890: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
-</span><span id="891" class="l"><a href="#891"> 891: </a>            }
-</span><span id="892" class="l"><a href="#892"> 892: </a>
-</span><span id="893" class="l"><a href="#893"> 893: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
-</span><span id="894" class="l"><a href="#894"> 894: </a>        }
-</span><span id="895" class="l"><a href="#895"> 895: </a>
-</span><span id="896" class="l"><a href="#896"> 896: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
-</span><span id="897" class="l"><a href="#897"> 897: </a>        {
-</span><span id="898" class="l"><a href="#898"> 898: </a>            <span class="php-comment">// Get the request method as a lowercase string.</span>
-</span><span id="899" class="l"><a href="#899"> 899: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
-</span><span id="900" class="l"><a href="#900"> 900: </a>        }
-</span><span id="901" class="l"><a href="#901"> 901: </a>
-</span><span id="902" class="l"><a href="#902"> 902: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
-</span><span id="903" class="l"><a href="#903"> 903: </a>    }
-</span><span id="904" class="l"><a href="#904"> 904: </a>
-</span><span id="905" class="l"><a href="#905"> 905: </a>    <span class="php-comment">/**
-</span></span><span id="906" class="l"><a href="#906"> 906: </a><span class="php-comment">     * See if the user has provided an API key
-</span></span><span id="907" class="l"><a href="#907"> 907: </a><span class="php-comment">     *
-</span></span><span id="908" class="l"><a href="#908"> 908: </a><span class="php-comment">     * @access protected
-</span></span><span id="909" class="l"><a href="#909"> 909: </a><span class="php-comment">     * @return bool
-</span></span><span id="910" class="l"><a href="#910"> 910: </a><span class="php-comment">     */</span>
-</span><span id="911" class="l"><a href="#911"> 911: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
-</span><span id="912" class="l"><a href="#912"> 912: </a>    {
-</span><span id="913" class="l"><a href="#913"> 913: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
-</span><span id="914" class="l"><a href="#914"> 914: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
-</span><span id="915" class="l"><a href="#915"> 915: </a>
-</span><span id="916" class="l"><a href="#916"> 916: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
-</span><span id="917" class="l"><a href="#917"> 917: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
-</span><span id="918" class="l"><a href="#918"> 918: </a>
-</span><span id="919" class="l"><a href="#919"> 919: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="920" class="l"><a href="#920"> 920: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
-</span><span id="921" class="l"><a href="#921"> 921: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
-</span><span id="922" class="l"><a href="#922"> 922: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
-</span><span id="923" class="l"><a href="#923"> 923: </a>
-</span><span id="924" class="l"><a href="#924"> 924: </a>        <span class="php-comment">// Find the key from server or arguments</span>
-</span><span id="925" class="l"><a href="#925"> 925: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
-</span><span id="926" class="l"><a href="#926"> 926: </a>        {
-</span><span id="927" class="l"><a href="#927"> 927: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
-</span><span id="928" class="l"><a href="#928"> 928: </a>            {
-</span><span id="929" class="l"><a href="#929"> 929: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="930" class="l"><a href="#930"> 930: </a>            }
-</span><span id="931" class="l"><a href="#931"> 931: </a>
-</span><span id="932" class="l"><a href="#932"> 932: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
-</span><span id="933" class="l"><a href="#933"> 933: </a>
-</span><span id="934" class="l"><a href="#934"> 934: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
-</span><span id="935" class="l"><a href="#935"> 935: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
-</span><span id="936" class="l"><a href="#936"> 936: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
-</span><span id="937" class="l"><a href="#937"> 937: </a>
-</span><span id="938" class="l"><a href="#938"> 938: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
-</span><span id="939" class="l"><a href="#939"> 939: </a>
-</span><span id="940" class="l"><a href="#940"> 940: </a>            <span class="php-comment">/*
-</span></span><span id="941" class="l"><a href="#941"> 941: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
-</span></span><span id="942" class="l"><a href="#942"> 942: </a><span class="php-comment">             * of valid ip addresses stored in the database.
-</span></span><span id="943" class="l"><a href="#943"> 943: </a><span class="php-comment">             */</span>
-</span><span id="944" class="l"><a href="#944"> 944: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
-</span><span id="945" class="l"><a href="#945"> 945: </a>            {
-</span><span id="946" class="l"><a href="#946"> 946: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
-</span><span id="947" class="l"><a href="#947"> 947: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
-</span><span id="948" class="l"><a href="#948"> 948: </a>                {
-</span><span id="949" class="l"><a href="#949"> 949: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
-</span><span id="950" class="l"><a href="#950"> 950: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
-</span><span id="951" class="l"><a href="#951"> 951: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
-</span><span id="952" class="l"><a href="#952"> 952: </a>
-</span><span id="953" class="l"><a href="#953"> 953: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
-</span><span id="954" class="l"><a href="#954"> 954: </a>                    {
-</span><span id="955" class="l"><a href="#955"> 955: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() == <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
-</span><span id="956" class="l"><a href="#956"> 956: </a>                        {
-</span><span id="957" class="l"><a href="#957"> 957: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
-</span><span id="958" class="l"><a href="#958"> 958: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
-</span><span id="959" class="l"><a href="#959"> 959: </a>                            <span class="php-keyword1">break</span>;
-</span><span id="960" class="l"><a href="#960"> 960: </a>                        }
-</span><span id="961" class="l"><a href="#961"> 961: </a>                    }
-</span><span id="962" class="l"><a href="#962"> 962: </a>
-</span><span id="963" class="l"><a href="#963"> 963: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
-</span><span id="964" class="l"><a href="#964"> 964: </a>                }
-</span><span id="965" class="l"><a href="#965"> 965: </a>                <span class="php-keyword1">else</span>
-</span><span id="966" class="l"><a href="#966"> 966: </a>                {
-</span><span id="967" class="l"><a href="#967"> 967: </a>                    <span class="php-comment">// There should be at least one IP address for this private key.</span>
-</span><span id="968" class="l"><a href="#968"> 968: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="969" class="l"><a href="#969"> 969: </a>                }
-</span><span id="970" class="l"><a href="#970"> 970: </a>            }
-</span><span id="971" class="l"><a href="#971"> 971: </a>
-</span><span id="972" class="l"><a href="#972"> 972: </a>            <span class="php-keyword1">return</span> <span class="php-var">$row</span>;
-</span><span id="973" class="l"><a href="#973"> 973: </a>        }
-</span><span id="974" class="l"><a href="#974"> 974: </a>
-</span><span id="975" class="l"><a href="#975"> 975: </a>        <span class="php-comment">// No key has been sent</span>
-</span><span id="976" class="l"><a href="#976"> 976: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="977" class="l"><a href="#977"> 977: </a>    }
-</span><span id="978" class="l"><a href="#978"> 978: </a>
-</span><span id="979" class="l"><a href="#979"> 979: </a>    <span class="php-comment">/**
-</span></span><span id="980" class="l"><a href="#980"> 980: </a><span class="php-comment">     * What language do they want it in?
-</span></span><span id="981" class="l"><a href="#981"> 981: </a><span class="php-comment">     *
-</span></span><span id="982" class="l"><a href="#982"> 982: </a><span class="php-comment">     * @access protected
-</span></span><span id="983" class="l"><a href="#983"> 983: </a><span class="php-comment">     * @return NULL|string The language code.
-</span></span><span id="984" class="l"><a href="#984"> 984: </a><span class="php-comment">     */</span>
-</span><span id="985" class="l"><a href="#985"> 985: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
-</span><span id="986" class="l"><a href="#986"> 986: </a>    {
-</span><span id="987" class="l"><a href="#987"> 987: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>))
+</span><span id="813" class="l"><a href="#813"> 813: </a>        <span class="php-comment">// Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2</span>
+</span><span id="814" class="l"><a href="#814"> 814: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
+</span><span id="815" class="l"><a href="#815"> 815: </a>        {
+</span><span id="816" class="l"><a href="#816"> 816: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
+</span><span id="817" class="l"><a href="#817"> 817: </a>        }
+</span><span id="818" class="l"><a href="#818"> 818: </a>
+</span><span id="819" class="l"><a href="#819"> 819: </a>        <span class="php-comment">// Get the format parameter named as 'format'</span>
+</span><span id="820" class="l"><a href="#820"> 820: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]))
+</span><span id="821" class="l"><a href="#821"> 821: </a>        {
+</span><span id="822" class="l"><a href="#822"> 822: </a>            <span class="php-var">$format</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]);
+</span><span id="823" class="l"><a href="#823"> 823: </a>
+</span><span id="824" class="l"><a href="#824"> 824: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]) === <span class="php-keyword1">TRUE</span>)
+</span><span id="825" class="l"><a href="#825"> 825: </a>            {
+</span><span id="826" class="l"><a href="#826"> 826: </a>                <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="827" class="l"><a href="#827"> 827: </a>            }
+</span><span id="828" class="l"><a href="#828"> 828: </a>        }
+</span><span id="829" class="l"><a href="#829"> 829: </a>
+</span><span id="830" class="l"><a href="#830"> 830: </a>        <span class="php-comment">// Get the HTTP_ACCEPT server variable</span>
+</span><span id="831" class="l"><a href="#831"> 831: </a>        <span class="php-var">$http_accept</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>);
+</span><span id="832" class="l"><a href="#832"> 832: </a>
+</span><span id="833" class="l"><a href="#833"> 833: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT server variable</span>
+</span><span id="834" class="l"><a href="#834"> 834: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$http_accept</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="835" class="l"><a href="#835"> 835: </a>        {
+</span><span id="836" class="l"><a href="#836"> 836: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="837" class="l"><a href="#837"> 837: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
+</span><span id="838" class="l"><a href="#838"> 838: </a>            {
+</span><span id="839" class="l"><a href="#839"> 839: </a>                <span class="php-comment">// Has this format been requested?</span>
+</span><span id="840" class="l"><a href="#840"> 840: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="841" class="l"><a href="#841"> 841: </a>                {
+</span><span id="842" class="l"><a href="#842"> 842: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
+</span><span id="843" class="l"><a href="#843"> 843: </a>                    {
+</span><span id="844" class="l"><a href="#844"> 844: </a>                        <span class="php-comment">// If not HTML or XML assume it's correct</span>
+</span><span id="845" class="l"><a href="#845"> 845: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="846" class="l"><a href="#846"> 846: </a>                    }
+</span><span id="847" class="l"><a href="#847"> 847: </a>                    <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="848" class="l"><a href="#848"> 848: </a>                    {
+</span><span id="849" class="l"><a href="#849"> 849: </a>                        <span class="php-comment">// HTML or XML have shown up as a match</span>
+</span><span id="850" class="l"><a href="#850"> 850: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
+</span><span id="851" class="l"><a href="#851"> 851: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="852" class="l"><a href="#852"> 852: </a>                    }
+</span><span id="853" class="l"><a href="#853"> 853: </a>                    <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="854" class="l"><a href="#854"> 854: </a>                    {
+</span><span id="855" class="l"><a href="#855"> 855: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
+</span><span id="856" class="l"><a href="#856"> 856: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="857" class="l"><a href="#857"> 857: </a>                    }
+</span><span id="858" class="l"><a href="#858"> 858: </a>                }
+</span><span id="859" class="l"><a href="#859"> 859: </a>            }
+</span><span id="860" class="l"><a href="#860"> 860: </a>        }
+</span><span id="861" class="l"><a href="#861"> 861: </a>
+</span><span id="862" class="l"><a href="#862"> 862: </a>        <span class="php-comment">// Check if the controller has a default format</span>
+</span><span id="863" class="l"><a href="#863"> 863: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
+</span><span id="864" class="l"><a href="#864"> 864: </a>        {
+</span><span id="865" class="l"><a href="#865"> 865: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
+</span><span id="866" class="l"><a href="#866"> 866: </a>        }
+</span><span id="867" class="l"><a href="#867"> 867: </a>
+</span><span id="868" class="l"><a href="#868"> 868: </a>        <span class="php-comment">// Obtain the default format from the configuration</span>
+</span><span id="869" class="l"><a href="#869"> 869: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
+</span><span id="870" class="l"><a href="#870"> 870: </a>    }
+</span><span id="871" class="l"><a href="#871"> 871: </a>
+</span><span id="872" class="l"><a href="#872"> 872: </a>    <span class="php-comment">/**
+</span></span><span id="873" class="l"><a href="#873"> 873: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
+</span></span><span id="874" class="l"><a href="#874"> 874: </a><span class="php-comment">     *
+</span></span><span id="875" class="l"><a href="#875"> 875: </a><span class="php-comment">     * @access protected
+</span></span><span id="876" class="l"><a href="#876"> 876: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
+</span></span><span id="877" class="l"><a href="#877"> 877: </a><span class="php-comment">     */</span>
+</span><span id="878" class="l"><a href="#878"> 878: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
+</span><span id="879" class="l"><a href="#879"> 879: </a>    {
+</span><span id="880" class="l"><a href="#880"> 880: </a>        <span class="php-comment">// Declare a variable to store the method</span>
+</span><span id="881" class="l"><a href="#881"> 881: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="882" class="l"><a href="#882"> 882: </a>
+</span><span id="883" class="l"><a href="#883"> 883: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
+</span><span id="884" class="l"><a href="#884"> 884: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="885" class="l"><a href="#885"> 885: </a>        {
+</span><span id="886" class="l"><a href="#886"> 886: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
+</span><span id="887" class="l"><a href="#887"> 887: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="888" class="l"><a href="#888"> 888: </a>            {
+</span><span id="889" class="l"><a href="#889"> 889: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
+</span><span id="890" class="l"><a href="#890"> 890: </a>            }
+</span><span id="891" class="l"><a href="#891"> 891: </a>
+</span><span id="892" class="l"><a href="#892"> 892: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
+</span><span id="893" class="l"><a href="#893"> 893: </a>        }
+</span><span id="894" class="l"><a href="#894"> 894: </a>
+</span><span id="895" class="l"><a href="#895"> 895: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
+</span><span id="896" class="l"><a href="#896"> 896: </a>        {
+</span><span id="897" class="l"><a href="#897"> 897: </a>            <span class="php-comment">// Get the request method as a lowercase string.</span>
+</span><span id="898" class="l"><a href="#898"> 898: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
+</span><span id="899" class="l"><a href="#899"> 899: </a>        }
+</span><span id="900" class="l"><a href="#900"> 900: </a>
+</span><span id="901" class="l"><a href="#901"> 901: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
+</span><span id="902" class="l"><a href="#902"> 902: </a>    }
+</span><span id="903" class="l"><a href="#903"> 903: </a>
+</span><span id="904" class="l"><a href="#904"> 904: </a>    <span class="php-comment">/**
+</span></span><span id="905" class="l"><a href="#905"> 905: </a><span class="php-comment">     * See if the user has provided an API key
+</span></span><span id="906" class="l"><a href="#906"> 906: </a><span class="php-comment">     *
+</span></span><span id="907" class="l"><a href="#907"> 907: </a><span class="php-comment">     * @access protected
+</span></span><span id="908" class="l"><a href="#908"> 908: </a><span class="php-comment">     * @return bool
+</span></span><span id="909" class="l"><a href="#909"> 909: </a><span class="php-comment">     */</span>
+</span><span id="910" class="l"><a href="#910"> 910: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
+</span><span id="911" class="l"><a href="#911"> 911: </a>    {
+</span><span id="912" class="l"><a href="#912"> 912: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
+</span><span id="913" class="l"><a href="#913"> 913: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
+</span><span id="914" class="l"><a href="#914"> 914: </a>
+</span><span id="915" class="l"><a href="#915"> 915: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
+</span><span id="916" class="l"><a href="#916"> 916: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
+</span><span id="917" class="l"><a href="#917"> 917: </a>
+</span><span id="918" class="l"><a href="#918"> 918: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="919" class="l"><a href="#919"> 919: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
+</span><span id="920" class="l"><a href="#920"> 920: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
+</span><span id="921" class="l"><a href="#921"> 921: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
+</span><span id="922" class="l"><a href="#922"> 922: </a>
+</span><span id="923" class="l"><a href="#923"> 923: </a>        <span class="php-comment">// Find the key from server or arguments</span>
+</span><span id="924" class="l"><a href="#924"> 924: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
+</span><span id="925" class="l"><a href="#925"> 925: </a>        {
+</span><span id="926" class="l"><a href="#926"> 926: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
+</span><span id="927" class="l"><a href="#927"> 927: </a>            {
+</span><span id="928" class="l"><a href="#928"> 928: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="929" class="l"><a href="#929"> 929: </a>            }
+</span><span id="930" class="l"><a href="#930"> 930: </a>
+</span><span id="931" class="l"><a href="#931"> 931: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
+</span><span id="932" class="l"><a href="#932"> 932: </a>
+</span><span id="933" class="l"><a href="#933"> 933: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
+</span><span id="934" class="l"><a href="#934"> 934: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
+</span><span id="935" class="l"><a href="#935"> 935: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
+</span><span id="936" class="l"><a href="#936"> 936: </a>
+</span><span id="937" class="l"><a href="#937"> 937: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
+</span><span id="938" class="l"><a href="#938"> 938: </a>
+</span><span id="939" class="l"><a href="#939"> 939: </a>            <span class="php-comment">/*
+</span></span><span id="940" class="l"><a href="#940"> 940: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
+</span></span><span id="941" class="l"><a href="#941"> 941: </a><span class="php-comment">             * of valid ip addresses stored in the database.
+</span></span><span id="942" class="l"><a href="#942"> 942: </a><span class="php-comment">             */</span>
+</span><span id="943" class="l"><a href="#943"> 943: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
+</span><span id="944" class="l"><a href="#944"> 944: </a>            {
+</span><span id="945" class="l"><a href="#945"> 945: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
+</span><span id="946" class="l"><a href="#946"> 946: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
+</span><span id="947" class="l"><a href="#947"> 947: </a>                {
+</span><span id="948" class="l"><a href="#948"> 948: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
+</span><span id="949" class="l"><a href="#949"> 949: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
+</span><span id="950" class="l"><a href="#950"> 950: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
+</span><span id="951" class="l"><a href="#951"> 951: </a>
+</span><span id="952" class="l"><a href="#952"> 952: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
+</span><span id="953" class="l"><a href="#953"> 953: </a>                    {
+</span><span id="954" class="l"><a href="#954"> 954: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() === <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
+</span><span id="955" class="l"><a href="#955"> 955: </a>                        {
+</span><span id="956" class="l"><a href="#956"> 956: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
+</span><span id="957" class="l"><a href="#957"> 957: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
+</span><span id="958" class="l"><a href="#958"> 958: </a>                            <span class="php-keyword1">break</span>;
+</span><span id="959" class="l"><a href="#959"> 959: </a>                        }
+</span><span id="960" class="l"><a href="#960"> 960: </a>                    }
+</span><span id="961" class="l"><a href="#961"> 961: </a>
+</span><span id="962" class="l"><a href="#962"> 962: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
+</span><span id="963" class="l"><a href="#963"> 963: </a>                }
+</span><span id="964" class="l"><a href="#964"> 964: </a>                <span class="php-keyword1">else</span>
+</span><span id="965" class="l"><a href="#965"> 965: </a>                {
+</span><span id="966" class="l"><a href="#966"> 966: </a>                    <span class="php-comment">// There should be at least one IP address for this private key.</span>
+</span><span id="967" class="l"><a href="#967"> 967: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="968" class="l"><a href="#968"> 968: </a>                }
+</span><span id="969" class="l"><a href="#969"> 969: </a>            }
+</span><span id="970" class="l"><a href="#970"> 970: </a>
+</span><span id="971" class="l"><a href="#971"> 971: </a>            <span class="php-keyword1">return</span> <span class="php-var">$row</span>;
+</span><span id="972" class="l"><a href="#972"> 972: </a>        }
+</span><span id="973" class="l"><a href="#973"> 973: </a>
+</span><span id="974" class="l"><a href="#974"> 974: </a>        <span class="php-comment">// No key has been sent</span>
+</span><span id="975" class="l"><a href="#975"> 975: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="976" class="l"><a href="#976"> 976: </a>    }
+</span><span id="977" class="l"><a href="#977"> 977: </a>
+</span><span id="978" class="l"><a href="#978"> 978: </a>    <span class="php-comment">/**
+</span></span><span id="979" class="l"><a href="#979"> 979: </a><span class="php-comment">     * Preferred return language
+</span></span><span id="980" class="l"><a href="#980"> 980: </a><span class="php-comment">     *
+</span></span><span id="981" class="l"><a href="#981"> 981: </a><span class="php-comment">     * @access protected
+</span></span><span id="982" class="l"><a href="#982"> 982: </a><span class="php-comment">     * @return string|NULL The language code
+</span></span><span id="983" class="l"><a href="#983"> 983: </a><span class="php-comment">     */</span>
+</span><span id="984" class="l"><a href="#984"> 984: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
+</span><span id="985" class="l"><a href="#985"> 985: </a>    {
+</span><span id="986" class="l"><a href="#986"> 986: </a>        <span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>);
+</span><span id="987" class="l"><a href="#987"> 987: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$lang</span> === <span class="php-keyword1">NULL</span>)
 </span><span id="988" class="l"><a href="#988"> 988: </a>        {
 </span><span id="989" class="l"><a href="#989"> 989: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
 </span><span id="990" class="l"><a href="#990"> 990: </a>        }
 </span><span id="991" class="l"><a href="#991"> 991: </a>
-</span><span id="992" class="l"><a href="#992"> 992: </a>        <span class="php-comment">// They might have sent a few, make it an array</span>
+</span><span id="992" class="l"><a href="#992"> 992: </a>        <span class="php-comment">// It appears more than one language has been sent using a comma delimiter</span>
 </span><span id="993" class="l"><a href="#993"> 993: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
 </span><span id="994" class="l"><a href="#994"> 994: </a>        {
 </span><span id="995" class="l"><a href="#995"> 995: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
@@ -1089,7 +1091,7 @@ <h3>Classes</h3>
 </span><span id="997" class="l"><a href="#997"> 997: </a>            <span class="php-var">$return_langs</span> = [];
 </span><span id="998" class="l"><a href="#998"> 998: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
 </span><span id="999" class="l"><a href="#999"> 999: </a>            {
-</span><span id="1000" class="l"><a href="#1000">1000: </a>                <span class="php-comment">// Remove weight and strip space</span>
+</span><span id="1000" class="l"><a href="#1000">1000: </a>                <span class="php-comment">// Remove weight and trim leading and trailing whitespace</span>
 </span><span id="1001" class="l"><a href="#1001">1001: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
 </span><span id="1002" class="l"><a href="#1002">1002: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
 </span><span id="1003" class="l"><a href="#1003">1003: </a>            }
@@ -1097,7 +1099,7 @@ <h3>Classes</h3>
 </span><span id="1005" class="l"><a href="#1005">1005: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
 </span><span id="1006" class="l"><a href="#1006">1006: </a>        }
 </span><span id="1007" class="l"><a href="#1007">1007: </a>
-</span><span id="1008" class="l"><a href="#1008">1008: </a>        <span class="php-comment">// Nope, just return the string</span>
+</span><span id="1008" class="l"><a href="#1008">1008: </a>        <span class="php-comment">// Otherwise simply return as a string</span>
 </span><span id="1009" class="l"><a href="#1009">1009: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
 </span><span id="1010" class="l"><a href="#1010">1010: </a>    }
 </span><span id="1011" class="l"><a href="#1011">1011: </a>
@@ -1111,7 +1113,7 @@ <h3>Classes</h3>
 </span><span id="1019" class="l"><a href="#1019">1019: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
 </span><span id="1020" class="l"><a href="#1020">1020: </a>    {
 </span><span id="1021" class="l"><a href="#1021">1021: </a>        <span class="php-comment">// Insert the request into the log table</span>
-</span><span id="1022" class="l"><a href="#1022">1022: </a>        <span class="php-var">$isInserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1022" class="l"><a href="#1022">1022: </a>        <span class="php-var">$is_inserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
 </span><span id="1023" class="l"><a href="#1023">1023: </a>            -&gt;insert(
 </span><span id="1024" class="l"><a href="#1024">1024: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
 </span><span id="1025" class="l"><a href="#1025">1025: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
@@ -1126,7 +1128,7 @@ <h3>Classes</h3>
 </span><span id="1034" class="l"><a href="#1034">1034: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
 </span><span id="1035" class="l"><a href="#1035">1035: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
 </span><span id="1036" class="l"><a href="#1036">1036: </a>
-</span><span id="1037" class="l"><a href="#1037">1037: </a>        <span class="php-keyword1">return</span> <span class="php-var">$isInserted</span>;
+</span><span id="1037" class="l"><a href="#1037">1037: </a>        <span class="php-keyword1">return</span> <span class="php-var">$is_inserted</span>;
 </span><span id="1038" class="l"><a href="#1038">1038: </a>    }
 </span><span id="1039" class="l"><a href="#1039">1039: </a>
 </span><span id="1040" class="l"><a href="#1040">1040: </a>    <span class="php-comment">/**
@@ -1139,989 +1141,1065 @@ <h3>Classes</h3>
 </span><span id="1047" class="l"><a href="#1047">1047: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
 </span><span id="1048" class="l"><a href="#1048">1048: </a>    {
 </span><span id="1049" class="l"><a href="#1049">1049: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
-</span><span id="1050" class="l"><a href="#1050">1050: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span> || <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1050" class="l"><a href="#1050">1050: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span>)
 </span><span id="1051" class="l"><a href="#1051">1051: </a>        {
 </span><span id="1052" class="l"><a href="#1052">1052: </a>            <span class="php-comment">// Everything is fine</span>
 </span><span id="1053" class="l"><a href="#1053">1053: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
 </span><span id="1054" class="l"><a href="#1054">1054: </a>        }
 </span><span id="1055" class="l"><a href="#1055">1055: </a>
-</span><span id="1056" class="l"><a href="#1056">1056: </a>        <span class="php-comment">// How many times can you get to this method in a defined timelimit (default: 1hr)?</span>
-</span><span id="1057" class="l"><a href="#1057">1057: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'limit'</span>];
-</span><span id="1058" class="l"><a href="#1058">1058: </a>
-</span><span id="1059" class="l"><a href="#1059">1059: </a>        <span class="php-var">$uri_noext</span> = <span class="php-var">$this</span>-&gt;uri-&gt;uri_string();
-</span><span id="1060" class="l"><a href="#1060">1060: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;uri-&gt;uri_string()), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
-</span><span id="1061" class="l"><a href="#1061">1061: </a>        {
-</span><span id="1062" class="l"><a href="#1062">1062: </a>            <span class="php-var">$uri_noext</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)-<span class="php-num">1</span>);
-</span><span id="1063" class="l"><a href="#1063">1063: </a>        }
-</span><span id="1064" class="l"><a href="#1064">1064: </a>
-</span><span id="1065" class="l"><a href="#1065">1065: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
-</span><span id="1066" class="l"><a href="#1066">1066: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1067" class="l"><a href="#1067">1067: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
-</span><span id="1068" class="l"><a href="#1068">1068: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1069" class="l"><a href="#1069">1069: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
-</span><span id="1070" class="l"><a href="#1070">1070: </a>            -&gt;row();
-</span><span id="1071" class="l"><a href="#1071">1071: </a>
-</span><span id="1072" class="l"><a href="#1072">1072: </a>        <span class="php-var">$timelimit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'time'</span>] : <span class="php-num">60</span> * <span class="php-num">60</span>);
-</span><span id="1073" class="l"><a href="#1073">1073: </a>
-</span><span id="1074" class="l"><a href="#1074">1074: </a>        <span class="php-comment">// No calls have been made for this key</span>
-</span><span id="1075" class="l"><a href="#1075">1075: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1076" class="l"><a href="#1076">1076: </a>        {
-</span><span id="1077" class="l"><a href="#1077">1077: </a>            <span class="php-comment">// Create a new row for the following key</span>
-</span><span id="1078" class="l"><a href="#1078">1078: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
-</span><span id="1079" class="l"><a href="#1079">1079: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
-</span><span id="1080" class="l"><a href="#1080">1080: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="1081" class="l"><a href="#1081">1081: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
-</span><span id="1082" class="l"><a href="#1082">1082: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
-</span><span id="1083" class="l"><a href="#1083">1083: </a>            ]);
+</span><span id="1056" class="l"><a href="#1056">1056: </a>        <span class="php-keyword1">switch</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_method'</span>))
+</span><span id="1057" class="l"><a href="#1057">1057: </a>        {
+</span><span id="1058" class="l"><a href="#1058">1058: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'API_KEY'</span>:
+</span><span id="1059" class="l"><a href="#1059">1059: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'api-key:'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>);
+</span><span id="1060" class="l"><a href="#1060">1060: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>;
+</span><span id="1061" class="l"><a href="#1061">1061: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1062" class="l"><a href="#1062">1062: </a>
+</span><span id="1063" class="l"><a href="#1063">1063: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'METHOD_NAME'</span>:
+</span><span id="1064" class="l"><a href="#1064">1064: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'method-name:'</span> . <span class="php-var">$controller_method</span>;
+</span><span id="1065" class="l"><a href="#1065">1065: </a>            <span class="php-var">$limited_method_name</span> =  <span class="php-var">$controller_method</span>;
+</span><span id="1066" class="l"><a href="#1066">1066: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1067" class="l"><a href="#1067">1067: </a>
+</span><span id="1068" class="l"><a href="#1068">1068: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'ROUTED_URL'</span>:
+</span><span id="1069" class="l"><a href="#1069">1069: </a>          <span class="php-keyword1">default</span>:
+</span><span id="1070" class="l"><a href="#1070">1070: </a>            <span class="php-var">$limited_uri</span> = <span class="php-var">$this</span>-&gt;uri-&gt;ruri_string();
+</span><span id="1071" class="l"><a href="#1071">1071: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$limited_uri</span>), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
+</span><span id="1072" class="l"><a href="#1072">1072: </a>            {
+</span><span id="1073" class="l"><a href="#1073">1073: </a>                <span class="php-var">$limited_uri</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$limited_uri</span>,<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format) - <span class="php-num">1</span>);
+</span><span id="1074" class="l"><a href="#1074">1074: </a>            }
+</span><span id="1075" class="l"><a href="#1075">1075: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'uri:'</span> . <span class="php-var">$limited_uri</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method; <span class="php-comment">// It's good to differentiate GET from PUT</span>
+</span><span id="1076" class="l"><a href="#1076">1076: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-var">$controller_method</span>;
+</span><span id="1077" class="l"><a href="#1077">1077: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1078" class="l"><a href="#1078">1078: </a>        }
+</span><span id="1079" class="l"><a href="#1079">1079: </a>
+</span><span id="1080" class="l"><a href="#1080">1080: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span> )
+</span><span id="1081" class="l"><a href="#1081">1081: </a>        {
+</span><span id="1082" class="l"><a href="#1082">1082: </a>            <span class="php-comment">// Everything is fine</span>
+</span><span id="1083" class="l"><a href="#1083">1083: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
 </span><span id="1084" class="l"><a href="#1084">1084: </a>        }
 </span><span id="1085" class="l"><a href="#1085">1085: </a>
-</span><span id="1086" class="l"><a href="#1086">1086: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
-</span><span id="1087" class="l"><a href="#1087">1087: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$timelimit</span>))
-</span><span id="1088" class="l"><a href="#1088">1088: </a>        {
-</span><span id="1089" class="l"><a href="#1089">1089: </a>            <span class="php-comment">// Reset the started period and count</span>
-</span><span id="1090" class="l"><a href="#1090">1090: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1091" class="l"><a href="#1091">1091: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
-</span><span id="1092" class="l"><a href="#1092">1092: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
-</span><span id="1093" class="l"><a href="#1093">1093: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
-</span><span id="1094" class="l"><a href="#1094">1094: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
-</span><span id="1095" class="l"><a href="#1095">1095: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1096" class="l"><a href="#1096">1096: </a>        }
+</span><span id="1086" class="l"><a href="#1086">1086: </a>        <span class="php-comment">// How many times can you get to this method in a defined time_limit (default: 1 hour)?</span>
+</span><span id="1087" class="l"><a href="#1087">1087: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>];
+</span><span id="1088" class="l"><a href="#1088">1088: </a>
+</span><span id="1089" class="l"><a href="#1089">1089: </a>        <span class="php-var">$time_limit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>] : <span class="php-num">3600</span>); <span class="php-comment">// 3600 = 60 * 60</span>
+</span><span id="1090" class="l"><a href="#1090">1090: </a>
+</span><span id="1091" class="l"><a href="#1091">1091: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
+</span><span id="1092" class="l"><a href="#1092">1092: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1093" class="l"><a href="#1093">1093: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1094" class="l"><a href="#1094">1094: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1095" class="l"><a href="#1095">1095: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
+</span><span id="1096" class="l"><a href="#1096">1096: </a>            -&gt;row();
 </span><span id="1097" class="l"><a href="#1097">1097: </a>
-</span><span id="1098" class="l"><a href="#1098">1098: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
-</span><span id="1099" class="l"><a href="#1099">1099: </a>        <span class="php-keyword1">else</span>
+</span><span id="1098" class="l"><a href="#1098">1098: </a>        <span class="php-comment">// No calls have been made for this key</span>
+</span><span id="1099" class="l"><a href="#1099">1099: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
 </span><span id="1100" class="l"><a href="#1100">1100: </a>        {
-</span><span id="1101" class="l"><a href="#1101">1101: </a>            <span class="php-comment">// The limit has been exceeded</span>
-</span><span id="1102" class="l"><a href="#1102">1102: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
-</span><span id="1103" class="l"><a href="#1103">1103: </a>            {
-</span><span id="1104" class="l"><a href="#1104">1104: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1105" class="l"><a href="#1105">1105: </a>            }
-</span><span id="1106" class="l"><a href="#1106">1106: </a>
-</span><span id="1107" class="l"><a href="#1107">1107: </a>            <span class="php-comment">// Increase the count by one</span>
-</span><span id="1108" class="l"><a href="#1108">1108: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1109" class="l"><a href="#1109">1109: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$uri_noext</span>)
-</span><span id="1110" class="l"><a href="#1110">1110: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1111" class="l"><a href="#1111">1111: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
-</span><span id="1112" class="l"><a href="#1112">1112: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1113" class="l"><a href="#1113">1113: </a>        }
-</span><span id="1114" class="l"><a href="#1114">1114: </a>
-</span><span id="1115" class="l"><a href="#1115">1115: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1116" class="l"><a href="#1116">1116: </a>    }
-</span><span id="1117" class="l"><a href="#1117">1117: </a>
-</span><span id="1118" class="l"><a href="#1118">1118: </a>    <span class="php-comment">/**
-</span></span><span id="1119" class="l"><a href="#1119">1119: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method being called
-</span></span><span id="1120" class="l"><a href="#1120">1120: </a><span class="php-comment">     *
-</span></span><span id="1121" class="l"><a href="#1121">1121: </a><span class="php-comment">     * @access protected
-</span></span><span id="1122" class="l"><a href="#1122">1122: </a><span class="php-comment">     * @return bool
-</span></span><span id="1123" class="l"><a href="#1123">1123: </a><span class="php-comment">     */</span>
-</span><span id="1124" class="l"><a href="#1124">1124: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
-</span><span id="1125" class="l"><a href="#1125">1125: </a>    {
-</span><span id="1126" class="l"><a href="#1126">1126: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
-</span><span id="1127" class="l"><a href="#1127">1127: </a>        <span class="php-var">$this</span>-&gt;overrides_array = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
-</span><span id="1128" class="l"><a href="#1128">1128: </a>
-</span><span id="1129" class="l"><a href="#1129">1129: </a>        <span class="php-comment">// Check to see if the override array is even populated, otherwise return FALSE</span>
-</span><span id="1130" class="l"><a href="#1130">1130: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array))
-</span><span id="1131" class="l"><a href="#1131">1131: </a>        {
-</span><span id="1132" class="l"><a href="#1132">1132: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1133" class="l"><a href="#1133">1133: </a>        }
-</span><span id="1134" class="l"><a href="#1134">1134: </a>
-</span><span id="1135" class="l"><a href="#1135">1135: </a>        <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="1136" class="l"><a href="#1136">1136: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>]) === <span class="php-keyword1">FALSE</span>) <span class="php-comment">// Check for class overrides</span>
-</span><span id="1137" class="l"><a href="#1137">1137: </a>        {
-</span><span id="1138" class="l"><a href="#1138">1138: </a>            <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1139" class="l"><a href="#1139">1139: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'none'</span>)
-</span><span id="1140" class="l"><a href="#1140">1140: </a>            {
-</span><span id="1141" class="l"><a href="#1141">1141: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1142" class="l"><a href="#1142">1142: </a>            }
-</span><span id="1143" class="l"><a href="#1143">1143: </a>
-</span><span id="1144" class="l"><a href="#1144">1144: </a>            <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1145" class="l"><a href="#1145">1145: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'basic'</span>)
-</span><span id="1146" class="l"><a href="#1146">1146: </a>            {
-</span><span id="1147" class="l"><a href="#1147">1147: </a>                <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1148" class="l"><a href="#1148">1148: </a>
-</span><span id="1149" class="l"><a href="#1149">1149: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1150" class="l"><a href="#1150">1150: </a>            }
-</span><span id="1151" class="l"><a href="#1151">1151: </a>
-</span><span id="1152" class="l"><a href="#1152">1152: </a>            <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1153" class="l"><a href="#1153">1153: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'digest'</span>)
-</span><span id="1154" class="l"><a href="#1154">1154: </a>            {
-</span><span id="1155" class="l"><a href="#1155">1155: </a>                <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1156" class="l"><a href="#1156">1156: </a>
-</span><span id="1157" class="l"><a href="#1157">1157: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1158" class="l"><a href="#1158">1158: </a>            }
-</span><span id="1159" class="l"><a href="#1159">1159: </a>
-</span><span id="1160" class="l"><a href="#1160">1160: </a>            <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1161" class="l"><a href="#1161">1161: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'whitelist'</span>)
-</span><span id="1162" class="l"><a href="#1162">1162: </a>            {
-</span><span id="1163" class="l"><a href="#1163">1163: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1101" class="l"><a href="#1101">1101: </a>            <span class="php-comment">// Create a new row for the following key</span>
+</span><span id="1102" class="l"><a href="#1102">1102: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
+</span><span id="1103" class="l"><a href="#1103">1103: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$limited_uri</span>,
+</span><span id="1104" class="l"><a href="#1104">1104: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="1105" class="l"><a href="#1105">1105: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
+</span><span id="1106" class="l"><a href="#1106">1106: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
+</span><span id="1107" class="l"><a href="#1107">1107: </a>            ]);
+</span><span id="1108" class="l"><a href="#1108">1108: </a>        }
+</span><span id="1109" class="l"><a href="#1109">1109: </a>
+</span><span id="1110" class="l"><a href="#1110">1110: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
+</span><span id="1111" class="l"><a href="#1111">1111: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$time_limit</span>))
+</span><span id="1112" class="l"><a href="#1112">1112: </a>        {
+</span><span id="1113" class="l"><a href="#1113">1113: </a>            <span class="php-comment">// Reset the started period and count</span>
+</span><span id="1114" class="l"><a href="#1114">1114: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1115" class="l"><a href="#1115">1115: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1116" class="l"><a href="#1116">1116: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
+</span><span id="1117" class="l"><a href="#1117">1117: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
+</span><span id="1118" class="l"><a href="#1118">1118: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
+</span><span id="1119" class="l"><a href="#1119">1119: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1120" class="l"><a href="#1120">1120: </a>        }
+</span><span id="1121" class="l"><a href="#1121">1121: </a>
+</span><span id="1122" class="l"><a href="#1122">1122: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
+</span><span id="1123" class="l"><a href="#1123">1123: </a>        <span class="php-keyword1">else</span>
+</span><span id="1124" class="l"><a href="#1124">1124: </a>        {
+</span><span id="1125" class="l"><a href="#1125">1125: </a>            <span class="php-comment">// The limit has been exceeded</span>
+</span><span id="1126" class="l"><a href="#1126">1126: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
+</span><span id="1127" class="l"><a href="#1127">1127: </a>            {
+</span><span id="1128" class="l"><a href="#1128">1128: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1129" class="l"><a href="#1129">1129: </a>            }
+</span><span id="1130" class="l"><a href="#1130">1130: </a>
+</span><span id="1131" class="l"><a href="#1131">1131: </a>            <span class="php-comment">// Increase the count by one</span>
+</span><span id="1132" class="l"><a href="#1132">1132: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1133" class="l"><a href="#1133">1133: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1134" class="l"><a href="#1134">1134: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1135" class="l"><a href="#1135">1135: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
+</span><span id="1136" class="l"><a href="#1136">1136: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1137" class="l"><a href="#1137">1137: </a>        }
+</span><span id="1138" class="l"><a href="#1138">1138: </a>
+</span><span id="1139" class="l"><a href="#1139">1139: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1140" class="l"><a href="#1140">1140: </a>    }
+</span><span id="1141" class="l"><a href="#1141">1141: </a>
+</span><span id="1142" class="l"><a href="#1142">1142: </a>    <span class="php-comment">/**
+</span></span><span id="1143" class="l"><a href="#1143">1143: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method/HTTP-method being called
+</span></span><span id="1144" class="l"><a href="#1144">1144: </a><span class="php-comment">     *
+</span></span><span id="1145" class="l"><a href="#1145">1145: </a><span class="php-comment">     * @access protected
+</span></span><span id="1146" class="l"><a href="#1146">1146: </a><span class="php-comment">     * @return bool
+</span></span><span id="1147" class="l"><a href="#1147">1147: </a><span class="php-comment">     */</span>
+</span><span id="1148" class="l"><a href="#1148">1148: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
+</span><span id="1149" class="l"><a href="#1149">1149: </a>    {
+</span><span id="1150" class="l"><a href="#1150">1150: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
+</span><span id="1151" class="l"><a href="#1151">1151: </a>        <span class="php-var">$auth_override_class_method</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
+</span><span id="1152" class="l"><a href="#1152">1152: </a>
+</span><span id="1153" class="l"><a href="#1153">1153: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
+</span><span id="1154" class="l"><a href="#1154">1154: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>))
+</span><span id="1155" class="l"><a href="#1155">1155: </a>        {
+</span><span id="1156" class="l"><a href="#1156">1156: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
+</span><span id="1157" class="l"><a href="#1157">1157: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>])) <span class="php-comment">// Check for class overrides</span>
+</span><span id="1158" class="l"><a href="#1158">1158: </a>            {
+</span><span id="1159" class="l"><a href="#1159">1159: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1160" class="l"><a href="#1160">1160: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'none'</span>)
+</span><span id="1161" class="l"><a href="#1161">1161: </a>                {
+</span><span id="1162" class="l"><a href="#1162">1162: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1163" class="l"><a href="#1163">1163: </a>                }
 </span><span id="1164" class="l"><a href="#1164">1164: </a>
-</span><span id="1165" class="l"><a href="#1165">1165: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1166" class="l"><a href="#1166">1166: </a>            }
-</span><span id="1167" class="l"><a href="#1167">1167: </a>        }
-</span><span id="1168" class="l"><a href="#1168">1168: </a>
-</span><span id="1169" class="l"><a href="#1169">1169: </a>        <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
-</span><span id="1170" class="l"><a href="#1170">1170: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
-</span><span id="1171" class="l"><a href="#1171">1171: </a>        {
-</span><span id="1172" class="l"><a href="#1172">1172: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1173" class="l"><a href="#1173">1173: </a>        }
-</span><span id="1174" class="l"><a href="#1174">1174: </a>
-</span><span id="1175" class="l"><a href="#1175">1175: </a>        <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1176" class="l"><a href="#1176">1176: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'none'</span>)
-</span><span id="1177" class="l"><a href="#1177">1177: </a>        {
-</span><span id="1178" class="l"><a href="#1178">1178: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1179" class="l"><a href="#1179">1179: </a>        }
+</span><span id="1165" class="l"><a href="#1165">1165: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1166" class="l"><a href="#1166">1166: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'basic'</span>)
+</span><span id="1167" class="l"><a href="#1167">1167: </a>                {
+</span><span id="1168" class="l"><a href="#1168">1168: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1169" class="l"><a href="#1169">1169: </a>
+</span><span id="1170" class="l"><a href="#1170">1170: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1171" class="l"><a href="#1171">1171: </a>                }
+</span><span id="1172" class="l"><a href="#1172">1172: </a>
+</span><span id="1173" class="l"><a href="#1173">1173: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1174" class="l"><a href="#1174">1174: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'digest'</span>)
+</span><span id="1175" class="l"><a href="#1175">1175: </a>                {
+</span><span id="1176" class="l"><a href="#1176">1176: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1177" class="l"><a href="#1177">1177: </a>
+</span><span id="1178" class="l"><a href="#1178">1178: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1179" class="l"><a href="#1179">1179: </a>                }
 </span><span id="1180" class="l"><a href="#1180">1180: </a>
-</span><span id="1181" class="l"><a href="#1181">1181: </a>        <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1182" class="l"><a href="#1182">1182: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'basic'</span>)
-</span><span id="1183" class="l"><a href="#1183">1183: </a>        {
-</span><span id="1184" class="l"><a href="#1184">1184: </a>            <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1181" class="l"><a href="#1181">1181: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1182" class="l"><a href="#1182">1182: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'whitelist'</span>)
+</span><span id="1183" class="l"><a href="#1183">1183: </a>                {
+</span><span id="1184" class="l"><a href="#1184">1184: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
 </span><span id="1185" class="l"><a href="#1185">1185: </a>
-</span><span id="1186" class="l"><a href="#1186">1186: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1187" class="l"><a href="#1187">1187: </a>        }
-</span><span id="1188" class="l"><a href="#1188">1188: </a>
-</span><span id="1189" class="l"><a href="#1189">1189: </a>        <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1190" class="l"><a href="#1190">1190: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'digest'</span>)
-</span><span id="1191" class="l"><a href="#1191">1191: </a>        {
-</span><span id="1192" class="l"><a href="#1192">1192: </a>            <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1193" class="l"><a href="#1193">1193: </a>
-</span><span id="1194" class="l"><a href="#1194">1194: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1195" class="l"><a href="#1195">1195: </a>        }
-</span><span id="1196" class="l"><a href="#1196">1196: </a>
-</span><span id="1197" class="l"><a href="#1197">1197: </a>        <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1198" class="l"><a href="#1198">1198: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;overrides_array[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'whitelist'</span>)
-</span><span id="1199" class="l"><a href="#1199">1199: </a>        {
-</span><span id="1200" class="l"><a href="#1200">1200: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1201" class="l"><a href="#1201">1201: </a>
-</span><span id="1202" class="l"><a href="#1202">1202: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1203" class="l"><a href="#1203">1203: </a>        }
-</span><span id="1204" class="l"><a href="#1204">1204: </a>
-</span><span id="1205" class="l"><a href="#1205">1205: </a>        <span class="php-comment">// Return FALSE when there is an override value set but it does not match</span>
-</span><span id="1206" class="l"><a href="#1206">1206: </a>        <span class="php-comment">// 'basic', 'digest', or 'none'. (the value was misspelled)</span>
-</span><span id="1207" class="l"><a href="#1207">1207: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1208" class="l"><a href="#1208">1208: </a>    }
-</span><span id="1209" class="l"><a href="#1209">1209: </a>
-</span><span id="1210" class="l"><a href="#1210">1210: </a>    <span class="php-comment">/**
-</span></span><span id="1211" class="l"><a href="#1211">1211: </a><span class="php-comment">     * Parse the GET request arguments
-</span></span><span id="1212" class="l"><a href="#1212">1212: </a><span class="php-comment">     *
-</span></span><span id="1213" class="l"><a href="#1213">1213: </a><span class="php-comment">     * @access protected
-</span></span><span id="1214" class="l"><a href="#1214">1214: </a><span class="php-comment">     * @return void
-</span></span><span id="1215" class="l"><a href="#1215">1215: </a><span class="php-comment">     */</span>
-</span><span id="1216" class="l"><a href="#1216">1216: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
-</span><span id="1217" class="l"><a href="#1217">1217: </a>    {
-</span><span id="1218" class="l"><a href="#1218">1218: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
-</span><span id="1219" class="l"><a href="#1219">1219: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
-</span><span id="1220" class="l"><a href="#1220">1220: </a>    }
-</span><span id="1221" class="l"><a href="#1221">1221: </a>
-</span><span id="1222" class="l"><a href="#1222">1222: </a>    <span class="php-comment">/**
-</span></span><span id="1223" class="l"><a href="#1223">1223: </a><span class="php-comment">     * Parse the POST request arguments
-</span></span><span id="1224" class="l"><a href="#1224">1224: </a><span class="php-comment">     *
-</span></span><span id="1225" class="l"><a href="#1225">1225: </a><span class="php-comment">     * @access protected
-</span></span><span id="1226" class="l"><a href="#1226">1226: </a><span class="php-comment">     * @return void
-</span></span><span id="1227" class="l"><a href="#1227">1227: </a><span class="php-comment">     */</span>
-</span><span id="1228" class="l"><a href="#1228">1228: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
-</span><span id="1229" class="l"><a href="#1229">1229: </a>    {
-</span><span id="1230" class="l"><a href="#1230">1230: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
-</span><span id="1231" class="l"><a href="#1231">1231: </a>
-</span><span id="1232" class="l"><a href="#1232">1232: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1233" class="l"><a href="#1233">1233: </a>        {
-</span><span id="1234" class="l"><a href="#1234">1234: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1235" class="l"><a href="#1235">1235: </a>        }
-</span><span id="1236" class="l"><a href="#1236">1236: </a>    }
-</span><span id="1237" class="l"><a href="#1237">1237: </a>
-</span><span id="1238" class="l"><a href="#1238">1238: </a>    <span class="php-comment">/**
-</span></span><span id="1239" class="l"><a href="#1239">1239: </a><span class="php-comment">     * Parse the PUT request arguments
-</span></span><span id="1240" class="l"><a href="#1240">1240: </a><span class="php-comment">     *
-</span></span><span id="1241" class="l"><a href="#1241">1241: </a><span class="php-comment">     * @access protected
-</span></span><span id="1242" class="l"><a href="#1242">1242: </a><span class="php-comment">     * @return void
-</span></span><span id="1243" class="l"><a href="#1243">1243: </a><span class="php-comment">     */</span>
-</span><span id="1244" class="l"><a href="#1244">1244: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
-</span><span id="1245" class="l"><a href="#1245">1245: </a>    {
-</span><span id="1246" class="l"><a href="#1246">1246: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1247" class="l"><a href="#1247">1247: </a>        {
-</span><span id="1248" class="l"><a href="#1248">1248: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1249" class="l"><a href="#1249">1249: </a>        }
-</span><span id="1250" class="l"><a href="#1250">1250: </a>        <span class="php-keyword1">else</span>
-</span><span id="1251" class="l"><a href="#1251">1251: </a>        {
-</span><span id="1252" class="l"><a href="#1252">1252: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1253" class="l"><a href="#1253">1253: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
-</span><span id="1254" class="l"><a href="#1254">1254: </a>            {
-</span><span id="1255" class="l"><a href="#1255">1255: </a>                <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1256" class="l"><a href="#1256">1256: </a>            }
-</span><span id="1257" class="l"><a href="#1257">1257: </a>        }
-</span><span id="1258" class="l"><a href="#1258">1258: </a>    }
-</span><span id="1259" class="l"><a href="#1259">1259: </a>
-</span><span id="1260" class="l"><a href="#1260">1260: </a>    <span class="php-comment">/**
-</span></span><span id="1261" class="l"><a href="#1261">1261: </a><span class="php-comment">     * Parse the HEAD request arguments
-</span></span><span id="1262" class="l"><a href="#1262">1262: </a><span class="php-comment">     *
-</span></span><span id="1263" class="l"><a href="#1263">1263: </a><span class="php-comment">     * @access protected
-</span></span><span id="1264" class="l"><a href="#1264">1264: </a><span class="php-comment">     * @return void
-</span></span><span id="1265" class="l"><a href="#1265">1265: </a><span class="php-comment">     */</span>
-</span><span id="1266" class="l"><a href="#1266">1266: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
-</span><span id="1267" class="l"><a href="#1267">1267: </a>    {
-</span><span id="1268" class="l"><a href="#1268">1268: </a>        <span class="php-comment">// Parse the HEAD variables</span>
-</span><span id="1269" class="l"><a href="#1269">1269: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
-</span><span id="1270" class="l"><a href="#1270">1270: </a>
-</span><span id="1271" class="l"><a href="#1271">1271: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
-</span><span id="1272" class="l"><a href="#1272">1272: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
-</span><span id="1273" class="l"><a href="#1273">1273: </a>    }
-</span><span id="1274" class="l"><a href="#1274">1274: </a>
-</span><span id="1275" class="l"><a href="#1275">1275: </a>    <span class="php-comment">/**
-</span></span><span id="1276" class="l"><a href="#1276">1276: </a><span class="php-comment">     * Parse the OPTIONS request arguments
-</span></span><span id="1277" class="l"><a href="#1277">1277: </a><span class="php-comment">     *
-</span></span><span id="1278" class="l"><a href="#1278">1278: </a><span class="php-comment">     * @access protected
-</span></span><span id="1279" class="l"><a href="#1279">1279: </a><span class="php-comment">     * @return void
-</span></span><span id="1280" class="l"><a href="#1280">1280: </a><span class="php-comment">     */</span>
-</span><span id="1281" class="l"><a href="#1281">1281: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
-</span><span id="1282" class="l"><a href="#1282">1282: </a>    {
-</span><span id="1283" class="l"><a href="#1283">1283: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
-</span><span id="1284" class="l"><a href="#1284">1284: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
-</span><span id="1285" class="l"><a href="#1285">1285: </a>
-</span><span id="1286" class="l"><a href="#1286">1286: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
-</span><span id="1287" class="l"><a href="#1287">1287: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
-</span><span id="1288" class="l"><a href="#1288">1288: </a>    }
+</span><span id="1186" class="l"><a href="#1186">1186: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1187" class="l"><a href="#1187">1187: </a>                }
+</span><span id="1188" class="l"><a href="#1188">1188: </a>            }
+</span><span id="1189" class="l"><a href="#1189">1189: </a>
+</span><span id="1190" class="l"><a href="#1190">1190: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
+</span><span id="1191" class="l"><a href="#1191">1191: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
+</span><span id="1192" class="l"><a href="#1192">1192: </a>            {
+</span><span id="1193" class="l"><a href="#1193">1193: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1194" class="l"><a href="#1194">1194: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'none'</span>)
+</span><span id="1195" class="l"><a href="#1195">1195: </a>                {
+</span><span id="1196" class="l"><a href="#1196">1196: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1197" class="l"><a href="#1197">1197: </a>                }
+</span><span id="1198" class="l"><a href="#1198">1198: </a>
+</span><span id="1199" class="l"><a href="#1199">1199: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1200" class="l"><a href="#1200">1200: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'basic'</span>)
+</span><span id="1201" class="l"><a href="#1201">1201: </a>                {
+</span><span id="1202" class="l"><a href="#1202">1202: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1203" class="l"><a href="#1203">1203: </a>
+</span><span id="1204" class="l"><a href="#1204">1204: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1205" class="l"><a href="#1205">1205: </a>                }
+</span><span id="1206" class="l"><a href="#1206">1206: </a>
+</span><span id="1207" class="l"><a href="#1207">1207: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1208" class="l"><a href="#1208">1208: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'digest'</span>)
+</span><span id="1209" class="l"><a href="#1209">1209: </a>                {
+</span><span id="1210" class="l"><a href="#1210">1210: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1211" class="l"><a href="#1211">1211: </a>
+</span><span id="1212" class="l"><a href="#1212">1212: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1213" class="l"><a href="#1213">1213: </a>                }
+</span><span id="1214" class="l"><a href="#1214">1214: </a>
+</span><span id="1215" class="l"><a href="#1215">1215: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1216" class="l"><a href="#1216">1216: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'whitelist'</span>)
+</span><span id="1217" class="l"><a href="#1217">1217: </a>                {
+</span><span id="1218" class="l"><a href="#1218">1218: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1219" class="l"><a href="#1219">1219: </a>
+</span><span id="1220" class="l"><a href="#1220">1220: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1221" class="l"><a href="#1221">1221: </a>                }
+</span><span id="1222" class="l"><a href="#1222">1222: </a>            }
+</span><span id="1223" class="l"><a href="#1223">1223: </a>        }
+</span><span id="1224" class="l"><a href="#1224">1224: </a>
+</span><span id="1225" class="l"><a href="#1225">1225: </a>        <span class="php-comment">// Assign the class/method/HTTP-method auth type override array from the config</span>
+</span><span id="1226" class="l"><a href="#1226">1226: </a>        <span class="php-var">$auth_override_class_method_http</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method_http'</span>);
+</span><span id="1227" class="l"><a href="#1227">1227: </a>
+</span><span id="1228" class="l"><a href="#1228">1228: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
+</span><span id="1229" class="l"><a href="#1229">1229: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>))
+</span><span id="1230" class="l"><a href="#1230">1230: </a>        {
+</span><span id="1231" class="l"><a href="#1231">1231: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
+</span><span id="1232" class="l"><a href="#1232">1232: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method]))
+</span><span id="1233" class="l"><a href="#1233">1233: </a>            {
+</span><span id="1234" class="l"><a href="#1234">1234: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1235" class="l"><a href="#1235">1235: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] == <span class="php-quote">'none'</span>)
+</span><span id="1236" class="l"><a href="#1236">1236: </a>                {
+</span><span id="1237" class="l"><a href="#1237">1237: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1238" class="l"><a href="#1238">1238: </a>                }
+</span><span id="1239" class="l"><a href="#1239">1239: </a>
+</span><span id="1240" class="l"><a href="#1240">1240: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1241" class="l"><a href="#1241">1241: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] == <span class="php-quote">'basic'</span>)
+</span><span id="1242" class="l"><a href="#1242">1242: </a>                {
+</span><span id="1243" class="l"><a href="#1243">1243: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1244" class="l"><a href="#1244">1244: </a>
+</span><span id="1245" class="l"><a href="#1245">1245: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1246" class="l"><a href="#1246">1246: </a>                }
+</span><span id="1247" class="l"><a href="#1247">1247: </a>
+</span><span id="1248" class="l"><a href="#1248">1248: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1249" class="l"><a href="#1249">1249: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] == <span class="php-quote">'digest'</span>)
+</span><span id="1250" class="l"><a href="#1250">1250: </a>                {
+</span><span id="1251" class="l"><a href="#1251">1251: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1252" class="l"><a href="#1252">1252: </a>
+</span><span id="1253" class="l"><a href="#1253">1253: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1254" class="l"><a href="#1254">1254: </a>                }
+</span><span id="1255" class="l"><a href="#1255">1255: </a>
+</span><span id="1256" class="l"><a href="#1256">1256: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1257" class="l"><a href="#1257">1257: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] == <span class="php-quote">'whitelist'</span>)
+</span><span id="1258" class="l"><a href="#1258">1258: </a>                {
+</span><span id="1259" class="l"><a href="#1259">1259: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1260" class="l"><a href="#1260">1260: </a>
+</span><span id="1261" class="l"><a href="#1261">1261: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1262" class="l"><a href="#1262">1262: </a>                }
+</span><span id="1263" class="l"><a href="#1263">1263: </a>            }
+</span><span id="1264" class="l"><a href="#1264">1264: </a>
+</span><span id="1265" class="l"><a href="#1265">1265: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method/HTTP-method being called</span>
+</span><span id="1266" class="l"><a href="#1266">1266: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method]))
+</span><span id="1267" class="l"><a href="#1267">1267: </a>            {
+</span><span id="1268" class="l"><a href="#1268">1268: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1269" class="l"><a href="#1269">1269: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] == <span class="php-quote">'none'</span>)
+</span><span id="1270" class="l"><a href="#1270">1270: </a>                {
+</span><span id="1271" class="l"><a href="#1271">1271: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1272" class="l"><a href="#1272">1272: </a>                }
+</span><span id="1273" class="l"><a href="#1273">1273: </a>
+</span><span id="1274" class="l"><a href="#1274">1274: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1275" class="l"><a href="#1275">1275: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] == <span class="php-quote">'basic'</span>)
+</span><span id="1276" class="l"><a href="#1276">1276: </a>                {
+</span><span id="1277" class="l"><a href="#1277">1277: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1278" class="l"><a href="#1278">1278: </a>
+</span><span id="1279" class="l"><a href="#1279">1279: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1280" class="l"><a href="#1280">1280: </a>                }
+</span><span id="1281" class="l"><a href="#1281">1281: </a>
+</span><span id="1282" class="l"><a href="#1282">1282: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1283" class="l"><a href="#1283">1283: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] == <span class="php-quote">'digest'</span>)
+</span><span id="1284" class="l"><a href="#1284">1284: </a>                {
+</span><span id="1285" class="l"><a href="#1285">1285: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1286" class="l"><a href="#1286">1286: </a>
+</span><span id="1287" class="l"><a href="#1287">1287: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1288" class="l"><a href="#1288">1288: </a>                }
 </span><span id="1289" class="l"><a href="#1289">1289: </a>
-</span><span id="1290" class="l"><a href="#1290">1290: </a>    <span class="php-comment">/**
-</span></span><span id="1291" class="l"><a href="#1291">1291: </a><span class="php-comment">     * Parse the PATCH request arguments
-</span></span><span id="1292" class="l"><a href="#1292">1292: </a><span class="php-comment">     *
-</span></span><span id="1293" class="l"><a href="#1293">1293: </a><span class="php-comment">     * @access protected
-</span></span><span id="1294" class="l"><a href="#1294">1294: </a><span class="php-comment">     * @return void
-</span></span><span id="1295" class="l"><a href="#1295">1295: </a><span class="php-comment">     */</span>
-</span><span id="1296" class="l"><a href="#1296">1296: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
-</span><span id="1297" class="l"><a href="#1297">1297: </a>    {
-</span><span id="1298" class="l"><a href="#1298">1298: </a>        <span class="php-comment">// It might be a HTTP body</span>
-</span><span id="1299" class="l"><a href="#1299">1299: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1300" class="l"><a href="#1300">1300: </a>        {
-</span><span id="1301" class="l"><a href="#1301">1301: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1302" class="l"><a href="#1302">1302: </a>        }
-</span><span id="1303" class="l"><a href="#1303">1303: </a>        <span class="php-keyword1">else</span>
-</span><span id="1304" class="l"><a href="#1304">1304: </a>        {
-</span><span id="1305" class="l"><a href="#1305">1305: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1306" class="l"><a href="#1306">1306: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
-</span><span id="1307" class="l"><a href="#1307">1307: </a>            {
-</span><span id="1308" class="l"><a href="#1308">1308: </a>                <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1309" class="l"><a href="#1309">1309: </a>            }
-</span><span id="1310" class="l"><a href="#1310">1310: </a>        }
-</span><span id="1311" class="l"><a href="#1311">1311: </a>    }
-</span><span id="1312" class="l"><a href="#1312">1312: </a>
-</span><span id="1313" class="l"><a href="#1313">1313: </a>    <span class="php-comment">/**
-</span></span><span id="1314" class="l"><a href="#1314">1314: </a><span class="php-comment">     * Parse the DELETE request arguments
-</span></span><span id="1315" class="l"><a href="#1315">1315: </a><span class="php-comment">     *
-</span></span><span id="1316" class="l"><a href="#1316">1316: </a><span class="php-comment">     * @access protected
-</span></span><span id="1317" class="l"><a href="#1317">1317: </a><span class="php-comment">     * @return void
-</span></span><span id="1318" class="l"><a href="#1318">1318: </a><span class="php-comment">     */</span>
-</span><span id="1319" class="l"><a href="#1319">1319: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
-</span><span id="1320" class="l"><a href="#1320">1320: </a>    {
-</span><span id="1321" class="l"><a href="#1321">1321: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
-</span><span id="1322" class="l"><a href="#1322">1322: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
-</span><span id="1323" class="l"><a href="#1323">1323: </a>        {
-</span><span id="1324" class="l"><a href="#1324">1324: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1325" class="l"><a href="#1325">1325: </a>        }
-</span><span id="1326" class="l"><a href="#1326">1326: </a>    }
-</span><span id="1327" class="l"><a href="#1327">1327: </a>
-</span><span id="1328" class="l"><a href="#1328">1328: </a>    <span class="php-comment">/**
-</span></span><span id="1329" class="l"><a href="#1329">1329: </a><span class="php-comment">     * Parse the query parameters
-</span></span><span id="1330" class="l"><a href="#1330">1330: </a><span class="php-comment">     *
-</span></span><span id="1331" class="l"><a href="#1331">1331: </a><span class="php-comment">     * @access protected
-</span></span><span id="1332" class="l"><a href="#1332">1332: </a><span class="php-comment">     * @return void
-</span></span><span id="1333" class="l"><a href="#1333">1333: </a><span class="php-comment">     */</span>
-</span><span id="1334" class="l"><a href="#1334">1334: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
-</span><span id="1335" class="l"><a href="#1335">1335: </a>    {
-</span><span id="1336" class="l"><a href="#1336">1336: </a>        <span class="php-comment">// Declare a variable that will hold the REQUEST_URI</span>
-</span><span id="1337" class="l"><a href="#1337">1337: </a>        <span class="php-var">$request_uri</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1338" class="l"><a href="#1338">1338: </a>
-</span><span id="1339" class="l"><a href="#1339">1339: </a>        <span class="php-comment">// If using the commandline version</span>
-</span><span id="1340" class="l"><a href="#1340">1340: </a>        <span class="php-keyword1">if</span> (is_cli())
-</span><span id="1341" class="l"><a href="#1341">1341: </a>        {
-</span><span id="1342" class="l"><a href="#1342">1342: </a>            <span class="php-var">$args</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'argv'</span>);
-</span><span id="1343" class="l"><a href="#1343">1343: </a>            <span class="php-keyword1">unset</span>(<span class="php-var">$args</span>[<span class="php-num">0</span>]);
-</span><span id="1344" class="l"><a href="#1344">1344: </a>
-</span><span id="1345" class="l"><a href="#1345">1345: </a>            <span class="php-comment">// Combine the arguments using '/' as the delimiter</span>
-</span><span id="1346" class="l"><a href="#1346">1346: </a>            <span class="php-var">$request_uri</span> = <span class="php-quote">'/'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'/'</span>, <span class="php-var">$args</span>) . <span class="php-quote">'/'</span>;
-</span><span id="1347" class="l"><a href="#1347">1347: </a>
-</span><span id="1348" class="l"><a href="#1348">1348: </a>            <span class="php-comment">// Set the following server variables (perhaps not required anymore?)</span>
-</span><span id="1349" class="l"><a href="#1349">1349: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1350" class="l"><a href="#1350">1350: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'PATH_INFO'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1351" class="l"><a href="#1351">1351: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'QUERY_STRING'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1352" class="l"><a href="#1352">1352: </a>        }
-</span><span id="1353" class="l"><a href="#1353">1353: </a>        <span class="php-keyword1">else</span>
-</span><span id="1354" class="l"><a href="#1354">1354: </a>        {
-</span><span id="1355" class="l"><a href="#1355">1355: </a>            <span class="php-var">$request_uri</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>);
-</span><span id="1356" class="l"><a href="#1356">1356: </a>        }
-</span><span id="1357" class="l"><a href="#1357">1357: </a>
-</span><span id="1358" class="l"><a href="#1358">1358: </a>        <span class="php-comment">// Parse the query parameters from the query string</span>
-</span><span id="1359" class="l"><a href="#1359">1359: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$request_uri</span>, PHP_URL_QUERY), <span class="php-var">$this</span>-&gt;_query_args);
-</span><span id="1360" class="l"><a href="#1360">1360: </a>    }
-</span><span id="1361" class="l"><a href="#1361">1361: </a>
-</span><span id="1362" class="l"><a href="#1362">1362: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
-</span><span id="1363" class="l"><a href="#1363">1363: </a>
-</span><span id="1364" class="l"><a href="#1364">1364: </a>    <span class="php-comment">/**
-</span></span><span id="1365" class="l"><a href="#1365">1365: </a><span class="php-comment">     * Retrieve a value from a GET request
-</span></span><span id="1366" class="l"><a href="#1366">1366: </a><span class="php-comment">     *
-</span></span><span id="1367" class="l"><a href="#1367">1367: </a><span class="php-comment">     * @access public
-</span></span><span id="1368" class="l"><a href="#1368">1368: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
-</span></span><span id="1369" class="l"><a href="#1369">1369: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1370" class="l"><a href="#1370">1370: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1371" class="l"><a href="#1371">1371: </a><span class="php-comment">     * @return array|string|NULL Value from the GET request; otherwise, NULL
+</span><span id="1290" class="l"><a href="#1290">1290: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1291" class="l"><a href="#1291">1291: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] == <span class="php-quote">'whitelist'</span>)
+</span><span id="1292" class="l"><a href="#1292">1292: </a>                {
+</span><span id="1293" class="l"><a href="#1293">1293: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1294" class="l"><a href="#1294">1294: </a>
+</span><span id="1295" class="l"><a href="#1295">1295: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1296" class="l"><a href="#1296">1296: </a>                }
+</span><span id="1297" class="l"><a href="#1297">1297: </a>            }
+</span><span id="1298" class="l"><a href="#1298">1298: </a>        }
+</span><span id="1299" class="l"><a href="#1299">1299: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1300" class="l"><a href="#1300">1300: </a>    }
+</span><span id="1301" class="l"><a href="#1301">1301: </a>
+</span><span id="1302" class="l"><a href="#1302">1302: </a>    <span class="php-comment">/**
+</span></span><span id="1303" class="l"><a href="#1303">1303: </a><span class="php-comment">     * Parse the GET request arguments
+</span></span><span id="1304" class="l"><a href="#1304">1304: </a><span class="php-comment">     *
+</span></span><span id="1305" class="l"><a href="#1305">1305: </a><span class="php-comment">     * @access protected
+</span></span><span id="1306" class="l"><a href="#1306">1306: </a><span class="php-comment">     * @return void
+</span></span><span id="1307" class="l"><a href="#1307">1307: </a><span class="php-comment">     */</span>
+</span><span id="1308" class="l"><a href="#1308">1308: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
+</span><span id="1309" class="l"><a href="#1309">1309: </a>    {
+</span><span id="1310" class="l"><a href="#1310">1310: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
+</span><span id="1311" class="l"><a href="#1311">1311: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
+</span><span id="1312" class="l"><a href="#1312">1312: </a>    }
+</span><span id="1313" class="l"><a href="#1313">1313: </a>
+</span><span id="1314" class="l"><a href="#1314">1314: </a>    <span class="php-comment">/**
+</span></span><span id="1315" class="l"><a href="#1315">1315: </a><span class="php-comment">     * Parse the POST request arguments
+</span></span><span id="1316" class="l"><a href="#1316">1316: </a><span class="php-comment">     *
+</span></span><span id="1317" class="l"><a href="#1317">1317: </a><span class="php-comment">     * @access protected
+</span></span><span id="1318" class="l"><a href="#1318">1318: </a><span class="php-comment">     * @return void
+</span></span><span id="1319" class="l"><a href="#1319">1319: </a><span class="php-comment">     */</span>
+</span><span id="1320" class="l"><a href="#1320">1320: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
+</span><span id="1321" class="l"><a href="#1321">1321: </a>    {
+</span><span id="1322" class="l"><a href="#1322">1322: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
+</span><span id="1323" class="l"><a href="#1323">1323: </a>
+</span><span id="1324" class="l"><a href="#1324">1324: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1325" class="l"><a href="#1325">1325: </a>        {
+</span><span id="1326" class="l"><a href="#1326">1326: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1327" class="l"><a href="#1327">1327: </a>        }
+</span><span id="1328" class="l"><a href="#1328">1328: </a>    }
+</span><span id="1329" class="l"><a href="#1329">1329: </a>
+</span><span id="1330" class="l"><a href="#1330">1330: </a>    <span class="php-comment">/**
+</span></span><span id="1331" class="l"><a href="#1331">1331: </a><span class="php-comment">     * Parse the PUT request arguments
+</span></span><span id="1332" class="l"><a href="#1332">1332: </a><span class="php-comment">     *
+</span></span><span id="1333" class="l"><a href="#1333">1333: </a><span class="php-comment">     * @access protected
+</span></span><span id="1334" class="l"><a href="#1334">1334: </a><span class="php-comment">     * @return void
+</span></span><span id="1335" class="l"><a href="#1335">1335: </a><span class="php-comment">     */</span>
+</span><span id="1336" class="l"><a href="#1336">1336: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
+</span><span id="1337" class="l"><a href="#1337">1337: </a>    {
+</span><span id="1338" class="l"><a href="#1338">1338: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1339" class="l"><a href="#1339">1339: </a>        {
+</span><span id="1340" class="l"><a href="#1340">1340: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1341" class="l"><a href="#1341">1341: </a>        }
+</span><span id="1342" class="l"><a href="#1342">1342: </a>        <span class="php-keyword1">else</span>
+</span><span id="1343" class="l"><a href="#1343">1343: </a>        {
+</span><span id="1344" class="l"><a href="#1344">1344: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1345" class="l"><a href="#1345">1345: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
+</span><span id="1346" class="l"><a href="#1346">1346: </a>            {
+</span><span id="1347" class="l"><a href="#1347">1347: </a>                <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1348" class="l"><a href="#1348">1348: </a>            }
+</span><span id="1349" class="l"><a href="#1349">1349: </a>        }
+</span><span id="1350" class="l"><a href="#1350">1350: </a>    }
+</span><span id="1351" class="l"><a href="#1351">1351: </a>
+</span><span id="1352" class="l"><a href="#1352">1352: </a>    <span class="php-comment">/**
+</span></span><span id="1353" class="l"><a href="#1353">1353: </a><span class="php-comment">     * Parse the HEAD request arguments
+</span></span><span id="1354" class="l"><a href="#1354">1354: </a><span class="php-comment">     *
+</span></span><span id="1355" class="l"><a href="#1355">1355: </a><span class="php-comment">     * @access protected
+</span></span><span id="1356" class="l"><a href="#1356">1356: </a><span class="php-comment">     * @return void
+</span></span><span id="1357" class="l"><a href="#1357">1357: </a><span class="php-comment">     */</span>
+</span><span id="1358" class="l"><a href="#1358">1358: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
+</span><span id="1359" class="l"><a href="#1359">1359: </a>    {
+</span><span id="1360" class="l"><a href="#1360">1360: </a>        <span class="php-comment">// Parse the HEAD variables</span>
+</span><span id="1361" class="l"><a href="#1361">1361: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
+</span><span id="1362" class="l"><a href="#1362">1362: </a>
+</span><span id="1363" class="l"><a href="#1363">1363: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
+</span><span id="1364" class="l"><a href="#1364">1364: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
+</span><span id="1365" class="l"><a href="#1365">1365: </a>    }
+</span><span id="1366" class="l"><a href="#1366">1366: </a>
+</span><span id="1367" class="l"><a href="#1367">1367: </a>    <span class="php-comment">/**
+</span></span><span id="1368" class="l"><a href="#1368">1368: </a><span class="php-comment">     * Parse the OPTIONS request arguments
+</span></span><span id="1369" class="l"><a href="#1369">1369: </a><span class="php-comment">     *
+</span></span><span id="1370" class="l"><a href="#1370">1370: </a><span class="php-comment">     * @access protected
+</span></span><span id="1371" class="l"><a href="#1371">1371: </a><span class="php-comment">     * @return void
 </span></span><span id="1372" class="l"><a href="#1372">1372: </a><span class="php-comment">     */</span>
-</span><span id="1373" class="l"><a href="#1373">1373: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1373" class="l"><a href="#1373">1373: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
 </span><span id="1374" class="l"><a href="#1374">1374: </a>    {
-</span><span id="1375" class="l"><a href="#1375">1375: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1376" class="l"><a href="#1376">1376: </a>        {
-</span><span id="1377" class="l"><a href="#1377">1377: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
-</span><span id="1378" class="l"><a href="#1378">1378: </a>        }
-</span><span id="1379" class="l"><a href="#1379">1379: </a>
-</span><span id="1380" class="l"><a href="#1380">1380: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1381" class="l"><a href="#1381">1381: </a>    }
-</span><span id="1382" class="l"><a href="#1382">1382: </a>
-</span><span id="1383" class="l"><a href="#1383">1383: </a>    <span class="php-comment">/**
-</span></span><span id="1384" class="l"><a href="#1384">1384: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
-</span></span><span id="1385" class="l"><a href="#1385">1385: </a><span class="php-comment">     *
-</span></span><span id="1386" class="l"><a href="#1386">1386: </a><span class="php-comment">     * @access public
-</span></span><span id="1387" class="l"><a href="#1387">1387: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
-</span></span><span id="1388" class="l"><a href="#1388">1388: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1389" class="l"><a href="#1389">1389: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1390" class="l"><a href="#1390">1390: </a><span class="php-comment">     * @return array|string|NULL Value from the OPTIONS request; otherwise, NULL
-</span></span><span id="1391" class="l"><a href="#1391">1391: </a><span class="php-comment">     */</span>
-</span><span id="1392" class="l"><a href="#1392">1392: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1393" class="l"><a href="#1393">1393: </a>    {
-</span><span id="1394" class="l"><a href="#1394">1394: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1395" class="l"><a href="#1395">1395: </a>        {
-</span><span id="1396" class="l"><a href="#1396">1396: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
-</span><span id="1397" class="l"><a href="#1397">1397: </a>        }
-</span><span id="1398" class="l"><a href="#1398">1398: </a>
-</span><span id="1399" class="l"><a href="#1399">1399: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1400" class="l"><a href="#1400">1400: </a>    }
-</span><span id="1401" class="l"><a href="#1401">1401: </a>
-</span><span id="1402" class="l"><a href="#1402">1402: </a>    <span class="php-comment">/**
-</span></span><span id="1403" class="l"><a href="#1403">1403: </a><span class="php-comment">     * Retrieve a value from a HEAD request
-</span></span><span id="1404" class="l"><a href="#1404">1404: </a><span class="php-comment">     *
-</span></span><span id="1405" class="l"><a href="#1405">1405: </a><span class="php-comment">     * @access public
-</span></span><span id="1406" class="l"><a href="#1406">1406: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
-</span></span><span id="1407" class="l"><a href="#1407">1407: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1408" class="l"><a href="#1408">1408: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1409" class="l"><a href="#1409">1409: </a><span class="php-comment">     * @return array|string|NULL Value from the HEAD request; otherwise, NULL
+</span><span id="1375" class="l"><a href="#1375">1375: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
+</span><span id="1376" class="l"><a href="#1376">1376: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
+</span><span id="1377" class="l"><a href="#1377">1377: </a>
+</span><span id="1378" class="l"><a href="#1378">1378: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
+</span><span id="1379" class="l"><a href="#1379">1379: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
+</span><span id="1380" class="l"><a href="#1380">1380: </a>    }
+</span><span id="1381" class="l"><a href="#1381">1381: </a>
+</span><span id="1382" class="l"><a href="#1382">1382: </a>    <span class="php-comment">/**
+</span></span><span id="1383" class="l"><a href="#1383">1383: </a><span class="php-comment">     * Parse the PATCH request arguments
+</span></span><span id="1384" class="l"><a href="#1384">1384: </a><span class="php-comment">     *
+</span></span><span id="1385" class="l"><a href="#1385">1385: </a><span class="php-comment">     * @access protected
+</span></span><span id="1386" class="l"><a href="#1386">1386: </a><span class="php-comment">     * @return void
+</span></span><span id="1387" class="l"><a href="#1387">1387: </a><span class="php-comment">     */</span>
+</span><span id="1388" class="l"><a href="#1388">1388: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
+</span><span id="1389" class="l"><a href="#1389">1389: </a>    {
+</span><span id="1390" class="l"><a href="#1390">1390: </a>        <span class="php-comment">// It might be a HTTP body</span>
+</span><span id="1391" class="l"><a href="#1391">1391: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1392" class="l"><a href="#1392">1392: </a>        {
+</span><span id="1393" class="l"><a href="#1393">1393: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1394" class="l"><a href="#1394">1394: </a>        }
+</span><span id="1395" class="l"><a href="#1395">1395: </a>        <span class="php-keyword1">else</span>
+</span><span id="1396" class="l"><a href="#1396">1396: </a>        {
+</span><span id="1397" class="l"><a href="#1397">1397: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1398" class="l"><a href="#1398">1398: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
+</span><span id="1399" class="l"><a href="#1399">1399: </a>            {
+</span><span id="1400" class="l"><a href="#1400">1400: </a>                <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1401" class="l"><a href="#1401">1401: </a>            }
+</span><span id="1402" class="l"><a href="#1402">1402: </a>        }
+</span><span id="1403" class="l"><a href="#1403">1403: </a>    }
+</span><span id="1404" class="l"><a href="#1404">1404: </a>
+</span><span id="1405" class="l"><a href="#1405">1405: </a>    <span class="php-comment">/**
+</span></span><span id="1406" class="l"><a href="#1406">1406: </a><span class="php-comment">     * Parse the DELETE request arguments
+</span></span><span id="1407" class="l"><a href="#1407">1407: </a><span class="php-comment">     *
+</span></span><span id="1408" class="l"><a href="#1408">1408: </a><span class="php-comment">     * @access protected
+</span></span><span id="1409" class="l"><a href="#1409">1409: </a><span class="php-comment">     * @return void
 </span></span><span id="1410" class="l"><a href="#1410">1410: </a><span class="php-comment">     */</span>
-</span><span id="1411" class="l"><a href="#1411">1411: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1411" class="l"><a href="#1411">1411: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
 </span><span id="1412" class="l"><a href="#1412">1412: </a>    {
-</span><span id="1413" class="l"><a href="#1413">1413: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1414" class="l"><a href="#1414">1414: </a>        {
-</span><span id="1415" class="l"><a href="#1415">1415: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;head_args;
-</span><span id="1416" class="l"><a href="#1416">1416: </a>        }
-</span><span id="1417" class="l"><a href="#1417">1417: </a>
-</span><span id="1418" class="l"><a href="#1418">1418: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1419" class="l"><a href="#1419">1419: </a>    }
-</span><span id="1420" class="l"><a href="#1420">1420: </a>
-</span><span id="1421" class="l"><a href="#1421">1421: </a>    <span class="php-comment">/**
-</span></span><span id="1422" class="l"><a href="#1422">1422: </a><span class="php-comment">     * Retrieve a value from a POST request
-</span></span><span id="1423" class="l"><a href="#1423">1423: </a><span class="php-comment">     *
-</span></span><span id="1424" class="l"><a href="#1424">1424: </a><span class="php-comment">     * @access public
-</span></span><span id="1425" class="l"><a href="#1425">1425: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
-</span></span><span id="1426" class="l"><a href="#1426">1426: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1427" class="l"><a href="#1427">1427: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1428" class="l"><a href="#1428">1428: </a><span class="php-comment">     * @return array|string|NULL Value from the POST request; otherwise, NULL
-</span></span><span id="1429" class="l"><a href="#1429">1429: </a><span class="php-comment">     */</span>
-</span><span id="1430" class="l"><a href="#1430">1430: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1431" class="l"><a href="#1431">1431: </a>    {
-</span><span id="1432" class="l"><a href="#1432">1432: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1413" class="l"><a href="#1413">1413: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
+</span><span id="1414" class="l"><a href="#1414">1414: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
+</span><span id="1415" class="l"><a href="#1415">1415: </a>        {
+</span><span id="1416" class="l"><a href="#1416">1416: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1417" class="l"><a href="#1417">1417: </a>        }
+</span><span id="1418" class="l"><a href="#1418">1418: </a>    }
+</span><span id="1419" class="l"><a href="#1419">1419: </a>
+</span><span id="1420" class="l"><a href="#1420">1420: </a>    <span class="php-comment">/**
+</span></span><span id="1421" class="l"><a href="#1421">1421: </a><span class="php-comment">     * Parse the query parameters
+</span></span><span id="1422" class="l"><a href="#1422">1422: </a><span class="php-comment">     *
+</span></span><span id="1423" class="l"><a href="#1423">1423: </a><span class="php-comment">     * @access protected
+</span></span><span id="1424" class="l"><a href="#1424">1424: </a><span class="php-comment">     * @return void
+</span></span><span id="1425" class="l"><a href="#1425">1425: </a><span class="php-comment">     */</span>
+</span><span id="1426" class="l"><a href="#1426">1426: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
+</span><span id="1427" class="l"><a href="#1427">1427: </a>    {
+</span><span id="1428" class="l"><a href="#1428">1428: </a>        <span class="php-comment">// Declare a variable that will hold the REQUEST_URI</span>
+</span><span id="1429" class="l"><a href="#1429">1429: </a>        <span class="php-var">$request_uri</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1430" class="l"><a href="#1430">1430: </a>
+</span><span id="1431" class="l"><a href="#1431">1431: </a>        <span class="php-comment">// If using the commandline version</span>
+</span><span id="1432" class="l"><a href="#1432">1432: </a>        <span class="php-keyword1">if</span> (is_cli())
 </span><span id="1433" class="l"><a href="#1433">1433: </a>        {
-</span><span id="1434" class="l"><a href="#1434">1434: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
-</span><span id="1435" class="l"><a href="#1435">1435: </a>        }
+</span><span id="1434" class="l"><a href="#1434">1434: </a>            <span class="php-var">$args</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'argv'</span>);
+</span><span id="1435" class="l"><a href="#1435">1435: </a>            <span class="php-keyword1">unset</span>(<span class="php-var">$args</span>[<span class="php-num">0</span>]);
 </span><span id="1436" class="l"><a href="#1436">1436: </a>
-</span><span id="1437" class="l"><a href="#1437">1437: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1438" class="l"><a href="#1438">1438: </a>    }
+</span><span id="1437" class="l"><a href="#1437">1437: </a>            <span class="php-comment">// Combine the arguments using '/' as the delimiter</span>
+</span><span id="1438" class="l"><a href="#1438">1438: </a>            <span class="php-var">$request_uri</span> = <span class="php-quote">'/'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'/'</span>, <span class="php-var">$args</span>) . <span class="php-quote">'/'</span>;
 </span><span id="1439" class="l"><a href="#1439">1439: </a>
-</span><span id="1440" class="l"><a href="#1440">1440: </a>    <span class="php-comment">/**
-</span></span><span id="1441" class="l"><a href="#1441">1441: </a><span class="php-comment">     * Retrieve a value from a PUT request
-</span></span><span id="1442" class="l"><a href="#1442">1442: </a><span class="php-comment">     *
-</span></span><span id="1443" class="l"><a href="#1443">1443: </a><span class="php-comment">     * @access public
-</span></span><span id="1444" class="l"><a href="#1444">1444: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
-</span></span><span id="1445" class="l"><a href="#1445">1445: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1446" class="l"><a href="#1446">1446: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1447" class="l"><a href="#1447">1447: </a><span class="php-comment">     * @return array|string|NULL Value from the PUT request; otherwise, NULL
-</span></span><span id="1448" class="l"><a href="#1448">1448: </a><span class="php-comment">     */</span>
-</span><span id="1449" class="l"><a href="#1449">1449: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1450" class="l"><a href="#1450">1450: </a>    {
-</span><span id="1451" class="l"><a href="#1451">1451: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1452" class="l"><a href="#1452">1452: </a>        {
-</span><span id="1453" class="l"><a href="#1453">1453: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
-</span><span id="1454" class="l"><a href="#1454">1454: </a>        }
+</span><span id="1440" class="l"><a href="#1440">1440: </a>            <span class="php-comment">// Set the following server variables (perhaps not required anymore?)</span>
+</span><span id="1441" class="l"><a href="#1441">1441: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1442" class="l"><a href="#1442">1442: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'PATH_INFO'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1443" class="l"><a href="#1443">1443: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'QUERY_STRING'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1444" class="l"><a href="#1444">1444: </a>        }
+</span><span id="1445" class="l"><a href="#1445">1445: </a>        <span class="php-keyword1">else</span>
+</span><span id="1446" class="l"><a href="#1446">1446: </a>        {
+</span><span id="1447" class="l"><a href="#1447">1447: </a>            <span class="php-var">$request_uri</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>);
+</span><span id="1448" class="l"><a href="#1448">1448: </a>        }
+</span><span id="1449" class="l"><a href="#1449">1449: </a>
+</span><span id="1450" class="l"><a href="#1450">1450: </a>        <span class="php-comment">// Parse the query parameters from the query string</span>
+</span><span id="1451" class="l"><a href="#1451">1451: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$request_uri</span>, PHP_URL_QUERY), <span class="php-var">$this</span>-&gt;_query_args);
+</span><span id="1452" class="l"><a href="#1452">1452: </a>    }
+</span><span id="1453" class="l"><a href="#1453">1453: </a>
+</span><span id="1454" class="l"><a href="#1454">1454: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
 </span><span id="1455" class="l"><a href="#1455">1455: </a>
-</span><span id="1456" class="l"><a href="#1456">1456: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1457" class="l"><a href="#1457">1457: </a>    }
-</span><span id="1458" class="l"><a href="#1458">1458: </a>
-</span><span id="1459" class="l"><a href="#1459">1459: </a>    <span class="php-comment">/**
-</span></span><span id="1460" class="l"><a href="#1460">1460: </a><span class="php-comment">     * Retrieve a value from a DELETE request
-</span></span><span id="1461" class="l"><a href="#1461">1461: </a><span class="php-comment">     *
-</span></span><span id="1462" class="l"><a href="#1462">1462: </a><span class="php-comment">     * @access public
-</span></span><span id="1463" class="l"><a href="#1463">1463: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
-</span></span><span id="1464" class="l"><a href="#1464">1464: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1465" class="l"><a href="#1465">1465: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1466" class="l"><a href="#1466">1466: </a><span class="php-comment">     * @return array|string|NULL Value from the DELETE request; otherwise, NULL
-</span></span><span id="1467" class="l"><a href="#1467">1467: </a><span class="php-comment">     */</span>
-</span><span id="1468" class="l"><a href="#1468">1468: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1469" class="l"><a href="#1469">1469: </a>    {
-</span><span id="1470" class="l"><a href="#1470">1470: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1471" class="l"><a href="#1471">1471: </a>        {
-</span><span id="1472" class="l"><a href="#1472">1472: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
-</span><span id="1473" class="l"><a href="#1473">1473: </a>        }
+</span><span id="1456" class="l"><a href="#1456">1456: </a>    <span class="php-comment">/**
+</span></span><span id="1457" class="l"><a href="#1457">1457: </a><span class="php-comment">     * Retrieve a value from a GET request
+</span></span><span id="1458" class="l"><a href="#1458">1458: </a><span class="php-comment">     *
+</span></span><span id="1459" class="l"><a href="#1459">1459: </a><span class="php-comment">     * @access public
+</span></span><span id="1460" class="l"><a href="#1460">1460: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
+</span></span><span id="1461" class="l"><a href="#1461">1461: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1462" class="l"><a href="#1462">1462: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1463" class="l"><a href="#1463">1463: </a><span class="php-comment">     * @return array|string|NULL Value from the GET request; otherwise, NULL
+</span></span><span id="1464" class="l"><a href="#1464">1464: </a><span class="php-comment">     */</span>
+</span><span id="1465" class="l"><a href="#1465">1465: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1466" class="l"><a href="#1466">1466: </a>    {
+</span><span id="1467" class="l"><a href="#1467">1467: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1468" class="l"><a href="#1468">1468: </a>        {
+</span><span id="1469" class="l"><a href="#1469">1469: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
+</span><span id="1470" class="l"><a href="#1470">1470: </a>        }
+</span><span id="1471" class="l"><a href="#1471">1471: </a>
+</span><span id="1472" class="l"><a href="#1472">1472: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1473" class="l"><a href="#1473">1473: </a>    }
 </span><span id="1474" class="l"><a href="#1474">1474: </a>
-</span><span id="1475" class="l"><a href="#1475">1475: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1476" class="l"><a href="#1476">1476: </a>    }
-</span><span id="1477" class="l"><a href="#1477">1477: </a>
-</span><span id="1478" class="l"><a href="#1478">1478: </a>    <span class="php-comment">/**
-</span></span><span id="1479" class="l"><a href="#1479">1479: </a><span class="php-comment">     * Retrieve a value from a PATCH request
-</span></span><span id="1480" class="l"><a href="#1480">1480: </a><span class="php-comment">     *
-</span></span><span id="1481" class="l"><a href="#1481">1481: </a><span class="php-comment">     * @access public
-</span></span><span id="1482" class="l"><a href="#1482">1482: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
-</span></span><span id="1483" class="l"><a href="#1483">1483: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1484" class="l"><a href="#1484">1484: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1485" class="l"><a href="#1485">1485: </a><span class="php-comment">     * @return array|string|NULL Value from the PATCH request; otherwise, NULL
-</span></span><span id="1486" class="l"><a href="#1486">1486: </a><span class="php-comment">     */</span>
-</span><span id="1487" class="l"><a href="#1487">1487: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1488" class="l"><a href="#1488">1488: </a>    {
-</span><span id="1489" class="l"><a href="#1489">1489: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1490" class="l"><a href="#1490">1490: </a>        {
-</span><span id="1491" class="l"><a href="#1491">1491: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
-</span><span id="1492" class="l"><a href="#1492">1492: </a>        }
+</span><span id="1475" class="l"><a href="#1475">1475: </a>    <span class="php-comment">/**
+</span></span><span id="1476" class="l"><a href="#1476">1476: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
+</span></span><span id="1477" class="l"><a href="#1477">1477: </a><span class="php-comment">     *
+</span></span><span id="1478" class="l"><a href="#1478">1478: </a><span class="php-comment">     * @access public
+</span></span><span id="1479" class="l"><a href="#1479">1479: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
+</span></span><span id="1480" class="l"><a href="#1480">1480: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1481" class="l"><a href="#1481">1481: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1482" class="l"><a href="#1482">1482: </a><span class="php-comment">     * @return array|string|NULL Value from the OPTIONS request; otherwise, NULL
+</span></span><span id="1483" class="l"><a href="#1483">1483: </a><span class="php-comment">     */</span>
+</span><span id="1484" class="l"><a href="#1484">1484: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1485" class="l"><a href="#1485">1485: </a>    {
+</span><span id="1486" class="l"><a href="#1486">1486: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1487" class="l"><a href="#1487">1487: </a>        {
+</span><span id="1488" class="l"><a href="#1488">1488: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
+</span><span id="1489" class="l"><a href="#1489">1489: </a>        }
+</span><span id="1490" class="l"><a href="#1490">1490: </a>
+</span><span id="1491" class="l"><a href="#1491">1491: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1492" class="l"><a href="#1492">1492: </a>    }
 </span><span id="1493" class="l"><a href="#1493">1493: </a>
-</span><span id="1494" class="l"><a href="#1494">1494: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1495" class="l"><a href="#1495">1495: </a>    }
-</span><span id="1496" class="l"><a href="#1496">1496: </a>
-</span><span id="1497" class="l"><a href="#1497">1497: </a>    <span class="php-comment">/**
-</span></span><span id="1498" class="l"><a href="#1498">1498: </a><span class="php-comment">     * Retrieve a value from the query parameters
-</span></span><span id="1499" class="l"><a href="#1499">1499: </a><span class="php-comment">     *
-</span></span><span id="1500" class="l"><a href="#1500">1500: </a><span class="php-comment">     * @access public
-</span></span><span id="1501" class="l"><a href="#1501">1501: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
-</span></span><span id="1502" class="l"><a href="#1502">1502: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1503" class="l"><a href="#1503">1503: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1504" class="l"><a href="#1504">1504: </a><span class="php-comment">     * @return array|string|NULL Value from the query parameters; otherwise, NULL
-</span></span><span id="1505" class="l"><a href="#1505">1505: </a><span class="php-comment">     */</span>
-</span><span id="1506" class="l"><a href="#1506">1506: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1507" class="l"><a href="#1507">1507: </a>    {
-</span><span id="1508" class="l"><a href="#1508">1508: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1509" class="l"><a href="#1509">1509: </a>        {
-</span><span id="1510" class="l"><a href="#1510">1510: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
-</span><span id="1511" class="l"><a href="#1511">1511: </a>        }
+</span><span id="1494" class="l"><a href="#1494">1494: </a>    <span class="php-comment">/**
+</span></span><span id="1495" class="l"><a href="#1495">1495: </a><span class="php-comment">     * Retrieve a value from a HEAD request
+</span></span><span id="1496" class="l"><a href="#1496">1496: </a><span class="php-comment">     *
+</span></span><span id="1497" class="l"><a href="#1497">1497: </a><span class="php-comment">     * @access public
+</span></span><span id="1498" class="l"><a href="#1498">1498: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
+</span></span><span id="1499" class="l"><a href="#1499">1499: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1500" class="l"><a href="#1500">1500: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1501" class="l"><a href="#1501">1501: </a><span class="php-comment">     * @return array|string|NULL Value from the HEAD request; otherwise, NULL
+</span></span><span id="1502" class="l"><a href="#1502">1502: </a><span class="php-comment">     */</span>
+</span><span id="1503" class="l"><a href="#1503">1503: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1504" class="l"><a href="#1504">1504: </a>    {
+</span><span id="1505" class="l"><a href="#1505">1505: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1506" class="l"><a href="#1506">1506: </a>        {
+</span><span id="1507" class="l"><a href="#1507">1507: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;head_args;
+</span><span id="1508" class="l"><a href="#1508">1508: </a>        }
+</span><span id="1509" class="l"><a href="#1509">1509: </a>
+</span><span id="1510" class="l"><a href="#1510">1510: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1511" class="l"><a href="#1511">1511: </a>    }
 </span><span id="1512" class="l"><a href="#1512">1512: </a>
-</span><span id="1513" class="l"><a href="#1513">1513: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1514" class="l"><a href="#1514">1514: </a>    }
-</span><span id="1515" class="l"><a href="#1515">1515: </a>
-</span><span id="1516" class="l"><a href="#1516">1516: </a>    <span class="php-comment">/**
-</span></span><span id="1517" class="l"><a href="#1517">1517: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
-</span></span><span id="1518" class="l"><a href="#1518">1518: </a><span class="php-comment">     * prevented.
-</span></span><span id="1519" class="l"><a href="#1519">1519: </a><span class="php-comment">     *
-</span></span><span id="1520" class="l"><a href="#1520">1520: </a><span class="php-comment">     * @access protected
-</span></span><span id="1521" class="l"><a href="#1521">1521: </a><span class="php-comment">     * @param  string $value Input data
-</span></span><span id="1522" class="l"><a href="#1522">1522: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
-</span></span><span id="1523" class="l"><a href="#1523">1523: </a><span class="php-comment">     * @return string
-</span></span><span id="1524" class="l"><a href="#1524">1524: </a><span class="php-comment">     */</span>
-</span><span id="1525" class="l"><a href="#1525">1525: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
-</span><span id="1526" class="l"><a href="#1526">1526: </a>    {
-</span><span id="1527" class="l"><a href="#1527">1527: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) <span class="php-keyword1">OR</span> <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
+</span><span id="1513" class="l"><a href="#1513">1513: </a>    <span class="php-comment">/**
+</span></span><span id="1514" class="l"><a href="#1514">1514: </a><span class="php-comment">     * Retrieve a value from a POST request
+</span></span><span id="1515" class="l"><a href="#1515">1515: </a><span class="php-comment">     *
+</span></span><span id="1516" class="l"><a href="#1516">1516: </a><span class="php-comment">     * @access public
+</span></span><span id="1517" class="l"><a href="#1517">1517: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
+</span></span><span id="1518" class="l"><a href="#1518">1518: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1519" class="l"><a href="#1519">1519: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1520" class="l"><a href="#1520">1520: </a><span class="php-comment">     * @return array|string|NULL Value from the POST request; otherwise, NULL
+</span></span><span id="1521" class="l"><a href="#1521">1521: </a><span class="php-comment">     */</span>
+</span><span id="1522" class="l"><a href="#1522">1522: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1523" class="l"><a href="#1523">1523: </a>    {
+</span><span id="1524" class="l"><a href="#1524">1524: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1525" class="l"><a href="#1525">1525: </a>        {
+</span><span id="1526" class="l"><a href="#1526">1526: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
+</span><span id="1527" class="l"><a href="#1527">1527: </a>        }
 </span><span id="1528" class="l"><a href="#1528">1528: </a>
-</span><span id="1529" class="l"><a href="#1529">1529: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
+</span><span id="1529" class="l"><a href="#1529">1529: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
 </span><span id="1530" class="l"><a href="#1530">1530: </a>    }
 </span><span id="1531" class="l"><a href="#1531">1531: </a>
 </span><span id="1532" class="l"><a href="#1532">1532: </a>    <span class="php-comment">/**
-</span></span><span id="1533" class="l"><a href="#1533">1533: </a><span class="php-comment">     * Retrieve the validation errors
+</span></span><span id="1533" class="l"><a href="#1533">1533: </a><span class="php-comment">     * Retrieve a value from a PUT request
 </span></span><span id="1534" class="l"><a href="#1534">1534: </a><span class="php-comment">     *
 </span></span><span id="1535" class="l"><a href="#1535">1535: </a><span class="php-comment">     * @access public
-</span></span><span id="1536" class="l"><a href="#1536">1536: </a><span class="php-comment">     * @return array
-</span></span><span id="1537" class="l"><a href="#1537">1537: </a><span class="php-comment">     */</span>
-</span><span id="1538" class="l"><a href="#1538">1538: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
-</span><span id="1539" class="l"><a href="#1539">1539: </a>    {
-</span><span id="1540" class="l"><a href="#1540">1540: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
-</span><span id="1541" class="l"><a href="#1541">1541: </a>
-</span><span id="1542" class="l"><a href="#1542">1542: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
-</span><span id="1543" class="l"><a href="#1543">1543: </a>    }
-</span><span id="1544" class="l"><a href="#1544">1544: </a>
-</span><span id="1545" class="l"><a href="#1545">1545: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
-</span><span id="1546" class="l"><a href="#1546">1546: </a>
-</span><span id="1547" class="l"><a href="#1547">1547: </a>    <span class="php-comment">/**
-</span></span><span id="1548" class="l"><a href="#1548">1548: </a><span class="php-comment">     * Perform LDAP Authentication
-</span></span><span id="1549" class="l"><a href="#1549">1549: </a><span class="php-comment">     *
-</span></span><span id="1550" class="l"><a href="#1550">1550: </a><span class="php-comment">     * @access protected
-</span></span><span id="1551" class="l"><a href="#1551">1551: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1552" class="l"><a href="#1552">1552: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1553" class="l"><a href="#1553">1553: </a><span class="php-comment">     * @return bool
-</span></span><span id="1554" class="l"><a href="#1554">1554: </a><span class="php-comment">     */</span>
-</span><span id="1555" class="l"><a href="#1555">1555: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1556" class="l"><a href="#1556">1556: </a>    {
-</span><span id="1557" class="l"><a href="#1557">1557: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1558" class="l"><a href="#1558">1558: </a>        {
-</span><span id="1559" class="l"><a href="#1559">1559: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
-</span><span id="1560" class="l"><a href="#1560">1560: </a>
-</span><span id="1561" class="l"><a href="#1561">1561: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1562" class="l"><a href="#1562">1562: </a>        }
-</span><span id="1563" class="l"><a href="#1563">1563: </a>
-</span><span id="1564" class="l"><a href="#1564">1564: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading Config'</span>);
-</span><span id="1565" class="l"><a href="#1565">1565: </a>
-</span><span id="1566" class="l"><a href="#1566">1566: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="1567" class="l"><a href="#1567">1567: </a>
-</span><span id="1568" class="l"><a href="#1568">1568: </a>        <span class="php-var">$ldap</span> = [
-</span><span id="1569" class="l"><a href="#1569">1569: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1570" class="l"><a href="#1570">1570: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1571" class="l"><a href="#1571">1571: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1572" class="l"><a href="#1572">1572: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1573" class="l"><a href="#1573">1573: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1574" class="l"><a href="#1574">1574: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1575" class="l"><a href="#1575">1575: </a>        ];
-</span><span id="1576" class="l"><a href="#1576">1576: </a>
-</span><span id="1577" class="l"><a href="#1577">1577: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
-</span><span id="1578" class="l"><a href="#1578">1578: </a>
-</span><span id="1579" class="l"><a href="#1579">1579: </a>        <span class="php-comment">// Appears to be unused</span>
-</span><span id="1580" class="l"><a href="#1580">1580: </a>        <span class="php-comment">// $ldapconfig['authrealm'] = $this-&gt;config-&gt;item('domain', 'ldap');</span>
-</span><span id="1581" class="l"><a href="#1581">1581: </a>
-</span><span id="1582" class="l"><a href="#1582">1582: </a>        <span class="php-comment">// connect to ldap server</span>
-</span><span id="1583" class="l"><a href="#1583">1583: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
-</span><span id="1584" class="l"><a href="#1584">1584: </a>
-</span><span id="1585" class="l"><a href="#1585">1585: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
-</span><span id="1586" class="l"><a href="#1586">1586: </a>        {
-</span><span id="1587" class="l"><a href="#1587">1587: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>] . <span class="php-quote">' seconds'</span>);
+</span></span><span id="1536" class="l"><a href="#1536">1536: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
+</span></span><span id="1537" class="l"><a href="#1537">1537: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1538" class="l"><a href="#1538">1538: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1539" class="l"><a href="#1539">1539: </a><span class="php-comment">     * @return array|string|NULL Value from the PUT request; otherwise, NULL
+</span></span><span id="1540" class="l"><a href="#1540">1540: </a><span class="php-comment">     */</span>
+</span><span id="1541" class="l"><a href="#1541">1541: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1542" class="l"><a href="#1542">1542: </a>    {
+</span><span id="1543" class="l"><a href="#1543">1543: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1544" class="l"><a href="#1544">1544: </a>        {
+</span><span id="1545" class="l"><a href="#1545">1545: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
+</span><span id="1546" class="l"><a href="#1546">1546: </a>        }
+</span><span id="1547" class="l"><a href="#1547">1547: </a>
+</span><span id="1548" class="l"><a href="#1548">1548: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1549" class="l"><a href="#1549">1549: </a>    }
+</span><span id="1550" class="l"><a href="#1550">1550: </a>
+</span><span id="1551" class="l"><a href="#1551">1551: </a>    <span class="php-comment">/**
+</span></span><span id="1552" class="l"><a href="#1552">1552: </a><span class="php-comment">     * Retrieve a value from a DELETE request
+</span></span><span id="1553" class="l"><a href="#1553">1553: </a><span class="php-comment">     *
+</span></span><span id="1554" class="l"><a href="#1554">1554: </a><span class="php-comment">     * @access public
+</span></span><span id="1555" class="l"><a href="#1555">1555: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
+</span></span><span id="1556" class="l"><a href="#1556">1556: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1557" class="l"><a href="#1557">1557: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1558" class="l"><a href="#1558">1558: </a><span class="php-comment">     * @return array|string|NULL Value from the DELETE request; otherwise, NULL
+</span></span><span id="1559" class="l"><a href="#1559">1559: </a><span class="php-comment">     */</span>
+</span><span id="1560" class="l"><a href="#1560">1560: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1561" class="l"><a href="#1561">1561: </a>    {
+</span><span id="1562" class="l"><a href="#1562">1562: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1563" class="l"><a href="#1563">1563: </a>        {
+</span><span id="1564" class="l"><a href="#1564">1564: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
+</span><span id="1565" class="l"><a href="#1565">1565: </a>        }
+</span><span id="1566" class="l"><a href="#1566">1566: </a>
+</span><span id="1567" class="l"><a href="#1567">1567: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1568" class="l"><a href="#1568">1568: </a>    }
+</span><span id="1569" class="l"><a href="#1569">1569: </a>
+</span><span id="1570" class="l"><a href="#1570">1570: </a>    <span class="php-comment">/**
+</span></span><span id="1571" class="l"><a href="#1571">1571: </a><span class="php-comment">     * Retrieve a value from a PATCH request
+</span></span><span id="1572" class="l"><a href="#1572">1572: </a><span class="php-comment">     *
+</span></span><span id="1573" class="l"><a href="#1573">1573: </a><span class="php-comment">     * @access public
+</span></span><span id="1574" class="l"><a href="#1574">1574: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
+</span></span><span id="1575" class="l"><a href="#1575">1575: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1576" class="l"><a href="#1576">1576: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1577" class="l"><a href="#1577">1577: </a><span class="php-comment">     * @return array|string|NULL Value from the PATCH request; otherwise, NULL
+</span></span><span id="1578" class="l"><a href="#1578">1578: </a><span class="php-comment">     */</span>
+</span><span id="1579" class="l"><a href="#1579">1579: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1580" class="l"><a href="#1580">1580: </a>    {
+</span><span id="1581" class="l"><a href="#1581">1581: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1582" class="l"><a href="#1582">1582: </a>        {
+</span><span id="1583" class="l"><a href="#1583">1583: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
+</span><span id="1584" class="l"><a href="#1584">1584: </a>        }
+</span><span id="1585" class="l"><a href="#1585">1585: </a>
+</span><span id="1586" class="l"><a href="#1586">1586: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1587" class="l"><a href="#1587">1587: </a>    }
 </span><span id="1588" class="l"><a href="#1588">1588: </a>
-</span><span id="1589" class="l"><a href="#1589">1589: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
-</span><span id="1590" class="l"><a href="#1590">1590: </a>
-</span><span id="1591" class="l"><a href="#1591">1591: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>] . <span class="php-quote">' with dn '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
-</span><span id="1592" class="l"><a href="#1592">1592: </a>
-</span><span id="1593" class="l"><a href="#1593">1593: </a>            <span class="php-comment">// binding to ldap server</span>
-</span><span id="1594" class="l"><a href="#1594">1594: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
-</span><span id="1595" class="l"><a href="#1595">1595: </a>
-</span><span id="1596" class="l"><a href="#1596">1596: </a>            <span class="php-comment">// verify binding</span>
-</span><span id="1597" class="l"><a href="#1597">1597: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span>)
-</span><span id="1598" class="l"><a href="#1598">1598: </a>            {
-</span><span id="1599" class="l"><a href="#1599">1599: </a>                log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
-</span><span id="1600" class="l"><a href="#1600">1600: </a>            }
-</span><span id="1601" class="l"><a href="#1601">1601: </a>            <span class="php-keyword1">else</span>
-</span><span id="1602" class="l"><a href="#1602">1602: </a>            {
-</span><span id="1603" class="l"><a href="#1603">1603: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind unsuccessful'</span>);
+</span><span id="1589" class="l"><a href="#1589">1589: </a>    <span class="php-comment">/**
+</span></span><span id="1590" class="l"><a href="#1590">1590: </a><span class="php-comment">     * Retrieve a value from the query parameters
+</span></span><span id="1591" class="l"><a href="#1591">1591: </a><span class="php-comment">     *
+</span></span><span id="1592" class="l"><a href="#1592">1592: </a><span class="php-comment">     * @access public
+</span></span><span id="1593" class="l"><a href="#1593">1593: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
+</span></span><span id="1594" class="l"><a href="#1594">1594: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1595" class="l"><a href="#1595">1595: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1596" class="l"><a href="#1596">1596: </a><span class="php-comment">     * @return array|string|NULL Value from the query parameters; otherwise, NULL
+</span></span><span id="1597" class="l"><a href="#1597">1597: </a><span class="php-comment">     */</span>
+</span><span id="1598" class="l"><a href="#1598">1598: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1599" class="l"><a href="#1599">1599: </a>    {
+</span><span id="1600" class="l"><a href="#1600">1600: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1601" class="l"><a href="#1601">1601: </a>        {
+</span><span id="1602" class="l"><a href="#1602">1602: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
+</span><span id="1603" class="l"><a href="#1603">1603: </a>        }
 </span><span id="1604" class="l"><a href="#1604">1604: </a>
-</span><span id="1605" class="l"><a href="#1605">1605: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1606" class="l"><a href="#1606">1606: </a>            }
-</span><span id="1607" class="l"><a href="#1607">1607: </a>        }
-</span><span id="1608" class="l"><a href="#1608">1608: </a>
-</span><span id="1609" class="l"><a href="#1609">1609: </a>        <span class="php-comment">// search for user</span>
-</span><span id="1610" class="l"><a href="#1610">1610: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) == <span class="php-keyword1">FALSE</span>)
-</span><span id="1611" class="l"><a href="#1611">1611: </a>        {
-</span><span id="1612" class="l"><a href="#1612">1612: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span> . <span class="php-var">$username</span> . <span class="php-quote">' not found in search'</span>);
-</span><span id="1613" class="l"><a href="#1613">1613: </a>
-</span><span id="1614" class="l"><a href="#1614">1614: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1615" class="l"><a href="#1615">1615: </a>        }
-</span><span id="1616" class="l"><a href="#1616">1616: </a>
-</span><span id="1617" class="l"><a href="#1617">1617: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
-</span><span id="1618" class="l"><a href="#1618">1618: </a>        {
-</span><span id="1619" class="l"><a href="#1619">1619: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username '</span> . <span class="php-var">$username</span> . <span class="php-quote">'found more than once'</span>);
+</span><span id="1605" class="l"><a href="#1605">1605: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1606" class="l"><a href="#1606">1606: </a>    }
+</span><span id="1607" class="l"><a href="#1607">1607: </a>
+</span><span id="1608" class="l"><a href="#1608">1608: </a>    <span class="php-comment">/**
+</span></span><span id="1609" class="l"><a href="#1609">1609: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
+</span></span><span id="1610" class="l"><a href="#1610">1610: </a><span class="php-comment">     * prevented.
+</span></span><span id="1611" class="l"><a href="#1611">1611: </a><span class="php-comment">     *
+</span></span><span id="1612" class="l"><a href="#1612">1612: </a><span class="php-comment">     * @access protected
+</span></span><span id="1613" class="l"><a href="#1613">1613: </a><span class="php-comment">     * @param  string $value Input data
+</span></span><span id="1614" class="l"><a href="#1614">1614: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
+</span></span><span id="1615" class="l"><a href="#1615">1615: </a><span class="php-comment">     * @return string
+</span></span><span id="1616" class="l"><a href="#1616">1616: </a><span class="php-comment">     */</span>
+</span><span id="1617" class="l"><a href="#1617">1617: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
+</span><span id="1618" class="l"><a href="#1618">1618: </a>    {
+</span><span id="1619" class="l"><a href="#1619">1619: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) || <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
 </span><span id="1620" class="l"><a href="#1620">1620: </a>
-</span><span id="1621" class="l"><a href="#1621">1621: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1622" class="l"><a href="#1622">1622: </a>        }
+</span><span id="1621" class="l"><a href="#1621">1621: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
+</span><span id="1622" class="l"><a href="#1622">1622: </a>    }
 </span><span id="1623" class="l"><a href="#1623">1623: </a>
-</span><span id="1624" class="l"><a href="#1624">1624: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) == <span class="php-keyword1">FALSE</span>)
-</span><span id="1625" class="l"><a href="#1625">1625: </a>        {
-</span><span id="1626" class="l"><a href="#1626">1626: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, entry of searchresult could not be fetched'</span>);
-</span><span id="1627" class="l"><a href="#1627">1627: </a>
-</span><span id="1628" class="l"><a href="#1628">1628: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1629" class="l"><a href="#1629">1629: </a>        }
-</span><span id="1630" class="l"><a href="#1630">1630: </a>
-</span><span id="1631" class="l"><a href="#1631">1631: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) == <span class="php-keyword1">FALSE</span>)
-</span><span id="1632" class="l"><a href="#1632">1632: </a>        {
-</span><span id="1633" class="l"><a href="#1633">1633: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, user-dn could not be fetched'</span>);
-</span><span id="1634" class="l"><a href="#1634">1634: </a>
-</span><span id="1635" class="l"><a href="#1635">1635: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1636" class="l"><a href="#1636">1636: </a>        }
-</span><span id="1637" class="l"><a href="#1637">1637: </a>
-</span><span id="1638" class="l"><a href="#1638">1638: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
-</span><span id="1639" class="l"><a href="#1639">1639: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) == <span class="php-keyword1">FALSE</span>)
-</span><span id="1640" class="l"><a href="#1640">1640: </a>        {
-</span><span id="1641" class="l"><a href="#1641">1641: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
-</span><span id="1642" class="l"><a href="#1642">1642: </a>
-</span><span id="1643" class="l"><a href="#1643">1643: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1644" class="l"><a href="#1644">1644: </a>        }
-</span><span id="1645" class="l"><a href="#1645">1645: </a>
-</span><span id="1646" class="l"><a href="#1646">1646: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span> . <span class="php-var">$user_dn</span> . <span class="php-quote">' authenticated successfully'</span>);
-</span><span id="1647" class="l"><a href="#1647">1647: </a>
-</span><span id="1648" class="l"><a href="#1648">1648: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
-</span><span id="1649" class="l"><a href="#1649">1649: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
-</span><span id="1650" class="l"><a href="#1650">1650: </a>
-</span><span id="1651" class="l"><a href="#1651">1651: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1652" class="l"><a href="#1652">1652: </a>    }
-</span><span id="1653" class="l"><a href="#1653">1653: </a>
-</span><span id="1654" class="l"><a href="#1654">1654: </a>    <span class="php-comment">/**
-</span></span><span id="1655" class="l"><a href="#1655">1655: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
-</span></span><span id="1656" class="l"><a href="#1656">1656: </a><span class="php-comment">     *
-</span></span><span id="1657" class="l"><a href="#1657">1657: </a><span class="php-comment">     * @access protected
-</span></span><span id="1658" class="l"><a href="#1658">1658: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1659" class="l"><a href="#1659">1659: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1660" class="l"><a href="#1660">1660: </a><span class="php-comment">     * @return bool
-</span></span><span id="1661" class="l"><a href="#1661">1661: </a><span class="php-comment">     */</span>
-</span><span id="1662" class="l"><a href="#1662">1662: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1663" class="l"><a href="#1663">1663: </a>    {
-</span><span id="1664" class="l"><a href="#1664">1664: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1665" class="l"><a href="#1665">1665: </a>        {
-</span><span id="1666" class="l"><a href="#1666">1666: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: failure, empty username'</span>);
+</span><span id="1624" class="l"><a href="#1624">1624: </a>    <span class="php-comment">/**
+</span></span><span id="1625" class="l"><a href="#1625">1625: </a><span class="php-comment">     * Retrieve the validation errors
+</span></span><span id="1626" class="l"><a href="#1626">1626: </a><span class="php-comment">     *
+</span></span><span id="1627" class="l"><a href="#1627">1627: </a><span class="php-comment">     * @access public
+</span></span><span id="1628" class="l"><a href="#1628">1628: </a><span class="php-comment">     * @return array
+</span></span><span id="1629" class="l"><a href="#1629">1629: </a><span class="php-comment">     */</span>
+</span><span id="1630" class="l"><a href="#1630">1630: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
+</span><span id="1631" class="l"><a href="#1631">1631: </a>    {
+</span><span id="1632" class="l"><a href="#1632">1632: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
+</span><span id="1633" class="l"><a href="#1633">1633: </a>
+</span><span id="1634" class="l"><a href="#1634">1634: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
+</span><span id="1635" class="l"><a href="#1635">1635: </a>    }
+</span><span id="1636" class="l"><a href="#1636">1636: </a>
+</span><span id="1637" class="l"><a href="#1637">1637: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
+</span><span id="1638" class="l"><a href="#1638">1638: </a>
+</span><span id="1639" class="l"><a href="#1639">1639: </a>    <span class="php-comment">/**
+</span></span><span id="1640" class="l"><a href="#1640">1640: </a><span class="php-comment">     * Perform LDAP Authentication
+</span></span><span id="1641" class="l"><a href="#1641">1641: </a><span class="php-comment">     *
+</span></span><span id="1642" class="l"><a href="#1642">1642: </a><span class="php-comment">     * @access protected
+</span></span><span id="1643" class="l"><a href="#1643">1643: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1644" class="l"><a href="#1644">1644: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1645" class="l"><a href="#1645">1645: </a><span class="php-comment">     * @return bool
+</span></span><span id="1646" class="l"><a href="#1646">1646: </a><span class="php-comment">     */</span>
+</span><span id="1647" class="l"><a href="#1647">1647: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1648" class="l"><a href="#1648">1648: </a>    {
+</span><span id="1649" class="l"><a href="#1649">1649: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1650" class="l"><a href="#1650">1650: </a>        {
+</span><span id="1651" class="l"><a href="#1651">1651: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
+</span><span id="1652" class="l"><a href="#1652">1652: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1653" class="l"><a href="#1653">1653: </a>        }
+</span><span id="1654" class="l"><a href="#1654">1654: </a>
+</span><span id="1655" class="l"><a href="#1655">1655: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading configuration'</span>);
+</span><span id="1656" class="l"><a href="#1656">1656: </a>
+</span><span id="1657" class="l"><a href="#1657">1657: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="1658" class="l"><a href="#1658">1658: </a>
+</span><span id="1659" class="l"><a href="#1659">1659: </a>        <span class="php-var">$ldap</span> = [
+</span><span id="1660" class="l"><a href="#1660">1660: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1661" class="l"><a href="#1661">1661: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1662" class="l"><a href="#1662">1662: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1663" class="l"><a href="#1663">1663: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1664" class="l"><a href="#1664">1664: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1665" class="l"><a href="#1665">1665: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1666" class="l"><a href="#1666">1666: </a>        ];
 </span><span id="1667" class="l"><a href="#1667">1667: </a>
-</span><span id="1668" class="l"><a href="#1668">1668: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1669" class="l"><a href="#1669">1669: </a>        }
-</span><span id="1670" class="l"><a href="#1670">1670: </a>
-</span><span id="1671" class="l"><a href="#1671">1671: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
-</span><span id="1672" class="l"><a href="#1672">1672: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
-</span><span id="1673" class="l"><a href="#1673">1673: </a>
-</span><span id="1674" class="l"><a href="#1674">1674: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
-</span><span id="1675" class="l"><a href="#1675">1675: </a>        {
-</span><span id="1676" class="l"><a href="#1676">1676: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_class'</span>);
+</span><span id="1668" class="l"><a href="#1668">1668: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
+</span><span id="1669" class="l"><a href="#1669">1669: </a>
+</span><span id="1670" class="l"><a href="#1670">1670: </a>        <span class="php-comment">// Connect to the ldap server</span>
+</span><span id="1671" class="l"><a href="#1671">1671: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
+</span><span id="1672" class="l"><a href="#1672">1672: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
+</span><span id="1673" class="l"><a href="#1673">1673: </a>        {
+</span><span id="1674" class="l"><a href="#1674">1674: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>] . <span class="php-quote">' seconds'</span>);
+</span><span id="1675" class="l"><a href="#1675">1675: </a>
+</span><span id="1676" class="l"><a href="#1676">1676: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
 </span><span id="1677" class="l"><a href="#1677">1677: </a>
-</span><span id="1678" class="l"><a href="#1678">1678: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1679" class="l"><a href="#1679">1679: </a>        }
-</span><span id="1680" class="l"><a href="#1680">1680: </a>
-</span><span id="1681" class="l"><a href="#1681">1681: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
-</span><span id="1682" class="l"><a href="#1682">1682: </a>        {
-</span><span id="1683" class="l"><a href="#1683">1683: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: failure, empty auth_library_function'</span>);
-</span><span id="1684" class="l"><a href="#1684">1684: </a>
-</span><span id="1685" class="l"><a href="#1685">1685: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1686" class="l"><a href="#1686">1686: </a>        }
-</span><span id="1687" class="l"><a href="#1687">1687: </a>
-</span><span id="1688" class="l"><a href="#1688">1688: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1689" class="l"><a href="#1689">1689: </a>        {
-</span><span id="1690" class="l"><a href="#1690">1690: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
+</span><span id="1678" class="l"><a href="#1678">1678: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>] . <span class="php-quote">' with dn '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
+</span><span id="1679" class="l"><a href="#1679">1679: </a>
+</span><span id="1680" class="l"><a href="#1680">1680: </a>            <span class="php-comment">// Binding to the ldap server</span>
+</span><span id="1681" class="l"><a href="#1681">1681: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
+</span><span id="1682" class="l"><a href="#1682">1682: </a>
+</span><span id="1683" class="l"><a href="#1683">1683: </a>            <span class="php-comment">// Verify the binding</span>
+</span><span id="1684" class="l"><a href="#1684">1684: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1685" class="l"><a href="#1685">1685: </a>            {
+</span><span id="1686" class="l"><a href="#1686">1686: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind was unsuccessful'</span>);
+</span><span id="1687" class="l"><a href="#1687">1687: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1688" class="l"><a href="#1688">1688: </a>            }
+</span><span id="1689" class="l"><a href="#1689">1689: </a>
+</span><span id="1690" class="l"><a href="#1690">1690: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
 </span><span id="1691" class="l"><a href="#1691">1691: </a>        }
 </span><span id="1692" class="l"><a href="#1692">1692: </a>
-</span><span id="1693" class="l"><a href="#1693">1693: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1694" class="l"><a href="#1694">1694: </a>    }
-</span><span id="1695" class="l"><a href="#1695">1695: </a>
-</span><span id="1696" class="l"><a href="#1696">1696: </a>    <span class="php-comment">/**
-</span></span><span id="1697" class="l"><a href="#1697">1697: </a><span class="php-comment">     * Check if the user is logged in
-</span></span><span id="1698" class="l"><a href="#1698">1698: </a><span class="php-comment">     *
-</span></span><span id="1699" class="l"><a href="#1699">1699: </a><span class="php-comment">     * @access protected
-</span></span><span id="1700" class="l"><a href="#1700">1700: </a><span class="php-comment">     * @param  string $username The user's name
-</span></span><span id="1701" class="l"><a href="#1701">1701: </a><span class="php-comment">     * @param  bool|string $password The user's password
-</span></span><span id="1702" class="l"><a href="#1702">1702: </a><span class="php-comment">     * @return bool
-</span></span><span id="1703" class="l"><a href="#1703">1703: </a><span class="php-comment">     */</span>
-</span><span id="1704" class="l"><a href="#1704">1704: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1705" class="l"><a href="#1705">1705: </a>    {
-</span><span id="1706" class="l"><a href="#1706">1706: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1693" class="l"><a href="#1693">1693: </a>        <span class="php-comment">// Search for user</span>
+</span><span id="1694" class="l"><a href="#1694">1694: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1695" class="l"><a href="#1695">1695: </a>        {
+</span><span id="1696" class="l"><a href="#1696">1696: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span> . <span class="php-var">$username</span> . <span class="php-quote">' not found in search'</span>);
+</span><span id="1697" class="l"><a href="#1697">1697: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1698" class="l"><a href="#1698">1698: </a>        }
+</span><span id="1699" class="l"><a href="#1699">1699: </a>
+</span><span id="1700" class="l"><a href="#1700">1700: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
+</span><span id="1701" class="l"><a href="#1701">1701: </a>        {
+</span><span id="1702" class="l"><a href="#1702">1702: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username '</span> . <span class="php-var">$username</span> . <span class="php-quote">'found more than once'</span>);
+</span><span id="1703" class="l"><a href="#1703">1703: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1704" class="l"><a href="#1704">1704: </a>        }
+</span><span id="1705" class="l"><a href="#1705">1705: </a>
+</span><span id="1706" class="l"><a href="#1706">1706: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) === <span class="php-keyword1">FALSE</span>)
 </span><span id="1707" class="l"><a href="#1707">1707: </a>        {
-</span><span id="1708" class="l"><a href="#1708">1708: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1709" class="l"><a href="#1709">1709: </a>        }
-</span><span id="1710" class="l"><a href="#1710">1710: </a>
-</span><span id="1711" class="l"><a href="#1711">1711: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
-</span><span id="1712" class="l"><a href="#1712">1712: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="1713" class="l"><a href="#1713">1713: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
-</span><span id="1714" class="l"><a href="#1714">1714: </a>
-</span><span id="1715" class="l"><a href="#1715">1715: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
-</span><span id="1716" class="l"><a href="#1716">1716: </a>        {
-</span><span id="1717" class="l"><a href="#1717">1717: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
-</span><span id="1718" class="l"><a href="#1718">1718: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>) . <span class="php-quote">':'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
-</span><span id="1719" class="l"><a href="#1719">1719: </a>        }
-</span><span id="1720" class="l"><a href="#1720">1720: </a>
-</span><span id="1721" class="l"><a href="#1721">1721: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1722" class="l"><a href="#1722">1722: </a>        {
-</span><span id="1723" class="l"><a href="#1723">1723: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1724" class="l"><a href="#1724">1724: </a>        }
-</span><span id="1725" class="l"><a href="#1725">1725: </a>
-</span><span id="1726" class="l"><a href="#1726">1726: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
-</span><span id="1727" class="l"><a href="#1727">1727: </a>        {
-</span><span id="1728" class="l"><a href="#1728">1728: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
-</span><span id="1729" class="l"><a href="#1729">1729: </a>
-</span><span id="1730" class="l"><a href="#1730">1730: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1731" class="l"><a href="#1731">1731: </a>        }
-</span><span id="1732" class="l"><a href="#1732">1732: </a>
-</span><span id="1733" class="l"><a href="#1733">1733: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
-</span><span id="1734" class="l"><a href="#1734">1734: </a>        {
-</span><span id="1735" class="l"><a href="#1735">1735: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
-</span><span id="1736" class="l"><a href="#1736">1736: </a>
-</span><span id="1737" class="l"><a href="#1737">1737: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1738" class="l"><a href="#1738">1738: </a>        }
-</span><span id="1739" class="l"><a href="#1739">1739: </a>
-</span><span id="1740" class="l"><a href="#1740">1740: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1741" class="l"><a href="#1741">1741: </a>        {
-</span><span id="1742" class="l"><a href="#1742">1742: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1743" class="l"><a href="#1743">1743: </a>        }
-</span><span id="1744" class="l"><a href="#1744">1744: </a>
-</span><span id="1745" class="l"><a href="#1745">1745: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
-</span><span id="1746" class="l"><a href="#1746">1746: </a>        {
+</span><span id="1708" class="l"><a href="#1708">1708: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, entry of search result could not be fetched'</span>);
+</span><span id="1709" class="l"><a href="#1709">1709: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1710" class="l"><a href="#1710">1710: </a>        }
+</span><span id="1711" class="l"><a href="#1711">1711: </a>
+</span><span id="1712" class="l"><a href="#1712">1712: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1713" class="l"><a href="#1713">1713: </a>        {
+</span><span id="1714" class="l"><a href="#1714">1714: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, user-dn could not be fetched'</span>);
+</span><span id="1715" class="l"><a href="#1715">1715: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1716" class="l"><a href="#1716">1716: </a>        }
+</span><span id="1717" class="l"><a href="#1717">1717: </a>
+</span><span id="1718" class="l"><a href="#1718">1718: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
+</span><span id="1719" class="l"><a href="#1719">1719: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1720" class="l"><a href="#1720">1720: </a>        {
+</span><span id="1721" class="l"><a href="#1721">1721: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
+</span><span id="1722" class="l"><a href="#1722">1722: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1723" class="l"><a href="#1723">1723: </a>        }
+</span><span id="1724" class="l"><a href="#1724">1724: </a>
+</span><span id="1725" class="l"><a href="#1725">1725: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span> . <span class="php-var">$user_dn</span> . <span class="php-quote">' authenticated successfully'</span>);
+</span><span id="1726" class="l"><a href="#1726">1726: </a>
+</span><span id="1727" class="l"><a href="#1727">1727: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
+</span><span id="1728" class="l"><a href="#1728">1728: </a>
+</span><span id="1729" class="l"><a href="#1729">1729: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
+</span><span id="1730" class="l"><a href="#1730">1730: </a>
+</span><span id="1731" class="l"><a href="#1731">1731: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1732" class="l"><a href="#1732">1732: </a>    }
+</span><span id="1733" class="l"><a href="#1733">1733: </a>
+</span><span id="1734" class="l"><a href="#1734">1734: </a>    <span class="php-comment">/**
+</span></span><span id="1735" class="l"><a href="#1735">1735: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
+</span></span><span id="1736" class="l"><a href="#1736">1736: </a><span class="php-comment">     *
+</span></span><span id="1737" class="l"><a href="#1737">1737: </a><span class="php-comment">     * @access protected
+</span></span><span id="1738" class="l"><a href="#1738">1738: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1739" class="l"><a href="#1739">1739: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1740" class="l"><a href="#1740">1740: </a><span class="php-comment">     * @return bool
+</span></span><span id="1741" class="l"><a href="#1741">1741: </a><span class="php-comment">     */</span>
+</span><span id="1742" class="l"><a href="#1742">1742: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1743" class="l"><a href="#1743">1743: </a>    {
+</span><span id="1744" class="l"><a href="#1744">1744: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1745" class="l"><a href="#1745">1745: </a>        {
+</span><span id="1746" class="l"><a href="#1746">1746: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: Failure, empty username'</span>);
 </span><span id="1747" class="l"><a href="#1747">1747: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
 </span><span id="1748" class="l"><a href="#1748">1748: </a>        }
 </span><span id="1749" class="l"><a href="#1749">1749: </a>
-</span><span id="1750" class="l"><a href="#1750">1750: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1751" class="l"><a href="#1751">1751: </a>    }
+</span><span id="1750" class="l"><a href="#1750">1750: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
+</span><span id="1751" class="l"><a href="#1751">1751: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
 </span><span id="1752" class="l"><a href="#1752">1752: </a>
-</span><span id="1753" class="l"><a href="#1753">1753: </a>    <span class="php-comment">/**
-</span></span><span id="1754" class="l"><a href="#1754">1754: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
-</span></span><span id="1755" class="l"><a href="#1755">1755: </a><span class="php-comment">     *
-</span></span><span id="1756" class="l"><a href="#1756">1756: </a><span class="php-comment">     * @access protected
-</span></span><span id="1757" class="l"><a href="#1757">1757: </a><span class="php-comment">     * @return void
-</span></span><span id="1758" class="l"><a href="#1758">1758: </a><span class="php-comment">     */</span>
-</span><span id="1759" class="l"><a href="#1759">1759: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
-</span><span id="1760" class="l"><a href="#1760">1760: </a>    {
-</span><span id="1761" class="l"><a href="#1761">1761: </a>        <span class="php-comment">// Get the auth_source config item</span>
-</span><span id="1762" class="l"><a href="#1762">1762: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
-</span><span id="1763" class="l"><a href="#1763">1763: </a>
-</span><span id="1764" class="l"><a href="#1764">1764: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
-</span><span id="1765" class="l"><a href="#1765">1765: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
+</span><span id="1753" class="l"><a href="#1753">1753: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
+</span><span id="1754" class="l"><a href="#1754">1754: </a>        {
+</span><span id="1755" class="l"><a href="#1755">1755: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_class'</span>);
+</span><span id="1756" class="l"><a href="#1756">1756: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1757" class="l"><a href="#1757">1757: </a>        }
+</span><span id="1758" class="l"><a href="#1758">1758: </a>
+</span><span id="1759" class="l"><a href="#1759">1759: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
+</span><span id="1760" class="l"><a href="#1760">1760: </a>        {
+</span><span id="1761" class="l"><a href="#1761">1761: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_function'</span>);
+</span><span id="1762" class="l"><a href="#1762">1762: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1763" class="l"><a href="#1763">1763: </a>        }
+</span><span id="1764" class="l"><a href="#1764">1764: </a>
+</span><span id="1765" class="l"><a href="#1765">1765: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
 </span><span id="1766" class="l"><a href="#1766">1766: </a>        {
-</span><span id="1767" class="l"><a href="#1767">1767: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1768" class="l"><a href="#1768">1768: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1769" class="l"><a href="#1769">1769: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1770" class="l"><a href="#1770">1770: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not Authorized'</span>
-</span><span id="1771" class="l"><a href="#1771">1771: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="1772" class="l"><a href="#1772">1772: </a>        }
-</span><span id="1773" class="l"><a href="#1773">1773: </a>    }
-</span><span id="1774" class="l"><a href="#1774">1774: </a>
-</span><span id="1775" class="l"><a href="#1775">1775: </a>    <span class="php-comment">/**
-</span></span><span id="1776" class="l"><a href="#1776">1776: </a><span class="php-comment">     * Prepares for basic authentication
-</span></span><span id="1777" class="l"><a href="#1777">1777: </a><span class="php-comment">     *
-</span></span><span id="1778" class="l"><a href="#1778">1778: </a><span class="php-comment">     * @access protected
-</span></span><span id="1779" class="l"><a href="#1779">1779: </a><span class="php-comment">     * @return void
+</span><span id="1767" class="l"><a href="#1767">1767: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
+</span><span id="1768" class="l"><a href="#1768">1768: </a>        }
+</span><span id="1769" class="l"><a href="#1769">1769: </a>
+</span><span id="1770" class="l"><a href="#1770">1770: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1771" class="l"><a href="#1771">1771: </a>    }
+</span><span id="1772" class="l"><a href="#1772">1772: </a>
+</span><span id="1773" class="l"><a href="#1773">1773: </a>    <span class="php-comment">/**
+</span></span><span id="1774" class="l"><a href="#1774">1774: </a><span class="php-comment">     * Check if the user is logged in
+</span></span><span id="1775" class="l"><a href="#1775">1775: </a><span class="php-comment">     *
+</span></span><span id="1776" class="l"><a href="#1776">1776: </a><span class="php-comment">     * @access protected
+</span></span><span id="1777" class="l"><a href="#1777">1777: </a><span class="php-comment">     * @param  string $username The user's name
+</span></span><span id="1778" class="l"><a href="#1778">1778: </a><span class="php-comment">     * @param  bool|string $password The user's password
+</span></span><span id="1779" class="l"><a href="#1779">1779: </a><span class="php-comment">     * @return bool
 </span></span><span id="1780" class="l"><a href="#1780">1780: </a><span class="php-comment">     */</span>
-</span><span id="1781" class="l"><a href="#1781">1781: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
+</span><span id="1781" class="l"><a href="#1781">1781: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
 </span><span id="1782" class="l"><a href="#1782">1782: </a>    {
-</span><span id="1783" class="l"><a href="#1783">1783: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1784" class="l"><a href="#1784">1784: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
-</span><span id="1785" class="l"><a href="#1785">1785: </a>        {
-</span><span id="1786" class="l"><a href="#1786">1786: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1787" class="l"><a href="#1787">1787: </a>        }
-</span><span id="1788" class="l"><a href="#1788">1788: </a>
-</span><span id="1789" class="l"><a href="#1789">1789: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
-</span><span id="1790" class="l"><a href="#1790">1790: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
-</span><span id="1791" class="l"><a href="#1791">1791: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
-</span><span id="1792" class="l"><a href="#1792">1792: </a>
-</span><span id="1793" class="l"><a href="#1793">1793: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1794" class="l"><a href="#1794">1794: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1795" class="l"><a href="#1795">1795: </a>        {
-</span><span id="1796" class="l"><a href="#1796">1796: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
-</span><span id="1797" class="l"><a href="#1797">1797: </a>        }
-</span><span id="1798" class="l"><a href="#1798">1798: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1783" class="l"><a href="#1783">1783: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1784" class="l"><a href="#1784">1784: </a>        {
+</span><span id="1785" class="l"><a href="#1785">1785: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1786" class="l"><a href="#1786">1786: </a>        }
+</span><span id="1787" class="l"><a href="#1787">1787: </a>
+</span><span id="1788" class="l"><a href="#1788">1788: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
+</span><span id="1789" class="l"><a href="#1789">1789: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="1790" class="l"><a href="#1790">1790: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
+</span><span id="1791" class="l"><a href="#1791">1791: </a>
+</span><span id="1792" class="l"><a href="#1792">1792: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
+</span><span id="1793" class="l"><a href="#1793">1793: </a>        {
+</span><span id="1794" class="l"><a href="#1794">1794: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
+</span><span id="1795" class="l"><a href="#1795">1795: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>) . <span class="php-quote">':'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
+</span><span id="1796" class="l"><a href="#1796">1796: </a>        }
+</span><span id="1797" class="l"><a href="#1797">1797: </a>
+</span><span id="1798" class="l"><a href="#1798">1798: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
 </span><span id="1799" class="l"><a href="#1799">1799: </a>        {
-</span><span id="1800" class="l"><a href="#1800">1800: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
-</span><span id="1801" class="l"><a href="#1801">1801: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
-</span><span id="1802" class="l"><a href="#1802">1802: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
-</span><span id="1803" class="l"><a href="#1803">1803: </a>            {
-</span><span id="1804" class="l"><a href="#1804">1804: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
-</span><span id="1805" class="l"><a href="#1805">1805: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
-</span><span id="1806" class="l"><a href="#1806">1806: </a>            }
-</span><span id="1807" class="l"><a href="#1807">1807: </a>        }
-</span><span id="1808" class="l"><a href="#1808">1808: </a>
-</span><span id="1809" class="l"><a href="#1809">1809: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
-</span><span id="1810" class="l"><a href="#1810">1810: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1800" class="l"><a href="#1800">1800: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1801" class="l"><a href="#1801">1801: </a>        }
+</span><span id="1802" class="l"><a href="#1802">1802: </a>
+</span><span id="1803" class="l"><a href="#1803">1803: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
+</span><span id="1804" class="l"><a href="#1804">1804: </a>        {
+</span><span id="1805" class="l"><a href="#1805">1805: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1806" class="l"><a href="#1806">1806: </a>
+</span><span id="1807" class="l"><a href="#1807">1807: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1808" class="l"><a href="#1808">1808: </a>        }
+</span><span id="1809" class="l"><a href="#1809">1809: </a>
+</span><span id="1810" class="l"><a href="#1810">1810: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
 </span><span id="1811" class="l"><a href="#1811">1811: </a>        {
-</span><span id="1812" class="l"><a href="#1812">1812: </a>            <span class="php-var">$this</span>-&gt;_force_login();
-</span><span id="1813" class="l"><a href="#1813">1813: </a>        }
-</span><span id="1814" class="l"><a href="#1814">1814: </a>    }
-</span><span id="1815" class="l"><a href="#1815">1815: </a>
-</span><span id="1816" class="l"><a href="#1816">1816: </a>    <span class="php-comment">/**
-</span></span><span id="1817" class="l"><a href="#1817">1817: </a><span class="php-comment">     * Prepares for digest authentication
-</span></span><span id="1818" class="l"><a href="#1818">1818: </a><span class="php-comment">     *
-</span></span><span id="1819" class="l"><a href="#1819">1819: </a><span class="php-comment">     * @access protected
-</span></span><span id="1820" class="l"><a href="#1820">1820: </a><span class="php-comment">     * @return void
-</span></span><span id="1821" class="l"><a href="#1821">1821: </a><span class="php-comment">     */</span>
-</span><span id="1822" class="l"><a href="#1822">1822: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
-</span><span id="1823" class="l"><a href="#1823">1823: </a>    {
-</span><span id="1824" class="l"><a href="#1824">1824: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1825" class="l"><a href="#1825">1825: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
-</span><span id="1826" class="l"><a href="#1826">1826: </a>        {
-</span><span id="1827" class="l"><a href="#1827">1827: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1828" class="l"><a href="#1828">1828: </a>        }
+</span><span id="1812" class="l"><a href="#1812">1812: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1813" class="l"><a href="#1813">1813: </a>
+</span><span id="1814" class="l"><a href="#1814">1814: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1815" class="l"><a href="#1815">1815: </a>        }
+</span><span id="1816" class="l"><a href="#1816">1816: </a>
+</span><span id="1817" class="l"><a href="#1817">1817: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1818" class="l"><a href="#1818">1818: </a>        {
+</span><span id="1819" class="l"><a href="#1819">1819: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1820" class="l"><a href="#1820">1820: </a>        }
+</span><span id="1821" class="l"><a href="#1821">1821: </a>
+</span><span id="1822" class="l"><a href="#1822">1822: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
+</span><span id="1823" class="l"><a href="#1823">1823: </a>        {
+</span><span id="1824" class="l"><a href="#1824">1824: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1825" class="l"><a href="#1825">1825: </a>        }
+</span><span id="1826" class="l"><a href="#1826">1826: </a>
+</span><span id="1827" class="l"><a href="#1827">1827: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1828" class="l"><a href="#1828">1828: </a>    }
 </span><span id="1829" class="l"><a href="#1829">1829: </a>
-</span><span id="1830" class="l"><a href="#1830">1830: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
-</span><span id="1831" class="l"><a href="#1831">1831: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
-</span><span id="1832" class="l"><a href="#1832">1832: </a>        <span class="php-var">$digest_string</span> = <span class="php-quote">''</span>;
-</span><span id="1833" class="l"><a href="#1833">1833: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>))
-</span><span id="1834" class="l"><a href="#1834">1834: </a>        {
-</span><span id="1835" class="l"><a href="#1835">1835: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
-</span><span id="1836" class="l"><a href="#1836">1836: </a>        }
-</span><span id="1837" class="l"><a href="#1837">1837: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>))
-</span><span id="1838" class="l"><a href="#1838">1838: </a>        {
-</span><span id="1839" class="l"><a href="#1839">1839: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
-</span><span id="1840" class="l"><a href="#1840">1840: </a>        }
-</span><span id="1841" class="l"><a href="#1841">1841: </a>
-</span><span id="1842" class="l"><a href="#1842">1842: </a>        <span class="php-var">$uniqueId</span> = <span class="php-keyword2">uniqid</span>();
-</span><span id="1843" class="l"><a href="#1843">1843: </a>
-</span><span id="1844" class="l"><a href="#1844">1844: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
-</span><span id="1845" class="l"><a href="#1845">1845: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
-</span><span id="1846" class="l"><a href="#1846">1846: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
-</span><span id="1847" class="l"><a href="#1847">1847: </a>        {
-</span><span id="1848" class="l"><a href="#1848">1848: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqueId</span>);
+</span><span id="1830" class="l"><a href="#1830">1830: </a>    <span class="php-comment">/**
+</span></span><span id="1831" class="l"><a href="#1831">1831: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
+</span></span><span id="1832" class="l"><a href="#1832">1832: </a><span class="php-comment">     *
+</span></span><span id="1833" class="l"><a href="#1833">1833: </a><span class="php-comment">     * @access protected
+</span></span><span id="1834" class="l"><a href="#1834">1834: </a><span class="php-comment">     * @return void
+</span></span><span id="1835" class="l"><a href="#1835">1835: </a><span class="php-comment">     */</span>
+</span><span id="1836" class="l"><a href="#1836">1836: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
+</span><span id="1837" class="l"><a href="#1837">1837: </a>    {
+</span><span id="1838" class="l"><a href="#1838">1838: </a>        <span class="php-comment">// Get the auth_source config item</span>
+</span><span id="1839" class="l"><a href="#1839">1839: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
+</span><span id="1840" class="l"><a href="#1840">1840: </a>
+</span><span id="1841" class="l"><a href="#1841">1841: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
+</span><span id="1842" class="l"><a href="#1842">1842: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
+</span><span id="1843" class="l"><a href="#1843">1843: </a>        {
+</span><span id="1844" class="l"><a href="#1844">1844: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1845" class="l"><a href="#1845">1845: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1846" class="l"><a href="#1846">1846: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1847" class="l"><a href="#1847">1847: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not Authorized'</span>
+</span><span id="1848" class="l"><a href="#1848">1848: </a>                ], self::HTTP_UNAUTHORIZED);
 </span><span id="1849" class="l"><a href="#1849">1849: </a>        }
-</span><span id="1850" class="l"><a href="#1850">1850: </a>
-</span><span id="1851" class="l"><a href="#1851">1851: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
-</span><span id="1852" class="l"><a href="#1852">1852: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="1853" class="l"><a href="#1853">1853: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
-</span><span id="1854" class="l"><a href="#1854">1854: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
-</span><span id="1855" class="l"><a href="#1855">1855: </a>
-</span><span id="1856" class="l"><a href="#1856">1856: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config</span>
-</span><span id="1857" class="l"><a href="#1857">1857: </a>        <span class="php-var">$A1</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
-</span><span id="1858" class="l"><a href="#1858">1858: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$A1</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1859" class="l"><a href="#1859">1859: </a>        {
-</span><span id="1860" class="l"><a href="#1860">1860: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$uniqueId</span>);
-</span><span id="1861" class="l"><a href="#1861">1861: </a>        }
-</span><span id="1862" class="l"><a href="#1862">1862: </a>
-</span><span id="1863" class="l"><a href="#1863">1863: </a>        <span class="php-var">$A2</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method) . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
-</span><span id="1864" class="l"><a href="#1864">1864: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$A1</span> . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$A2</span>);
+</span><span id="1850" class="l"><a href="#1850">1850: </a>    }
+</span><span id="1851" class="l"><a href="#1851">1851: </a>
+</span><span id="1852" class="l"><a href="#1852">1852: </a>    <span class="php-comment">/**
+</span></span><span id="1853" class="l"><a href="#1853">1853: </a><span class="php-comment">     * Prepares for basic authentication
+</span></span><span id="1854" class="l"><a href="#1854">1854: </a><span class="php-comment">     *
+</span></span><span id="1855" class="l"><a href="#1855">1855: </a><span class="php-comment">     * @access protected
+</span></span><span id="1856" class="l"><a href="#1856">1856: </a><span class="php-comment">     * @return void
+</span></span><span id="1857" class="l"><a href="#1857">1857: </a><span class="php-comment">     */</span>
+</span><span id="1858" class="l"><a href="#1858">1858: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
+</span><span id="1859" class="l"><a href="#1859">1859: </a>    {
+</span><span id="1860" class="l"><a href="#1860">1860: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1861" class="l"><a href="#1861">1861: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1862" class="l"><a href="#1862">1862: </a>        {
+</span><span id="1863" class="l"><a href="#1863">1863: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1864" class="l"><a href="#1864">1864: </a>        }
 </span><span id="1865" class="l"><a href="#1865">1865: </a>
-</span><span id="1866" class="l"><a href="#1866">1866: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
-</span><span id="1867" class="l"><a href="#1867">1867: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
-</span><span id="1868" class="l"><a href="#1868">1868: </a>        {
-</span><span id="1869" class="l"><a href="#1869">1869: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1870" class="l"><a href="#1870">1870: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1871" class="l"><a href="#1871">1871: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-num">0</span>,
-</span><span id="1872" class="l"><a href="#1872">1872: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid credentials'</span>
-</span><span id="1873" class="l"><a href="#1873">1873: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="1866" class="l"><a href="#1866">1866: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
+</span><span id="1867" class="l"><a href="#1867">1867: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
+</span><span id="1868" class="l"><a href="#1868">1868: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
+</span><span id="1869" class="l"><a href="#1869">1869: </a>
+</span><span id="1870" class="l"><a href="#1870">1870: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1871" class="l"><a href="#1871">1871: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1872" class="l"><a href="#1872">1872: </a>        {
+</span><span id="1873" class="l"><a href="#1873">1873: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
 </span><span id="1874" class="l"><a href="#1874">1874: </a>        }
-</span><span id="1875" class="l"><a href="#1875">1875: </a>    }
-</span><span id="1876" class="l"><a href="#1876">1876: </a>
-</span><span id="1877" class="l"><a href="#1877">1877: </a>    <span class="php-comment">/**
-</span></span><span id="1878" class="l"><a href="#1878">1878: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
-</span></span><span id="1879" class="l"><a href="#1879">1879: </a><span class="php-comment">     *
-</span></span><span id="1880" class="l"><a href="#1880">1880: </a><span class="php-comment">     * @access protected
-</span></span><span id="1881" class="l"><a href="#1881">1881: </a><span class="php-comment">     * @return void
-</span></span><span id="1882" class="l"><a href="#1882">1882: </a><span class="php-comment">     */</span>
-</span><span id="1883" class="l"><a href="#1883">1883: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
-</span><span id="1884" class="l"><a href="#1884">1884: </a>    {
-</span><span id="1885" class="l"><a href="#1885">1885: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
-</span><span id="1886" class="l"><a href="#1886">1886: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
-</span><span id="1887" class="l"><a href="#1887">1887: </a>
-</span><span id="1888" class="l"><a href="#1888">1888: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
-</span><span id="1889" class="l"><a href="#1889">1889: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
-</span><span id="1890" class="l"><a href="#1890">1890: </a>        {
-</span><span id="1891" class="l"><a href="#1891">1891: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1892" class="l"><a href="#1892">1892: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1893" class="l"><a href="#1893">1893: </a>                    <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1894" class="l"><a href="#1894">1894: </a>                    <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'IP Denied'</span>
-</span><span id="1895" class="l"><a href="#1895">1895: </a>                ],
-</span><span id="1896" class="l"><a href="#1896">1896: </a>                self::HTTP_UNAUTHORIZED);
-</span><span id="1897" class="l"><a href="#1897">1897: </a>        }
-</span><span id="1898" class="l"><a href="#1898">1898: </a>    }
-</span><span id="1899" class="l"><a href="#1899">1899: </a>
-</span><span id="1900" class="l"><a href="#1900">1900: </a>    <span class="php-comment">/**
-</span></span><span id="1901" class="l"><a href="#1901">1901: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
-</span></span><span id="1902" class="l"><a href="#1902">1902: </a><span class="php-comment">     *
-</span></span><span id="1903" class="l"><a href="#1903">1903: </a><span class="php-comment">     * @access protected
-</span></span><span id="1904" class="l"><a href="#1904">1904: </a><span class="php-comment">     * @return void
-</span></span><span id="1905" class="l"><a href="#1905">1905: </a><span class="php-comment">     */</span>
-</span><span id="1906" class="l"><a href="#1906">1906: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
-</span><span id="1907" class="l"><a href="#1907">1907: </a>    {
-</span><span id="1908" class="l"><a href="#1908">1908: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
-</span><span id="1909" class="l"><a href="#1909">1909: </a>
-</span><span id="1910" class="l"><a href="#1910">1910: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
-</span><span id="1911" class="l"><a href="#1911">1911: </a>
-</span><span id="1912" class="l"><a href="#1912">1912: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">AS</span> &amp;<span class="php-var">$ip</span>)
-</span><span id="1913" class="l"><a href="#1913">1913: </a>        {
-</span><span id="1914" class="l"><a href="#1914">1914: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
-</span><span id="1915" class="l"><a href="#1915">1915: </a>        }
+</span><span id="1875" class="l"><a href="#1875">1875: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1876" class="l"><a href="#1876">1876: </a>        {
+</span><span id="1877" class="l"><a href="#1877">1877: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
+</span><span id="1878" class="l"><a href="#1878">1878: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
+</span><span id="1879" class="l"><a href="#1879">1879: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
+</span><span id="1880" class="l"><a href="#1880">1880: </a>            {
+</span><span id="1881" class="l"><a href="#1881">1881: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
+</span><span id="1882" class="l"><a href="#1882">1882: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
+</span><span id="1883" class="l"><a href="#1883">1883: </a>            }
+</span><span id="1884" class="l"><a href="#1884">1884: </a>        }
+</span><span id="1885" class="l"><a href="#1885">1885: </a>
+</span><span id="1886" class="l"><a href="#1886">1886: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
+</span><span id="1887" class="l"><a href="#1887">1887: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1888" class="l"><a href="#1888">1888: </a>        {
+</span><span id="1889" class="l"><a href="#1889">1889: </a>            <span class="php-var">$this</span>-&gt;_force_login();
+</span><span id="1890" class="l"><a href="#1890">1890: </a>        }
+</span><span id="1891" class="l"><a href="#1891">1891: </a>    }
+</span><span id="1892" class="l"><a href="#1892">1892: </a>
+</span><span id="1893" class="l"><a href="#1893">1893: </a>    <span class="php-comment">/**
+</span></span><span id="1894" class="l"><a href="#1894">1894: </a><span class="php-comment">     * Prepares for digest authentication
+</span></span><span id="1895" class="l"><a href="#1895">1895: </a><span class="php-comment">     *
+</span></span><span id="1896" class="l"><a href="#1896">1896: </a><span class="php-comment">     * @access protected
+</span></span><span id="1897" class="l"><a href="#1897">1897: </a><span class="php-comment">     * @return void
+</span></span><span id="1898" class="l"><a href="#1898">1898: </a><span class="php-comment">     */</span>
+</span><span id="1899" class="l"><a href="#1899">1899: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
+</span><span id="1900" class="l"><a href="#1900">1900: </a>    {
+</span><span id="1901" class="l"><a href="#1901">1901: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1902" class="l"><a href="#1902">1902: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1903" class="l"><a href="#1903">1903: </a>        {
+</span><span id="1904" class="l"><a href="#1904">1904: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1905" class="l"><a href="#1905">1905: </a>        }
+</span><span id="1906" class="l"><a href="#1906">1906: </a>
+</span><span id="1907" class="l"><a href="#1907">1907: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
+</span><span id="1908" class="l"><a href="#1908">1908: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
+</span><span id="1909" class="l"><a href="#1909">1909: </a>        <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
+</span><span id="1910" class="l"><a href="#1910">1910: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$digest_string</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1911" class="l"><a href="#1911">1911: </a>        {
+</span><span id="1912" class="l"><a href="#1912">1912: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
+</span><span id="1913" class="l"><a href="#1913">1913: </a>        }
+</span><span id="1914" class="l"><a href="#1914">1914: </a>
+</span><span id="1915" class="l"><a href="#1915">1915: </a>        <span class="php-var">$unique_id</span> = <span class="php-keyword2">uniqid</span>();
 </span><span id="1916" class="l"><a href="#1916">1916: </a>
-</span><span id="1917" class="l"><a href="#1917">1917: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1918" class="l"><a href="#1918">1918: </a>        {
-</span><span id="1919" class="l"><a href="#1919">1919: </a>            <span class="php-var">$this</span>-&gt;response([<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'IP not authorized'</span>], self::HTTP_UNAUTHORIZED);
-</span><span id="1920" class="l"><a href="#1920">1920: </a>        }
-</span><span id="1921" class="l"><a href="#1921">1921: </a>    }
-</span><span id="1922" class="l"><a href="#1922">1922: </a>
-</span><span id="1923" class="l"><a href="#1923">1923: </a>    <span class="php-comment">/**
-</span></span><span id="1924" class="l"><a href="#1924">1924: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
-</span></span><span id="1925" class="l"><a href="#1925">1925: </a><span class="php-comment">     *
-</span></span><span id="1926" class="l"><a href="#1926">1926: </a><span class="php-comment">     * @access protected
-</span></span><span id="1927" class="l"><a href="#1927">1927: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
-</span></span><span id="1928" class="l"><a href="#1928">1928: </a><span class="php-comment">     * each time
-</span></span><span id="1929" class="l"><a href="#1929">1929: </a><span class="php-comment">     * @return void
-</span></span><span id="1930" class="l"><a href="#1930">1930: </a><span class="php-comment">     */</span>
-</span><span id="1931" class="l"><a href="#1931">1931: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
-</span><span id="1932" class="l"><a href="#1932">1932: </a>    {
-</span><span id="1933" class="l"><a href="#1933">1933: </a>        <span class="php-var">$restAuth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
-</span><span id="1934" class="l"><a href="#1934">1934: </a>        <span class="php-var">$restRealm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
-</span><span id="1935" class="l"><a href="#1935">1935: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'basic'</span>)
-</span><span id="1936" class="l"><a href="#1936">1936: </a>        {
-</span><span id="1937" class="l"><a href="#1937">1937: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
-</span><span id="1938" class="l"><a href="#1938">1938: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span> . <span class="php-var">$restRealm</span> . <span class="php-quote">'&quot;'</span>);
-</span><span id="1939" class="l"><a href="#1939">1939: </a>        }
-</span><span id="1940" class="l"><a href="#1940">1940: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$restAuth</span>) === <span class="php-quote">'digest'</span>)
+</span><span id="1917" class="l"><a href="#1917">1917: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
+</span><span id="1918" class="l"><a href="#1918">1918: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
+</span><span id="1919" class="l"><a href="#1919">1919: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
+</span><span id="1920" class="l"><a href="#1920">1920: </a>        {
+</span><span id="1921" class="l"><a href="#1921">1921: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
+</span><span id="1922" class="l"><a href="#1922">1922: </a>        }
+</span><span id="1923" class="l"><a href="#1923">1923: </a>
+</span><span id="1924" class="l"><a href="#1924">1924: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
+</span><span id="1925" class="l"><a href="#1925">1925: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="1926" class="l"><a href="#1926">1926: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
+</span><span id="1927" class="l"><a href="#1927">1927: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
+</span><span id="1928" class="l"><a href="#1928">1928: </a>
+</span><span id="1929" class="l"><a href="#1929">1929: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config</span>
+</span><span id="1930" class="l"><a href="#1930">1930: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
+</span><span id="1931" class="l"><a href="#1931">1931: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$username</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1932" class="l"><a href="#1932">1932: </a>        {
+</span><span id="1933" class="l"><a href="#1933">1933: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
+</span><span id="1934" class="l"><a href="#1934">1934: </a>        }
+</span><span id="1935" class="l"><a href="#1935">1935: </a>
+</span><span id="1936" class="l"><a href="#1936">1936: </a>        <span class="php-var">$md5</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method) . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
+</span><span id="1937" class="l"><a href="#1937">1937: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$md5</span>);
+</span><span id="1938" class="l"><a href="#1938">1938: </a>
+</span><span id="1939" class="l"><a href="#1939">1939: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
+</span><span id="1940" class="l"><a href="#1940">1940: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
 </span><span id="1941" class="l"><a href="#1941">1941: </a>        {
-</span><span id="1942" class="l"><a href="#1942">1942: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
-</span><span id="1943" class="l"><a href="#1943">1943: </a>            <span class="php-keyword2">header</span>(
-</span><span id="1944" class="l"><a href="#1944">1944: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span> . <span class="php-var">$restRealm</span>
-</span><span id="1945" class="l"><a href="#1945">1945: </a>                . <span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span> . <span class="php-var">$nonce</span>
-</span><span id="1946" class="l"><a href="#1946">1946: </a>                . <span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$restRealm</span>) . <span class="php-quote">'&quot;'</span>);
+</span><span id="1942" class="l"><a href="#1942">1942: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1943" class="l"><a href="#1943">1943: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1944" class="l"><a href="#1944">1944: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-num">0</span>,
+</span><span id="1945" class="l"><a href="#1945">1945: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid credentials'</span>
+</span><span id="1946" class="l"><a href="#1946">1946: </a>                ], self::HTTP_UNAUTHORIZED);
 </span><span id="1947" class="l"><a href="#1947">1947: </a>        }
-</span><span id="1948" class="l"><a href="#1948">1948: </a>
-</span><span id="1949" class="l"><a href="#1949">1949: </a>        <span class="php-comment">// Display an error response</span>
-</span><span id="1950" class="l"><a href="#1950">1950: </a>        <span class="php-var">$this</span>-&gt;response([
-</span><span id="1951" class="l"><a href="#1951">1951: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1952" class="l"><a href="#1952">1952: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not authorized'</span>
-</span><span id="1953" class="l"><a href="#1953">1953: </a>            ], self::HTTP_UNAUTHORIZED);
-</span><span id="1954" class="l"><a href="#1954">1954: </a>    }
-</span><span id="1955" class="l"><a href="#1955">1955: </a>
-</span><span id="1956" class="l"><a href="#1956">1956: </a>    <span class="php-comment">/**
-</span></span><span id="1957" class="l"><a href="#1957">1957: </a><span class="php-comment">     * Updates the log table with the total access time
-</span></span><span id="1958" class="l"><a href="#1958">1958: </a><span class="php-comment">     *
-</span></span><span id="1959" class="l"><a href="#1959">1959: </a><span class="php-comment">     * @access protected
-</span></span><span id="1960" class="l"><a href="#1960">1960: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="1961" class="l"><a href="#1961">1961: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="1962" class="l"><a href="#1962">1962: </a><span class="php-comment">     */</span>
-</span><span id="1963" class="l"><a href="#1963">1963: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
-</span><span id="1964" class="l"><a href="#1964">1964: </a>    {
-</span><span id="1965" class="l"><a href="#1965">1965: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
-</span><span id="1966" class="l"><a href="#1966">1966: </a>
-</span><span id="1967" class="l"><a href="#1967">1967: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1968" class="l"><a href="#1968">1968: </a>            -&gt;update(
-</span><span id="1969" class="l"><a href="#1969">1969: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="1970" class="l"><a href="#1970">1970: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="1971" class="l"><a href="#1971">1971: </a>            ]);
-</span><span id="1972" class="l"><a href="#1972">1972: </a>    }
-</span><span id="1973" class="l"><a href="#1973">1973: </a>
-</span><span id="1974" class="l"><a href="#1974">1974: </a>    <span class="php-comment">/**
-</span></span><span id="1975" class="l"><a href="#1975">1975: </a><span class="php-comment">     * Updates the log table with HTTP response code
-</span></span><span id="1976" class="l"><a href="#1976">1976: </a><span class="php-comment">     *
-</span></span><span id="1977" class="l"><a href="#1977">1977: </a><span class="php-comment">     * @access protected
-</span></span><span id="1978" class="l"><a href="#1978">1978: </a><span class="php-comment">     * @author Justin Chen
-</span></span><span id="1979" class="l"><a href="#1979">1979: </a><span class="php-comment">     * @param $http_code int HTTP status code
-</span></span><span id="1980" class="l"><a href="#1980">1980: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="1981" class="l"><a href="#1981">1981: </a><span class="php-comment">     */</span>
-</span><span id="1982" class="l"><a href="#1982">1982: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
-</span><span id="1983" class="l"><a href="#1983">1983: </a>    {
-</span><span id="1984" class="l"><a href="#1984">1984: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
-</span><span id="1985" class="l"><a href="#1985">1985: </a>
-</span><span id="1986" class="l"><a href="#1986">1986: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
-</span><span id="1987" class="l"><a href="#1987">1987: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="1988" class="l"><a href="#1988">1988: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="1989" class="l"><a href="#1989">1989: </a>        ]);
-</span><span id="1990" class="l"><a href="#1990">1990: </a>    }
-</span><span id="1991" class="l"><a href="#1991">1991: </a>
-</span><span id="1992" class="l"><a href="#1992">1992: </a>    <span class="php-comment">/**
-</span></span><span id="1993" class="l"><a href="#1993">1993: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
-</span></span><span id="1994" class="l"><a href="#1994">1994: </a><span class="php-comment">     *
-</span></span><span id="1995" class="l"><a href="#1995">1995: </a><span class="php-comment">     * @access protected
-</span></span><span id="1996" class="l"><a href="#1996">1996: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
-</span></span><span id="1997" class="l"><a href="#1997">1997: </a><span class="php-comment">     */</span>
-</span><span id="1998" class="l"><a href="#1998">1998: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
-</span><span id="1999" class="l"><a href="#1999">1999: </a>    {
-</span><span id="2000" class="l"><a href="#2000">2000: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
-</span><span id="2001" class="l"><a href="#2001">2001: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="2002" class="l"><a href="#2002">2002: </a>        {
-</span><span id="2003" class="l"><a href="#2003">2003: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="2004" class="l"><a href="#2004">2004: </a>        }
-</span><span id="2005" class="l"><a href="#2005">2005: </a>
-</span><span id="2006" class="l"><a href="#2006">2006: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
-</span><span id="2007" class="l"><a href="#2007">2007: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
-</span><span id="2008" class="l"><a href="#2008">2008: </a>            <span class="php-quote">'/'</span>, [
-</span><span id="2009" class="l"><a href="#2009">2009: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
-</span><span id="2010" class="l"><a href="#2010">2010: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
-</span><span id="2011" class="l"><a href="#2011">2011: </a>        ]);
-</span><span id="2012" class="l"><a href="#2012">2012: </a>
-</span><span id="2013" class="l"><a href="#2013">2013: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
-</span><span id="2014" class="l"><a href="#2014">2014: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
-</span><span id="2015" class="l"><a href="#2015">2015: </a>
-</span><span id="2016" class="l"><a href="#2016">2016: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
-</span><span id="2017" class="l"><a href="#2017">2017: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="2018" class="l"><a href="#2018">2018: </a>                   -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="2019" class="l"><a href="#2019">2019: </a>                   -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
-</span><span id="2020" class="l"><a href="#2020">2020: </a>                   -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
-</span><span id="2021" class="l"><a href="#2021">2021: </a>                   -&gt;num_rows() &gt; <span class="php-num">0</span>;
-</span><span id="2022" class="l"><a href="#2022">2022: </a>    }
-</span><span id="2023" class="l"><a href="#2023">2023: </a>
-</span><span id="2024" class="l"><a href="#2024">2024: </a>}
-</span><span id="2025" class="l"><a href="#2025">2025: </a></span></code></pre>
+</span><span id="1948" class="l"><a href="#1948">1948: </a>    }
+</span><span id="1949" class="l"><a href="#1949">1949: </a>
+</span><span id="1950" class="l"><a href="#1950">1950: </a>    <span class="php-comment">/**
+</span></span><span id="1951" class="l"><a href="#1951">1951: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
+</span></span><span id="1952" class="l"><a href="#1952">1952: </a><span class="php-comment">     *
+</span></span><span id="1953" class="l"><a href="#1953">1953: </a><span class="php-comment">     * @access protected
+</span></span><span id="1954" class="l"><a href="#1954">1954: </a><span class="php-comment">     * @return void
+</span></span><span id="1955" class="l"><a href="#1955">1955: </a><span class="php-comment">     */</span>
+</span><span id="1956" class="l"><a href="#1956">1956: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
+</span><span id="1957" class="l"><a href="#1957">1957: </a>    {
+</span><span id="1958" class="l"><a href="#1958">1958: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
+</span><span id="1959" class="l"><a href="#1959">1959: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
+</span><span id="1960" class="l"><a href="#1960">1960: </a>
+</span><span id="1961" class="l"><a href="#1961">1961: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
+</span><span id="1962" class="l"><a href="#1962">1962: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
+</span><span id="1963" class="l"><a href="#1963">1963: </a>        {
+</span><span id="1964" class="l"><a href="#1964">1964: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1965" class="l"><a href="#1965">1965: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1966" class="l"><a href="#1966">1966: </a>                    <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1967" class="l"><a href="#1967">1967: </a>                    <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'IP Denied'</span>
+</span><span id="1968" class="l"><a href="#1968">1968: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="1969" class="l"><a href="#1969">1969: </a>        }
+</span><span id="1970" class="l"><a href="#1970">1970: </a>    }
+</span><span id="1971" class="l"><a href="#1971">1971: </a>
+</span><span id="1972" class="l"><a href="#1972">1972: </a>    <span class="php-comment">/**
+</span></span><span id="1973" class="l"><a href="#1973">1973: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
+</span></span><span id="1974" class="l"><a href="#1974">1974: </a><span class="php-comment">     *
+</span></span><span id="1975" class="l"><a href="#1975">1975: </a><span class="php-comment">     * @access protected
+</span></span><span id="1976" class="l"><a href="#1976">1976: </a><span class="php-comment">     * @return void
+</span></span><span id="1977" class="l"><a href="#1977">1977: </a><span class="php-comment">     */</span>
+</span><span id="1978" class="l"><a href="#1978">1978: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
+</span><span id="1979" class="l"><a href="#1979">1979: </a>    {
+</span><span id="1980" class="l"><a href="#1980">1980: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
+</span><span id="1981" class="l"><a href="#1981">1981: </a>
+</span><span id="1982" class="l"><a href="#1982">1982: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
+</span><span id="1983" class="l"><a href="#1983">1983: </a>
+</span><span id="1984" class="l"><a href="#1984">1984: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$ip</span>)
+</span><span id="1985" class="l"><a href="#1985">1985: </a>        {
+</span><span id="1986" class="l"><a href="#1986">1986: </a>            <span class="php-comment">// As $ip is a reference, trim leading and trailing whitespace, then store the new value</span>
+</span><span id="1987" class="l"><a href="#1987">1987: </a>            <span class="php-comment">// using the reference</span>
+</span><span id="1988" class="l"><a href="#1988">1988: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
+</span><span id="1989" class="l"><a href="#1989">1989: </a>        }
+</span><span id="1990" class="l"><a href="#1990">1990: </a>
+</span><span id="1991" class="l"><a href="#1991">1991: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1992" class="l"><a href="#1992">1992: </a>        {
+</span><span id="1993" class="l"><a href="#1993">1993: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1994" class="l"><a href="#1994">1994: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1995" class="l"><a href="#1995">1995: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'IP not authorized'</span>
+</span><span id="1996" class="l"><a href="#1996">1996: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="1997" class="l"><a href="#1997">1997: </a>        }
+</span><span id="1998" class="l"><a href="#1998">1998: </a>    }
+</span><span id="1999" class="l"><a href="#1999">1999: </a>
+</span><span id="2000" class="l"><a href="#2000">2000: </a>    <span class="php-comment">/**
+</span></span><span id="2001" class="l"><a href="#2001">2001: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
+</span></span><span id="2002" class="l"><a href="#2002">2002: </a><span class="php-comment">     *
+</span></span><span id="2003" class="l"><a href="#2003">2003: </a><span class="php-comment">     * @access protected
+</span></span><span id="2004" class="l"><a href="#2004">2004: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
+</span></span><span id="2005" class="l"><a href="#2005">2005: </a><span class="php-comment">     * each time
+</span></span><span id="2006" class="l"><a href="#2006">2006: </a><span class="php-comment">     * @return void
+</span></span><span id="2007" class="l"><a href="#2007">2007: </a><span class="php-comment">     */</span>
+</span><span id="2008" class="l"><a href="#2008">2008: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
+</span><span id="2009" class="l"><a href="#2009">2009: </a>    {
+</span><span id="2010" class="l"><a href="#2010">2010: </a>        <span class="php-var">$rest_auth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
+</span><span id="2011" class="l"><a href="#2011">2011: </a>        <span class="php-var">$rest_realm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
+</span><span id="2012" class="l"><a href="#2012">2012: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'basic'</span>)
+</span><span id="2013" class="l"><a href="#2013">2013: </a>        {
+</span><span id="2014" class="l"><a href="#2014">2014: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
+</span><span id="2015" class="l"><a href="#2015">2015: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span> . <span class="php-var">$rest_realm</span> . <span class="php-quote">'&quot;'</span>);
+</span><span id="2016" class="l"><a href="#2016">2016: </a>        }
+</span><span id="2017" class="l"><a href="#2017">2017: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'digest'</span>)
+</span><span id="2018" class="l"><a href="#2018">2018: </a>        {
+</span><span id="2019" class="l"><a href="#2019">2019: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
+</span><span id="2020" class="l"><a href="#2020">2020: </a>            <span class="php-keyword2">header</span>(
+</span><span id="2021" class="l"><a href="#2021">2021: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span> . <span class="php-var">$rest_realm</span>
+</span><span id="2022" class="l"><a href="#2022">2022: </a>                . <span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span> . <span class="php-var">$nonce</span>
+</span><span id="2023" class="l"><a href="#2023">2023: </a>                . <span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$rest_realm</span>) . <span class="php-quote">'&quot;'</span>);
+</span><span id="2024" class="l"><a href="#2024">2024: </a>        }
+</span><span id="2025" class="l"><a href="#2025">2025: </a>
+</span><span id="2026" class="l"><a href="#2026">2026: </a>        <span class="php-comment">// Display an error response</span>
+</span><span id="2027" class="l"><a href="#2027">2027: </a>        <span class="php-var">$this</span>-&gt;response([
+</span><span id="2028" class="l"><a href="#2028">2028: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="2029" class="l"><a href="#2029">2029: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not authorized'</span>
+</span><span id="2030" class="l"><a href="#2030">2030: </a>            ], self::HTTP_UNAUTHORIZED);
+</span><span id="2031" class="l"><a href="#2031">2031: </a>    }
+</span><span id="2032" class="l"><a href="#2032">2032: </a>
+</span><span id="2033" class="l"><a href="#2033">2033: </a>    <span class="php-comment">/**
+</span></span><span id="2034" class="l"><a href="#2034">2034: </a><span class="php-comment">     * Updates the log table with the total access time
+</span></span><span id="2035" class="l"><a href="#2035">2035: </a><span class="php-comment">     *
+</span></span><span id="2036" class="l"><a href="#2036">2036: </a><span class="php-comment">     * @access protected
+</span></span><span id="2037" class="l"><a href="#2037">2037: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="2038" class="l"><a href="#2038">2038: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="2039" class="l"><a href="#2039">2039: </a><span class="php-comment">     */</span>
+</span><span id="2040" class="l"><a href="#2040">2040: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
+</span><span id="2041" class="l"><a href="#2041">2041: </a>    {
+</span><span id="2042" class="l"><a href="#2042">2042: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
+</span><span id="2043" class="l"><a href="#2043">2043: </a>
+</span><span id="2044" class="l"><a href="#2044">2044: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
+</span><span id="2045" class="l"><a href="#2045">2045: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="2046" class="l"><a href="#2046">2046: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="2047" class="l"><a href="#2047">2047: </a>            ]);
+</span><span id="2048" class="l"><a href="#2048">2048: </a>    }
+</span><span id="2049" class="l"><a href="#2049">2049: </a>
+</span><span id="2050" class="l"><a href="#2050">2050: </a>    <span class="php-comment">/**
+</span></span><span id="2051" class="l"><a href="#2051">2051: </a><span class="php-comment">     * Updates the log table with HTTP response code
+</span></span><span id="2052" class="l"><a href="#2052">2052: </a><span class="php-comment">     *
+</span></span><span id="2053" class="l"><a href="#2053">2053: </a><span class="php-comment">     * @access protected
+</span></span><span id="2054" class="l"><a href="#2054">2054: </a><span class="php-comment">     * @author Justin Chen
+</span></span><span id="2055" class="l"><a href="#2055">2055: </a><span class="php-comment">     * @param $http_code int HTTP status code
+</span></span><span id="2056" class="l"><a href="#2056">2056: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="2057" class="l"><a href="#2057">2057: </a><span class="php-comment">     */</span>
+</span><span id="2058" class="l"><a href="#2058">2058: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
+</span><span id="2059" class="l"><a href="#2059">2059: </a>    {
+</span><span id="2060" class="l"><a href="#2060">2060: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
+</span><span id="2061" class="l"><a href="#2061">2061: </a>
+</span><span id="2062" class="l"><a href="#2062">2062: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
+</span><span id="2063" class="l"><a href="#2063">2063: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="2064" class="l"><a href="#2064">2064: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="2065" class="l"><a href="#2065">2065: </a>        ]);
+</span><span id="2066" class="l"><a href="#2066">2066: </a>    }
+</span><span id="2067" class="l"><a href="#2067">2067: </a>
+</span><span id="2068" class="l"><a href="#2068">2068: </a>    <span class="php-comment">/**
+</span></span><span id="2069" class="l"><a href="#2069">2069: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
+</span></span><span id="2070" class="l"><a href="#2070">2070: </a><span class="php-comment">     *
+</span></span><span id="2071" class="l"><a href="#2071">2071: </a><span class="php-comment">     * @access protected
+</span></span><span id="2072" class="l"><a href="#2072">2072: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
+</span></span><span id="2073" class="l"><a href="#2073">2073: </a><span class="php-comment">     */</span>
+</span><span id="2074" class="l"><a href="#2074">2074: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
+</span><span id="2075" class="l"><a href="#2075">2075: </a>    {
+</span><span id="2076" class="l"><a href="#2076">2076: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
+</span><span id="2077" class="l"><a href="#2077">2077: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="2078" class="l"><a href="#2078">2078: </a>        {
+</span><span id="2079" class="l"><a href="#2079">2079: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="2080" class="l"><a href="#2080">2080: </a>        }
+</span><span id="2081" class="l"><a href="#2081">2081: </a>
+</span><span id="2082" class="l"><a href="#2082">2082: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
+</span><span id="2083" class="l"><a href="#2083">2083: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
+</span><span id="2084" class="l"><a href="#2084">2084: </a>            <span class="php-quote">'/'</span>, [
+</span><span id="2085" class="l"><a href="#2085">2085: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
+</span><span id="2086" class="l"><a href="#2086">2086: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
+</span><span id="2087" class="l"><a href="#2087">2087: </a>        ]);
+</span><span id="2088" class="l"><a href="#2088">2088: </a>
+</span><span id="2089" class="l"><a href="#2089">2089: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
+</span><span id="2090" class="l"><a href="#2090">2090: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
+</span><span id="2091" class="l"><a href="#2091">2091: </a>
+</span><span id="2092" class="l"><a href="#2092">2092: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
+</span><span id="2093" class="l"><a href="#2093">2093: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="2094" class="l"><a href="#2094">2094: </a>            -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="2095" class="l"><a href="#2095">2095: </a>            -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
+</span><span id="2096" class="l"><a href="#2096">2096: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
+</span><span id="2097" class="l"><a href="#2097">2097: </a>            -&gt;num_rows() &gt; <span class="php-num">0</span>;
+</span><span id="2098" class="l"><a href="#2098">2098: </a>    }
+</span><span id="2099" class="l"><a href="#2099">2099: </a>
+</span><span id="2100" class="l"><a href="#2100">2100: </a>}
+</span><span id="2101" class="l"><a href="#2101">2101: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
-<script src="http://github.com/elementlist.js?a5b1ba95e501c58a0d40c25588af403de4e38989"></script>
+<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Rest_server.html b/documentation/source-class-Rest_server.html
new file mode 100644
index 00000000..ab5c4b5d
--- /dev/null
+++ b/documentation/source-class-Rest_server.html
@@ -0,0 +1,117 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta name="robots" content="noindex">
+
+	<title>File controllers/Rest_server.php</title>
+
+	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
+
+</head>
+
+<body>
+<div id="left">
+	<div id="menu">
+		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
+
+
+		<div id="groups">
+				<h3>Packages</h3>
+			<ul>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.html">
+						CodeIgniter<span></span>
+					</a>
+
+						<ul>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Libraries.html">
+						Libraries					</a>
+
+						</li>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
+						</li>
+							</ul></li>
+				<li>
+					<a href="http://github.com/package-None.html">
+						None					</a>
+
+						</li>
+			</ul>
+		</div>
+
+		<hr>
+
+
+		<div id="elements">
+			<h3>Classes</h3>
+			<ul>
+				<li><a href="http://github.com/class-Example.html">Example</a></li>
+				<li><a href="http://github.com/class-Format.html">Format</a></li>
+				<li><a href="http://github.com/class-Key.html">Key</a></li>
+				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
+				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
+				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
+			</ul>
+
+
+
+
+
+		</div>
+	</div>
+</div>
+
+<div id="splitter"></div>
+
+<div id="right">
+<div id="rightInner">
+	<form id="search">
+		<input type="hidden" name="cx" value="">
+		<input type="hidden" name="ie" value="UTF-8">
+		<input type="text" name="q" class="text" placeholder="Search">
+	</form>
+
+	<div id="navigation">
+		<ul>
+			<li>
+				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
+			</li>
+			<li>
+<span>Package</span>			</li>
+			<li>
+<span>Class</span>			</li>
+		</ul>
+		<ul>
+		</ul>
+		<ul>
+		</ul>
+	</div>
+
+<pre><code><span id="1" class="l"><a href="#1"> 1: </a><span class="xlang">&lt;?php</span>
+</span><span id="2" class="l"><a href="#2"> 2: </a><span class="php-keyword2">defined</span>(<span class="php-quote">'BASEPATH'</span>) <span class="php-keyword1">OR</span> <span class="php-keyword1">exit</span>(<span class="php-quote">'No direct script access allowed'</span>);
+</span><span id="3" class="l"><a href="#3"> 3: </a>
+</span><span id="4" class="l"><a href="#4"> 4: </a><span class="php-keyword1">class</span> Rest_server <span class="php-keyword1">extends</span> CI_Controller {
+</span><span id="5" class="l"><a href="#5"> 5: </a>
+</span><span id="6" class="l"><a href="#6"> 6: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> index()
+</span><span id="7" class="l"><a href="#7"> 7: </a>    {
+</span><span id="8" class="l"><a href="#8"> 8: </a>        <span class="php-var">$this</span>-&gt;load-&gt;helper(<span class="php-quote">'url'</span>);
+</span><span id="9" class="l"><a href="#9"> 9: </a>
+</span><span id="10" class="l"><a href="#10">10: </a>        <span class="php-var">$this</span>-&gt;load-&gt;view(<span class="php-quote">'rest_server'</span>);
+</span><span id="11" class="l"><a href="#11">11: </a>    }
+</span><span id="12" class="l"><a href="#12">12: </a>}
+</span><span id="13" class="l"><a href="#13">13: </a></span></code></pre>
+
+	<div id="footer">
+		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
+	</div>
+</div>
+</div>
+<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
+</body>
+</html>
diff --git a/documentation/source-class-Welcome.html b/documentation/source-class-Welcome.html
new file mode 100644
index 00000000..5dd87266
--- /dev/null
+++ b/documentation/source-class-Welcome.html
@@ -0,0 +1,132 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta name="robots" content="noindex">
+
+	<title>File controllers/Welcome.php</title>
+
+	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
+
+</head>
+
+<body>
+<div id="left">
+	<div id="menu">
+		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
+
+
+		<div id="groups">
+				<h3>Packages</h3>
+			<ul>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.html">
+						CodeIgniter<span></span>
+					</a>
+
+						<ul>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Libraries.html">
+						Libraries					</a>
+
+						</li>
+				<li>
+					<a href="http://github.com/package-CodeIgniter.Rest.html">
+						Rest					</a>
+
+						</li>
+							</ul></li>
+				<li>
+					<a href="http://github.com/package-None.html">
+						None					</a>
+
+						</li>
+			</ul>
+		</div>
+
+		<hr>
+
+
+		<div id="elements">
+			<h3>Classes</h3>
+			<ul>
+				<li><a href="http://github.com/class-Example.html">Example</a></li>
+				<li><a href="http://github.com/class-Format.html">Format</a></li>
+				<li><a href="http://github.com/class-Key.html">Key</a></li>
+				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
+				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
+				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
+			</ul>
+
+
+
+
+
+		</div>
+	</div>
+</div>
+
+<div id="splitter"></div>
+
+<div id="right">
+<div id="rightInner">
+	<form id="search">
+		<input type="hidden" name="cx" value="">
+		<input type="hidden" name="ie" value="UTF-8">
+		<input type="text" name="q" class="text" placeholder="Search">
+	</form>
+
+	<div id="navigation">
+		<ul>
+			<li>
+				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
+			</li>
+			<li>
+<span>Package</span>			</li>
+			<li>
+<span>Class</span>			</li>
+		</ul>
+		<ul>
+		</ul>
+		<ul>
+		</ul>
+	</div>
+
+<pre><code><span id="1" class="l"><a href="#1"> 1: </a><span class="xlang">&lt;?php</span>
+</span><span id="2" class="l"><a href="#2"> 2: </a><span class="php-keyword2">defined</span>(<span class="php-quote">'BASEPATH'</span>) <span class="php-keyword1">OR</span> <span class="php-keyword1">exit</span>(<span class="php-quote">'No direct script access allowed'</span>);
+</span><span id="3" class="l"><a href="#3"> 3: </a>
+</span><span id="4" class="l"><a href="#4"> 4: </a><span class="php-keyword1">class</span> Welcome <span class="php-keyword1">extends</span> CI_Controller {
+</span><span id="5" class="l"><a href="#5"> 5: </a>
+</span><span id="6" class="l"><a href="#6"> 6: </a>    <span class="php-comment">/**
+</span></span><span id="7" class="l"><a href="#7"> 7: </a><span class="php-comment">     * Index Page for this controller.
+</span></span><span id="8" class="l"><a href="#8"> 8: </a><span class="php-comment">     *
+</span></span><span id="9" class="l"><a href="#9"> 9: </a><span class="php-comment">     * Maps to the following URL
+</span></span><span id="10" class="l"><a href="#10">10: </a><span class="php-comment">     * http://example.com/index.php/welcome
+</span></span><span id="11" class="l"><a href="#11">11: </a><span class="php-comment">     *    - or -
+</span></span><span id="12" class="l"><a href="#12">12: </a><span class="php-comment">     * http://example.com/index.php/welcome/index
+</span></span><span id="13" class="l"><a href="#13">13: </a><span class="php-comment">     *    - or -
+</span></span><span id="14" class="l"><a href="#14">14: </a><span class="php-comment">     * Since this controller is set as the default controller in
+</span></span><span id="15" class="l"><a href="#15">15: </a><span class="php-comment">     * config/routes.php, it's displayed at http://example.com/
+</span></span><span id="16" class="l"><a href="#16">16: </a><span class="php-comment">     *
+</span></span><span id="17" class="l"><a href="#17">17: </a><span class="php-comment">     * So any other public methods not prefixed with an underscore will
+</span></span><span id="18" class="l"><a href="#18">18: </a><span class="php-comment">     * map to /index.php/welcome/&lt;method_name&gt;
+</span></span><span id="19" class="l"><a href="#19">19: </a><span class="php-comment">     * @see http://codeigniter.com/user_guide/general/urls.html
+</span></span><span id="20" class="l"><a href="#20">20: </a><span class="php-comment">     */</span>
+</span><span id="21" class="l"><a href="#21">21: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> index()
+</span><span id="22" class="l"><a href="#22">22: </a>    {
+</span><span id="23" class="l"><a href="#23">23: </a>        <span class="php-var">$this</span>-&gt;load-&gt;helper(<span class="php-quote">'url'</span>);
+</span><span id="24" class="l"><a href="#24">24: </a>
+</span><span id="25" class="l"><a href="#25">25: </a>        <span class="php-var">$this</span>-&gt;load-&gt;view(<span class="php-quote">'welcome_message'</span>);
+</span><span id="26" class="l"><a href="#26">26: </a>    }
+</span><span id="27" class="l"><a href="#27">27: </a>}
+</span><span id="28" class="l"><a href="#28">28: </a></span></code></pre>
+
+	<div id="footer">
+		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
+	</div>
+</div>
+</div>
+<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
+</body>
+</html>

From 6c0dbac7eb375c9307cc0cdcb5c9407093880b8d Mon Sep 17 00:00:00 2001
From: erikjonkers <git@erik.eu>
Date: Fri, 24 Jul 2015 21:05:51 +0200
Subject: [PATCH 122/354] function _detect_api_key should return boolean

$row was returned instead of TRUE. The test at line 509 failed therefor.
---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 5ebe05e9..8a4282fe 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -968,7 +968,7 @@ protected function _detect_api_key()
                 }
             }
 
-            return $row;
+            return TRUE;
         }
 
         // No key has been sent

From 4c8f4a0f6884f72c7d646011d9b5022b3d213cad Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 25 Jul 2015 09:22:41 +0300
Subject: [PATCH 123/354] Using hardcoded strings instead of config items

---
 application/libraries/REST_Controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 5ebe05e9..98968b12 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1963,8 +1963,8 @@ protected function _check_blacklist_auth()
         {
             // Display an error response
             $this->response([
-                    'status' => FALSE,
-                    'error' => 'IP Denied'
+                    $this->config->item('rest_status_field_name') => FALSE,
+                    $this->config->item('rest_message_field_name') => 'IP Denied'
                 ], self::HTTP_UNAUTHORIZED);
         }
     }

From 5fdbd3ec61208b52b02ffa4a9a6e6f6e8115e1e8 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 25 Jul 2015 09:54:34 +0300
Subject: [PATCH 124/354] Moved hardcoded message strings

Ref: #516. Now the language strings are in a protected array that can be
changed. I also fixed a status value to be FALSE instead of 0.
---
 application/libraries/REST_Controller.php | 45 ++++++++++++++++-------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 98968b12..94327b08 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -352,6 +352,25 @@ abstract class REST_Controller extends CI_Controller {
         self::HTTP_NOT_IMPLEMENTED => 'NOT IMPLEMENTED'
     ];
 
+    /**
+     * Language strings for the response message
+     *
+     * @var array
+     */
+    protected $text_lang_strings = [
+        'text_rest_invalid_api_key' => 'Invalid API key %s', // %s is the REST API key
+        'text_rest_invalid_credentials' => 'Invalid credentials',
+        'text_rest_ip_denied' => 'IP denied' =>
+        'text_rest_ip_unauthorized' => 'IP unauthorized',
+        'text_rest_unauthorized' => 'Unauthorized',
+        'text_rest_ajax_only' => 'Only Ajax requests are only allowed',
+        'text_rest_api_key_unauthorized' => 'This API key does not have access to the requested controller',
+        'text_rest_api_key_permissions' => 'This API key does not have enough permissions',
+        'text_rest_api_key_time_limit' => 'This API key has reached the time limit for this method',
+        'text_rest_unknown_method' => 'Unknown method',
+        'text_rest_unsupported' => 'Unsupported protocol'
+    ];
+
     /**
      * Extend this function to apply additional checking early on in the process
      *
@@ -501,7 +520,7 @@ public function __construct($config = 'rest')
             // Display an error response
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => 'Only AJAX requests are acceptable'
+                    $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_ajax_only']
                 ], self::HTTP_NOT_ACCEPTABLE);
         }
 
@@ -563,7 +582,7 @@ public function _remap($object_called, $arguments)
         {
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => 'Unsupported protocol'
+                    $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_unsupported']
                 ], self::HTTP_FORBIDDEN);
         }
 
@@ -588,7 +607,7 @@ public function _remap($object_called, $arguments)
 
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => 'Invalid API Key ' . $this->rest->key
+                    $this->config->item('rest_message_field_name') => sprintf($this->text_lang_strings['text_rest_invalid_api_key'], $this->rest->key);
                 ], self::HTTP_FORBIDDEN);
         }
 
@@ -602,7 +621,7 @@ public function _remap($object_called, $arguments)
 
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => 'This API key does not have access to the requested controller.'
+                    $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_api_key_unauthorized']
                 ], self::HTTP_UNAUTHORIZED);
         }
 
@@ -611,7 +630,7 @@ public function _remap($object_called, $arguments)
         {
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => 'Unknown method.'
+                    $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_unknown_method']
                 ], self::HTTP_NOT_FOUND);
         }
 
@@ -621,7 +640,7 @@ public function _remap($object_called, $arguments)
             // Check the limit
             if ($this->config->item('rest_enable_limits') && $this->_check_limit($controller_method) === FALSE)
             {
-                $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key has reached the time limit for this method.'];
+                $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_api_key_time_limit']];
                 $this->response($response, self::HTTP_UNAUTHORIZED);
             }
 
@@ -638,7 +657,7 @@ public function _remap($object_called, $arguments)
             }
 
             // They don't have good enough perms
-            $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => 'This API key does not have enough permissions.'];
+            $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_api_key_permissions']];
             $authorized || $this->response($response, self::HTTP_UNAUTHORIZED);
         }
 
@@ -1844,7 +1863,7 @@ protected function _check_php_session()
             // Display an error response
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => 'Not Authorized'
+                    $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_unauthorized']
                 ], self::HTTP_UNAUTHORIZED);
         }
     }
@@ -1941,8 +1960,8 @@ protected function _prepare_digest_auth()
         {
             // Display an error response
             $this->response([
-                    $this->config->item('rest_status_field_name') => 0,
-                    $this->config->item('rest_message_field_name') => 'Invalid credentials'
+                    $this->config->item('rest_status_field_name') => FALSE,
+                    $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_invalid_credentials']
                 ], self::HTTP_UNAUTHORIZED);
         }
     }
@@ -1964,7 +1983,7 @@ protected function _check_blacklist_auth()
             // Display an error response
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => 'IP Denied'
+                    $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_ip_denied']
                 ], self::HTTP_UNAUTHORIZED);
         }
     }
@@ -1992,7 +2011,7 @@ protected function _check_whitelist_auth()
         {
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => 'IP not authorized'
+                    $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_ip_unauthorized']
                 ], self::HTTP_UNAUTHORIZED);
         }
     }
@@ -2026,7 +2045,7 @@ protected function _force_login($nonce = '')
         // Display an error response
         $this->response([
                 $this->config->item('rest_status_field_name') => FALSE,
-                $this->config->item('rest_message_field_name') => 'Not authorized'
+                $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_unauthorized']
             ], self::HTTP_UNAUTHORIZED);
     }
 

From ccf7978c78e172511db6d6dd03faf0217f399eb1 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 25 Jul 2015 10:07:05 +0300
Subject: [PATCH 125/354] === checking type and value

---
 application/libraries/REST_Controller.php | 32 +++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 94327b08..6f9221b3 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1176,13 +1176,13 @@ protected function _auth_override_check()
             if (!empty($auth_override_class_method[$this->router->class]['*'])) // Check for class overrides
             {
                 // None auth override found, prepare nothing but send back a TRUE override flag
-                if ($auth_override_class_method[$this->router->class]['*'] == 'none')
+                if ($auth_override_class_method[$this->router->class]['*'] === 'none')
                 {
                     return TRUE;
                 }
 
                 // Basic auth override found, prepare basic
-                if ($auth_override_class_method[$this->router->class]['*'] == 'basic')
+                if ($auth_override_class_method[$this->router->class]['*'] === 'basic')
                 {
                     $this->_prepare_basic_auth();
 
@@ -1190,7 +1190,7 @@ protected function _auth_override_check()
                 }
 
                 // Digest auth override found, prepare digest
-                if ($auth_override_class_method[$this->router->class]['*'] == 'digest')
+                if ($auth_override_class_method[$this->router->class]['*'] === 'digest')
                 {
                     $this->_prepare_digest_auth();
 
@@ -1198,7 +1198,7 @@ protected function _auth_override_check()
                 }
 
                 // Whitelist auth override found, check client's ip against config whitelist
-                if ($auth_override_class_method[$this->router->class]['*'] == 'whitelist')
+                if ($auth_override_class_method[$this->router->class]['*'] === 'whitelist')
                 {
                     $this->_check_whitelist_auth();
 
@@ -1210,13 +1210,13 @@ protected function _auth_override_check()
             if (!empty($auth_override_class_method[$this->router->class][$this->router->method]))
             {
                 // None auth override found, prepare nothing but send back a TRUE override flag
-                if ($auth_override_class_method[$this->router->class][$this->router->method] == 'none')
+                if ($auth_override_class_method[$this->router->class][$this->router->method] === 'none')
                 {
                     return TRUE;
                 }
 
                 // Basic auth override found, prepare basic
-                if ($auth_override_class_method[$this->router->class][$this->router->method] == 'basic')
+                if ($auth_override_class_method[$this->router->class][$this->router->method] === 'basic')
                 {
                     $this->_prepare_basic_auth();
 
@@ -1224,7 +1224,7 @@ protected function _auth_override_check()
                 }
 
                 // Digest auth override found, prepare digest
-                if ($auth_override_class_method[$this->router->class][$this->router->method] == 'digest')
+                if ($auth_override_class_method[$this->router->class][$this->router->method] === 'digest')
                 {
                     $this->_prepare_digest_auth();
 
@@ -1232,7 +1232,7 @@ protected function _auth_override_check()
                 }
 
                 // Whitelist auth override found, check client's ip against config whitelist
-                if ($auth_override_class_method[$this->router->class][$this->router->method] == 'whitelist')
+                if ($auth_override_class_method[$this->router->class][$this->router->method] === 'whitelist')
                 {
                     $this->_check_whitelist_auth();
 
@@ -1251,13 +1251,13 @@ protected function _auth_override_check()
             if(!empty($auth_override_class_method_http[$this->router->class]['*'][$this->request->method]))
             {
                 // None auth override found, prepare nothing but send back a TRUE override flag
-                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] == 'none')
+                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'none')
                 {
                     return TRUE;
                 }
 
                 // Basic auth override found, prepare basic
-                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] == 'basic')
+                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'basic')
                 {
                     $this->_prepare_basic_auth();
 
@@ -1265,7 +1265,7 @@ protected function _auth_override_check()
                 }
 
                 // Digest auth override found, prepare digest
-                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] == 'digest')
+                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'digest')
                 {
                     $this->_prepare_digest_auth();
 
@@ -1273,7 +1273,7 @@ protected function _auth_override_check()
                 }
 
                 // Whitelist auth override found, check client's ip against config whitelist
-                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] == 'whitelist')
+                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'whitelist')
                 {
                     $this->_check_whitelist_auth();
 
@@ -1285,13 +1285,13 @@ protected function _auth_override_check()
             if(!empty($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method]))
             {
                 // None auth override found, prepare nothing but send back a TRUE override flag
-                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] == 'none')
+                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'none')
                 {
                     return TRUE;
                 }
 
                 // Basic auth override found, prepare basic
-                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] == 'basic')
+                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'basic')
                 {
                     $this->_prepare_basic_auth();
 
@@ -1299,7 +1299,7 @@ protected function _auth_override_check()
                 }
 
                 // Digest auth override found, prepare digest
-                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] == 'digest')
+                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'digest')
                 {
                     $this->_prepare_digest_auth();
 
@@ -1307,7 +1307,7 @@ protected function _auth_override_check()
                 }
 
                 // Whitelist auth override found, check client's ip against config whitelist
-                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] == 'whitelist')
+                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'whitelist')
                 {
                     $this->_check_whitelist_auth();
 

From 9dbaac8486c118c30d4e62f3181f0d5f280defa0 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 25 Jul 2015 10:57:37 +0300
Subject: [PATCH 126/354] Added whitespace

---
 application/controllers/Rest_server.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/Rest_server.php b/application/controllers/Rest_server.php
index 7ceef858..5d44f921 100644
--- a/application/controllers/Rest_server.php
+++ b/application/controllers/Rest_server.php
@@ -1,4 +1,5 @@
 <?php
+
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 class Rest_server extends CI_Controller {

From c41e75c167b21f1b954fad8bcd6330911921c351 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 25 Jul 2015 11:00:35 +0300
Subject: [PATCH 127/354] Changed inconsistency of return response

Using standard status and message
---
 application/controllers/api/Example.php |  4 ++--
 application/controllers/api/Key.php     | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 479d790c..2cfecaaf 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -56,7 +56,7 @@ public function users_get()
                 // Set the response and exit
                 $this->response([
                     'status' => FALSE,
-                    'error' => 'No users were found'
+                    'message' => 'No users were found'
                 ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
             }
         }
@@ -96,7 +96,7 @@ public function users_get()
         {
             $this->set_response([
                 'status' => FALSE,
-                'error' => 'User could not be found'
+                'message' => 'User could not be found'
             ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
         }
     }
diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
index e2510764..1823c814 100644
--- a/application/controllers/api/Key.php
+++ b/application/controllers/api/Key.php
@@ -52,7 +52,7 @@ public function index_put()
         {
             $this->response([
                 'status' => FALSE,
-                'error' => 'Could not save the key'
+                'message' => 'Could not save the key'
             ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
     }
@@ -73,7 +73,7 @@ public function index_delete()
             // It doesn't appear the key exists
             $this->response([
                 'status' => FALSE,
-                'error' => 'Invalid API key'
+                'message' => 'Invalid API key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
@@ -83,7 +83,7 @@ public function index_delete()
         // Respond that the key was destroyed
         $this->response([
             'status' => TRUE,
-            'success' => 'API key was deleted'
+            'message' => 'API key was deleted'
             ], REST_Controller::HTTP_NO_CONTENT); // NO_CONTENT (204) being the HTTP response code
     }
 
@@ -104,7 +104,7 @@ public function level_post()
             // It doesn't appear the key exists
             $this->response([
                 'status' => FALSE,
-                'error' => 'Invalid API key'
+                'message' => 'Invalid API key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
@@ -113,14 +113,14 @@ public function level_post()
         {
             $this->response([
                 'status' => TRUE,
-                'success' => 'API key was updated'
+                'message' => 'API key was updated'
             ], REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
         else
         {
             $this->response([
                 'status' => FALSE,
-                'error' => 'Could not update the key level'
+                'message' => 'Could not update the key level'
             ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
     }
@@ -141,7 +141,7 @@ public function suspend_post()
             // It doesn't appear the key exists
             $this->response([
                 'status' => FALSE,
-                'error' => 'Invalid API key'
+                'message' => 'Invalid API key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
@@ -150,14 +150,14 @@ public function suspend_post()
         {
             $this->response([
                 'status' => TRUE,
-                'success' => 'Key was suspended'
+                'message' => 'Key was suspended'
             ], REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
         else
         {
             $this->response([
                 'status' => FALSE,
-                'error' => 'Could not suspend the user'
+                'message' => 'Could not suspend the user'
             ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
     }
@@ -179,7 +179,7 @@ public function regenerate_post()
             // It doesn't appear the key exists
             $this->response([
                 'status' => FALSE,
-                'error' => 'Invalid API key'
+                'message' => 'Invalid API key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
@@ -201,7 +201,7 @@ public function regenerate_post()
         {
             $this->response([
                 'status' => FALSE,
-                'error' => 'Could not save the key'
+                'message' => 'Could not save the key'
             ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
     }

From 8e5de1f069a1a586d3104b29c66cd29a75d0e6ad Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 25 Jul 2015 11:02:15 +0300
Subject: [PATCH 128/354] Removed attributes that aren't required

---
 application/views/rest_server.php | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/application/views/rest_server.php b/application/views/rest_server.php
index ffcdd7d8..1de67da7 100644
--- a/application/views/rest_server.php
+++ b/application/views/rest_server.php
@@ -112,11 +112,9 @@
     <p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>' . CI_VERSION . '</strong>' : '' ?></p>
 </div>
 
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
-
-<script type="text/javascript">
-//<![CDATA[
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
 
+<script>
     $(function() {
 
         $("#ajax").on("click", function(evt) {
@@ -139,9 +137,7 @@
             });
         });
     });
-
-//]]>
 </script>
 
 </body>
-</html>
\ No newline at end of file
+</html>

From 4c9b07c6b98941699b6145b653f477de0681308c Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 25 Jul 2015 11:03:59 +0300
Subject: [PATCH 129/354] Refactored JS code to meet Google's standards

---
 application/views/rest_server.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/application/views/rest_server.php b/application/views/rest_server.php
index 1de67da7..3ebe52a8 100644
--- a/application/views/rest_server.php
+++ b/application/views/rest_server.php
@@ -117,25 +117,27 @@
 <script>
     $(function() {
 
-        $("#ajax").on("click", function(evt) {
+        $('#ajax').on('click', function(event) {
 
-            evt.preventDefault();
+            event.preventDefault();
 
             $.ajax({
 
-                url: $(this).attr("href"), // URL from the link that was clicked on.
+                url: $(this).attr('href'), // URL from the link that was clicked on.
 
             }).done(function (data) {
 
                 // The 'data' parameter is an array of objects that can be looped over.
 
-                alert(window.JSON.stringify(data));
+                alert(JSON.stringify(data));
 
             }).fail(function () {
 
-                alert('Oh no! A problem with the AJAX request!');
+                alert('Oh no! A problem with the Ajax request!');
+
             });
         });
+
     });
 </script>
 

From 4293552b5ad5ac6a953e6b300069e97a126898c2 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 25 Jul 2015 11:04:37 +0300
Subject: [PATCH 130/354] Using official jQuery cdn

---
 application/views/rest_server.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/rest_server.php b/application/views/rest_server.php
index 3ebe52a8..18ad4412 100644
--- a/application/views/rest_server.php
+++ b/application/views/rest_server.php
@@ -112,7 +112,7 @@
     <p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>' . CI_VERSION . '</strong>' : '' ?></p>
 </div>
 
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+<script src="https://code.jquery.com/jquery-1.11.3.js"></script>
 
 <script>
     $(function() {

From e8c72e3501b0ff1870488b633567b906b9bc0919 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 25 Jul 2015 11:07:34 +0300
Subject: [PATCH 131/354] Various tweaks to layout

---
 application/views/rest_server.php | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/application/views/rest_server.php b/application/views/rest_server.php
index 18ad4412..efb554f6 100644
--- a/application/views/rest_server.php
+++ b/application/views/rest_server.php
@@ -1,25 +1,27 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-?><!DOCTYPE html>
+    defined('BASEPATH') OR exit('No direct script access allowed');
+?>
+
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8">
     <title>REST Server Tests</title>
 
-    <style type="text/css">
+    <style>
 
     ::selection { background-color: #E13300; color: white; }
     ::-moz-selection { background-color: #E13300; color: white; }
 
     body {
-        background-color: #fff;
+        background-color: #FFF;
         margin: 40px;
         font: 16px/20px normal Helvetica, Arial, sans-serif;
         color: #4F5155;
     }
 
     a {
-        color: #003399;
+        color: #039;
         background-color: transparent;
         font-weight: normal;
     }
@@ -117,13 +119,14 @@
 <script>
     $(function() {
 
-        $('#ajax').on('click', function(event) {
+        $('#ajax').on('click', function (event) {
 
             event.preventDefault();
 
             $.ajax({
 
-                url: $(this).attr('href'), // URL from the link that was clicked on.
+                // URL from the link that was clicked on.
+                url: $(this).attr('href'),
 
             }).done(function (data) {
 

From 00aeef69933c28fe5468eedc328ea404cfa9dc4e Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 25 Jul 2015 17:26:55 +0300
Subject: [PATCH 132/354] Fixed syntax bugs

---
 application/libraries/REST_Controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 6f9221b3..ad38504b 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -360,7 +360,7 @@ abstract class REST_Controller extends CI_Controller {
     protected $text_lang_strings = [
         'text_rest_invalid_api_key' => 'Invalid API key %s', // %s is the REST API key
         'text_rest_invalid_credentials' => 'Invalid credentials',
-        'text_rest_ip_denied' => 'IP denied' =>
+        'text_rest_ip_denied' => 'IP denied',
         'text_rest_ip_unauthorized' => 'IP unauthorized',
         'text_rest_unauthorized' => 'Unauthorized',
         'text_rest_ajax_only' => 'Only Ajax requests are only allowed',
@@ -607,7 +607,7 @@ public function _remap($object_called, $arguments)
 
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => sprintf($this->text_lang_strings['text_rest_invalid_api_key'], $this->rest->key);
+                    $this->config->item('rest_message_field_name') => sprintf($this->text_lang_strings['text_rest_invalid_api_key'], $this->rest->key)
                 ], self::HTTP_FORBIDDEN);
         }
 

From 83bb3b747d658cdb2c239aed4dda8ab3102c03b3 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 25 Jul 2015 17:31:33 +0300
Subject: [PATCH 133/354] Removed unneeded comma

---
 application/views/rest_server.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/rest_server.php b/application/views/rest_server.php
index efb554f6..b5e378db 100644
--- a/application/views/rest_server.php
+++ b/application/views/rest_server.php
@@ -126,7 +126,7 @@
             $.ajax({
 
                 // URL from the link that was clicked on.
-                url: $(this).attr('href'),
+                url: $(this).attr('href')
 
             }).done(function (data) {
 

From b158456c1232876d999eb8c4144451b012273cd1 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 25 Jul 2015 17:42:36 +0300
Subject: [PATCH 134/354] Updated documentation

Includes the fix #525
---
 documentation/404.html                        |    2 +-
 documentation/class-Example.html              |    3 +-
 documentation/class-Key.html                  |    3 +-
 documentation/class-REST_Controller.html      |  127 +-
 documentation/class-Rest_server.html          |    4 +-
 documentation/index.html                      |    2 +-
 .../package-CodeIgniter.Libraries.html        |    2 +-
 documentation/package-CodeIgniter.Rest.html   |    2 +-
 documentation/package-CodeIgniter.html        |    2 +-
 documentation/package-None.html               |    2 +-
 documentation/resources/combined.js           |    2 +-
 documentation/source-class-Example.html       |    6 +-
 documentation/source-class-Format.html        |    2 +-
 documentation/source-class-Key.html           |   24 +-
 .../source-class-REST_Controller.html         | 3213 +++++++++--------
 documentation/source-class-Rest_server.html   |   27 +-
 documentation/source-class-Welcome.html       |    2 +-
 17 files changed, 1742 insertions(+), 1683 deletions(-)

diff --git a/documentation/404.html b/documentation/404.html
index 8a6b8ffa..27b3bc36 100644
--- a/documentation/404.html
+++ b/documentation/404.html
@@ -104,7 +104,7 @@ <h1>Page not found</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
 <script src="http://github.com/elementlist.js"></script>
 </body>
 </html>
diff --git a/documentation/class-Example.html b/documentation/class-Example.html
index e8af6477..8e22e562 100644
--- a/documentation/class-Example.html
+++ b/documentation/class-Example.html
@@ -432,7 +432,8 @@ <h4>Overrides</h4>
 			<a href="http://github.com/class-REST_Controller.html#$request"><var>$request</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$response"><var>$response</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$rest"><var>$rest</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$rest_format"><var>$rest_format</var></a>
+			<a href="http://github.com/class-REST_Controller.html#$rest_format"><var>$rest_format</var></a>, 
+			<a href="http://github.com/class-REST_Controller.html#$text_lang_strings"><var>$text_lang_strings</var></a>
 		</code></td>
 	</tr>
 	</table>
diff --git a/documentation/class-Key.html b/documentation/class-Key.html
index 540d7d3e..4abc4d24 100644
--- a/documentation/class-Key.html
+++ b/documentation/class-Key.html
@@ -487,7 +487,8 @@ <h1>Class Key</h1>
 			<a href="http://github.com/class-REST_Controller.html#$request"><var>$request</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$response"><var>$response</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$rest"><var>$rest</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$rest_format"><var>$rest_format</var></a>
+			<a href="http://github.com/class-REST_Controller.html#$rest_format"><var>$rest_format</var></a>, 
+			<a href="http://github.com/class-REST_Controller.html#$text_lang_strings"><var>$text_lang_strings</var></a>
 		</code></td>
 	</tr>
 	</table>
diff --git a/documentation/class-REST_Controller.html b/documentation/class-REST_Controller.html
index 67ca8676..12271449 100644
--- a/documentation/class-REST_Controller.html
+++ b/documentation/class-REST_Controller.html
@@ -137,7 +137,7 @@ <h4>Direct known subclasses</h4>
 				3.0.0<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-2100" title="Go to source code">libraries/REST_Controller.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-2119" title="Go to source code">libraries/REST_Controller.php</a>
 		<br>
 	</div>
 
@@ -157,7 +157,7 @@ <h4>Direct known subclasses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_early_checks">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#355-363" title="Go to source code">early_checks</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#374-382" title="Go to source code">early_checks</a>( )</code>
 
 		<div class="description short">
 			<p>Extend this function to apply additional checking early on in the process</p>
@@ -187,7 +187,7 @@ <h4>Direct known subclasses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___construct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#365-529" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#384-548" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
 
 		<div class="description short">
 			<p>Constructor for the REST API</p>
@@ -223,7 +223,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___destruct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#531-548" title="Go to source code">__destruct</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#550-567" title="Go to source code">__destruct</a>( )</code>
 
 		<div class="description short">
 			<p>Deconstructor</p>
@@ -257,7 +257,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__remap">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#550-667" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#569-686" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var></span> )</code>
 
 		<div class="description short">
 			<p>Requests are not made to methods directly, the request will be for
@@ -298,7 +298,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#669-750" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#688-769" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Takes mixed data and optionally a status code, then creates the response</p>
@@ -338,7 +338,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_set_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#752-765" title="Go to source code">set_response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#771-784" title="Go to source code">set_response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Takes mixed data and optionally a status code, then creates the response
@@ -381,7 +381,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_input_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#767-799" title="Go to source code">_detect_input_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#786-818" title="Go to source code">_detect_input_format</a>( )</code>
 
 		<div class="description short">
 			<p>Get the input format e.g. json or xml</p>
@@ -415,7 +415,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_output_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#801-870" title="Go to source code">_detect_output_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#820-889" title="Go to source code">_detect_output_format</a>( )</code>
 
 		<div class="description short">
 			<p>Detect which format should be used to output the data</p>
@@ -449,7 +449,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_method">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#872-902" title="Go to source code">_detect_method</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#891-921" title="Go to source code">_detect_method</a>( )</code>
 
 		<div class="description short">
 			<p>Get the HTTP request string e.g. get or post</p>
@@ -483,7 +483,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_api_key">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#904-976" title="Go to source code">_detect_api_key</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#923-995" title="Go to source code">_detect_api_key</a>( )</code>
 
 		<div class="description short">
 			<p>See if the user has provided an API key</p>
@@ -517,7 +517,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_lang">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#978-1010" title="Go to source code">_detect_lang</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#997-1029" title="Go to source code">_detect_lang</a>( )</code>
 
 		<div class="description short">
 			<p>Preferred return language</p>
@@ -551,7 +551,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_request">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1012-1038" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1031-1057" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Add the request to the log table</p>
@@ -590,7 +590,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_limit">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1040-1140" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1059-1159" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
 
 		<div class="description short">
 			<p>Check if the requests to a controller method exceed a limit</p>
@@ -629,7 +629,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__auth_override_check">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1142-1300" title="Go to source code">_auth_override_check</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1161-1319" title="Go to source code">_auth_override_check</a>( )</code>
 
 		<div class="description short">
 			<p>Check if there is a specific auth type set for the current class/method/HTTP-method being called</p>
@@ -663,7 +663,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1302-1312" title="Go to source code">_parse_get</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1321-1331" title="Go to source code">_parse_get</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the GET request arguments</p>
@@ -693,7 +693,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1314-1328" title="Go to source code">_parse_post</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1333-1347" title="Go to source code">_parse_post</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the POST request arguments</p>
@@ -723,7 +723,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1330-1350" title="Go to source code">_parse_put</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1349-1369" title="Go to source code">_parse_put</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PUT request arguments</p>
@@ -753,7 +753,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1352-1365" title="Go to source code">_parse_head</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1371-1384" title="Go to source code">_parse_head</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the HEAD request arguments</p>
@@ -783,7 +783,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1367-1380" title="Go to source code">_parse_options</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1386-1399" title="Go to source code">_parse_options</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the OPTIONS request arguments</p>
@@ -813,7 +813,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1382-1403" title="Go to source code">_parse_patch</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1401-1422" title="Go to source code">_parse_patch</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PATCH request arguments</p>
@@ -843,7 +843,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1405-1418" title="Go to source code">_parse_delete</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1424-1437" title="Go to source code">_parse_delete</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the DELETE request arguments</p>
@@ -873,7 +873,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1420-1452" title="Go to source code">_parse_query</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1439-1471" title="Go to source code">_parse_query</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the query parameters</p>
@@ -903,7 +903,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1456-1473" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1475-1492" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a GET request</p>
@@ -945,7 +945,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1475-1492" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1494-1511" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a OPTIONS request</p>
@@ -987,7 +987,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1494-1511" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1513-1530" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a HEAD request</p>
@@ -1029,7 +1029,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1513-1530" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1532-1549" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a POST request</p>
@@ -1071,7 +1071,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1532-1549" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1551-1568" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PUT request</p>
@@ -1113,7 +1113,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1551-1568" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1570-1587" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a DELETE request</p>
@@ -1155,7 +1155,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1570-1587" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1589-1606" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PATCH request</p>
@@ -1197,7 +1197,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1589-1606" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1608-1625" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from the query parameters</p>
@@ -1239,7 +1239,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__xss_clean">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1608-1622" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1627-1641" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
 
 		<div class="description short">
 			<p>Sanitizes data so that Cross Site Scripting Hacks can be
@@ -1282,7 +1282,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_validation_errors">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1624-1635" title="Go to source code">validation_errors</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1643-1654" title="Go to source code">validation_errors</a>( )</code>
 
 		<div class="description short">
 			<p>Retrieve the validation errors</p>
@@ -1316,7 +1316,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_ldap_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1639-1732" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1658-1751" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform LDAP Authentication</p>
@@ -1357,7 +1357,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_library_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1734-1771" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1753-1790" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform Library Authentication - Override this function to change the way the library is called</p>
@@ -1398,7 +1398,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1773-1828" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1792-1847" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Check if the user is logged in</p>
@@ -1439,7 +1439,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_php_session">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1830-1850" title="Go to source code">_check_php_session</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1849-1869" title="Go to source code">_check_php_session</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the user is logged in with a PHP session key</p>
@@ -1469,7 +1469,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_basic_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1852-1891" title="Go to source code">_prepare_basic_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1871-1910" title="Go to source code">_prepare_basic_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for basic authentication</p>
@@ -1499,7 +1499,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_digest_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1893-1948" title="Go to source code">_prepare_digest_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1912-1967" title="Go to source code">_prepare_digest_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for digest authentication</p>
@@ -1529,7 +1529,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_blacklist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1950-1970" title="Go to source code">_check_blacklist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1969-1989" title="Go to source code">_check_blacklist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response</p>
@@ -1559,7 +1559,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_whitelist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1972-1998" title="Go to source code">_check_whitelist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1991-2017" title="Go to source code">_check_whitelist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response</p>
@@ -1589,7 +1589,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__force_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2000-2031" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2019-2050" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
 
 		<div class="description short">
 			<p>Force logging in by setting the WWW-Authenticate header</p>
@@ -1625,7 +1625,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_access_time">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2033-2048" title="Go to source code">_log_access_time</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2052-2067" title="Go to source code">_log_access_time</a>( )</code>
 
 		<div class="description short">
 			<p>Updates the log table with the total access time</p>
@@ -1663,7 +1663,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_response_code">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2050-2066" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2069-2085" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
 
 		<div class="description short">
 			<p>Updates the log table with HTTP response code</p>
@@ -1706,7 +1706,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_access">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2068-2098" title="Go to source code">_check_access</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2087-2117" title="Go to source code">_check_access</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the API key has access to the controller and methods</p>
@@ -3839,6 +3839,43 @@ <h4>Link</h4>
     self::HTTP_CONFLICT =&gt; <span class="php-quote">'CONFLICT'</span>,
     self::HTTP_INTERNAL_SERVER_ERROR =&gt; <span class="php-quote">'INTERNAL SERVER ERROR'</span>,
     self::HTTP_NOT_IMPLEMENTED =&gt; <span class="php-quote">'NOT IMPLEMENTED'</span>
+]</code>
+			</div>
+		</td>
+	</tr>
+	<tr data-order="text_lang_strings" id="$text_lang_strings">
+		<td class="attributes"><code>
+			protected  
+			array
+		</code></td>
+
+		<td class="name">
+				<a href="http://github.com/source-class-REST_Controller.html#355-372" title="Go to source code"><var>$text_lang_strings</var></a>
+
+			<div class="description short">
+				<p>Language strings for the response message</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>Language strings for the response message</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#$text_lang_strings" class="anchor">#</a>
+				<code>[
+    <span class="php-quote">'text_rest_invalid_api_key'</span> =&gt; <span class="php-quote">'Invalid API key %s'</span>, <span class="php-comment">// %s is the REST API key</span>
+    <span class="php-quote">'text_rest_invalid_credentials'</span> =&gt; <span class="php-quote">'Invalid credentials'</span>,
+    <span class="php-quote">'text_rest_ip_denied'</span> =&gt; <span class="php-quote">'IP denied'</span>,
+    <span class="php-quote">'text_rest_ip_unauthorized'</span> =&gt; <span class="php-quote">'IP unauthorized'</span>,
+    <span class="php-quote">'text_rest_unauthorized'</span> =&gt; <span class="php-quote">'Unauthorized'</span>,
+    <span class="php-quote">'text_rest_ajax_only'</span> =&gt; <span class="php-quote">'Only Ajax requests are only allowed'</span>,
+    <span class="php-quote">'text_rest_api_key_unauthorized'</span> =&gt; <span class="php-quote">'This API key does not have access to the requested controller'</span>,
+    <span class="php-quote">'text_rest_api_key_permissions'</span> =&gt; <span class="php-quote">'This API key does not have enough permissions'</span>,
+    <span class="php-quote">'text_rest_api_key_time_limit'</span> =&gt; <span class="php-quote">'This API key has reached the time limit for this method'</span>,
+    <span class="php-quote">'text_rest_unknown_method'</span> =&gt; <span class="php-quote">'Unknown method'</span>,
+    <span class="php-quote">'text_rest_unsupported'</span> =&gt; <span class="php-quote">'Unsupported protocol'</span>
 ]</code>
 			</div>
 		</td>
diff --git a/documentation/class-Rest_server.html b/documentation/class-Rest_server.html
index d414d461..20eae472 100644
--- a/documentation/class-Rest_server.html
+++ b/documentation/class-Rest_server.html
@@ -120,7 +120,7 @@ <h1>Class Rest_server</h1>
 		
 		
 
-			<b>Located at</b> <a href="http://github.com/source-class-Rest_server.html#4-12" title="Go to source code">controllers/Rest_server.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-Rest_server.html#5-13" title="Go to source code">controllers/Rest_server.php</a>
 		<br>
 	</div>
 
@@ -140,7 +140,7 @@ <h1>Class Rest_server</h1>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_index">#</a>
-		<code><a href="http://github.com/source-class-Rest_server.html#6-11" title="Go to source code">index</a>( )</code>
+		<code><a href="http://github.com/source-class-Rest_server.html#7-12" title="Go to source code">index</a>( )</code>
 
 		<div class="description short">
 			
diff --git a/documentation/index.html b/documentation/index.html
index 64a7cab9..e2e1801a 100644
--- a/documentation/index.html
+++ b/documentation/index.html
@@ -125,7 +125,7 @@ <h1>Overview</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
 <script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/package-CodeIgniter.Libraries.html b/documentation/package-CodeIgniter.Libraries.html
index 4d4833cd..2e0fe2ed 100644
--- a/documentation/package-CodeIgniter.Libraries.html
+++ b/documentation/package-CodeIgniter.Libraries.html
@@ -111,7 +111,7 @@ <h1>Package <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\Libraries</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
 <script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/package-CodeIgniter.Rest.html b/documentation/package-CodeIgniter.Rest.html
index c532fa4d..f6d41a7d 100644
--- a/documentation/package-CodeIgniter.Rest.html
+++ b/documentation/package-CodeIgniter.Rest.html
@@ -117,7 +117,7 @@ <h1>Package <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\Rest</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
 <script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/package-CodeIgniter.html b/documentation/package-CodeIgniter.html
index f2ec181d..e9351dfc 100644
--- a/documentation/package-CodeIgniter.html
+++ b/documentation/package-CodeIgniter.html
@@ -107,7 +107,7 @@ <h1>Package CodeIgniter</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
 <script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/package-None.html b/documentation/package-None.html
index 7d10ab75..08b3ad5c 100644
--- a/documentation/package-None.html
+++ b/documentation/package-None.html
@@ -121,7 +121,7 @@ <h1>No package</h1>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
 <script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/resources/combined.js b/documentation/resources/combined.js
index 489234d5..84bde60a 100644
--- a/documentation/resources/combined.js
+++ b/documentation/resources/combined.js
@@ -1,6 +1,6 @@
 
 var ApiGen = ApiGen || {};
-ApiGen.config = {"options":{"elementDetailsCollapsed":true,"elementsOrder":"natural"},"name":"ApiGen theme","templatesPath":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src","resources":{"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/resources":"resources"},"templates":{"overview":{"filename":"index.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/overview.latte"},"combined":{"filename":"resources\/combined.js","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/combined.js.latte"},"elementlist":{"filename":"elementlist.js","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/elementlist.js.latte"},"404":{"filename":"404.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/404.latte"},"package":{"filename":"package-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/package.latte"},"namespace":{"filename":"namespace-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/namespace.latte"},"class":{"filename":"class-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/class.latte"},"constant":{"filename":"constant-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/constant.latte"},"function":{"filename":"function-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/function.latte"},"annotationGroup":{"filename":"annotation-group-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/annotation-group.latte"},"source":{"filename":"source-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/source.latte"},"tree":{"filename":"tree.html","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/tree.latte"},"sitemap":{"filename":"sitemap.xml","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/sitemap.xml.latte"},"opensearch":{"filename":"opensearch.xml","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/opensearch.xml.latte"},"robots":{"filename":"robots.txt","template":"phar:\/\/C:\/Users\/softwarespot\/Downloads\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/robots.txt.latte"}}};
+ApiGen.config = {"options":{"elementDetailsCollapsed":true,"elementsOrder":"natural"},"name":"ApiGen theme","templatesPath":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src","resources":{"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/resources":"resources"},"templates":{"overview":{"filename":"index.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/overview.latte"},"combined":{"filename":"resources\/combined.js","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/combined.js.latte"},"elementlist":{"filename":"elementlist.js","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/elementlist.js.latte"},"404":{"filename":"404.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/404.latte"},"package":{"filename":"package-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/package.latte"},"namespace":{"filename":"namespace-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/namespace.latte"},"class":{"filename":"class-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/class.latte"},"constant":{"filename":"constant-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/constant.latte"},"function":{"filename":"function-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/function.latte"},"annotationGroup":{"filename":"annotation-group-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/annotation-group.latte"},"source":{"filename":"source-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/source.latte"},"tree":{"filename":"tree.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/tree.latte"},"sitemap":{"filename":"sitemap.xml","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/sitemap.xml.latte"},"opensearch":{"filename":"opensearch.xml","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/opensearch.xml.latte"},"robots":{"filename":"robots.txt","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/robots.txt.latte"}}};
 
 
 	/*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
diff --git a/documentation/source-class-Example.html b/documentation/source-class-Example.html
index 73786431..9544bae6 100644
--- a/documentation/source-class-Example.html
+++ b/documentation/source-class-Example.html
@@ -150,7 +150,7 @@ <h3>Classes</h3>
 </span><span id="56" class="l"><a href="#56"> 56: </a>                <span class="php-comment">// Set the response and exit</span>
 </span><span id="57" class="l"><a href="#57"> 57: </a>                <span class="php-var">$this</span>-&gt;response([
 </span><span id="58" class="l"><a href="#58"> 58: </a>                    <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="59" class="l"><a href="#59"> 59: </a>                    <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'No users were found'</span>
+</span><span id="59" class="l"><a href="#59"> 59: </a>                    <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'No users were found'</span>
 </span><span id="60" class="l"><a href="#60"> 60: </a>                ], REST_Controller::HTTP_NOT_FOUND); <span class="php-comment">// NOT_FOUND (404) being the HTTP response code</span>
 </span><span id="61" class="l"><a href="#61"> 61: </a>            }
 </span><span id="62" class="l"><a href="#62"> 62: </a>        }
@@ -190,7 +190,7 @@ <h3>Classes</h3>
 </span><span id="96" class="l"><a href="#96"> 96: </a>        {
 </span><span id="97" class="l"><a href="#97"> 97: </a>            <span class="php-var">$this</span>-&gt;set_response([
 </span><span id="98" class="l"><a href="#98"> 98: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="99" class="l"><a href="#99"> 99: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'User could not be found'</span>
+</span><span id="99" class="l"><a href="#99"> 99: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'User could not be found'</span>
 </span><span id="100" class="l"><a href="#100">100: </a>            ], REST_Controller::HTTP_NOT_FOUND); <span class="php-comment">// NOT_FOUND (404) being the HTTP response code</span>
 </span><span id="101" class="l"><a href="#101">101: </a>        }
 </span><span id="102" class="l"><a href="#102">102: </a>    }
@@ -236,7 +236,7 @@ <h3>Classes</h3>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
 <script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Format.html b/documentation/source-class-Format.html
index 935100d0..050cbd84 100644
--- a/documentation/source-class-Format.html
+++ b/documentation/source-class-Format.html
@@ -630,7 +630,7 @@ <h3>Classes</h3>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
 <script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Key.html b/documentation/source-class-Key.html
index a2ffbb80..0d0e86e9 100644
--- a/documentation/source-class-Key.html
+++ b/documentation/source-class-Key.html
@@ -146,7 +146,7 @@ <h3>Classes</h3>
 </span><span id="52" class="l"><a href="#52"> 52: </a>        {
 </span><span id="53" class="l"><a href="#53"> 53: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="54" class="l"><a href="#54"> 54: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="55" class="l"><a href="#55"> 55: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
+</span><span id="55" class="l"><a href="#55"> 55: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
 </span><span id="56" class="l"><a href="#56"> 56: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
 </span><span id="57" class="l"><a href="#57"> 57: </a>        }
 </span><span id="58" class="l"><a href="#58"> 58: </a>    }
@@ -167,7 +167,7 @@ <h3>Classes</h3>
 </span><span id="73" class="l"><a href="#73"> 73: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
 </span><span id="74" class="l"><a href="#74"> 74: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="75" class="l"><a href="#75"> 75: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="76" class="l"><a href="#76"> 76: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
+</span><span id="76" class="l"><a href="#76"> 76: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
 </span><span id="77" class="l"><a href="#77"> 77: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
 </span><span id="78" class="l"><a href="#78"> 78: </a>        }
 </span><span id="79" class="l"><a href="#79"> 79: </a>
@@ -177,7 +177,7 @@ <h3>Classes</h3>
 </span><span id="83" class="l"><a href="#83"> 83: </a>        <span class="php-comment">// Respond that the key was destroyed</span>
 </span><span id="84" class="l"><a href="#84"> 84: </a>        <span class="php-var">$this</span>-&gt;response([
 </span><span id="85" class="l"><a href="#85"> 85: </a>            <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
-</span><span id="86" class="l"><a href="#86"> 86: </a>            <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API key was deleted'</span>
+</span><span id="86" class="l"><a href="#86"> 86: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'API key was deleted'</span>
 </span><span id="87" class="l"><a href="#87"> 87: </a>            ], REST_Controller::HTTP_NO_CONTENT); <span class="php-comment">// NO_CONTENT (204) being the HTTP response code</span>
 </span><span id="88" class="l"><a href="#88"> 88: </a>    }
 </span><span id="89" class="l"><a href="#89"> 89: </a>
@@ -198,7 +198,7 @@ <h3>Classes</h3>
 </span><span id="104" class="l"><a href="#104">104: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
 </span><span id="105" class="l"><a href="#105">105: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="106" class="l"><a href="#106">106: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="107" class="l"><a href="#107">107: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
+</span><span id="107" class="l"><a href="#107">107: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
 </span><span id="108" class="l"><a href="#108">108: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
 </span><span id="109" class="l"><a href="#109">109: </a>        }
 </span><span id="110" class="l"><a href="#110">110: </a>
@@ -207,14 +207,14 @@ <h3>Classes</h3>
 </span><span id="113" class="l"><a href="#113">113: </a>        {
 </span><span id="114" class="l"><a href="#114">114: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="115" class="l"><a href="#115">115: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
-</span><span id="116" class="l"><a href="#116">116: </a>                <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'API key was updated'</span>
+</span><span id="116" class="l"><a href="#116">116: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'API key was updated'</span>
 </span><span id="117" class="l"><a href="#117">117: </a>            ], REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
 </span><span id="118" class="l"><a href="#118">118: </a>        }
 </span><span id="119" class="l"><a href="#119">119: </a>        <span class="php-keyword1">else</span>
 </span><span id="120" class="l"><a href="#120">120: </a>        {
 </span><span id="121" class="l"><a href="#121">121: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="122" class="l"><a href="#122">122: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="123" class="l"><a href="#123">123: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not update the key level'</span>
+</span><span id="123" class="l"><a href="#123">123: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Could not update the key level'</span>
 </span><span id="124" class="l"><a href="#124">124: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
 </span><span id="125" class="l"><a href="#125">125: </a>        }
 </span><span id="126" class="l"><a href="#126">126: </a>    }
@@ -235,7 +235,7 @@ <h3>Classes</h3>
 </span><span id="141" class="l"><a href="#141">141: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
 </span><span id="142" class="l"><a href="#142">142: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="143" class="l"><a href="#143">143: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="144" class="l"><a href="#144">144: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
+</span><span id="144" class="l"><a href="#144">144: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
 </span><span id="145" class="l"><a href="#145">145: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
 </span><span id="146" class="l"><a href="#146">146: </a>        }
 </span><span id="147" class="l"><a href="#147">147: </a>
@@ -244,14 +244,14 @@ <h3>Classes</h3>
 </span><span id="150" class="l"><a href="#150">150: </a>        {
 </span><span id="151" class="l"><a href="#151">151: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="152" class="l"><a href="#152">152: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
-</span><span id="153" class="l"><a href="#153">153: </a>                <span class="php-quote">'success'</span> =&gt; <span class="php-quote">'Key was suspended'</span>
+</span><span id="153" class="l"><a href="#153">153: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Key was suspended'</span>
 </span><span id="154" class="l"><a href="#154">154: </a>            ], REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
 </span><span id="155" class="l"><a href="#155">155: </a>        }
 </span><span id="156" class="l"><a href="#156">156: </a>        <span class="php-keyword1">else</span>
 </span><span id="157" class="l"><a href="#157">157: </a>        {
 </span><span id="158" class="l"><a href="#158">158: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="159" class="l"><a href="#159">159: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="160" class="l"><a href="#160">160: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not suspend the user'</span>
+</span><span id="160" class="l"><a href="#160">160: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Could not suspend the user'</span>
 </span><span id="161" class="l"><a href="#161">161: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
 </span><span id="162" class="l"><a href="#162">162: </a>        }
 </span><span id="163" class="l"><a href="#163">163: </a>    }
@@ -273,7 +273,7 @@ <h3>Classes</h3>
 </span><span id="179" class="l"><a href="#179">179: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
 </span><span id="180" class="l"><a href="#180">180: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="181" class="l"><a href="#181">181: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="182" class="l"><a href="#182">182: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
+</span><span id="182" class="l"><a href="#182">182: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
 </span><span id="183" class="l"><a href="#183">183: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
 </span><span id="184" class="l"><a href="#184">184: </a>        }
 </span><span id="185" class="l"><a href="#185">185: </a>
@@ -295,7 +295,7 @@ <h3>Classes</h3>
 </span><span id="201" class="l"><a href="#201">201: </a>        {
 </span><span id="202" class="l"><a href="#202">202: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="203" class="l"><a href="#203">203: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="204" class="l"><a href="#204">204: </a>                <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
+</span><span id="204" class="l"><a href="#204">204: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
 </span><span id="205" class="l"><a href="#205">205: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
 </span><span id="206" class="l"><a href="#206">206: </a>        }
 </span><span id="207" class="l"><a href="#207">207: </a>    }
@@ -371,7 +371,7 @@ <h3>Classes</h3>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
 <script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/source-class-REST_Controller.html b/documentation/source-class-REST_Controller.html
index 4a5a2ae5..e36232ee 100644
--- a/documentation/source-class-REST_Controller.html
+++ b/documentation/source-class-REST_Controller.html
@@ -447,1759 +447,1778 @@ <h3>Classes</h3>
 </span><span id="353" class="l"><a href="#353"> 353: </a>    ];
 </span><span id="354" class="l"><a href="#354"> 354: </a>
 </span><span id="355" class="l"><a href="#355"> 355: </a>    <span class="php-comment">/**
-</span></span><span id="356" class="l"><a href="#356"> 356: </a><span class="php-comment">     * Extend this function to apply additional checking early on in the process
+</span></span><span id="356" class="l"><a href="#356"> 356: </a><span class="php-comment">     * Language strings for the response message
 </span></span><span id="357" class="l"><a href="#357"> 357: </a><span class="php-comment">     *
-</span></span><span id="358" class="l"><a href="#358"> 358: </a><span class="php-comment">     * @access protected
-</span></span><span id="359" class="l"><a href="#359"> 359: </a><span class="php-comment">     * @return void
-</span></span><span id="360" class="l"><a href="#360"> 360: </a><span class="php-comment">     */</span>
-</span><span id="361" class="l"><a href="#361"> 361: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> early_checks()
-</span><span id="362" class="l"><a href="#362"> 362: </a>    {
-</span><span id="363" class="l"><a href="#363"> 363: </a>    }
-</span><span id="364" class="l"><a href="#364"> 364: </a>
-</span><span id="365" class="l"><a href="#365"> 365: </a>    <span class="php-comment">/**
-</span></span><span id="366" class="l"><a href="#366"> 366: </a><span class="php-comment">     * Constructor for the REST API
-</span></span><span id="367" class="l"><a href="#367"> 367: </a><span class="php-comment">     *
-</span></span><span id="368" class="l"><a href="#368"> 368: </a><span class="php-comment">     * @access public
-</span></span><span id="369" class="l"><a href="#369"> 369: </a><span class="php-comment">     * @param string $config Configuration filename minus the file extension
-</span></span><span id="370" class="l"><a href="#370"> 370: </a><span class="php-comment">     * e.g: my_rest.php is passed as 'my_rest'
-</span></span><span id="371" class="l"><a href="#371"> 371: </a><span class="php-comment">     * @return void
-</span></span><span id="372" class="l"><a href="#372"> 372: </a><span class="php-comment">     */</span>
-</span><span id="373" class="l"><a href="#373"> 373: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$config</span> = <span class="php-quote">'rest'</span>)
-</span><span id="374" class="l"><a href="#374"> 374: </a>    {
-</span><span id="375" class="l"><a href="#375"> 375: </a>        parent::__construct();
-</span><span id="376" class="l"><a href="#376"> 376: </a>
-</span><span id="377" class="l"><a href="#377"> 377: </a>        <span class="php-comment">// Disable XML Entity (security vulnerability)</span>
-</span><span id="378" class="l"><a href="#378"> 378: </a>        <span class="php-keyword2">libxml_disable_entity_loader</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="379" class="l"><a href="#379"> 379: </a>
-</span><span id="380" class="l"><a href="#380"> 380: </a>        <span class="php-comment">// Check to see if PHP is equal to or greater than 5.4.x</span>
-</span><span id="381" class="l"><a href="#381"> 381: </a>        <span class="php-keyword1">if</span> (is_php(<span class="php-quote">'5.4'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="382" class="l"><a href="#382"> 382: </a>        {
-</span><span id="383" class="l"><a href="#383"> 383: </a>            <span class="php-comment">// CodeIgniter 3 is recommended for v5.4 or above</span>
-</span><span id="384" class="l"><a href="#384"> 384: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'Using PHP v'</span> . PHP_VERSION . <span class="php-quote">', though PHP v5.4 or greater is required'</span>);
-</span><span id="385" class="l"><a href="#385"> 385: </a>        }
-</span><span id="386" class="l"><a href="#386"> 386: </a>
-</span><span id="387" class="l"><a href="#387"> 387: </a>        <span class="php-comment">// Check to see if this is CI 3.x</span>
-</span><span id="388" class="l"><a href="#388"> 388: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">explode</span>(<span class="php-quote">'.'</span>, CI_VERSION, <span class="php-num">2</span>)[<span class="php-num">0</span>] &lt; <span class="php-num">3</span>)
-</span><span id="389" class="l"><a href="#389"> 389: </a>        {
-</span><span id="390" class="l"><a href="#390"> 390: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
-</span><span id="391" class="l"><a href="#391"> 391: </a>        }
-</span><span id="392" class="l"><a href="#392"> 392: </a>
-</span><span id="393" class="l"><a href="#393"> 393: </a>        <span class="php-comment">// Set the default value of global xss filtering. Same approach as CodeIgniter 3</span>
-</span><span id="394" class="l"><a href="#394"> 394: </a>        <span class="php-var">$this</span>-&gt;_enable_xss = (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'global_xss_filtering'</span>) === <span class="php-keyword1">TRUE</span>);
+</span></span><span id="358" class="l"><a href="#358"> 358: </a><span class="php-comment">     * @var array
+</span></span><span id="359" class="l"><a href="#359"> 359: </a><span class="php-comment">     */</span>
+</span><span id="360" class="l"><a href="#360"> 360: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$text_lang_strings</span> = [
+</span><span id="361" class="l"><a href="#361"> 361: </a>        <span class="php-quote">'text_rest_invalid_api_key'</span> =&gt; <span class="php-quote">'Invalid API key %s'</span>, <span class="php-comment">// %s is the REST API key</span>
+</span><span id="362" class="l"><a href="#362"> 362: </a>        <span class="php-quote">'text_rest_invalid_credentials'</span> =&gt; <span class="php-quote">'Invalid credentials'</span>,
+</span><span id="363" class="l"><a href="#363"> 363: </a>        <span class="php-quote">'text_rest_ip_denied'</span> =&gt; <span class="php-quote">'IP denied'</span>,
+</span><span id="364" class="l"><a href="#364"> 364: </a>        <span class="php-quote">'text_rest_ip_unauthorized'</span> =&gt; <span class="php-quote">'IP unauthorized'</span>,
+</span><span id="365" class="l"><a href="#365"> 365: </a>        <span class="php-quote">'text_rest_unauthorized'</span> =&gt; <span class="php-quote">'Unauthorized'</span>,
+</span><span id="366" class="l"><a href="#366"> 366: </a>        <span class="php-quote">'text_rest_ajax_only'</span> =&gt; <span class="php-quote">'Only Ajax requests are only allowed'</span>,
+</span><span id="367" class="l"><a href="#367"> 367: </a>        <span class="php-quote">'text_rest_api_key_unauthorized'</span> =&gt; <span class="php-quote">'This API key does not have access to the requested controller'</span>,
+</span><span id="368" class="l"><a href="#368"> 368: </a>        <span class="php-quote">'text_rest_api_key_permissions'</span> =&gt; <span class="php-quote">'This API key does not have enough permissions'</span>,
+</span><span id="369" class="l"><a href="#369"> 369: </a>        <span class="php-quote">'text_rest_api_key_time_limit'</span> =&gt; <span class="php-quote">'This API key has reached the time limit for this method'</span>,
+</span><span id="370" class="l"><a href="#370"> 370: </a>        <span class="php-quote">'text_rest_unknown_method'</span> =&gt; <span class="php-quote">'Unknown method'</span>,
+</span><span id="371" class="l"><a href="#371"> 371: </a>        <span class="php-quote">'text_rest_unsupported'</span> =&gt; <span class="php-quote">'Unsupported protocol'</span>
+</span><span id="372" class="l"><a href="#372"> 372: </a>    ];
+</span><span id="373" class="l"><a href="#373"> 373: </a>
+</span><span id="374" class="l"><a href="#374"> 374: </a>    <span class="php-comment">/**
+</span></span><span id="375" class="l"><a href="#375"> 375: </a><span class="php-comment">     * Extend this function to apply additional checking early on in the process
+</span></span><span id="376" class="l"><a href="#376"> 376: </a><span class="php-comment">     *
+</span></span><span id="377" class="l"><a href="#377"> 377: </a><span class="php-comment">     * @access protected
+</span></span><span id="378" class="l"><a href="#378"> 378: </a><span class="php-comment">     * @return void
+</span></span><span id="379" class="l"><a href="#379"> 379: </a><span class="php-comment">     */</span>
+</span><span id="380" class="l"><a href="#380"> 380: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> early_checks()
+</span><span id="381" class="l"><a href="#381"> 381: </a>    {
+</span><span id="382" class="l"><a href="#382"> 382: </a>    }
+</span><span id="383" class="l"><a href="#383"> 383: </a>
+</span><span id="384" class="l"><a href="#384"> 384: </a>    <span class="php-comment">/**
+</span></span><span id="385" class="l"><a href="#385"> 385: </a><span class="php-comment">     * Constructor for the REST API
+</span></span><span id="386" class="l"><a href="#386"> 386: </a><span class="php-comment">     *
+</span></span><span id="387" class="l"><a href="#387"> 387: </a><span class="php-comment">     * @access public
+</span></span><span id="388" class="l"><a href="#388"> 388: </a><span class="php-comment">     * @param string $config Configuration filename minus the file extension
+</span></span><span id="389" class="l"><a href="#389"> 389: </a><span class="php-comment">     * e.g: my_rest.php is passed as 'my_rest'
+</span></span><span id="390" class="l"><a href="#390"> 390: </a><span class="php-comment">     * @return void
+</span></span><span id="391" class="l"><a href="#391"> 391: </a><span class="php-comment">     */</span>
+</span><span id="392" class="l"><a href="#392"> 392: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$config</span> = <span class="php-quote">'rest'</span>)
+</span><span id="393" class="l"><a href="#393"> 393: </a>    {
+</span><span id="394" class="l"><a href="#394"> 394: </a>        parent::__construct();
 </span><span id="395" class="l"><a href="#395"> 395: </a>
-</span><span id="396" class="l"><a href="#396"> 396: </a>        <span class="php-comment">// Don't try to parse template variables like {elapsed_time} and {memory_usage}</span>
-</span><span id="397" class="l"><a href="#397"> 397: </a>        <span class="php-comment">// when output is displayed for not damaging data accidentally</span>
-</span><span id="398" class="l"><a href="#398"> 398: </a>        <span class="php-var">$this</span>-&gt;output-&gt;parse_exec_vars = <span class="php-keyword1">FALSE</span>;
-</span><span id="399" class="l"><a href="#399"> 399: </a>
-</span><span id="400" class="l"><a href="#400"> 400: </a>        <span class="php-comment">// Start the timer for how long the request takes</span>
-</span><span id="401" class="l"><a href="#401"> 401: </a>        <span class="php-var">$this</span>-&gt;_start_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="402" class="l"><a href="#402"> 402: </a>
-</span><span id="403" class="l"><a href="#403"> 403: </a>        <span class="php-comment">// Load the rest.php configuration file</span>
-</span><span id="404" class="l"><a href="#404"> 404: </a>        <span class="php-var">$this</span>-&gt;load-&gt;config(<span class="php-var">$config</span>);
+</span><span id="396" class="l"><a href="#396"> 396: </a>        <span class="php-comment">// Disable XML Entity (security vulnerability)</span>
+</span><span id="397" class="l"><a href="#397"> 397: </a>        <span class="php-keyword2">libxml_disable_entity_loader</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="398" class="l"><a href="#398"> 398: </a>
+</span><span id="399" class="l"><a href="#399"> 399: </a>        <span class="php-comment">// Check to see if PHP is equal to or greater than 5.4.x</span>
+</span><span id="400" class="l"><a href="#400"> 400: </a>        <span class="php-keyword1">if</span> (is_php(<span class="php-quote">'5.4'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="401" class="l"><a href="#401"> 401: </a>        {
+</span><span id="402" class="l"><a href="#402"> 402: </a>            <span class="php-comment">// CodeIgniter 3 is recommended for v5.4 or above</span>
+</span><span id="403" class="l"><a href="#403"> 403: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'Using PHP v'</span> . PHP_VERSION . <span class="php-quote">', though PHP v5.4 or greater is required'</span>);
+</span><span id="404" class="l"><a href="#404"> 404: </a>        }
 </span><span id="405" class="l"><a href="#405"> 405: </a>
-</span><span id="406" class="l"><a href="#406"> 406: </a>        <span class="php-comment">// At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)</span>
-</span><span id="407" class="l"><a href="#407"> 407: </a>        <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-quote">'format'</span>);
-</span><span id="408" class="l"><a href="#408"> 408: </a>
-</span><span id="409" class="l"><a href="#409"> 409: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
-</span><span id="410" class="l"><a href="#410"> 410: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
-</span><span id="411" class="l"><a href="#411"> 411: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
-</span><span id="412" class="l"><a href="#412"> 412: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
-</span><span id="413" class="l"><a href="#413"> 413: </a>
-</span><span id="414" class="l"><a href="#414"> 414: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
-</span><span id="415" class="l"><a href="#415"> 415: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="416" class="l"><a href="#416"> 416: </a>        {
-</span><span id="417" class="l"><a href="#417"> 417: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
-</span><span id="418" class="l"><a href="#418"> 418: </a>        }
-</span><span id="419" class="l"><a href="#419"> 419: </a>
-</span><span id="420" class="l"><a href="#420"> 420: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
-</span><span id="421" class="l"><a href="#421"> 421: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
-</span><span id="422" class="l"><a href="#422"> 422: </a>
-</span><span id="423" class="l"><a href="#423"> 423: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
-</span><span id="424" class="l"><a href="#424"> 424: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
-</span><span id="425" class="l"><a href="#425"> 425: </a>
-</span><span id="426" class="l"><a href="#426"> 426: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
-</span><span id="427" class="l"><a href="#427"> 427: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
-</span><span id="428" class="l"><a href="#428"> 428: </a>        {
-</span><span id="429" class="l"><a href="#429"> 429: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = [];
-</span><span id="430" class="l"><a href="#430"> 430: </a>        }
-</span><span id="431" class="l"><a href="#431"> 431: </a>
-</span><span id="432" class="l"><a href="#432"> 432: </a>        <span class="php-comment">// Set up the query parameters</span>
-</span><span id="433" class="l"><a href="#433"> 433: </a>        <span class="php-var">$this</span>-&gt;_parse_query();
-</span><span id="434" class="l"><a href="#434"> 434: </a>
-</span><span id="435" class="l"><a href="#435"> 435: </a>        <span class="php-comment">// Set up the GET variables</span>
-</span><span id="436" class="l"><a href="#436"> 436: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
-</span><span id="437" class="l"><a href="#437"> 437: </a>
-</span><span id="438" class="l"><a href="#438"> 438: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
-</span><span id="439" class="l"><a href="#439"> 439: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
-</span><span id="440" class="l"><a href="#440"> 440: </a>
-</span><span id="441" class="l"><a href="#441"> 441: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
-</span><span id="442" class="l"><a href="#442"> 442: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
-</span><span id="443" class="l"><a href="#443"> 443: </a>
-</span><span id="444" class="l"><a href="#444"> 444: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
-</span><span id="445" class="l"><a href="#445"> 445: </a>
-</span><span id="446" class="l"><a href="#446"> 446: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
-</span><span id="447" class="l"><a href="#447"> 447: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
-</span><span id="448" class="l"><a href="#448"> 448: </a>        {
-</span><span id="449" class="l"><a href="#449"> 449: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
-</span><span id="450" class="l"><a href="#450"> 450: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
-</span><span id="451" class="l"><a href="#451"> 451: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
-</span><span id="452" class="l"><a href="#452"> 452: </a>        }
+</span><span id="406" class="l"><a href="#406"> 406: </a>        <span class="php-comment">// Check to see if this is CI 3.x</span>
+</span><span id="407" class="l"><a href="#407"> 407: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">explode</span>(<span class="php-quote">'.'</span>, CI_VERSION, <span class="php-num">2</span>)[<span class="php-num">0</span>] &lt; <span class="php-num">3</span>)
+</span><span id="408" class="l"><a href="#408"> 408: </a>        {
+</span><span id="409" class="l"><a href="#409"> 409: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
+</span><span id="410" class="l"><a href="#410"> 410: </a>        }
+</span><span id="411" class="l"><a href="#411"> 411: </a>
+</span><span id="412" class="l"><a href="#412"> 412: </a>        <span class="php-comment">// Set the default value of global xss filtering. Same approach as CodeIgniter 3</span>
+</span><span id="413" class="l"><a href="#413"> 413: </a>        <span class="php-var">$this</span>-&gt;_enable_xss = (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'global_xss_filtering'</span>) === <span class="php-keyword1">TRUE</span>);
+</span><span id="414" class="l"><a href="#414"> 414: </a>
+</span><span id="415" class="l"><a href="#415"> 415: </a>        <span class="php-comment">// Don't try to parse template variables like {elapsed_time} and {memory_usage}</span>
+</span><span id="416" class="l"><a href="#416"> 416: </a>        <span class="php-comment">// when output is displayed for not damaging data accidentally</span>
+</span><span id="417" class="l"><a href="#417"> 417: </a>        <span class="php-var">$this</span>-&gt;output-&gt;parse_exec_vars = <span class="php-keyword1">FALSE</span>;
+</span><span id="418" class="l"><a href="#418"> 418: </a>
+</span><span id="419" class="l"><a href="#419"> 419: </a>        <span class="php-comment">// Start the timer for how long the request takes</span>
+</span><span id="420" class="l"><a href="#420"> 420: </a>        <span class="php-var">$this</span>-&gt;_start_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="421" class="l"><a href="#421"> 421: </a>
+</span><span id="422" class="l"><a href="#422"> 422: </a>        <span class="php-comment">// Load the rest.php configuration file</span>
+</span><span id="423" class="l"><a href="#423"> 423: </a>        <span class="php-var">$this</span>-&gt;load-&gt;config(<span class="php-var">$config</span>);
+</span><span id="424" class="l"><a href="#424"> 424: </a>
+</span><span id="425" class="l"><a href="#425"> 425: </a>        <span class="php-comment">// At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)</span>
+</span><span id="426" class="l"><a href="#426"> 426: </a>        <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-quote">'format'</span>);
+</span><span id="427" class="l"><a href="#427"> 427: </a>
+</span><span id="428" class="l"><a href="#428"> 428: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
+</span><span id="429" class="l"><a href="#429"> 429: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
+</span><span id="430" class="l"><a href="#430"> 430: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
+</span><span id="431" class="l"><a href="#431"> 431: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
+</span><span id="432" class="l"><a href="#432"> 432: </a>
+</span><span id="433" class="l"><a href="#433"> 433: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
+</span><span id="434" class="l"><a href="#434"> 434: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="435" class="l"><a href="#435"> 435: </a>        {
+</span><span id="436" class="l"><a href="#436"> 436: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
+</span><span id="437" class="l"><a href="#437"> 437: </a>        }
+</span><span id="438" class="l"><a href="#438"> 438: </a>
+</span><span id="439" class="l"><a href="#439"> 439: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
+</span><span id="440" class="l"><a href="#440"> 440: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
+</span><span id="441" class="l"><a href="#441"> 441: </a>
+</span><span id="442" class="l"><a href="#442"> 442: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
+</span><span id="443" class="l"><a href="#443"> 443: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
+</span><span id="444" class="l"><a href="#444"> 444: </a>
+</span><span id="445" class="l"><a href="#445"> 445: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
+</span><span id="446" class="l"><a href="#446"> 446: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
+</span><span id="447" class="l"><a href="#447"> 447: </a>        {
+</span><span id="448" class="l"><a href="#448"> 448: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = [];
+</span><span id="449" class="l"><a href="#449"> 449: </a>        }
+</span><span id="450" class="l"><a href="#450"> 450: </a>
+</span><span id="451" class="l"><a href="#451"> 451: </a>        <span class="php-comment">// Set up the query parameters</span>
+</span><span id="452" class="l"><a href="#452"> 452: </a>        <span class="php-var">$this</span>-&gt;_parse_query();
 </span><span id="453" class="l"><a href="#453"> 453: </a>
-</span><span id="454" class="l"><a href="#454"> 454: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
-</span><span id="455" class="l"><a href="#455"> 455: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
-</span><span id="456" class="l"><a href="#456"> 456: </a>            <span class="php-var">$this</span>-&gt;_get_args,
-</span><span id="457" class="l"><a href="#457"> 457: </a>            <span class="php-var">$this</span>-&gt;_options_args,
-</span><span id="458" class="l"><a href="#458"> 458: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
-</span><span id="459" class="l"><a href="#459"> 459: </a>            <span class="php-var">$this</span>-&gt;_head_args,
-</span><span id="460" class="l"><a href="#460"> 460: </a>            <span class="php-var">$this</span>-&gt;_put_args,
-</span><span id="461" class="l"><a href="#461"> 461: </a>            <span class="php-var">$this</span>-&gt;_post_args,
-</span><span id="462" class="l"><a href="#462"> 462: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
-</span><span id="463" class="l"><a href="#463"> 463: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}
-</span><span id="464" class="l"><a href="#464"> 464: </a>        );
-</span><span id="465" class="l"><a href="#465"> 465: </a>
-</span><span id="466" class="l"><a href="#466"> 466: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
-</span><span id="467" class="l"><a href="#467"> 467: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
-</span><span id="468" class="l"><a href="#468"> 468: </a>
-</span><span id="469" class="l"><a href="#469"> 469: </a>        <span class="php-comment">// Which language should the data be returned in?</span>
-</span><span id="470" class="l"><a href="#470"> 470: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
-</span><span id="471" class="l"><a href="#471"> 471: </a>
-</span><span id="472" class="l"><a href="#472"> 472: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
-</span><span id="473" class="l"><a href="#473"> 473: </a>        <span class="php-var">$this</span>-&gt;early_checks();
-</span><span id="474" class="l"><a href="#474"> 474: </a>
-</span><span id="475" class="l"><a href="#475"> 475: </a>        <span class="php-comment">// Load DB if its enabled</span>
-</span><span id="476" class="l"><a href="#476"> 476: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
-</span><span id="477" class="l"><a href="#477"> 477: </a>        {
-</span><span id="478" class="l"><a href="#478"> 478: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
-</span><span id="479" class="l"><a href="#479"> 479: </a>        }
-</span><span id="480" class="l"><a href="#480"> 480: </a>
-</span><span id="481" class="l"><a href="#481"> 481: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
-</span><span id="482" class="l"><a href="#482"> 482: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
-</span><span id="483" class="l"><a href="#483"> 483: </a>        {
-</span><span id="484" class="l"><a href="#484"> 484: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
-</span><span id="485" class="l"><a href="#485"> 485: </a>        }
-</span><span id="486" class="l"><a href="#486"> 486: </a>
-</span><span id="487" class="l"><a href="#487"> 487: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
-</span><span id="488" class="l"><a href="#488"> 488: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
-</span><span id="489" class="l"><a href="#489"> 489: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
+</span><span id="454" class="l"><a href="#454"> 454: </a>        <span class="php-comment">// Set up the GET variables</span>
+</span><span id="455" class="l"><a href="#455"> 455: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
+</span><span id="456" class="l"><a href="#456"> 456: </a>
+</span><span id="457" class="l"><a href="#457"> 457: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
+</span><span id="458" class="l"><a href="#458"> 458: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
+</span><span id="459" class="l"><a href="#459"> 459: </a>
+</span><span id="460" class="l"><a href="#460"> 460: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
+</span><span id="461" class="l"><a href="#461"> 461: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
+</span><span id="462" class="l"><a href="#462"> 462: </a>
+</span><span id="463" class="l"><a href="#463"> 463: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
+</span><span id="464" class="l"><a href="#464"> 464: </a>
+</span><span id="465" class="l"><a href="#465"> 465: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
+</span><span id="466" class="l"><a href="#466"> 466: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
+</span><span id="467" class="l"><a href="#467"> 467: </a>        {
+</span><span id="468" class="l"><a href="#468"> 468: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
+</span><span id="469" class="l"><a href="#469"> 469: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
+</span><span id="470" class="l"><a href="#470"> 470: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
+</span><span id="471" class="l"><a href="#471"> 471: </a>        }
+</span><span id="472" class="l"><a href="#472"> 472: </a>
+</span><span id="473" class="l"><a href="#473"> 473: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
+</span><span id="474" class="l"><a href="#474"> 474: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
+</span><span id="475" class="l"><a href="#475"> 475: </a>            <span class="php-var">$this</span>-&gt;_get_args,
+</span><span id="476" class="l"><a href="#476"> 476: </a>            <span class="php-var">$this</span>-&gt;_options_args,
+</span><span id="477" class="l"><a href="#477"> 477: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
+</span><span id="478" class="l"><a href="#478"> 478: </a>            <span class="php-var">$this</span>-&gt;_head_args,
+</span><span id="479" class="l"><a href="#479"> 479: </a>            <span class="php-var">$this</span>-&gt;_put_args,
+</span><span id="480" class="l"><a href="#480"> 480: </a>            <span class="php-var">$this</span>-&gt;_post_args,
+</span><span id="481" class="l"><a href="#481"> 481: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
+</span><span id="482" class="l"><a href="#482"> 482: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}
+</span><span id="483" class="l"><a href="#483"> 483: </a>        );
+</span><span id="484" class="l"><a href="#484"> 484: </a>
+</span><span id="485" class="l"><a href="#485"> 485: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
+</span><span id="486" class="l"><a href="#486"> 486: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
+</span><span id="487" class="l"><a href="#487"> 487: </a>
+</span><span id="488" class="l"><a href="#488"> 488: </a>        <span class="php-comment">// Which language should the data be returned in?</span>
+</span><span id="489" class="l"><a href="#489"> 489: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
 </span><span id="490" class="l"><a href="#490"> 490: </a>
-</span><span id="491" class="l"><a href="#491"> 491: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
-</span><span id="492" class="l"><a href="#492"> 492: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
-</span><span id="493" class="l"><a href="#493"> 493: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
-</span><span id="494" class="l"><a href="#494"> 494: </a>        {
-</span><span id="495" class="l"><a href="#495"> 495: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
-</span><span id="496" class="l"><a href="#496"> 496: </a>        }
-</span><span id="497" class="l"><a href="#497"> 497: </a>
-</span><span id="498" class="l"><a href="#498"> 498: </a>        <span class="php-comment">// Only allow ajax requests</span>
-</span><span id="499" class="l"><a href="#499"> 499: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
-</span><span id="500" class="l"><a href="#500"> 500: </a>        {
-</span><span id="501" class="l"><a href="#501"> 501: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="502" class="l"><a href="#502"> 502: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="503" class="l"><a href="#503"> 503: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="504" class="l"><a href="#504"> 504: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Only AJAX requests are acceptable'</span>
-</span><span id="505" class="l"><a href="#505"> 505: </a>                ], self::HTTP_NOT_ACCEPTABLE);
-</span><span id="506" class="l"><a href="#506"> 506: </a>        }
-</span><span id="507" class="l"><a href="#507"> 507: </a>
-</span><span id="508" class="l"><a href="#508"> 508: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
-</span><span id="509" class="l"><a href="#509"> 509: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; !(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
-</span><span id="510" class="l"><a href="#510"> 510: </a>        {
-</span><span id="511" class="l"><a href="#511"> 511: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="512" class="l"><a href="#512"> 512: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
-</span><span id="513" class="l"><a href="#513"> 513: </a>            {
-</span><span id="514" class="l"><a href="#514"> 514: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
-</span><span id="515" class="l"><a href="#515"> 515: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="516" class="l"><a href="#516"> 516: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="517" class="l"><a href="#517"> 517: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
-</span><span id="518" class="l"><a href="#518"> 518: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="519" class="l"><a href="#519"> 519: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="520" class="l"><a href="#520"> 520: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
-</span><span id="521" class="l"><a href="#521"> 521: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="522" class="l"><a href="#522"> 522: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="523" class="l"><a href="#523"> 523: </a>            }
-</span><span id="524" class="l"><a href="#524"> 524: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="525" class="l"><a href="#525"> 525: </a>            {
-</span><span id="526" class="l"><a href="#526"> 526: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="527" class="l"><a href="#527"> 527: </a>            }
-</span><span id="528" class="l"><a href="#528"> 528: </a>        }
-</span><span id="529" class="l"><a href="#529"> 529: </a>    }
-</span><span id="530" class="l"><a href="#530"> 530: </a>
-</span><span id="531" class="l"><a href="#531"> 531: </a>    <span class="php-comment">/**
-</span></span><span id="532" class="l"><a href="#532"> 532: </a><span class="php-comment">     * Deconstructor
-</span></span><span id="533" class="l"><a href="#533"> 533: </a><span class="php-comment">     *
-</span></span><span id="534" class="l"><a href="#534"> 534: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="535" class="l"><a href="#535"> 535: </a><span class="php-comment">     * @access public
-</span></span><span id="536" class="l"><a href="#536"> 536: </a><span class="php-comment">     * @return void
-</span></span><span id="537" class="l"><a href="#537"> 537: </a><span class="php-comment">     */</span>
-</span><span id="538" class="l"><a href="#538"> 538: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
-</span><span id="539" class="l"><a href="#539"> 539: </a>    {
-</span><span id="540" class="l"><a href="#540"> 540: </a>        <span class="php-comment">// Get the current timestamp</span>
-</span><span id="541" class="l"><a href="#541"> 541: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="542" class="l"><a href="#542"> 542: </a>
-</span><span id="543" class="l"><a href="#543"> 543: </a>        <span class="php-comment">// Log the loading time to the log table</span>
-</span><span id="544" class="l"><a href="#544"> 544: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="545" class="l"><a href="#545"> 545: </a>        {
-</span><span id="546" class="l"><a href="#546"> 546: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
+</span><span id="491" class="l"><a href="#491"> 491: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
+</span><span id="492" class="l"><a href="#492"> 492: </a>        <span class="php-var">$this</span>-&gt;early_checks();
+</span><span id="493" class="l"><a href="#493"> 493: </a>
+</span><span id="494" class="l"><a href="#494"> 494: </a>        <span class="php-comment">// Load DB if its enabled</span>
+</span><span id="495" class="l"><a href="#495"> 495: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
+</span><span id="496" class="l"><a href="#496"> 496: </a>        {
+</span><span id="497" class="l"><a href="#497"> 497: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
+</span><span id="498" class="l"><a href="#498"> 498: </a>        }
+</span><span id="499" class="l"><a href="#499"> 499: </a>
+</span><span id="500" class="l"><a href="#500"> 500: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
+</span><span id="501" class="l"><a href="#501"> 501: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
+</span><span id="502" class="l"><a href="#502"> 502: </a>        {
+</span><span id="503" class="l"><a href="#503"> 503: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
+</span><span id="504" class="l"><a href="#504"> 504: </a>        }
+</span><span id="505" class="l"><a href="#505"> 505: </a>
+</span><span id="506" class="l"><a href="#506"> 506: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
+</span><span id="507" class="l"><a href="#507"> 507: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
+</span><span id="508" class="l"><a href="#508"> 508: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
+</span><span id="509" class="l"><a href="#509"> 509: </a>
+</span><span id="510" class="l"><a href="#510"> 510: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
+</span><span id="511" class="l"><a href="#511"> 511: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
+</span><span id="512" class="l"><a href="#512"> 512: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
+</span><span id="513" class="l"><a href="#513"> 513: </a>        {
+</span><span id="514" class="l"><a href="#514"> 514: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
+</span><span id="515" class="l"><a href="#515"> 515: </a>        }
+</span><span id="516" class="l"><a href="#516"> 516: </a>
+</span><span id="517" class="l"><a href="#517"> 517: </a>        <span class="php-comment">// Only allow ajax requests</span>
+</span><span id="518" class="l"><a href="#518"> 518: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
+</span><span id="519" class="l"><a href="#519"> 519: </a>        {
+</span><span id="520" class="l"><a href="#520"> 520: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="521" class="l"><a href="#521"> 521: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="522" class="l"><a href="#522"> 522: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="523" class="l"><a href="#523"> 523: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_ajax_only'</span>]
+</span><span id="524" class="l"><a href="#524"> 524: </a>                ], self::HTTP_NOT_ACCEPTABLE);
+</span><span id="525" class="l"><a href="#525"> 525: </a>        }
+</span><span id="526" class="l"><a href="#526"> 526: </a>
+</span><span id="527" class="l"><a href="#527"> 527: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
+</span><span id="528" class="l"><a href="#528"> 528: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; !(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
+</span><span id="529" class="l"><a href="#529"> 529: </a>        {
+</span><span id="530" class="l"><a href="#530"> 530: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="531" class="l"><a href="#531"> 531: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
+</span><span id="532" class="l"><a href="#532"> 532: </a>            {
+</span><span id="533" class="l"><a href="#533"> 533: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
+</span><span id="534" class="l"><a href="#534"> 534: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="535" class="l"><a href="#535"> 535: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="536" class="l"><a href="#536"> 536: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
+</span><span id="537" class="l"><a href="#537"> 537: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="538" class="l"><a href="#538"> 538: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="539" class="l"><a href="#539"> 539: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
+</span><span id="540" class="l"><a href="#540"> 540: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="541" class="l"><a href="#541"> 541: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="542" class="l"><a href="#542"> 542: </a>            }
+</span><span id="543" class="l"><a href="#543"> 543: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="544" class="l"><a href="#544"> 544: </a>            {
+</span><span id="545" class="l"><a href="#545"> 545: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="546" class="l"><a href="#546"> 546: </a>            }
 </span><span id="547" class="l"><a href="#547"> 547: </a>        }
 </span><span id="548" class="l"><a href="#548"> 548: </a>    }
 </span><span id="549" class="l"><a href="#549"> 549: </a>
 </span><span id="550" class="l"><a href="#550"> 550: </a>    <span class="php-comment">/**
-</span></span><span id="551" class="l"><a href="#551"> 551: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
-</span></span><span id="552" class="l"><a href="#552"> 552: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
-</span></span><span id="553" class="l"><a href="#553"> 553: </a><span class="php-comment">     * Controller method.
-</span></span><span id="554" class="l"><a href="#554"> 554: </a><span class="php-comment">     *
-</span></span><span id="555" class="l"><a href="#555"> 555: </a><span class="php-comment">     * @access public
-</span></span><span id="556" class="l"><a href="#556"> 556: </a><span class="php-comment">     * @param  string $object_called
-</span></span><span id="557" class="l"><a href="#557"> 557: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method.
-</span></span><span id="558" class="l"><a href="#558"> 558: </a><span class="php-comment">     */</span>
-</span><span id="559" class="l"><a href="#559"> 559: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span>)
-</span><span id="560" class="l"><a href="#560"> 560: </a>    {
-</span><span id="561" class="l"><a href="#561"> 561: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
-</span><span id="562" class="l"><a href="#562"> 562: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
-</span><span id="563" class="l"><a href="#563"> 563: </a>        {
-</span><span id="564" class="l"><a href="#564"> 564: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="565" class="l"><a href="#565"> 565: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="566" class="l"><a href="#566"> 566: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unsupported protocol'</span>
-</span><span id="567" class="l"><a href="#567"> 567: </a>                ], self::HTTP_FORBIDDEN);
-</span><span id="568" class="l"><a href="#568"> 568: </a>        }
-</span><span id="569" class="l"><a href="#569"> 569: </a>
-</span><span id="570" class="l"><a href="#570"> 570: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
-</span><span id="571" class="l"><a href="#571"> 571: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
-</span><span id="572" class="l"><a href="#572"> 572: </a>
-</span><span id="573" class="l"><a href="#573"> 573: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span> . <span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method;
-</span><span id="574" class="l"><a href="#574"> 574: </a>
-</span><span id="575" class="l"><a href="#575"> 575: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
-</span><span id="576" class="l"><a href="#576"> 576: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] === <span class="php-keyword1">FALSE</span>);
-</span><span id="577" class="l"><a href="#577"> 577: </a>
-</span><span id="578" class="l"><a href="#578"> 578: </a>        <span class="php-comment">// Use keys for this method?</span>
-</span><span id="579" class="l"><a href="#579"> 579: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] === <span class="php-keyword1">FALSE</span>);
-</span><span id="580" class="l"><a href="#580"> 580: </a>
-</span><span id="581" class="l"><a href="#581"> 581: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here.</span>
-</span><span id="582" class="l"><a href="#582"> 582: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
-</span><span id="583" class="l"><a href="#583"> 583: </a>        {
-</span><span id="584" class="l"><a href="#584"> 584: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="585" class="l"><a href="#585"> 585: </a>            {
-</span><span id="586" class="l"><a href="#586"> 586: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="587" class="l"><a href="#587"> 587: </a>            }
+</span></span><span id="551" class="l"><a href="#551"> 551: </a><span class="php-comment">     * Deconstructor
+</span></span><span id="552" class="l"><a href="#552"> 552: </a><span class="php-comment">     *
+</span></span><span id="553" class="l"><a href="#553"> 553: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="554" class="l"><a href="#554"> 554: </a><span class="php-comment">     * @access public
+</span></span><span id="555" class="l"><a href="#555"> 555: </a><span class="php-comment">     * @return void
+</span></span><span id="556" class="l"><a href="#556"> 556: </a><span class="php-comment">     */</span>
+</span><span id="557" class="l"><a href="#557"> 557: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
+</span><span id="558" class="l"><a href="#558"> 558: </a>    {
+</span><span id="559" class="l"><a href="#559"> 559: </a>        <span class="php-comment">// Get the current timestamp</span>
+</span><span id="560" class="l"><a href="#560"> 560: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="561" class="l"><a href="#561"> 561: </a>
+</span><span id="562" class="l"><a href="#562"> 562: </a>        <span class="php-comment">// Log the loading time to the log table</span>
+</span><span id="563" class="l"><a href="#563"> 563: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="564" class="l"><a href="#564"> 564: </a>        {
+</span><span id="565" class="l"><a href="#565"> 565: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
+</span><span id="566" class="l"><a href="#566"> 566: </a>        }
+</span><span id="567" class="l"><a href="#567"> 567: </a>    }
+</span><span id="568" class="l"><a href="#568"> 568: </a>
+</span><span id="569" class="l"><a href="#569"> 569: </a>    <span class="php-comment">/**
+</span></span><span id="570" class="l"><a href="#570"> 570: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
+</span></span><span id="571" class="l"><a href="#571"> 571: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
+</span></span><span id="572" class="l"><a href="#572"> 572: </a><span class="php-comment">     * Controller method.
+</span></span><span id="573" class="l"><a href="#573"> 573: </a><span class="php-comment">     *
+</span></span><span id="574" class="l"><a href="#574"> 574: </a><span class="php-comment">     * @access public
+</span></span><span id="575" class="l"><a href="#575"> 575: </a><span class="php-comment">     * @param  string $object_called
+</span></span><span id="576" class="l"><a href="#576"> 576: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method.
+</span></span><span id="577" class="l"><a href="#577"> 577: </a><span class="php-comment">     */</span>
+</span><span id="578" class="l"><a href="#578"> 578: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span>)
+</span><span id="579" class="l"><a href="#579"> 579: </a>    {
+</span><span id="580" class="l"><a href="#580"> 580: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
+</span><span id="581" class="l"><a href="#581"> 581: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
+</span><span id="582" class="l"><a href="#582"> 582: </a>        {
+</span><span id="583" class="l"><a href="#583"> 583: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="584" class="l"><a href="#584"> 584: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="585" class="l"><a href="#585"> 585: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_unsupported'</span>]
+</span><span id="586" class="l"><a href="#586"> 586: </a>                ], self::HTTP_FORBIDDEN);
+</span><span id="587" class="l"><a href="#587"> 587: </a>        }
 </span><span id="588" class="l"><a href="#588"> 588: </a>
-</span><span id="589" class="l"><a href="#589"> 589: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="590" class="l"><a href="#590"> 590: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="591" class="l"><a href="#591"> 591: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid API Key '</span> . <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>
-</span><span id="592" class="l"><a href="#592"> 592: </a>                ], self::HTTP_FORBIDDEN);
-</span><span id="593" class="l"><a href="#593"> 593: </a>        }
-</span><span id="594" class="l"><a href="#594"> 594: </a>
-</span><span id="595" class="l"><a href="#595"> 595: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller.</span>
-</span><span id="596" class="l"><a href="#596"> 596: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
-</span><span id="597" class="l"><a href="#597"> 597: </a>        {
-</span><span id="598" class="l"><a href="#598"> 598: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="599" class="l"><a href="#599"> 599: </a>            {
-</span><span id="600" class="l"><a href="#600"> 600: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="601" class="l"><a href="#601"> 601: </a>            }
-</span><span id="602" class="l"><a href="#602"> 602: </a>
-</span><span id="603" class="l"><a href="#603"> 603: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="604" class="l"><a href="#604"> 604: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="605" class="l"><a href="#605"> 605: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have access to the requested controller.'</span>
-</span><span id="606" class="l"><a href="#606"> 606: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="607" class="l"><a href="#607"> 607: </a>        }
-</span><span id="608" class="l"><a href="#608"> 608: </a>
-</span><span id="609" class="l"><a href="#609"> 609: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
-</span><span id="610" class="l"><a href="#610"> 610: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="611" class="l"><a href="#611"> 611: </a>        {
-</span><span id="612" class="l"><a href="#612"> 612: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="613" class="l"><a href="#613"> 613: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="614" class="l"><a href="#614"> 614: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Unknown method.'</span>
-</span><span id="615" class="l"><a href="#615"> 615: </a>                ], self::HTTP_NOT_FOUND);
-</span><span id="616" class="l"><a href="#616"> 616: </a>        }
-</span><span id="617" class="l"><a href="#617"> 617: </a>
-</span><span id="618" class="l"><a href="#618"> 618: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
-</span><span id="619" class="l"><a href="#619"> 619: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="620" class="l"><a href="#620"> 620: </a>        {
-</span><span id="621" class="l"><a href="#621"> 621: </a>            <span class="php-comment">// Check the limit</span>
-</span><span id="622" class="l"><a href="#622"> 622: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="623" class="l"><a href="#623"> 623: </a>            {
-</span><span id="624" class="l"><a href="#624"> 624: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key has reached the time limit for this method.'</span>];
-</span><span id="625" class="l"><a href="#625"> 625: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
-</span><span id="626" class="l"><a href="#626"> 626: </a>            }
+</span><span id="589" class="l"><a href="#589"> 589: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
+</span><span id="590" class="l"><a href="#590"> 590: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
+</span><span id="591" class="l"><a href="#591"> 591: </a>
+</span><span id="592" class="l"><a href="#592"> 592: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span> . <span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method;
+</span><span id="593" class="l"><a href="#593"> 593: </a>
+</span><span id="594" class="l"><a href="#594"> 594: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
+</span><span id="595" class="l"><a href="#595"> 595: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] === <span class="php-keyword1">FALSE</span>);
+</span><span id="596" class="l"><a href="#596"> 596: </a>
+</span><span id="597" class="l"><a href="#597"> 597: </a>        <span class="php-comment">// Use keys for this method?</span>
+</span><span id="598" class="l"><a href="#598"> 598: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] === <span class="php-keyword1">FALSE</span>);
+</span><span id="599" class="l"><a href="#599"> 599: </a>
+</span><span id="600" class="l"><a href="#600"> 600: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here.</span>
+</span><span id="601" class="l"><a href="#601"> 601: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
+</span><span id="602" class="l"><a href="#602"> 602: </a>        {
+</span><span id="603" class="l"><a href="#603"> 603: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="604" class="l"><a href="#604"> 604: </a>            {
+</span><span id="605" class="l"><a href="#605"> 605: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="606" class="l"><a href="#606"> 606: </a>            }
+</span><span id="607" class="l"><a href="#607"> 607: </a>
+</span><span id="608" class="l"><a href="#608"> 608: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="609" class="l"><a href="#609"> 609: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="610" class="l"><a href="#610"> 610: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-keyword2">sprintf</span>(<span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_invalid_api_key'</span>], <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="611" class="l"><a href="#611"> 611: </a>                ], self::HTTP_FORBIDDEN);
+</span><span id="612" class="l"><a href="#612"> 612: </a>        }
+</span><span id="613" class="l"><a href="#613"> 613: </a>
+</span><span id="614" class="l"><a href="#614"> 614: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller.</span>
+</span><span id="615" class="l"><a href="#615"> 615: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
+</span><span id="616" class="l"><a href="#616"> 616: </a>        {
+</span><span id="617" class="l"><a href="#617"> 617: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="618" class="l"><a href="#618"> 618: </a>            {
+</span><span id="619" class="l"><a href="#619"> 619: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="620" class="l"><a href="#620"> 620: </a>            }
+</span><span id="621" class="l"><a href="#621"> 621: </a>
+</span><span id="622" class="l"><a href="#622"> 622: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="623" class="l"><a href="#623"> 623: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="624" class="l"><a href="#624"> 624: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_api_key_unauthorized'</span>]
+</span><span id="625" class="l"><a href="#625"> 625: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="626" class="l"><a href="#626"> 626: </a>        }
 </span><span id="627" class="l"><a href="#627"> 627: </a>
-</span><span id="628" class="l"><a href="#628"> 628: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
-</span><span id="629" class="l"><a href="#629"> 629: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
-</span><span id="630" class="l"><a href="#630"> 630: </a>
-</span><span id="631" class="l"><a href="#631"> 631: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
-</span><span id="632" class="l"><a href="#632"> 632: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
-</span><span id="633" class="l"><a href="#633"> 633: </a>
-</span><span id="634" class="l"><a href="#634"> 634: </a>            <span class="php-comment">// IM TELLIN!</span>
-</span><span id="635" class="l"><a href="#635"> 635: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="636" class="l"><a href="#636"> 636: </a>            {
-</span><span id="637" class="l"><a href="#637"> 637: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
-</span><span id="638" class="l"><a href="#638"> 638: </a>            }
-</span><span id="639" class="l"><a href="#639"> 639: </a>
-</span><span id="640" class="l"><a href="#640"> 640: </a>            <span class="php-comment">// They don't have good enough perms</span>
-</span><span id="641" class="l"><a href="#641"> 641: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'This API key does not have enough permissions.'</span>];
-</span><span id="642" class="l"><a href="#642"> 642: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
-</span><span id="643" class="l"><a href="#643"> 643: </a>        }
-</span><span id="644" class="l"><a href="#644"> 644: </a>
-</span><span id="645" class="l"><a href="#645"> 645: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
-</span><span id="646" class="l"><a href="#646"> 646: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="647" class="l"><a href="#647"> 647: </a>        {
-</span><span id="648" class="l"><a href="#648"> 648: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
-</span><span id="649" class="l"><a href="#649"> 649: </a>        }
-</span><span id="650" class="l"><a href="#650"> 650: </a>
-</span><span id="651" class="l"><a href="#651"> 651: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
-</span><span id="652" class="l"><a href="#652"> 652: </a>        <span class="php-keyword1">try</span>
-</span><span id="653" class="l"><a href="#653"> 653: </a>        {
-</span><span id="654" class="l"><a href="#654"> 654: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
-</span><span id="655" class="l"><a href="#655"> 655: </a>        }
-</span><span id="656" class="l"><a href="#656"> 656: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
-</span><span id="657" class="l"><a href="#657"> 657: </a>        {
-</span><span id="658" class="l"><a href="#658"> 658: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
-</span><span id="659" class="l"><a href="#659"> 659: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="660" class="l"><a href="#660"> 660: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="661" class="l"><a href="#661"> 661: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
-</span><span id="662" class="l"><a href="#662"> 662: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
-</span><span id="663" class="l"><a href="#663"> 663: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
-</span><span id="664" class="l"><a href="#664"> 664: </a>                    ]
-</span><span id="665" class="l"><a href="#665"> 665: </a>                ], self::HTTP_INTERNAL_SERVER_ERROR);
-</span><span id="666" class="l"><a href="#666"> 666: </a>        }
-</span><span id="667" class="l"><a href="#667"> 667: </a>    }
-</span><span id="668" class="l"><a href="#668"> 668: </a>
-</span><span id="669" class="l"><a href="#669"> 669: </a>    <span class="php-comment">/**
-</span></span><span id="670" class="l"><a href="#670"> 670: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
-</span></span><span id="671" class="l"><a href="#671"> 671: </a><span class="php-comment">     *
-</span></span><span id="672" class="l"><a href="#672"> 672: </a><span class="php-comment">     * @access public
-</span></span><span id="673" class="l"><a href="#673"> 673: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
-</span></span><span id="674" class="l"><a href="#674"> 674: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
-</span></span><span id="675" class="l"><a href="#675"> 675: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
-</span></span><span id="676" class="l"><a href="#676"> 676: </a><span class="php-comment">     * running the script; otherwise, exit
-</span></span><span id="677" class="l"><a href="#677"> 677: </a><span class="php-comment">     */</span>
-</span><span id="678" class="l"><a href="#678"> 678: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="679" class="l"><a href="#679"> 679: </a>    {
-</span><span id="680" class="l"><a href="#680"> 680: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
-</span><span id="681" class="l"><a href="#681"> 681: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="682" class="l"><a href="#682"> 682: </a>        {
-</span><span id="683" class="l"><a href="#683"> 683: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
-</span><span id="684" class="l"><a href="#684"> 684: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
+</span><span id="628" class="l"><a href="#628"> 628: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
+</span><span id="629" class="l"><a href="#629"> 629: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="630" class="l"><a href="#630"> 630: </a>        {
+</span><span id="631" class="l"><a href="#631"> 631: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="632" class="l"><a href="#632"> 632: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="633" class="l"><a href="#633"> 633: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_unknown_method'</span>]
+</span><span id="634" class="l"><a href="#634"> 634: </a>                ], self::HTTP_NOT_FOUND);
+</span><span id="635" class="l"><a href="#635"> 635: </a>        }
+</span><span id="636" class="l"><a href="#636"> 636: </a>
+</span><span id="637" class="l"><a href="#637"> 637: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
+</span><span id="638" class="l"><a href="#638"> 638: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="639" class="l"><a href="#639"> 639: </a>        {
+</span><span id="640" class="l"><a href="#640"> 640: </a>            <span class="php-comment">// Check the limit</span>
+</span><span id="641" class="l"><a href="#641"> 641: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="642" class="l"><a href="#642"> 642: </a>            {
+</span><span id="643" class="l"><a href="#643"> 643: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_api_key_time_limit'</span>]];
+</span><span id="644" class="l"><a href="#644"> 644: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
+</span><span id="645" class="l"><a href="#645"> 645: </a>            }
+</span><span id="646" class="l"><a href="#646"> 646: </a>
+</span><span id="647" class="l"><a href="#647"> 647: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
+</span><span id="648" class="l"><a href="#648"> 648: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
+</span><span id="649" class="l"><a href="#649"> 649: </a>
+</span><span id="650" class="l"><a href="#650"> 650: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
+</span><span id="651" class="l"><a href="#651"> 651: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
+</span><span id="652" class="l"><a href="#652"> 652: </a>
+</span><span id="653" class="l"><a href="#653"> 653: </a>            <span class="php-comment">// IM TELLIN!</span>
+</span><span id="654" class="l"><a href="#654"> 654: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="655" class="l"><a href="#655"> 655: </a>            {
+</span><span id="656" class="l"><a href="#656"> 656: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
+</span><span id="657" class="l"><a href="#657"> 657: </a>            }
+</span><span id="658" class="l"><a href="#658"> 658: </a>
+</span><span id="659" class="l"><a href="#659"> 659: </a>            <span class="php-comment">// They don't have good enough perms</span>
+</span><span id="660" class="l"><a href="#660"> 660: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_api_key_permissions'</span>]];
+</span><span id="661" class="l"><a href="#661"> 661: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
+</span><span id="662" class="l"><a href="#662"> 662: </a>        }
+</span><span id="663" class="l"><a href="#663"> 663: </a>
+</span><span id="664" class="l"><a href="#664"> 664: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
+</span><span id="665" class="l"><a href="#665"> 665: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="666" class="l"><a href="#666"> 666: </a>        {
+</span><span id="667" class="l"><a href="#667"> 667: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
+</span><span id="668" class="l"><a href="#668"> 668: </a>        }
+</span><span id="669" class="l"><a href="#669"> 669: </a>
+</span><span id="670" class="l"><a href="#670"> 670: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
+</span><span id="671" class="l"><a href="#671"> 671: </a>        <span class="php-keyword1">try</span>
+</span><span id="672" class="l"><a href="#672"> 672: </a>        {
+</span><span id="673" class="l"><a href="#673"> 673: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
+</span><span id="674" class="l"><a href="#674"> 674: </a>        }
+</span><span id="675" class="l"><a href="#675"> 675: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
+</span><span id="676" class="l"><a href="#676"> 676: </a>        {
+</span><span id="677" class="l"><a href="#677"> 677: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
+</span><span id="678" class="l"><a href="#678"> 678: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="679" class="l"><a href="#679"> 679: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="680" class="l"><a href="#680"> 680: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
+</span><span id="681" class="l"><a href="#681"> 681: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
+</span><span id="682" class="l"><a href="#682"> 682: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
+</span><span id="683" class="l"><a href="#683"> 683: </a>                    ]
+</span><span id="684" class="l"><a href="#684"> 684: </a>                ], self::HTTP_INTERNAL_SERVER_ERROR);
 </span><span id="685" class="l"><a href="#685"> 685: </a>        }
-</span><span id="686" class="l"><a href="#686"> 686: </a>
-</span><span id="687" class="l"><a href="#687"> 687: </a>        <span class="php-comment">// Set the output as NULL by default</span>
-</span><span id="688" class="l"><a href="#688"> 688: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="689" class="l"><a href="#689"> 689: </a>
-</span><span id="690" class="l"><a href="#690"> 690: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
-</span><span id="691" class="l"><a href="#691"> 691: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="692" class="l"><a href="#692"> 692: </a>        {
-</span><span id="693" class="l"><a href="#693"> 693: </a>            <span class="php-var">$http_code</span> = self::HTTP_NOT_FOUND;
-</span><span id="694" class="l"><a href="#694"> 694: </a>        }
-</span><span id="695" class="l"><a href="#695"> 695: </a>
-</span><span id="696" class="l"><a href="#696"> 696: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
-</span><span id="697" class="l"><a href="#697"> 697: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="698" class="l"><a href="#698"> 698: </a>        {
-</span><span id="699" class="l"><a href="#699"> 699: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
-</span><span id="700" class="l"><a href="#700"> 700: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
-</span><span id="701" class="l"><a href="#701"> 701: </a>            {
-</span><span id="702" class="l"><a href="#702"> 702: </a>                <span class="php-comment">// Set the format header</span>
-</span><span id="703" class="l"><a href="#703"> 703: </a>                <span class="php-var">$this</span>-&gt;output-&gt;set_content_type(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format], <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
-</span><span id="704" class="l"><a href="#704"> 704: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
+</span><span id="686" class="l"><a href="#686"> 686: </a>    }
+</span><span id="687" class="l"><a href="#687"> 687: </a>
+</span><span id="688" class="l"><a href="#688"> 688: </a>    <span class="php-comment">/**
+</span></span><span id="689" class="l"><a href="#689"> 689: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
+</span></span><span id="690" class="l"><a href="#690"> 690: </a><span class="php-comment">     *
+</span></span><span id="691" class="l"><a href="#691"> 691: </a><span class="php-comment">     * @access public
+</span></span><span id="692" class="l"><a href="#692"> 692: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
+</span></span><span id="693" class="l"><a href="#693"> 693: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
+</span></span><span id="694" class="l"><a href="#694"> 694: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
+</span></span><span id="695" class="l"><a href="#695"> 695: </a><span class="php-comment">     * running the script; otherwise, exit
+</span></span><span id="696" class="l"><a href="#696"> 696: </a><span class="php-comment">     */</span>
+</span><span id="697" class="l"><a href="#697"> 697: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="698" class="l"><a href="#698"> 698: </a>    {
+</span><span id="699" class="l"><a href="#699"> 699: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
+</span><span id="700" class="l"><a href="#700"> 700: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="701" class="l"><a href="#701"> 701: </a>        {
+</span><span id="702" class="l"><a href="#702"> 702: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
+</span><span id="703" class="l"><a href="#703"> 703: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
+</span><span id="704" class="l"><a href="#704"> 704: </a>        }
 </span><span id="705" class="l"><a href="#705"> 705: </a>
-</span><span id="706" class="l"><a href="#706"> 706: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error.</span>
-</span><span id="707" class="l"><a href="#707"> 707: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
-</span><span id="708" class="l"><a href="#708"> 708: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
-</span><span id="709" class="l"><a href="#709"> 709: </a>                {
-</span><span id="710" class="l"><a href="#710"> 710: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="711" class="l"><a href="#711"> 711: </a>                }
-</span><span id="712" class="l"><a href="#712"> 712: </a>            }
-</span><span id="713" class="l"><a href="#713"> 713: </a>            <span class="php-keyword1">else</span>
-</span><span id="714" class="l"><a href="#714"> 714: </a>            {
-</span><span id="715" class="l"><a href="#715"> 715: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
-</span><span id="716" class="l"><a href="#716"> 716: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
-</span><span id="717" class="l"><a href="#717"> 717: </a>                {
-</span><span id="718" class="l"><a href="#718"> 718: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="719" class="l"><a href="#719"> 719: </a>                }
-</span><span id="720" class="l"><a href="#720"> 720: </a>
-</span><span id="721" class="l"><a href="#721"> 721: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
-</span><span id="722" class="l"><a href="#722"> 722: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
-</span><span id="723" class="l"><a href="#723"> 723: </a>            }
-</span><span id="724" class="l"><a href="#724"> 724: </a>        }
-</span><span id="725" class="l"><a href="#725"> 725: </a>
-</span><span id="726" class="l"><a href="#726"> 726: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
-</span><span id="727" class="l"><a href="#727"> 727: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
-</span><span id="728" class="l"><a href="#728"> 728: </a>        <span class="php-comment">// correct HTTP status code</span>
-</span><span id="729" class="l"><a href="#729"> 729: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = self::HTTP_OK;
-</span><span id="730" class="l"><a href="#730"> 730: </a>
-</span><span id="731" class="l"><a href="#731"> 731: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_status_header(<span class="php-var">$http_code</span>);
-</span><span id="732" class="l"><a href="#732"> 732: </a>
-</span><span id="733" class="l"><a href="#733"> 733: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
-</span><span id="734" class="l"><a href="#734"> 734: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="735" class="l"><a href="#735"> 735: </a>        {
-</span><span id="736" class="l"><a href="#736"> 736: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
-</span><span id="737" class="l"><a href="#737"> 737: </a>        }
-</span><span id="738" class="l"><a href="#738"> 738: </a>
-</span><span id="739" class="l"><a href="#739"> 739: </a>        <span class="php-comment">// Output the data</span>
-</span><span id="740" class="l"><a href="#740"> 740: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_output(<span class="php-var">$output</span>);
-</span><span id="741" class="l"><a href="#741"> 741: </a>
-</span><span id="742" class="l"><a href="#742"> 742: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="743" class="l"><a href="#743"> 743: </a>        {
-</span><span id="744" class="l"><a href="#744"> 744: </a>            <span class="php-comment">// Display the data and exit execution</span>
-</span><span id="745" class="l"><a href="#745"> 745: </a>            <span class="php-var">$this</span>-&gt;output-&gt;_display();
-</span><span id="746" class="l"><a href="#746"> 746: </a>            <span class="php-keyword1">exit</span>;
-</span><span id="747" class="l"><a href="#747"> 747: </a>        }
-</span><span id="748" class="l"><a href="#748"> 748: </a>
-</span><span id="749" class="l"><a href="#749"> 749: </a>        <span class="php-comment">// Otherwise dump the output automatically</span>
-</span><span id="750" class="l"><a href="#750"> 750: </a>    }
+</span><span id="706" class="l"><a href="#706"> 706: </a>        <span class="php-comment">// Set the output as NULL by default</span>
+</span><span id="707" class="l"><a href="#707"> 707: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="708" class="l"><a href="#708"> 708: </a>
+</span><span id="709" class="l"><a href="#709"> 709: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
+</span><span id="710" class="l"><a href="#710"> 710: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="711" class="l"><a href="#711"> 711: </a>        {
+</span><span id="712" class="l"><a href="#712"> 712: </a>            <span class="php-var">$http_code</span> = self::HTTP_NOT_FOUND;
+</span><span id="713" class="l"><a href="#713"> 713: </a>        }
+</span><span id="714" class="l"><a href="#714"> 714: </a>
+</span><span id="715" class="l"><a href="#715"> 715: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
+</span><span id="716" class="l"><a href="#716"> 716: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="717" class="l"><a href="#717"> 717: </a>        {
+</span><span id="718" class="l"><a href="#718"> 718: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
+</span><span id="719" class="l"><a href="#719"> 719: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
+</span><span id="720" class="l"><a href="#720"> 720: </a>            {
+</span><span id="721" class="l"><a href="#721"> 721: </a>                <span class="php-comment">// Set the format header</span>
+</span><span id="722" class="l"><a href="#722"> 722: </a>                <span class="php-var">$this</span>-&gt;output-&gt;set_content_type(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format], <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
+</span><span id="723" class="l"><a href="#723"> 723: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
+</span><span id="724" class="l"><a href="#724"> 724: </a>
+</span><span id="725" class="l"><a href="#725"> 725: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error.</span>
+</span><span id="726" class="l"><a href="#726"> 726: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
+</span><span id="727" class="l"><a href="#727"> 727: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
+</span><span id="728" class="l"><a href="#728"> 728: </a>                {
+</span><span id="729" class="l"><a href="#729"> 729: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="730" class="l"><a href="#730"> 730: </a>                }
+</span><span id="731" class="l"><a href="#731"> 731: </a>            }
+</span><span id="732" class="l"><a href="#732"> 732: </a>            <span class="php-keyword1">else</span>
+</span><span id="733" class="l"><a href="#733"> 733: </a>            {
+</span><span id="734" class="l"><a href="#734"> 734: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
+</span><span id="735" class="l"><a href="#735"> 735: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
+</span><span id="736" class="l"><a href="#736"> 736: </a>                {
+</span><span id="737" class="l"><a href="#737"> 737: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="738" class="l"><a href="#738"> 738: </a>                }
+</span><span id="739" class="l"><a href="#739"> 739: </a>
+</span><span id="740" class="l"><a href="#740"> 740: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
+</span><span id="741" class="l"><a href="#741"> 741: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
+</span><span id="742" class="l"><a href="#742"> 742: </a>            }
+</span><span id="743" class="l"><a href="#743"> 743: </a>        }
+</span><span id="744" class="l"><a href="#744"> 744: </a>
+</span><span id="745" class="l"><a href="#745"> 745: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
+</span><span id="746" class="l"><a href="#746"> 746: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
+</span><span id="747" class="l"><a href="#747"> 747: </a>        <span class="php-comment">// correct HTTP status code</span>
+</span><span id="748" class="l"><a href="#748"> 748: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = self::HTTP_OK;
+</span><span id="749" class="l"><a href="#749"> 749: </a>
+</span><span id="750" class="l"><a href="#750"> 750: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_status_header(<span class="php-var">$http_code</span>);
 </span><span id="751" class="l"><a href="#751"> 751: </a>
-</span><span id="752" class="l"><a href="#752"> 752: </a>    <span class="php-comment">/**
-</span></span><span id="753" class="l"><a href="#753"> 753: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
-</span></span><span id="754" class="l"><a href="#754"> 754: </a><span class="php-comment">     * within the buffers of the Output class. The response is sent to the client
-</span></span><span id="755" class="l"><a href="#755"> 755: </a><span class="php-comment">     * lately by the framework, after the current controller's method termination.
-</span></span><span id="756" class="l"><a href="#756"> 756: </a><span class="php-comment">     * All the hooks after the controller's method termination are executable.
-</span></span><span id="757" class="l"><a href="#757"> 757: </a><span class="php-comment">     *
-</span></span><span id="758" class="l"><a href="#758"> 758: </a><span class="php-comment">     * @access public
-</span></span><span id="759" class="l"><a href="#759"> 759: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
-</span></span><span id="760" class="l"><a href="#760"> 760: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
-</span></span><span id="761" class="l"><a href="#761"> 761: </a><span class="php-comment">     */</span>
-</span><span id="762" class="l"><a href="#762"> 762: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> set_response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="763" class="l"><a href="#763"> 763: </a>    {
-</span><span id="764" class="l"><a href="#764"> 764: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$data</span>, <span class="php-var">$http_code</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="765" class="l"><a href="#765"> 765: </a>    }
-</span><span id="766" class="l"><a href="#766"> 766: </a>
-</span><span id="767" class="l"><a href="#767"> 767: </a>    <span class="php-comment">/**
-</span></span><span id="768" class="l"><a href="#768"> 768: </a><span class="php-comment">     * Get the input format e.g. json or xml
-</span></span><span id="769" class="l"><a href="#769"> 769: </a><span class="php-comment">     *
-</span></span><span id="770" class="l"><a href="#770"> 770: </a><span class="php-comment">     * @access protected
-</span></span><span id="771" class="l"><a href="#771"> 771: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
-</span></span><span id="772" class="l"><a href="#772"> 772: </a><span class="php-comment">     */</span>
-</span><span id="773" class="l"><a href="#773"> 773: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
-</span><span id="774" class="l"><a href="#774"> 774: </a>    {
-</span><span id="775" class="l"><a href="#775"> 775: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
-</span><span id="776" class="l"><a href="#776"> 776: </a>        <span class="php-var">$content_type</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
-</span><span id="777" class="l"><a href="#777"> 777: </a>
-</span><span id="778" class="l"><a href="#778"> 778: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$content_type</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="779" class="l"><a href="#779"> 779: </a>        {
-</span><span id="780" class="l"><a href="#780"> 780: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="781" class="l"><a href="#781"> 781: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
-</span><span id="782" class="l"><a href="#782"> 782: </a>            {
-</span><span id="783" class="l"><a href="#783"> 783: </a>                <span class="php-comment">// $key = format e.g. csv</span>
-</span><span id="784" class="l"><a href="#784"> 784: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
+</span><span id="752" class="l"><a href="#752"> 752: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
+</span><span id="753" class="l"><a href="#753"> 753: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="754" class="l"><a href="#754"> 754: </a>        {
+</span><span id="755" class="l"><a href="#755"> 755: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
+</span><span id="756" class="l"><a href="#756"> 756: </a>        }
+</span><span id="757" class="l"><a href="#757"> 757: </a>
+</span><span id="758" class="l"><a href="#758"> 758: </a>        <span class="php-comment">// Output the data</span>
+</span><span id="759" class="l"><a href="#759"> 759: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_output(<span class="php-var">$output</span>);
+</span><span id="760" class="l"><a href="#760"> 760: </a>
+</span><span id="761" class="l"><a href="#761"> 761: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="762" class="l"><a href="#762"> 762: </a>        {
+</span><span id="763" class="l"><a href="#763"> 763: </a>            <span class="php-comment">// Display the data and exit execution</span>
+</span><span id="764" class="l"><a href="#764"> 764: </a>            <span class="php-var">$this</span>-&gt;output-&gt;_display();
+</span><span id="765" class="l"><a href="#765"> 765: </a>            <span class="php-keyword1">exit</span>;
+</span><span id="766" class="l"><a href="#766"> 766: </a>        }
+</span><span id="767" class="l"><a href="#767"> 767: </a>
+</span><span id="768" class="l"><a href="#768"> 768: </a>        <span class="php-comment">// Otherwise dump the output automatically</span>
+</span><span id="769" class="l"><a href="#769"> 769: </a>    }
+</span><span id="770" class="l"><a href="#770"> 770: </a>
+</span><span id="771" class="l"><a href="#771"> 771: </a>    <span class="php-comment">/**
+</span></span><span id="772" class="l"><a href="#772"> 772: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
+</span></span><span id="773" class="l"><a href="#773"> 773: </a><span class="php-comment">     * within the buffers of the Output class. The response is sent to the client
+</span></span><span id="774" class="l"><a href="#774"> 774: </a><span class="php-comment">     * lately by the framework, after the current controller's method termination.
+</span></span><span id="775" class="l"><a href="#775"> 775: </a><span class="php-comment">     * All the hooks after the controller's method termination are executable.
+</span></span><span id="776" class="l"><a href="#776"> 776: </a><span class="php-comment">     *
+</span></span><span id="777" class="l"><a href="#777"> 777: </a><span class="php-comment">     * @access public
+</span></span><span id="778" class="l"><a href="#778"> 778: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
+</span></span><span id="779" class="l"><a href="#779"> 779: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
+</span></span><span id="780" class="l"><a href="#780"> 780: </a><span class="php-comment">     */</span>
+</span><span id="781" class="l"><a href="#781"> 781: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> set_response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="782" class="l"><a href="#782"> 782: </a>    {
+</span><span id="783" class="l"><a href="#783"> 783: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$data</span>, <span class="php-var">$http_code</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="784" class="l"><a href="#784"> 784: </a>    }
 </span><span id="785" class="l"><a href="#785"> 785: </a>
-</span><span id="786" class="l"><a href="#786"> 786: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
-</span><span id="787" class="l"><a href="#787"> 787: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
-</span><span id="788" class="l"><a href="#788"> 788: </a>                <span class="php-var">$content_type</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$content_type</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$content_type</span>)) : <span class="php-var">$content_type</span>);
-</span><span id="789" class="l"><a href="#789"> 789: </a>
-</span><span id="790" class="l"><a href="#790"> 790: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
-</span><span id="791" class="l"><a href="#791"> 791: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$content_type</span> === <span class="php-var">$value</span>)
-</span><span id="792" class="l"><a href="#792"> 792: </a>                {
-</span><span id="793" class="l"><a href="#793"> 793: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
-</span><span id="794" class="l"><a href="#794"> 794: </a>                }
-</span><span id="795" class="l"><a href="#795"> 795: </a>            }
-</span><span id="796" class="l"><a href="#796"> 796: </a>        }
-</span><span id="797" class="l"><a href="#797"> 797: </a>
-</span><span id="798" class="l"><a href="#798"> 798: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="799" class="l"><a href="#799"> 799: </a>    }
-</span><span id="800" class="l"><a href="#800"> 800: </a>
-</span><span id="801" class="l"><a href="#801"> 801: </a>    <span class="php-comment">/**
-</span></span><span id="802" class="l"><a href="#802"> 802: </a><span class="php-comment">     * Detect which format should be used to output the data
-</span></span><span id="803" class="l"><a href="#803"> 803: </a><span class="php-comment">     *
-</span></span><span id="804" class="l"><a href="#804"> 804: </a><span class="php-comment">     * @access protected
-</span></span><span id="805" class="l"><a href="#805"> 805: </a><span class="php-comment">     * @return mixed|NULL|string Output format
-</span></span><span id="806" class="l"><a href="#806"> 806: </a><span class="php-comment">     */</span>
-</span><span id="807" class="l"><a href="#807"> 807: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
-</span><span id="808" class="l"><a href="#808"> 808: </a>    {
-</span><span id="809" class="l"><a href="#809"> 809: </a>        <span class="php-comment">// Concatenate formats to a regex pattern e.g. \.(csv|json|xml)</span>
-</span><span id="810" class="l"><a href="#810"> 810: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')($|\/)/'</span>;
-</span><span id="811" class="l"><a href="#811"> 811: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="812" class="l"><a href="#812"> 812: </a>
-</span><span id="813" class="l"><a href="#813"> 813: </a>        <span class="php-comment">// Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2</span>
-</span><span id="814" class="l"><a href="#814"> 814: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
-</span><span id="815" class="l"><a href="#815"> 815: </a>        {
-</span><span id="816" class="l"><a href="#816"> 816: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
-</span><span id="817" class="l"><a href="#817"> 817: </a>        }
-</span><span id="818" class="l"><a href="#818"> 818: </a>
-</span><span id="819" class="l"><a href="#819"> 819: </a>        <span class="php-comment">// Get the format parameter named as 'format'</span>
-</span><span id="820" class="l"><a href="#820"> 820: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]))
-</span><span id="821" class="l"><a href="#821"> 821: </a>        {
-</span><span id="822" class="l"><a href="#822"> 822: </a>            <span class="php-var">$format</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]);
-</span><span id="823" class="l"><a href="#823"> 823: </a>
-</span><span id="824" class="l"><a href="#824"> 824: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]) === <span class="php-keyword1">TRUE</span>)
-</span><span id="825" class="l"><a href="#825"> 825: </a>            {
-</span><span id="826" class="l"><a href="#826"> 826: </a>                <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="827" class="l"><a href="#827"> 827: </a>            }
-</span><span id="828" class="l"><a href="#828"> 828: </a>        }
-</span><span id="829" class="l"><a href="#829"> 829: </a>
-</span><span id="830" class="l"><a href="#830"> 830: </a>        <span class="php-comment">// Get the HTTP_ACCEPT server variable</span>
-</span><span id="831" class="l"><a href="#831"> 831: </a>        <span class="php-var">$http_accept</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>);
-</span><span id="832" class="l"><a href="#832"> 832: </a>
-</span><span id="833" class="l"><a href="#833"> 833: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT server variable</span>
-</span><span id="834" class="l"><a href="#834"> 834: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$http_accept</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="835" class="l"><a href="#835"> 835: </a>        {
-</span><span id="836" class="l"><a href="#836"> 836: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="837" class="l"><a href="#837"> 837: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
-</span><span id="838" class="l"><a href="#838"> 838: </a>            {
-</span><span id="839" class="l"><a href="#839"> 839: </a>                <span class="php-comment">// Has this format been requested?</span>
-</span><span id="840" class="l"><a href="#840"> 840: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="841" class="l"><a href="#841"> 841: </a>                {
-</span><span id="842" class="l"><a href="#842"> 842: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
-</span><span id="843" class="l"><a href="#843"> 843: </a>                    {
-</span><span id="844" class="l"><a href="#844"> 844: </a>                        <span class="php-comment">// If not HTML or XML assume it's correct</span>
-</span><span id="845" class="l"><a href="#845"> 845: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="846" class="l"><a href="#846"> 846: </a>                    }
-</span><span id="847" class="l"><a href="#847"> 847: </a>                    <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="848" class="l"><a href="#848"> 848: </a>                    {
-</span><span id="849" class="l"><a href="#849"> 849: </a>                        <span class="php-comment">// HTML or XML have shown up as a match</span>
-</span><span id="850" class="l"><a href="#850"> 850: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
-</span><span id="851" class="l"><a href="#851"> 851: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="852" class="l"><a href="#852"> 852: </a>                    }
-</span><span id="853" class="l"><a href="#853"> 853: </a>                    <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="854" class="l"><a href="#854"> 854: </a>                    {
-</span><span id="855" class="l"><a href="#855"> 855: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
-</span><span id="856" class="l"><a href="#856"> 856: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="857" class="l"><a href="#857"> 857: </a>                    }
-</span><span id="858" class="l"><a href="#858"> 858: </a>                }
-</span><span id="859" class="l"><a href="#859"> 859: </a>            }
-</span><span id="860" class="l"><a href="#860"> 860: </a>        }
-</span><span id="861" class="l"><a href="#861"> 861: </a>
-</span><span id="862" class="l"><a href="#862"> 862: </a>        <span class="php-comment">// Check if the controller has a default format</span>
-</span><span id="863" class="l"><a href="#863"> 863: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
-</span><span id="864" class="l"><a href="#864"> 864: </a>        {
-</span><span id="865" class="l"><a href="#865"> 865: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
-</span><span id="866" class="l"><a href="#866"> 866: </a>        }
-</span><span id="867" class="l"><a href="#867"> 867: </a>
-</span><span id="868" class="l"><a href="#868"> 868: </a>        <span class="php-comment">// Obtain the default format from the configuration</span>
-</span><span id="869" class="l"><a href="#869"> 869: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
-</span><span id="870" class="l"><a href="#870"> 870: </a>    }
-</span><span id="871" class="l"><a href="#871"> 871: </a>
-</span><span id="872" class="l"><a href="#872"> 872: </a>    <span class="php-comment">/**
-</span></span><span id="873" class="l"><a href="#873"> 873: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
-</span></span><span id="874" class="l"><a href="#874"> 874: </a><span class="php-comment">     *
-</span></span><span id="875" class="l"><a href="#875"> 875: </a><span class="php-comment">     * @access protected
-</span></span><span id="876" class="l"><a href="#876"> 876: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
-</span></span><span id="877" class="l"><a href="#877"> 877: </a><span class="php-comment">     */</span>
-</span><span id="878" class="l"><a href="#878"> 878: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
-</span><span id="879" class="l"><a href="#879"> 879: </a>    {
-</span><span id="880" class="l"><a href="#880"> 880: </a>        <span class="php-comment">// Declare a variable to store the method</span>
-</span><span id="881" class="l"><a href="#881"> 881: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="882" class="l"><a href="#882"> 882: </a>
-</span><span id="883" class="l"><a href="#883"> 883: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
-</span><span id="884" class="l"><a href="#884"> 884: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="885" class="l"><a href="#885"> 885: </a>        {
-</span><span id="886" class="l"><a href="#886"> 886: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
-</span><span id="887" class="l"><a href="#887"> 887: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="888" class="l"><a href="#888"> 888: </a>            {
-</span><span id="889" class="l"><a href="#889"> 889: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
-</span><span id="890" class="l"><a href="#890"> 890: </a>            }
-</span><span id="891" class="l"><a href="#891"> 891: </a>
-</span><span id="892" class="l"><a href="#892"> 892: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
-</span><span id="893" class="l"><a href="#893"> 893: </a>        }
-</span><span id="894" class="l"><a href="#894"> 894: </a>
-</span><span id="895" class="l"><a href="#895"> 895: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
-</span><span id="896" class="l"><a href="#896"> 896: </a>        {
-</span><span id="897" class="l"><a href="#897"> 897: </a>            <span class="php-comment">// Get the request method as a lowercase string.</span>
-</span><span id="898" class="l"><a href="#898"> 898: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
-</span><span id="899" class="l"><a href="#899"> 899: </a>        }
-</span><span id="900" class="l"><a href="#900"> 900: </a>
-</span><span id="901" class="l"><a href="#901"> 901: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
-</span><span id="902" class="l"><a href="#902"> 902: </a>    }
-</span><span id="903" class="l"><a href="#903"> 903: </a>
-</span><span id="904" class="l"><a href="#904"> 904: </a>    <span class="php-comment">/**
-</span></span><span id="905" class="l"><a href="#905"> 905: </a><span class="php-comment">     * See if the user has provided an API key
-</span></span><span id="906" class="l"><a href="#906"> 906: </a><span class="php-comment">     *
-</span></span><span id="907" class="l"><a href="#907"> 907: </a><span class="php-comment">     * @access protected
-</span></span><span id="908" class="l"><a href="#908"> 908: </a><span class="php-comment">     * @return bool
-</span></span><span id="909" class="l"><a href="#909"> 909: </a><span class="php-comment">     */</span>
-</span><span id="910" class="l"><a href="#910"> 910: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
-</span><span id="911" class="l"><a href="#911"> 911: </a>    {
-</span><span id="912" class="l"><a href="#912"> 912: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
-</span><span id="913" class="l"><a href="#913"> 913: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
-</span><span id="914" class="l"><a href="#914"> 914: </a>
-</span><span id="915" class="l"><a href="#915"> 915: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
-</span><span id="916" class="l"><a href="#916"> 916: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
-</span><span id="917" class="l"><a href="#917"> 917: </a>
-</span><span id="918" class="l"><a href="#918"> 918: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="919" class="l"><a href="#919"> 919: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
-</span><span id="920" class="l"><a href="#920"> 920: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
-</span><span id="921" class="l"><a href="#921"> 921: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
+</span><span id="786" class="l"><a href="#786"> 786: </a>    <span class="php-comment">/**
+</span></span><span id="787" class="l"><a href="#787"> 787: </a><span class="php-comment">     * Get the input format e.g. json or xml
+</span></span><span id="788" class="l"><a href="#788"> 788: </a><span class="php-comment">     *
+</span></span><span id="789" class="l"><a href="#789"> 789: </a><span class="php-comment">     * @access protected
+</span></span><span id="790" class="l"><a href="#790"> 790: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
+</span></span><span id="791" class="l"><a href="#791"> 791: </a><span class="php-comment">     */</span>
+</span><span id="792" class="l"><a href="#792"> 792: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
+</span><span id="793" class="l"><a href="#793"> 793: </a>    {
+</span><span id="794" class="l"><a href="#794"> 794: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
+</span><span id="795" class="l"><a href="#795"> 795: </a>        <span class="php-var">$content_type</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
+</span><span id="796" class="l"><a href="#796"> 796: </a>
+</span><span id="797" class="l"><a href="#797"> 797: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$content_type</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="798" class="l"><a href="#798"> 798: </a>        {
+</span><span id="799" class="l"><a href="#799"> 799: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="800" class="l"><a href="#800"> 800: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
+</span><span id="801" class="l"><a href="#801"> 801: </a>            {
+</span><span id="802" class="l"><a href="#802"> 802: </a>                <span class="php-comment">// $key = format e.g. csv</span>
+</span><span id="803" class="l"><a href="#803"> 803: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
+</span><span id="804" class="l"><a href="#804"> 804: </a>
+</span><span id="805" class="l"><a href="#805"> 805: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
+</span><span id="806" class="l"><a href="#806"> 806: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
+</span><span id="807" class="l"><a href="#807"> 807: </a>                <span class="php-var">$content_type</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$content_type</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$content_type</span>)) : <span class="php-var">$content_type</span>);
+</span><span id="808" class="l"><a href="#808"> 808: </a>
+</span><span id="809" class="l"><a href="#809"> 809: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
+</span><span id="810" class="l"><a href="#810"> 810: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$content_type</span> === <span class="php-var">$value</span>)
+</span><span id="811" class="l"><a href="#811"> 811: </a>                {
+</span><span id="812" class="l"><a href="#812"> 812: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
+</span><span id="813" class="l"><a href="#813"> 813: </a>                }
+</span><span id="814" class="l"><a href="#814"> 814: </a>            }
+</span><span id="815" class="l"><a href="#815"> 815: </a>        }
+</span><span id="816" class="l"><a href="#816"> 816: </a>
+</span><span id="817" class="l"><a href="#817"> 817: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="818" class="l"><a href="#818"> 818: </a>    }
+</span><span id="819" class="l"><a href="#819"> 819: </a>
+</span><span id="820" class="l"><a href="#820"> 820: </a>    <span class="php-comment">/**
+</span></span><span id="821" class="l"><a href="#821"> 821: </a><span class="php-comment">     * Detect which format should be used to output the data
+</span></span><span id="822" class="l"><a href="#822"> 822: </a><span class="php-comment">     *
+</span></span><span id="823" class="l"><a href="#823"> 823: </a><span class="php-comment">     * @access protected
+</span></span><span id="824" class="l"><a href="#824"> 824: </a><span class="php-comment">     * @return mixed|NULL|string Output format
+</span></span><span id="825" class="l"><a href="#825"> 825: </a><span class="php-comment">     */</span>
+</span><span id="826" class="l"><a href="#826"> 826: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
+</span><span id="827" class="l"><a href="#827"> 827: </a>    {
+</span><span id="828" class="l"><a href="#828"> 828: </a>        <span class="php-comment">// Concatenate formats to a regex pattern e.g. \.(csv|json|xml)</span>
+</span><span id="829" class="l"><a href="#829"> 829: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')($|\/)/'</span>;
+</span><span id="830" class="l"><a href="#830"> 830: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="831" class="l"><a href="#831"> 831: </a>
+</span><span id="832" class="l"><a href="#832"> 832: </a>        <span class="php-comment">// Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2</span>
+</span><span id="833" class="l"><a href="#833"> 833: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
+</span><span id="834" class="l"><a href="#834"> 834: </a>        {
+</span><span id="835" class="l"><a href="#835"> 835: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
+</span><span id="836" class="l"><a href="#836"> 836: </a>        }
+</span><span id="837" class="l"><a href="#837"> 837: </a>
+</span><span id="838" class="l"><a href="#838"> 838: </a>        <span class="php-comment">// Get the format parameter named as 'format'</span>
+</span><span id="839" class="l"><a href="#839"> 839: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]))
+</span><span id="840" class="l"><a href="#840"> 840: </a>        {
+</span><span id="841" class="l"><a href="#841"> 841: </a>            <span class="php-var">$format</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]);
+</span><span id="842" class="l"><a href="#842"> 842: </a>
+</span><span id="843" class="l"><a href="#843"> 843: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]) === <span class="php-keyword1">TRUE</span>)
+</span><span id="844" class="l"><a href="#844"> 844: </a>            {
+</span><span id="845" class="l"><a href="#845"> 845: </a>                <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="846" class="l"><a href="#846"> 846: </a>            }
+</span><span id="847" class="l"><a href="#847"> 847: </a>        }
+</span><span id="848" class="l"><a href="#848"> 848: </a>
+</span><span id="849" class="l"><a href="#849"> 849: </a>        <span class="php-comment">// Get the HTTP_ACCEPT server variable</span>
+</span><span id="850" class="l"><a href="#850"> 850: </a>        <span class="php-var">$http_accept</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>);
+</span><span id="851" class="l"><a href="#851"> 851: </a>
+</span><span id="852" class="l"><a href="#852"> 852: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT server variable</span>
+</span><span id="853" class="l"><a href="#853"> 853: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$http_accept</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="854" class="l"><a href="#854"> 854: </a>        {
+</span><span id="855" class="l"><a href="#855"> 855: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="856" class="l"><a href="#856"> 856: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
+</span><span id="857" class="l"><a href="#857"> 857: </a>            {
+</span><span id="858" class="l"><a href="#858"> 858: </a>                <span class="php-comment">// Has this format been requested?</span>
+</span><span id="859" class="l"><a href="#859"> 859: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="860" class="l"><a href="#860"> 860: </a>                {
+</span><span id="861" class="l"><a href="#861"> 861: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
+</span><span id="862" class="l"><a href="#862"> 862: </a>                    {
+</span><span id="863" class="l"><a href="#863"> 863: </a>                        <span class="php-comment">// If not HTML or XML assume it's correct</span>
+</span><span id="864" class="l"><a href="#864"> 864: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="865" class="l"><a href="#865"> 865: </a>                    }
+</span><span id="866" class="l"><a href="#866"> 866: </a>                    <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="867" class="l"><a href="#867"> 867: </a>                    {
+</span><span id="868" class="l"><a href="#868"> 868: </a>                        <span class="php-comment">// HTML or XML have shown up as a match</span>
+</span><span id="869" class="l"><a href="#869"> 869: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
+</span><span id="870" class="l"><a href="#870"> 870: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="871" class="l"><a href="#871"> 871: </a>                    }
+</span><span id="872" class="l"><a href="#872"> 872: </a>                    <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="873" class="l"><a href="#873"> 873: </a>                    {
+</span><span id="874" class="l"><a href="#874"> 874: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
+</span><span id="875" class="l"><a href="#875"> 875: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="876" class="l"><a href="#876"> 876: </a>                    }
+</span><span id="877" class="l"><a href="#877"> 877: </a>                }
+</span><span id="878" class="l"><a href="#878"> 878: </a>            }
+</span><span id="879" class="l"><a href="#879"> 879: </a>        }
+</span><span id="880" class="l"><a href="#880"> 880: </a>
+</span><span id="881" class="l"><a href="#881"> 881: </a>        <span class="php-comment">// Check if the controller has a default format</span>
+</span><span id="882" class="l"><a href="#882"> 882: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
+</span><span id="883" class="l"><a href="#883"> 883: </a>        {
+</span><span id="884" class="l"><a href="#884"> 884: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
+</span><span id="885" class="l"><a href="#885"> 885: </a>        }
+</span><span id="886" class="l"><a href="#886"> 886: </a>
+</span><span id="887" class="l"><a href="#887"> 887: </a>        <span class="php-comment">// Obtain the default format from the configuration</span>
+</span><span id="888" class="l"><a href="#888"> 888: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
+</span><span id="889" class="l"><a href="#889"> 889: </a>    }
+</span><span id="890" class="l"><a href="#890"> 890: </a>
+</span><span id="891" class="l"><a href="#891"> 891: </a>    <span class="php-comment">/**
+</span></span><span id="892" class="l"><a href="#892"> 892: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
+</span></span><span id="893" class="l"><a href="#893"> 893: </a><span class="php-comment">     *
+</span></span><span id="894" class="l"><a href="#894"> 894: </a><span class="php-comment">     * @access protected
+</span></span><span id="895" class="l"><a href="#895"> 895: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
+</span></span><span id="896" class="l"><a href="#896"> 896: </a><span class="php-comment">     */</span>
+</span><span id="897" class="l"><a href="#897"> 897: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
+</span><span id="898" class="l"><a href="#898"> 898: </a>    {
+</span><span id="899" class="l"><a href="#899"> 899: </a>        <span class="php-comment">// Declare a variable to store the method</span>
+</span><span id="900" class="l"><a href="#900"> 900: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="901" class="l"><a href="#901"> 901: </a>
+</span><span id="902" class="l"><a href="#902"> 902: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
+</span><span id="903" class="l"><a href="#903"> 903: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="904" class="l"><a href="#904"> 904: </a>        {
+</span><span id="905" class="l"><a href="#905"> 905: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
+</span><span id="906" class="l"><a href="#906"> 906: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="907" class="l"><a href="#907"> 907: </a>            {
+</span><span id="908" class="l"><a href="#908"> 908: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
+</span><span id="909" class="l"><a href="#909"> 909: </a>            }
+</span><span id="910" class="l"><a href="#910"> 910: </a>
+</span><span id="911" class="l"><a href="#911"> 911: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
+</span><span id="912" class="l"><a href="#912"> 912: </a>        }
+</span><span id="913" class="l"><a href="#913"> 913: </a>
+</span><span id="914" class="l"><a href="#914"> 914: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
+</span><span id="915" class="l"><a href="#915"> 915: </a>        {
+</span><span id="916" class="l"><a href="#916"> 916: </a>            <span class="php-comment">// Get the request method as a lowercase string.</span>
+</span><span id="917" class="l"><a href="#917"> 917: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
+</span><span id="918" class="l"><a href="#918"> 918: </a>        }
+</span><span id="919" class="l"><a href="#919"> 919: </a>
+</span><span id="920" class="l"><a href="#920"> 920: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
+</span><span id="921" class="l"><a href="#921"> 921: </a>    }
 </span><span id="922" class="l"><a href="#922"> 922: </a>
-</span><span id="923" class="l"><a href="#923"> 923: </a>        <span class="php-comment">// Find the key from server or arguments</span>
-</span><span id="924" class="l"><a href="#924"> 924: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
-</span><span id="925" class="l"><a href="#925"> 925: </a>        {
-</span><span id="926" class="l"><a href="#926"> 926: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
-</span><span id="927" class="l"><a href="#927"> 927: </a>            {
-</span><span id="928" class="l"><a href="#928"> 928: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="929" class="l"><a href="#929"> 929: </a>            }
-</span><span id="930" class="l"><a href="#930"> 930: </a>
-</span><span id="931" class="l"><a href="#931"> 931: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
-</span><span id="932" class="l"><a href="#932"> 932: </a>
-</span><span id="933" class="l"><a href="#933"> 933: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
-</span><span id="934" class="l"><a href="#934"> 934: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
-</span><span id="935" class="l"><a href="#935"> 935: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
+</span><span id="923" class="l"><a href="#923"> 923: </a>    <span class="php-comment">/**
+</span></span><span id="924" class="l"><a href="#924"> 924: </a><span class="php-comment">     * See if the user has provided an API key
+</span></span><span id="925" class="l"><a href="#925"> 925: </a><span class="php-comment">     *
+</span></span><span id="926" class="l"><a href="#926"> 926: </a><span class="php-comment">     * @access protected
+</span></span><span id="927" class="l"><a href="#927"> 927: </a><span class="php-comment">     * @return bool
+</span></span><span id="928" class="l"><a href="#928"> 928: </a><span class="php-comment">     */</span>
+</span><span id="929" class="l"><a href="#929"> 929: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
+</span><span id="930" class="l"><a href="#930"> 930: </a>    {
+</span><span id="931" class="l"><a href="#931"> 931: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
+</span><span id="932" class="l"><a href="#932"> 932: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
+</span><span id="933" class="l"><a href="#933"> 933: </a>
+</span><span id="934" class="l"><a href="#934"> 934: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
+</span><span id="935" class="l"><a href="#935"> 935: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
 </span><span id="936" class="l"><a href="#936"> 936: </a>
-</span><span id="937" class="l"><a href="#937"> 937: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
-</span><span id="938" class="l"><a href="#938"> 938: </a>
-</span><span id="939" class="l"><a href="#939"> 939: </a>            <span class="php-comment">/*
-</span></span><span id="940" class="l"><a href="#940"> 940: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
-</span></span><span id="941" class="l"><a href="#941"> 941: </a><span class="php-comment">             * of valid ip addresses stored in the database.
-</span></span><span id="942" class="l"><a href="#942"> 942: </a><span class="php-comment">             */</span>
-</span><span id="943" class="l"><a href="#943"> 943: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
-</span><span id="944" class="l"><a href="#944"> 944: </a>            {
-</span><span id="945" class="l"><a href="#945"> 945: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
-</span><span id="946" class="l"><a href="#946"> 946: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
-</span><span id="947" class="l"><a href="#947"> 947: </a>                {
-</span><span id="948" class="l"><a href="#948"> 948: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
-</span><span id="949" class="l"><a href="#949"> 949: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
-</span><span id="950" class="l"><a href="#950"> 950: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
+</span><span id="937" class="l"><a href="#937"> 937: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="938" class="l"><a href="#938"> 938: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
+</span><span id="939" class="l"><a href="#939"> 939: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
+</span><span id="940" class="l"><a href="#940"> 940: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
+</span><span id="941" class="l"><a href="#941"> 941: </a>
+</span><span id="942" class="l"><a href="#942"> 942: </a>        <span class="php-comment">// Find the key from server or arguments</span>
+</span><span id="943" class="l"><a href="#943"> 943: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
+</span><span id="944" class="l"><a href="#944"> 944: </a>        {
+</span><span id="945" class="l"><a href="#945"> 945: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
+</span><span id="946" class="l"><a href="#946"> 946: </a>            {
+</span><span id="947" class="l"><a href="#947"> 947: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="948" class="l"><a href="#948"> 948: </a>            }
+</span><span id="949" class="l"><a href="#949"> 949: </a>
+</span><span id="950" class="l"><a href="#950"> 950: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
 </span><span id="951" class="l"><a href="#951"> 951: </a>
-</span><span id="952" class="l"><a href="#952"> 952: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
-</span><span id="953" class="l"><a href="#953"> 953: </a>                    {
-</span><span id="954" class="l"><a href="#954"> 954: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() === <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
-</span><span id="955" class="l"><a href="#955"> 955: </a>                        {
-</span><span id="956" class="l"><a href="#956"> 956: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
-</span><span id="957" class="l"><a href="#957"> 957: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
-</span><span id="958" class="l"><a href="#958"> 958: </a>                            <span class="php-keyword1">break</span>;
-</span><span id="959" class="l"><a href="#959"> 959: </a>                        }
-</span><span id="960" class="l"><a href="#960"> 960: </a>                    }
-</span><span id="961" class="l"><a href="#961"> 961: </a>
-</span><span id="962" class="l"><a href="#962"> 962: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
-</span><span id="963" class="l"><a href="#963"> 963: </a>                }
-</span><span id="964" class="l"><a href="#964"> 964: </a>                <span class="php-keyword1">else</span>
-</span><span id="965" class="l"><a href="#965"> 965: </a>                {
-</span><span id="966" class="l"><a href="#966"> 966: </a>                    <span class="php-comment">// There should be at least one IP address for this private key.</span>
-</span><span id="967" class="l"><a href="#967"> 967: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="968" class="l"><a href="#968"> 968: </a>                }
-</span><span id="969" class="l"><a href="#969"> 969: </a>            }
+</span><span id="952" class="l"><a href="#952"> 952: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
+</span><span id="953" class="l"><a href="#953"> 953: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
+</span><span id="954" class="l"><a href="#954"> 954: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
+</span><span id="955" class="l"><a href="#955"> 955: </a>
+</span><span id="956" class="l"><a href="#956"> 956: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
+</span><span id="957" class="l"><a href="#957"> 957: </a>
+</span><span id="958" class="l"><a href="#958"> 958: </a>            <span class="php-comment">/*
+</span></span><span id="959" class="l"><a href="#959"> 959: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
+</span></span><span id="960" class="l"><a href="#960"> 960: </a><span class="php-comment">             * of valid ip addresses stored in the database.
+</span></span><span id="961" class="l"><a href="#961"> 961: </a><span class="php-comment">             */</span>
+</span><span id="962" class="l"><a href="#962"> 962: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
+</span><span id="963" class="l"><a href="#963"> 963: </a>            {
+</span><span id="964" class="l"><a href="#964"> 964: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
+</span><span id="965" class="l"><a href="#965"> 965: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
+</span><span id="966" class="l"><a href="#966"> 966: </a>                {
+</span><span id="967" class="l"><a href="#967"> 967: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
+</span><span id="968" class="l"><a href="#968"> 968: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
+</span><span id="969" class="l"><a href="#969"> 969: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
 </span><span id="970" class="l"><a href="#970"> 970: </a>
-</span><span id="971" class="l"><a href="#971"> 971: </a>            <span class="php-keyword1">return</span> <span class="php-var">$row</span>;
-</span><span id="972" class="l"><a href="#972"> 972: </a>        }
-</span><span id="973" class="l"><a href="#973"> 973: </a>
-</span><span id="974" class="l"><a href="#974"> 974: </a>        <span class="php-comment">// No key has been sent</span>
-</span><span id="975" class="l"><a href="#975"> 975: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="976" class="l"><a href="#976"> 976: </a>    }
-</span><span id="977" class="l"><a href="#977"> 977: </a>
-</span><span id="978" class="l"><a href="#978"> 978: </a>    <span class="php-comment">/**
-</span></span><span id="979" class="l"><a href="#979"> 979: </a><span class="php-comment">     * Preferred return language
-</span></span><span id="980" class="l"><a href="#980"> 980: </a><span class="php-comment">     *
-</span></span><span id="981" class="l"><a href="#981"> 981: </a><span class="php-comment">     * @access protected
-</span></span><span id="982" class="l"><a href="#982"> 982: </a><span class="php-comment">     * @return string|NULL The language code
-</span></span><span id="983" class="l"><a href="#983"> 983: </a><span class="php-comment">     */</span>
-</span><span id="984" class="l"><a href="#984"> 984: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
-</span><span id="985" class="l"><a href="#985"> 985: </a>    {
-</span><span id="986" class="l"><a href="#986"> 986: </a>        <span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>);
-</span><span id="987" class="l"><a href="#987"> 987: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$lang</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="988" class="l"><a href="#988"> 988: </a>        {
-</span><span id="989" class="l"><a href="#989"> 989: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="990" class="l"><a href="#990"> 990: </a>        }
-</span><span id="991" class="l"><a href="#991"> 991: </a>
-</span><span id="992" class="l"><a href="#992"> 992: </a>        <span class="php-comment">// It appears more than one language has been sent using a comma delimiter</span>
-</span><span id="993" class="l"><a href="#993"> 993: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="994" class="l"><a href="#994"> 994: </a>        {
-</span><span id="995" class="l"><a href="#995"> 995: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
+</span><span id="971" class="l"><a href="#971"> 971: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
+</span><span id="972" class="l"><a href="#972"> 972: </a>                    {
+</span><span id="973" class="l"><a href="#973"> 973: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() === <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
+</span><span id="974" class="l"><a href="#974"> 974: </a>                        {
+</span><span id="975" class="l"><a href="#975"> 975: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
+</span><span id="976" class="l"><a href="#976"> 976: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
+</span><span id="977" class="l"><a href="#977"> 977: </a>                            <span class="php-keyword1">break</span>;
+</span><span id="978" class="l"><a href="#978"> 978: </a>                        }
+</span><span id="979" class="l"><a href="#979"> 979: </a>                    }
+</span><span id="980" class="l"><a href="#980"> 980: </a>
+</span><span id="981" class="l"><a href="#981"> 981: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
+</span><span id="982" class="l"><a href="#982"> 982: </a>                }
+</span><span id="983" class="l"><a href="#983"> 983: </a>                <span class="php-keyword1">else</span>
+</span><span id="984" class="l"><a href="#984"> 984: </a>                {
+</span><span id="985" class="l"><a href="#985"> 985: </a>                    <span class="php-comment">// There should be at least one IP address for this private key.</span>
+</span><span id="986" class="l"><a href="#986"> 986: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="987" class="l"><a href="#987"> 987: </a>                }
+</span><span id="988" class="l"><a href="#988"> 988: </a>            }
+</span><span id="989" class="l"><a href="#989"> 989: </a>
+</span><span id="990" class="l"><a href="#990"> 990: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="991" class="l"><a href="#991"> 991: </a>        }
+</span><span id="992" class="l"><a href="#992"> 992: </a>
+</span><span id="993" class="l"><a href="#993"> 993: </a>        <span class="php-comment">// No key has been sent</span>
+</span><span id="994" class="l"><a href="#994"> 994: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="995" class="l"><a href="#995"> 995: </a>    }
 </span><span id="996" class="l"><a href="#996"> 996: </a>
-</span><span id="997" class="l"><a href="#997"> 997: </a>            <span class="php-var">$return_langs</span> = [];
-</span><span id="998" class="l"><a href="#998"> 998: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
-</span><span id="999" class="l"><a href="#999"> 999: </a>            {
-</span><span id="1000" class="l"><a href="#1000">1000: </a>                <span class="php-comment">// Remove weight and trim leading and trailing whitespace</span>
-</span><span id="1001" class="l"><a href="#1001">1001: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
-</span><span id="1002" class="l"><a href="#1002">1002: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
-</span><span id="1003" class="l"><a href="#1003">1003: </a>            }
-</span><span id="1004" class="l"><a href="#1004">1004: </a>
-</span><span id="1005" class="l"><a href="#1005">1005: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
-</span><span id="1006" class="l"><a href="#1006">1006: </a>        }
-</span><span id="1007" class="l"><a href="#1007">1007: </a>
-</span><span id="1008" class="l"><a href="#1008">1008: </a>        <span class="php-comment">// Otherwise simply return as a string</span>
-</span><span id="1009" class="l"><a href="#1009">1009: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
-</span><span id="1010" class="l"><a href="#1010">1010: </a>    }
-</span><span id="1011" class="l"><a href="#1011">1011: </a>
-</span><span id="1012" class="l"><a href="#1012">1012: </a>    <span class="php-comment">/**
-</span></span><span id="1013" class="l"><a href="#1013">1013: </a><span class="php-comment">     * Add the request to the log table
-</span></span><span id="1014" class="l"><a href="#1014">1014: </a><span class="php-comment">     *
-</span></span><span id="1015" class="l"><a href="#1015">1015: </a><span class="php-comment">     * @access protected
-</span></span><span id="1016" class="l"><a href="#1016">1016: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
-</span></span><span id="1017" class="l"><a href="#1017">1017: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
-</span></span><span id="1018" class="l"><a href="#1018">1018: </a><span class="php-comment">     */</span>
-</span><span id="1019" class="l"><a href="#1019">1019: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1020" class="l"><a href="#1020">1020: </a>    {
-</span><span id="1021" class="l"><a href="#1021">1021: </a>        <span class="php-comment">// Insert the request into the log table</span>
-</span><span id="1022" class="l"><a href="#1022">1022: </a>        <span class="php-var">$is_inserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1023" class="l"><a href="#1023">1023: </a>            -&gt;insert(
-</span><span id="1024" class="l"><a href="#1024">1024: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
-</span><span id="1025" class="l"><a href="#1025">1025: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
-</span><span id="1026" class="l"><a href="#1026">1026: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
-</span><span id="1027" class="l"><a href="#1027">1027: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
-</span><span id="1028" class="l"><a href="#1028">1028: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="1029" class="l"><a href="#1029">1029: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
-</span><span id="1030" class="l"><a href="#1030">1030: </a>                <span class="php-quote">'time'</span> =&gt; now(), <span class="php-comment">// Used to be: function_exists('now') ? now() : time()</span>
-</span><span id="1031" class="l"><a href="#1031">1031: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
-</span><span id="1032" class="l"><a href="#1032">1032: </a>            ]);
-</span><span id="1033" class="l"><a href="#1033">1033: </a>
-</span><span id="1034" class="l"><a href="#1034">1034: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
-</span><span id="1035" class="l"><a href="#1035">1035: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
-</span><span id="1036" class="l"><a href="#1036">1036: </a>
-</span><span id="1037" class="l"><a href="#1037">1037: </a>        <span class="php-keyword1">return</span> <span class="php-var">$is_inserted</span>;
-</span><span id="1038" class="l"><a href="#1038">1038: </a>    }
-</span><span id="1039" class="l"><a href="#1039">1039: </a>
-</span><span id="1040" class="l"><a href="#1040">1040: </a>    <span class="php-comment">/**
-</span></span><span id="1041" class="l"><a href="#1041">1041: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
-</span></span><span id="1042" class="l"><a href="#1042">1042: </a><span class="php-comment">     *
-</span></span><span id="1043" class="l"><a href="#1043">1043: </a><span class="php-comment">     * @access protected
-</span></span><span id="1044" class="l"><a href="#1044">1044: </a><span class="php-comment">     * @param  string $controller_method The method being called
-</span></span><span id="1045" class="l"><a href="#1045">1045: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
-</span></span><span id="1046" class="l"><a href="#1046">1046: </a><span class="php-comment">     */</span>
-</span><span id="1047" class="l"><a href="#1047">1047: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
-</span><span id="1048" class="l"><a href="#1048">1048: </a>    {
-</span><span id="1049" class="l"><a href="#1049">1049: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
-</span><span id="1050" class="l"><a href="#1050">1050: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1051" class="l"><a href="#1051">1051: </a>        {
-</span><span id="1052" class="l"><a href="#1052">1052: </a>            <span class="php-comment">// Everything is fine</span>
-</span><span id="1053" class="l"><a href="#1053">1053: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1054" class="l"><a href="#1054">1054: </a>        }
+</span><span id="997" class="l"><a href="#997"> 997: </a>    <span class="php-comment">/**
+</span></span><span id="998" class="l"><a href="#998"> 998: </a><span class="php-comment">     * Preferred return language
+</span></span><span id="999" class="l"><a href="#999"> 999: </a><span class="php-comment">     *
+</span></span><span id="1000" class="l"><a href="#1000">1000: </a><span class="php-comment">     * @access protected
+</span></span><span id="1001" class="l"><a href="#1001">1001: </a><span class="php-comment">     * @return string|NULL The language code
+</span></span><span id="1002" class="l"><a href="#1002">1002: </a><span class="php-comment">     */</span>
+</span><span id="1003" class="l"><a href="#1003">1003: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
+</span><span id="1004" class="l"><a href="#1004">1004: </a>    {
+</span><span id="1005" class="l"><a href="#1005">1005: </a>        <span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>);
+</span><span id="1006" class="l"><a href="#1006">1006: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$lang</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1007" class="l"><a href="#1007">1007: </a>        {
+</span><span id="1008" class="l"><a href="#1008">1008: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="1009" class="l"><a href="#1009">1009: </a>        }
+</span><span id="1010" class="l"><a href="#1010">1010: </a>
+</span><span id="1011" class="l"><a href="#1011">1011: </a>        <span class="php-comment">// It appears more than one language has been sent using a comma delimiter</span>
+</span><span id="1012" class="l"><a href="#1012">1012: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="1013" class="l"><a href="#1013">1013: </a>        {
+</span><span id="1014" class="l"><a href="#1014">1014: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
+</span><span id="1015" class="l"><a href="#1015">1015: </a>
+</span><span id="1016" class="l"><a href="#1016">1016: </a>            <span class="php-var">$return_langs</span> = [];
+</span><span id="1017" class="l"><a href="#1017">1017: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
+</span><span id="1018" class="l"><a href="#1018">1018: </a>            {
+</span><span id="1019" class="l"><a href="#1019">1019: </a>                <span class="php-comment">// Remove weight and trim leading and trailing whitespace</span>
+</span><span id="1020" class="l"><a href="#1020">1020: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
+</span><span id="1021" class="l"><a href="#1021">1021: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
+</span><span id="1022" class="l"><a href="#1022">1022: </a>            }
+</span><span id="1023" class="l"><a href="#1023">1023: </a>
+</span><span id="1024" class="l"><a href="#1024">1024: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
+</span><span id="1025" class="l"><a href="#1025">1025: </a>        }
+</span><span id="1026" class="l"><a href="#1026">1026: </a>
+</span><span id="1027" class="l"><a href="#1027">1027: </a>        <span class="php-comment">// Otherwise simply return as a string</span>
+</span><span id="1028" class="l"><a href="#1028">1028: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
+</span><span id="1029" class="l"><a href="#1029">1029: </a>    }
+</span><span id="1030" class="l"><a href="#1030">1030: </a>
+</span><span id="1031" class="l"><a href="#1031">1031: </a>    <span class="php-comment">/**
+</span></span><span id="1032" class="l"><a href="#1032">1032: </a><span class="php-comment">     * Add the request to the log table
+</span></span><span id="1033" class="l"><a href="#1033">1033: </a><span class="php-comment">     *
+</span></span><span id="1034" class="l"><a href="#1034">1034: </a><span class="php-comment">     * @access protected
+</span></span><span id="1035" class="l"><a href="#1035">1035: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
+</span></span><span id="1036" class="l"><a href="#1036">1036: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
+</span></span><span id="1037" class="l"><a href="#1037">1037: </a><span class="php-comment">     */</span>
+</span><span id="1038" class="l"><a href="#1038">1038: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="1039" class="l"><a href="#1039">1039: </a>    {
+</span><span id="1040" class="l"><a href="#1040">1040: </a>        <span class="php-comment">// Insert the request into the log table</span>
+</span><span id="1041" class="l"><a href="#1041">1041: </a>        <span class="php-var">$is_inserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1042" class="l"><a href="#1042">1042: </a>            -&gt;insert(
+</span><span id="1043" class="l"><a href="#1043">1043: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
+</span><span id="1044" class="l"><a href="#1044">1044: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
+</span><span id="1045" class="l"><a href="#1045">1045: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
+</span><span id="1046" class="l"><a href="#1046">1046: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
+</span><span id="1047" class="l"><a href="#1047">1047: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="1048" class="l"><a href="#1048">1048: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
+</span><span id="1049" class="l"><a href="#1049">1049: </a>                <span class="php-quote">'time'</span> =&gt; now(), <span class="php-comment">// Used to be: function_exists('now') ? now() : time()</span>
+</span><span id="1050" class="l"><a href="#1050">1050: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
+</span><span id="1051" class="l"><a href="#1051">1051: </a>            ]);
+</span><span id="1052" class="l"><a href="#1052">1052: </a>
+</span><span id="1053" class="l"><a href="#1053">1053: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
+</span><span id="1054" class="l"><a href="#1054">1054: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
 </span><span id="1055" class="l"><a href="#1055">1055: </a>
-</span><span id="1056" class="l"><a href="#1056">1056: </a>        <span class="php-keyword1">switch</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_method'</span>))
-</span><span id="1057" class="l"><a href="#1057">1057: </a>        {
-</span><span id="1058" class="l"><a href="#1058">1058: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'API_KEY'</span>:
-</span><span id="1059" class="l"><a href="#1059">1059: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'api-key:'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>);
-</span><span id="1060" class="l"><a href="#1060">1060: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>;
-</span><span id="1061" class="l"><a href="#1061">1061: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1062" class="l"><a href="#1062">1062: </a>
-</span><span id="1063" class="l"><a href="#1063">1063: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'METHOD_NAME'</span>:
-</span><span id="1064" class="l"><a href="#1064">1064: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'method-name:'</span> . <span class="php-var">$controller_method</span>;
-</span><span id="1065" class="l"><a href="#1065">1065: </a>            <span class="php-var">$limited_method_name</span> =  <span class="php-var">$controller_method</span>;
-</span><span id="1066" class="l"><a href="#1066">1066: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1067" class="l"><a href="#1067">1067: </a>
-</span><span id="1068" class="l"><a href="#1068">1068: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'ROUTED_URL'</span>:
-</span><span id="1069" class="l"><a href="#1069">1069: </a>          <span class="php-keyword1">default</span>:
-</span><span id="1070" class="l"><a href="#1070">1070: </a>            <span class="php-var">$limited_uri</span> = <span class="php-var">$this</span>-&gt;uri-&gt;ruri_string();
-</span><span id="1071" class="l"><a href="#1071">1071: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$limited_uri</span>), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
-</span><span id="1072" class="l"><a href="#1072">1072: </a>            {
-</span><span id="1073" class="l"><a href="#1073">1073: </a>                <span class="php-var">$limited_uri</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$limited_uri</span>,<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format) - <span class="php-num">1</span>);
-</span><span id="1074" class="l"><a href="#1074">1074: </a>            }
-</span><span id="1075" class="l"><a href="#1075">1075: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'uri:'</span> . <span class="php-var">$limited_uri</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method; <span class="php-comment">// It's good to differentiate GET from PUT</span>
-</span><span id="1076" class="l"><a href="#1076">1076: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-var">$controller_method</span>;
-</span><span id="1077" class="l"><a href="#1077">1077: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1078" class="l"><a href="#1078">1078: </a>        }
-</span><span id="1079" class="l"><a href="#1079">1079: </a>
-</span><span id="1080" class="l"><a href="#1080">1080: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span> )
-</span><span id="1081" class="l"><a href="#1081">1081: </a>        {
-</span><span id="1082" class="l"><a href="#1082">1082: </a>            <span class="php-comment">// Everything is fine</span>
-</span><span id="1083" class="l"><a href="#1083">1083: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1084" class="l"><a href="#1084">1084: </a>        }
-</span><span id="1085" class="l"><a href="#1085">1085: </a>
-</span><span id="1086" class="l"><a href="#1086">1086: </a>        <span class="php-comment">// How many times can you get to this method in a defined time_limit (default: 1 hour)?</span>
-</span><span id="1087" class="l"><a href="#1087">1087: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>];
-</span><span id="1088" class="l"><a href="#1088">1088: </a>
-</span><span id="1089" class="l"><a href="#1089">1089: </a>        <span class="php-var">$time_limit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>] : <span class="php-num">3600</span>); <span class="php-comment">// 3600 = 60 * 60</span>
-</span><span id="1090" class="l"><a href="#1090">1090: </a>
-</span><span id="1091" class="l"><a href="#1091">1091: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
-</span><span id="1092" class="l"><a href="#1092">1092: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1093" class="l"><a href="#1093">1093: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1094" class="l"><a href="#1094">1094: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1095" class="l"><a href="#1095">1095: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
-</span><span id="1096" class="l"><a href="#1096">1096: </a>            -&gt;row();
-</span><span id="1097" class="l"><a href="#1097">1097: </a>
-</span><span id="1098" class="l"><a href="#1098">1098: </a>        <span class="php-comment">// No calls have been made for this key</span>
-</span><span id="1099" class="l"><a href="#1099">1099: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1056" class="l"><a href="#1056">1056: </a>        <span class="php-keyword1">return</span> <span class="php-var">$is_inserted</span>;
+</span><span id="1057" class="l"><a href="#1057">1057: </a>    }
+</span><span id="1058" class="l"><a href="#1058">1058: </a>
+</span><span id="1059" class="l"><a href="#1059">1059: </a>    <span class="php-comment">/**
+</span></span><span id="1060" class="l"><a href="#1060">1060: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
+</span></span><span id="1061" class="l"><a href="#1061">1061: </a><span class="php-comment">     *
+</span></span><span id="1062" class="l"><a href="#1062">1062: </a><span class="php-comment">     * @access protected
+</span></span><span id="1063" class="l"><a href="#1063">1063: </a><span class="php-comment">     * @param  string $controller_method The method being called
+</span></span><span id="1064" class="l"><a href="#1064">1064: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
+</span></span><span id="1065" class="l"><a href="#1065">1065: </a><span class="php-comment">     */</span>
+</span><span id="1066" class="l"><a href="#1066">1066: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
+</span><span id="1067" class="l"><a href="#1067">1067: </a>    {
+</span><span id="1068" class="l"><a href="#1068">1068: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
+</span><span id="1069" class="l"><a href="#1069">1069: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1070" class="l"><a href="#1070">1070: </a>        {
+</span><span id="1071" class="l"><a href="#1071">1071: </a>            <span class="php-comment">// Everything is fine</span>
+</span><span id="1072" class="l"><a href="#1072">1072: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1073" class="l"><a href="#1073">1073: </a>        }
+</span><span id="1074" class="l"><a href="#1074">1074: </a>
+</span><span id="1075" class="l"><a href="#1075">1075: </a>        <span class="php-keyword1">switch</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_method'</span>))
+</span><span id="1076" class="l"><a href="#1076">1076: </a>        {
+</span><span id="1077" class="l"><a href="#1077">1077: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'API_KEY'</span>:
+</span><span id="1078" class="l"><a href="#1078">1078: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'api-key:'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>);
+</span><span id="1079" class="l"><a href="#1079">1079: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>;
+</span><span id="1080" class="l"><a href="#1080">1080: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1081" class="l"><a href="#1081">1081: </a>
+</span><span id="1082" class="l"><a href="#1082">1082: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'METHOD_NAME'</span>:
+</span><span id="1083" class="l"><a href="#1083">1083: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'method-name:'</span> . <span class="php-var">$controller_method</span>;
+</span><span id="1084" class="l"><a href="#1084">1084: </a>            <span class="php-var">$limited_method_name</span> =  <span class="php-var">$controller_method</span>;
+</span><span id="1085" class="l"><a href="#1085">1085: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1086" class="l"><a href="#1086">1086: </a>
+</span><span id="1087" class="l"><a href="#1087">1087: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'ROUTED_URL'</span>:
+</span><span id="1088" class="l"><a href="#1088">1088: </a>          <span class="php-keyword1">default</span>:
+</span><span id="1089" class="l"><a href="#1089">1089: </a>            <span class="php-var">$limited_uri</span> = <span class="php-var">$this</span>-&gt;uri-&gt;ruri_string();
+</span><span id="1090" class="l"><a href="#1090">1090: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$limited_uri</span>), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
+</span><span id="1091" class="l"><a href="#1091">1091: </a>            {
+</span><span id="1092" class="l"><a href="#1092">1092: </a>                <span class="php-var">$limited_uri</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$limited_uri</span>,<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format) - <span class="php-num">1</span>);
+</span><span id="1093" class="l"><a href="#1093">1093: </a>            }
+</span><span id="1094" class="l"><a href="#1094">1094: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'uri:'</span> . <span class="php-var">$limited_uri</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method; <span class="php-comment">// It's good to differentiate GET from PUT</span>
+</span><span id="1095" class="l"><a href="#1095">1095: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-var">$controller_method</span>;
+</span><span id="1096" class="l"><a href="#1096">1096: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1097" class="l"><a href="#1097">1097: </a>        }
+</span><span id="1098" class="l"><a href="#1098">1098: </a>
+</span><span id="1099" class="l"><a href="#1099">1099: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span> )
 </span><span id="1100" class="l"><a href="#1100">1100: </a>        {
-</span><span id="1101" class="l"><a href="#1101">1101: </a>            <span class="php-comment">// Create a new row for the following key</span>
-</span><span id="1102" class="l"><a href="#1102">1102: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
-</span><span id="1103" class="l"><a href="#1103">1103: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$limited_uri</span>,
-</span><span id="1104" class="l"><a href="#1104">1104: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="1105" class="l"><a href="#1105">1105: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
-</span><span id="1106" class="l"><a href="#1106">1106: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
-</span><span id="1107" class="l"><a href="#1107">1107: </a>            ]);
-</span><span id="1108" class="l"><a href="#1108">1108: </a>        }
+</span><span id="1101" class="l"><a href="#1101">1101: </a>            <span class="php-comment">// Everything is fine</span>
+</span><span id="1102" class="l"><a href="#1102">1102: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1103" class="l"><a href="#1103">1103: </a>        }
+</span><span id="1104" class="l"><a href="#1104">1104: </a>
+</span><span id="1105" class="l"><a href="#1105">1105: </a>        <span class="php-comment">// How many times can you get to this method in a defined time_limit (default: 1 hour)?</span>
+</span><span id="1106" class="l"><a href="#1106">1106: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>];
+</span><span id="1107" class="l"><a href="#1107">1107: </a>
+</span><span id="1108" class="l"><a href="#1108">1108: </a>        <span class="php-var">$time_limit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>] : <span class="php-num">3600</span>); <span class="php-comment">// 3600 = 60 * 60</span>
 </span><span id="1109" class="l"><a href="#1109">1109: </a>
-</span><span id="1110" class="l"><a href="#1110">1110: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
-</span><span id="1111" class="l"><a href="#1111">1111: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$time_limit</span>))
-</span><span id="1112" class="l"><a href="#1112">1112: </a>        {
-</span><span id="1113" class="l"><a href="#1113">1113: </a>            <span class="php-comment">// Reset the started period and count</span>
-</span><span id="1114" class="l"><a href="#1114">1114: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1115" class="l"><a href="#1115">1115: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1116" class="l"><a href="#1116">1116: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
-</span><span id="1117" class="l"><a href="#1117">1117: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
-</span><span id="1118" class="l"><a href="#1118">1118: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
-</span><span id="1119" class="l"><a href="#1119">1119: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1120" class="l"><a href="#1120">1120: </a>        }
-</span><span id="1121" class="l"><a href="#1121">1121: </a>
-</span><span id="1122" class="l"><a href="#1122">1122: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
-</span><span id="1123" class="l"><a href="#1123">1123: </a>        <span class="php-keyword1">else</span>
-</span><span id="1124" class="l"><a href="#1124">1124: </a>        {
-</span><span id="1125" class="l"><a href="#1125">1125: </a>            <span class="php-comment">// The limit has been exceeded</span>
-</span><span id="1126" class="l"><a href="#1126">1126: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
-</span><span id="1127" class="l"><a href="#1127">1127: </a>            {
-</span><span id="1128" class="l"><a href="#1128">1128: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1129" class="l"><a href="#1129">1129: </a>            }
-</span><span id="1130" class="l"><a href="#1130">1130: </a>
-</span><span id="1131" class="l"><a href="#1131">1131: </a>            <span class="php-comment">// Increase the count by one</span>
-</span><span id="1132" class="l"><a href="#1132">1132: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1133" class="l"><a href="#1133">1133: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1134" class="l"><a href="#1134">1134: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1135" class="l"><a href="#1135">1135: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
-</span><span id="1136" class="l"><a href="#1136">1136: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1137" class="l"><a href="#1137">1137: </a>        }
-</span><span id="1138" class="l"><a href="#1138">1138: </a>
-</span><span id="1139" class="l"><a href="#1139">1139: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1140" class="l"><a href="#1140">1140: </a>    }
-</span><span id="1141" class="l"><a href="#1141">1141: </a>
-</span><span id="1142" class="l"><a href="#1142">1142: </a>    <span class="php-comment">/**
-</span></span><span id="1143" class="l"><a href="#1143">1143: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method/HTTP-method being called
-</span></span><span id="1144" class="l"><a href="#1144">1144: </a><span class="php-comment">     *
-</span></span><span id="1145" class="l"><a href="#1145">1145: </a><span class="php-comment">     * @access protected
-</span></span><span id="1146" class="l"><a href="#1146">1146: </a><span class="php-comment">     * @return bool
-</span></span><span id="1147" class="l"><a href="#1147">1147: </a><span class="php-comment">     */</span>
-</span><span id="1148" class="l"><a href="#1148">1148: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
-</span><span id="1149" class="l"><a href="#1149">1149: </a>    {
-</span><span id="1150" class="l"><a href="#1150">1150: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
-</span><span id="1151" class="l"><a href="#1151">1151: </a>        <span class="php-var">$auth_override_class_method</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
-</span><span id="1152" class="l"><a href="#1152">1152: </a>
-</span><span id="1153" class="l"><a href="#1153">1153: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
-</span><span id="1154" class="l"><a href="#1154">1154: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>))
-</span><span id="1155" class="l"><a href="#1155">1155: </a>        {
-</span><span id="1156" class="l"><a href="#1156">1156: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="1157" class="l"><a href="#1157">1157: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>])) <span class="php-comment">// Check for class overrides</span>
-</span><span id="1158" class="l"><a href="#1158">1158: </a>            {
-</span><span id="1159" class="l"><a href="#1159">1159: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1160" class="l"><a href="#1160">1160: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'none'</span>)
-</span><span id="1161" class="l"><a href="#1161">1161: </a>                {
-</span><span id="1162" class="l"><a href="#1162">1162: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1163" class="l"><a href="#1163">1163: </a>                }
-</span><span id="1164" class="l"><a href="#1164">1164: </a>
-</span><span id="1165" class="l"><a href="#1165">1165: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1166" class="l"><a href="#1166">1166: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'basic'</span>)
-</span><span id="1167" class="l"><a href="#1167">1167: </a>                {
-</span><span id="1168" class="l"><a href="#1168">1168: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1169" class="l"><a href="#1169">1169: </a>
-</span><span id="1170" class="l"><a href="#1170">1170: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1171" class="l"><a href="#1171">1171: </a>                }
-</span><span id="1172" class="l"><a href="#1172">1172: </a>
-</span><span id="1173" class="l"><a href="#1173">1173: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1174" class="l"><a href="#1174">1174: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'digest'</span>)
-</span><span id="1175" class="l"><a href="#1175">1175: </a>                {
-</span><span id="1176" class="l"><a href="#1176">1176: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1177" class="l"><a href="#1177">1177: </a>
-</span><span id="1178" class="l"><a href="#1178">1178: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1179" class="l"><a href="#1179">1179: </a>                }
-</span><span id="1180" class="l"><a href="#1180">1180: </a>
-</span><span id="1181" class="l"><a href="#1181">1181: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1182" class="l"><a href="#1182">1182: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] == <span class="php-quote">'whitelist'</span>)
-</span><span id="1183" class="l"><a href="#1183">1183: </a>                {
-</span><span id="1184" class="l"><a href="#1184">1184: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1185" class="l"><a href="#1185">1185: </a>
-</span><span id="1186" class="l"><a href="#1186">1186: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1187" class="l"><a href="#1187">1187: </a>                }
-</span><span id="1188" class="l"><a href="#1188">1188: </a>            }
-</span><span id="1189" class="l"><a href="#1189">1189: </a>
-</span><span id="1190" class="l"><a href="#1190">1190: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
-</span><span id="1191" class="l"><a href="#1191">1191: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
-</span><span id="1192" class="l"><a href="#1192">1192: </a>            {
-</span><span id="1193" class="l"><a href="#1193">1193: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1194" class="l"><a href="#1194">1194: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'none'</span>)
-</span><span id="1195" class="l"><a href="#1195">1195: </a>                {
-</span><span id="1196" class="l"><a href="#1196">1196: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1197" class="l"><a href="#1197">1197: </a>                }
-</span><span id="1198" class="l"><a href="#1198">1198: </a>
-</span><span id="1199" class="l"><a href="#1199">1199: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1200" class="l"><a href="#1200">1200: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'basic'</span>)
-</span><span id="1201" class="l"><a href="#1201">1201: </a>                {
-</span><span id="1202" class="l"><a href="#1202">1202: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1203" class="l"><a href="#1203">1203: </a>
-</span><span id="1204" class="l"><a href="#1204">1204: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1205" class="l"><a href="#1205">1205: </a>                }
-</span><span id="1206" class="l"><a href="#1206">1206: </a>
-</span><span id="1207" class="l"><a href="#1207">1207: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1208" class="l"><a href="#1208">1208: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'digest'</span>)
-</span><span id="1209" class="l"><a href="#1209">1209: </a>                {
-</span><span id="1210" class="l"><a href="#1210">1210: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1211" class="l"><a href="#1211">1211: </a>
-</span><span id="1212" class="l"><a href="#1212">1212: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1213" class="l"><a href="#1213">1213: </a>                }
-</span><span id="1214" class="l"><a href="#1214">1214: </a>
-</span><span id="1215" class="l"><a href="#1215">1215: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1216" class="l"><a href="#1216">1216: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] == <span class="php-quote">'whitelist'</span>)
-</span><span id="1217" class="l"><a href="#1217">1217: </a>                {
-</span><span id="1218" class="l"><a href="#1218">1218: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1219" class="l"><a href="#1219">1219: </a>
-</span><span id="1220" class="l"><a href="#1220">1220: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1221" class="l"><a href="#1221">1221: </a>                }
-</span><span id="1222" class="l"><a href="#1222">1222: </a>            }
-</span><span id="1223" class="l"><a href="#1223">1223: </a>        }
-</span><span id="1224" class="l"><a href="#1224">1224: </a>
-</span><span id="1225" class="l"><a href="#1225">1225: </a>        <span class="php-comment">// Assign the class/method/HTTP-method auth type override array from the config</span>
-</span><span id="1226" class="l"><a href="#1226">1226: </a>        <span class="php-var">$auth_override_class_method_http</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method_http'</span>);
-</span><span id="1227" class="l"><a href="#1227">1227: </a>
-</span><span id="1228" class="l"><a href="#1228">1228: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
-</span><span id="1229" class="l"><a href="#1229">1229: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>))
-</span><span id="1230" class="l"><a href="#1230">1230: </a>        {
-</span><span id="1231" class="l"><a href="#1231">1231: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="1232" class="l"><a href="#1232">1232: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method]))
-</span><span id="1233" class="l"><a href="#1233">1233: </a>            {
-</span><span id="1234" class="l"><a href="#1234">1234: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1235" class="l"><a href="#1235">1235: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] == <span class="php-quote">'none'</span>)
+</span><span id="1110" class="l"><a href="#1110">1110: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
+</span><span id="1111" class="l"><a href="#1111">1111: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1112" class="l"><a href="#1112">1112: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1113" class="l"><a href="#1113">1113: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1114" class="l"><a href="#1114">1114: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
+</span><span id="1115" class="l"><a href="#1115">1115: </a>            -&gt;row();
+</span><span id="1116" class="l"><a href="#1116">1116: </a>
+</span><span id="1117" class="l"><a href="#1117">1117: </a>        <span class="php-comment">// No calls have been made for this key</span>
+</span><span id="1118" class="l"><a href="#1118">1118: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1119" class="l"><a href="#1119">1119: </a>        {
+</span><span id="1120" class="l"><a href="#1120">1120: </a>            <span class="php-comment">// Create a new row for the following key</span>
+</span><span id="1121" class="l"><a href="#1121">1121: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
+</span><span id="1122" class="l"><a href="#1122">1122: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$limited_uri</span>,
+</span><span id="1123" class="l"><a href="#1123">1123: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="1124" class="l"><a href="#1124">1124: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
+</span><span id="1125" class="l"><a href="#1125">1125: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
+</span><span id="1126" class="l"><a href="#1126">1126: </a>            ]);
+</span><span id="1127" class="l"><a href="#1127">1127: </a>        }
+</span><span id="1128" class="l"><a href="#1128">1128: </a>
+</span><span id="1129" class="l"><a href="#1129">1129: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
+</span><span id="1130" class="l"><a href="#1130">1130: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$time_limit</span>))
+</span><span id="1131" class="l"><a href="#1131">1131: </a>        {
+</span><span id="1132" class="l"><a href="#1132">1132: </a>            <span class="php-comment">// Reset the started period and count</span>
+</span><span id="1133" class="l"><a href="#1133">1133: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1134" class="l"><a href="#1134">1134: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1135" class="l"><a href="#1135">1135: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
+</span><span id="1136" class="l"><a href="#1136">1136: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
+</span><span id="1137" class="l"><a href="#1137">1137: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
+</span><span id="1138" class="l"><a href="#1138">1138: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1139" class="l"><a href="#1139">1139: </a>        }
+</span><span id="1140" class="l"><a href="#1140">1140: </a>
+</span><span id="1141" class="l"><a href="#1141">1141: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
+</span><span id="1142" class="l"><a href="#1142">1142: </a>        <span class="php-keyword1">else</span>
+</span><span id="1143" class="l"><a href="#1143">1143: </a>        {
+</span><span id="1144" class="l"><a href="#1144">1144: </a>            <span class="php-comment">// The limit has been exceeded</span>
+</span><span id="1145" class="l"><a href="#1145">1145: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
+</span><span id="1146" class="l"><a href="#1146">1146: </a>            {
+</span><span id="1147" class="l"><a href="#1147">1147: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1148" class="l"><a href="#1148">1148: </a>            }
+</span><span id="1149" class="l"><a href="#1149">1149: </a>
+</span><span id="1150" class="l"><a href="#1150">1150: </a>            <span class="php-comment">// Increase the count by one</span>
+</span><span id="1151" class="l"><a href="#1151">1151: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1152" class="l"><a href="#1152">1152: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1153" class="l"><a href="#1153">1153: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1154" class="l"><a href="#1154">1154: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
+</span><span id="1155" class="l"><a href="#1155">1155: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1156" class="l"><a href="#1156">1156: </a>        }
+</span><span id="1157" class="l"><a href="#1157">1157: </a>
+</span><span id="1158" class="l"><a href="#1158">1158: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1159" class="l"><a href="#1159">1159: </a>    }
+</span><span id="1160" class="l"><a href="#1160">1160: </a>
+</span><span id="1161" class="l"><a href="#1161">1161: </a>    <span class="php-comment">/**
+</span></span><span id="1162" class="l"><a href="#1162">1162: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method/HTTP-method being called
+</span></span><span id="1163" class="l"><a href="#1163">1163: </a><span class="php-comment">     *
+</span></span><span id="1164" class="l"><a href="#1164">1164: </a><span class="php-comment">     * @access protected
+</span></span><span id="1165" class="l"><a href="#1165">1165: </a><span class="php-comment">     * @return bool
+</span></span><span id="1166" class="l"><a href="#1166">1166: </a><span class="php-comment">     */</span>
+</span><span id="1167" class="l"><a href="#1167">1167: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
+</span><span id="1168" class="l"><a href="#1168">1168: </a>    {
+</span><span id="1169" class="l"><a href="#1169">1169: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
+</span><span id="1170" class="l"><a href="#1170">1170: </a>        <span class="php-var">$auth_override_class_method</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
+</span><span id="1171" class="l"><a href="#1171">1171: </a>
+</span><span id="1172" class="l"><a href="#1172">1172: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
+</span><span id="1173" class="l"><a href="#1173">1173: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>))
+</span><span id="1174" class="l"><a href="#1174">1174: </a>        {
+</span><span id="1175" class="l"><a href="#1175">1175: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
+</span><span id="1176" class="l"><a href="#1176">1176: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>])) <span class="php-comment">// Check for class overrides</span>
+</span><span id="1177" class="l"><a href="#1177">1177: </a>            {
+</span><span id="1178" class="l"><a href="#1178">1178: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1179" class="l"><a href="#1179">1179: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'none'</span>)
+</span><span id="1180" class="l"><a href="#1180">1180: </a>                {
+</span><span id="1181" class="l"><a href="#1181">1181: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1182" class="l"><a href="#1182">1182: </a>                }
+</span><span id="1183" class="l"><a href="#1183">1183: </a>
+</span><span id="1184" class="l"><a href="#1184">1184: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1185" class="l"><a href="#1185">1185: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'basic'</span>)
+</span><span id="1186" class="l"><a href="#1186">1186: </a>                {
+</span><span id="1187" class="l"><a href="#1187">1187: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1188" class="l"><a href="#1188">1188: </a>
+</span><span id="1189" class="l"><a href="#1189">1189: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1190" class="l"><a href="#1190">1190: </a>                }
+</span><span id="1191" class="l"><a href="#1191">1191: </a>
+</span><span id="1192" class="l"><a href="#1192">1192: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1193" class="l"><a href="#1193">1193: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'digest'</span>)
+</span><span id="1194" class="l"><a href="#1194">1194: </a>                {
+</span><span id="1195" class="l"><a href="#1195">1195: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1196" class="l"><a href="#1196">1196: </a>
+</span><span id="1197" class="l"><a href="#1197">1197: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1198" class="l"><a href="#1198">1198: </a>                }
+</span><span id="1199" class="l"><a href="#1199">1199: </a>
+</span><span id="1200" class="l"><a href="#1200">1200: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1201" class="l"><a href="#1201">1201: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1202" class="l"><a href="#1202">1202: </a>                {
+</span><span id="1203" class="l"><a href="#1203">1203: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1204" class="l"><a href="#1204">1204: </a>
+</span><span id="1205" class="l"><a href="#1205">1205: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1206" class="l"><a href="#1206">1206: </a>                }
+</span><span id="1207" class="l"><a href="#1207">1207: </a>            }
+</span><span id="1208" class="l"><a href="#1208">1208: </a>
+</span><span id="1209" class="l"><a href="#1209">1209: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
+</span><span id="1210" class="l"><a href="#1210">1210: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
+</span><span id="1211" class="l"><a href="#1211">1211: </a>            {
+</span><span id="1212" class="l"><a href="#1212">1212: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1213" class="l"><a href="#1213">1213: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'none'</span>)
+</span><span id="1214" class="l"><a href="#1214">1214: </a>                {
+</span><span id="1215" class="l"><a href="#1215">1215: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1216" class="l"><a href="#1216">1216: </a>                }
+</span><span id="1217" class="l"><a href="#1217">1217: </a>
+</span><span id="1218" class="l"><a href="#1218">1218: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1219" class="l"><a href="#1219">1219: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'basic'</span>)
+</span><span id="1220" class="l"><a href="#1220">1220: </a>                {
+</span><span id="1221" class="l"><a href="#1221">1221: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1222" class="l"><a href="#1222">1222: </a>
+</span><span id="1223" class="l"><a href="#1223">1223: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1224" class="l"><a href="#1224">1224: </a>                }
+</span><span id="1225" class="l"><a href="#1225">1225: </a>
+</span><span id="1226" class="l"><a href="#1226">1226: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1227" class="l"><a href="#1227">1227: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'digest'</span>)
+</span><span id="1228" class="l"><a href="#1228">1228: </a>                {
+</span><span id="1229" class="l"><a href="#1229">1229: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1230" class="l"><a href="#1230">1230: </a>
+</span><span id="1231" class="l"><a href="#1231">1231: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1232" class="l"><a href="#1232">1232: </a>                }
+</span><span id="1233" class="l"><a href="#1233">1233: </a>
+</span><span id="1234" class="l"><a href="#1234">1234: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1235" class="l"><a href="#1235">1235: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'whitelist'</span>)
 </span><span id="1236" class="l"><a href="#1236">1236: </a>                {
-</span><span id="1237" class="l"><a href="#1237">1237: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1238" class="l"><a href="#1238">1238: </a>                }
-</span><span id="1239" class="l"><a href="#1239">1239: </a>
-</span><span id="1240" class="l"><a href="#1240">1240: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1241" class="l"><a href="#1241">1241: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] == <span class="php-quote">'basic'</span>)
-</span><span id="1242" class="l"><a href="#1242">1242: </a>                {
-</span><span id="1243" class="l"><a href="#1243">1243: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1244" class="l"><a href="#1244">1244: </a>
-</span><span id="1245" class="l"><a href="#1245">1245: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1246" class="l"><a href="#1246">1246: </a>                }
-</span><span id="1247" class="l"><a href="#1247">1247: </a>
-</span><span id="1248" class="l"><a href="#1248">1248: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1249" class="l"><a href="#1249">1249: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] == <span class="php-quote">'digest'</span>)
-</span><span id="1250" class="l"><a href="#1250">1250: </a>                {
-</span><span id="1251" class="l"><a href="#1251">1251: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1252" class="l"><a href="#1252">1252: </a>
-</span><span id="1253" class="l"><a href="#1253">1253: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1254" class="l"><a href="#1254">1254: </a>                }
-</span><span id="1255" class="l"><a href="#1255">1255: </a>
-</span><span id="1256" class="l"><a href="#1256">1256: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1257" class="l"><a href="#1257">1257: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] == <span class="php-quote">'whitelist'</span>)
-</span><span id="1258" class="l"><a href="#1258">1258: </a>                {
-</span><span id="1259" class="l"><a href="#1259">1259: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1260" class="l"><a href="#1260">1260: </a>
-</span><span id="1261" class="l"><a href="#1261">1261: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1262" class="l"><a href="#1262">1262: </a>                }
-</span><span id="1263" class="l"><a href="#1263">1263: </a>            }
-</span><span id="1264" class="l"><a href="#1264">1264: </a>
-</span><span id="1265" class="l"><a href="#1265">1265: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method/HTTP-method being called</span>
-</span><span id="1266" class="l"><a href="#1266">1266: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method]))
-</span><span id="1267" class="l"><a href="#1267">1267: </a>            {
-</span><span id="1268" class="l"><a href="#1268">1268: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1269" class="l"><a href="#1269">1269: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] == <span class="php-quote">'none'</span>)
-</span><span id="1270" class="l"><a href="#1270">1270: </a>                {
-</span><span id="1271" class="l"><a href="#1271">1271: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1272" class="l"><a href="#1272">1272: </a>                }
-</span><span id="1273" class="l"><a href="#1273">1273: </a>
-</span><span id="1274" class="l"><a href="#1274">1274: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1275" class="l"><a href="#1275">1275: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] == <span class="php-quote">'basic'</span>)
-</span><span id="1276" class="l"><a href="#1276">1276: </a>                {
-</span><span id="1277" class="l"><a href="#1277">1277: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1278" class="l"><a href="#1278">1278: </a>
-</span><span id="1279" class="l"><a href="#1279">1279: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1280" class="l"><a href="#1280">1280: </a>                }
-</span><span id="1281" class="l"><a href="#1281">1281: </a>
-</span><span id="1282" class="l"><a href="#1282">1282: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1283" class="l"><a href="#1283">1283: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] == <span class="php-quote">'digest'</span>)
-</span><span id="1284" class="l"><a href="#1284">1284: </a>                {
-</span><span id="1285" class="l"><a href="#1285">1285: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1286" class="l"><a href="#1286">1286: </a>
-</span><span id="1287" class="l"><a href="#1287">1287: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1288" class="l"><a href="#1288">1288: </a>                }
-</span><span id="1289" class="l"><a href="#1289">1289: </a>
-</span><span id="1290" class="l"><a href="#1290">1290: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1291" class="l"><a href="#1291">1291: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] == <span class="php-quote">'whitelist'</span>)
-</span><span id="1292" class="l"><a href="#1292">1292: </a>                {
-</span><span id="1293" class="l"><a href="#1293">1293: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1294" class="l"><a href="#1294">1294: </a>
-</span><span id="1295" class="l"><a href="#1295">1295: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1296" class="l"><a href="#1296">1296: </a>                }
-</span><span id="1297" class="l"><a href="#1297">1297: </a>            }
-</span><span id="1298" class="l"><a href="#1298">1298: </a>        }
-</span><span id="1299" class="l"><a href="#1299">1299: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1300" class="l"><a href="#1300">1300: </a>    }
-</span><span id="1301" class="l"><a href="#1301">1301: </a>
-</span><span id="1302" class="l"><a href="#1302">1302: </a>    <span class="php-comment">/**
-</span></span><span id="1303" class="l"><a href="#1303">1303: </a><span class="php-comment">     * Parse the GET request arguments
-</span></span><span id="1304" class="l"><a href="#1304">1304: </a><span class="php-comment">     *
-</span></span><span id="1305" class="l"><a href="#1305">1305: </a><span class="php-comment">     * @access protected
-</span></span><span id="1306" class="l"><a href="#1306">1306: </a><span class="php-comment">     * @return void
-</span></span><span id="1307" class="l"><a href="#1307">1307: </a><span class="php-comment">     */</span>
-</span><span id="1308" class="l"><a href="#1308">1308: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
-</span><span id="1309" class="l"><a href="#1309">1309: </a>    {
-</span><span id="1310" class="l"><a href="#1310">1310: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
-</span><span id="1311" class="l"><a href="#1311">1311: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
-</span><span id="1312" class="l"><a href="#1312">1312: </a>    }
+</span><span id="1237" class="l"><a href="#1237">1237: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1238" class="l"><a href="#1238">1238: </a>
+</span><span id="1239" class="l"><a href="#1239">1239: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1240" class="l"><a href="#1240">1240: </a>                }
+</span><span id="1241" class="l"><a href="#1241">1241: </a>            }
+</span><span id="1242" class="l"><a href="#1242">1242: </a>        }
+</span><span id="1243" class="l"><a href="#1243">1243: </a>
+</span><span id="1244" class="l"><a href="#1244">1244: </a>        <span class="php-comment">// Assign the class/method/HTTP-method auth type override array from the config</span>
+</span><span id="1245" class="l"><a href="#1245">1245: </a>        <span class="php-var">$auth_override_class_method_http</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method_http'</span>);
+</span><span id="1246" class="l"><a href="#1246">1246: </a>
+</span><span id="1247" class="l"><a href="#1247">1247: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
+</span><span id="1248" class="l"><a href="#1248">1248: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>))
+</span><span id="1249" class="l"><a href="#1249">1249: </a>        {
+</span><span id="1250" class="l"><a href="#1250">1250: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
+</span><span id="1251" class="l"><a href="#1251">1251: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method]))
+</span><span id="1252" class="l"><a href="#1252">1252: </a>            {
+</span><span id="1253" class="l"><a href="#1253">1253: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1254" class="l"><a href="#1254">1254: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
+</span><span id="1255" class="l"><a href="#1255">1255: </a>                {
+</span><span id="1256" class="l"><a href="#1256">1256: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1257" class="l"><a href="#1257">1257: </a>                }
+</span><span id="1258" class="l"><a href="#1258">1258: </a>
+</span><span id="1259" class="l"><a href="#1259">1259: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1260" class="l"><a href="#1260">1260: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
+</span><span id="1261" class="l"><a href="#1261">1261: </a>                {
+</span><span id="1262" class="l"><a href="#1262">1262: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1263" class="l"><a href="#1263">1263: </a>
+</span><span id="1264" class="l"><a href="#1264">1264: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1265" class="l"><a href="#1265">1265: </a>                }
+</span><span id="1266" class="l"><a href="#1266">1266: </a>
+</span><span id="1267" class="l"><a href="#1267">1267: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1268" class="l"><a href="#1268">1268: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
+</span><span id="1269" class="l"><a href="#1269">1269: </a>                {
+</span><span id="1270" class="l"><a href="#1270">1270: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1271" class="l"><a href="#1271">1271: </a>
+</span><span id="1272" class="l"><a href="#1272">1272: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1273" class="l"><a href="#1273">1273: </a>                }
+</span><span id="1274" class="l"><a href="#1274">1274: </a>
+</span><span id="1275" class="l"><a href="#1275">1275: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1276" class="l"><a href="#1276">1276: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1277" class="l"><a href="#1277">1277: </a>                {
+</span><span id="1278" class="l"><a href="#1278">1278: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1279" class="l"><a href="#1279">1279: </a>
+</span><span id="1280" class="l"><a href="#1280">1280: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1281" class="l"><a href="#1281">1281: </a>                }
+</span><span id="1282" class="l"><a href="#1282">1282: </a>            }
+</span><span id="1283" class="l"><a href="#1283">1283: </a>
+</span><span id="1284" class="l"><a href="#1284">1284: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method/HTTP-method being called</span>
+</span><span id="1285" class="l"><a href="#1285">1285: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method]))
+</span><span id="1286" class="l"><a href="#1286">1286: </a>            {
+</span><span id="1287" class="l"><a href="#1287">1287: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1288" class="l"><a href="#1288">1288: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
+</span><span id="1289" class="l"><a href="#1289">1289: </a>                {
+</span><span id="1290" class="l"><a href="#1290">1290: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1291" class="l"><a href="#1291">1291: </a>                }
+</span><span id="1292" class="l"><a href="#1292">1292: </a>
+</span><span id="1293" class="l"><a href="#1293">1293: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1294" class="l"><a href="#1294">1294: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
+</span><span id="1295" class="l"><a href="#1295">1295: </a>                {
+</span><span id="1296" class="l"><a href="#1296">1296: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1297" class="l"><a href="#1297">1297: </a>
+</span><span id="1298" class="l"><a href="#1298">1298: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1299" class="l"><a href="#1299">1299: </a>                }
+</span><span id="1300" class="l"><a href="#1300">1300: </a>
+</span><span id="1301" class="l"><a href="#1301">1301: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1302" class="l"><a href="#1302">1302: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
+</span><span id="1303" class="l"><a href="#1303">1303: </a>                {
+</span><span id="1304" class="l"><a href="#1304">1304: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1305" class="l"><a href="#1305">1305: </a>
+</span><span id="1306" class="l"><a href="#1306">1306: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1307" class="l"><a href="#1307">1307: </a>                }
+</span><span id="1308" class="l"><a href="#1308">1308: </a>
+</span><span id="1309" class="l"><a href="#1309">1309: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1310" class="l"><a href="#1310">1310: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1311" class="l"><a href="#1311">1311: </a>                {
+</span><span id="1312" class="l"><a href="#1312">1312: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
 </span><span id="1313" class="l"><a href="#1313">1313: </a>
-</span><span id="1314" class="l"><a href="#1314">1314: </a>    <span class="php-comment">/**
-</span></span><span id="1315" class="l"><a href="#1315">1315: </a><span class="php-comment">     * Parse the POST request arguments
-</span></span><span id="1316" class="l"><a href="#1316">1316: </a><span class="php-comment">     *
-</span></span><span id="1317" class="l"><a href="#1317">1317: </a><span class="php-comment">     * @access protected
-</span></span><span id="1318" class="l"><a href="#1318">1318: </a><span class="php-comment">     * @return void
-</span></span><span id="1319" class="l"><a href="#1319">1319: </a><span class="php-comment">     */</span>
-</span><span id="1320" class="l"><a href="#1320">1320: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
-</span><span id="1321" class="l"><a href="#1321">1321: </a>    {
-</span><span id="1322" class="l"><a href="#1322">1322: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
-</span><span id="1323" class="l"><a href="#1323">1323: </a>
-</span><span id="1324" class="l"><a href="#1324">1324: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1325" class="l"><a href="#1325">1325: </a>        {
-</span><span id="1326" class="l"><a href="#1326">1326: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1327" class="l"><a href="#1327">1327: </a>        }
-</span><span id="1328" class="l"><a href="#1328">1328: </a>    }
-</span><span id="1329" class="l"><a href="#1329">1329: </a>
-</span><span id="1330" class="l"><a href="#1330">1330: </a>    <span class="php-comment">/**
-</span></span><span id="1331" class="l"><a href="#1331">1331: </a><span class="php-comment">     * Parse the PUT request arguments
-</span></span><span id="1332" class="l"><a href="#1332">1332: </a><span class="php-comment">     *
-</span></span><span id="1333" class="l"><a href="#1333">1333: </a><span class="php-comment">     * @access protected
-</span></span><span id="1334" class="l"><a href="#1334">1334: </a><span class="php-comment">     * @return void
-</span></span><span id="1335" class="l"><a href="#1335">1335: </a><span class="php-comment">     */</span>
-</span><span id="1336" class="l"><a href="#1336">1336: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
-</span><span id="1337" class="l"><a href="#1337">1337: </a>    {
-</span><span id="1338" class="l"><a href="#1338">1338: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1339" class="l"><a href="#1339">1339: </a>        {
-</span><span id="1340" class="l"><a href="#1340">1340: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1341" class="l"><a href="#1341">1341: </a>        }
-</span><span id="1342" class="l"><a href="#1342">1342: </a>        <span class="php-keyword1">else</span>
-</span><span id="1343" class="l"><a href="#1343">1343: </a>        {
-</span><span id="1344" class="l"><a href="#1344">1344: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1345" class="l"><a href="#1345">1345: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
-</span><span id="1346" class="l"><a href="#1346">1346: </a>            {
-</span><span id="1347" class="l"><a href="#1347">1347: </a>                <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1348" class="l"><a href="#1348">1348: </a>            }
-</span><span id="1349" class="l"><a href="#1349">1349: </a>        }
-</span><span id="1350" class="l"><a href="#1350">1350: </a>    }
-</span><span id="1351" class="l"><a href="#1351">1351: </a>
-</span><span id="1352" class="l"><a href="#1352">1352: </a>    <span class="php-comment">/**
-</span></span><span id="1353" class="l"><a href="#1353">1353: </a><span class="php-comment">     * Parse the HEAD request arguments
-</span></span><span id="1354" class="l"><a href="#1354">1354: </a><span class="php-comment">     *
-</span></span><span id="1355" class="l"><a href="#1355">1355: </a><span class="php-comment">     * @access protected
-</span></span><span id="1356" class="l"><a href="#1356">1356: </a><span class="php-comment">     * @return void
-</span></span><span id="1357" class="l"><a href="#1357">1357: </a><span class="php-comment">     */</span>
-</span><span id="1358" class="l"><a href="#1358">1358: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
-</span><span id="1359" class="l"><a href="#1359">1359: </a>    {
-</span><span id="1360" class="l"><a href="#1360">1360: </a>        <span class="php-comment">// Parse the HEAD variables</span>
-</span><span id="1361" class="l"><a href="#1361">1361: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
-</span><span id="1362" class="l"><a href="#1362">1362: </a>
-</span><span id="1363" class="l"><a href="#1363">1363: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
-</span><span id="1364" class="l"><a href="#1364">1364: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
-</span><span id="1365" class="l"><a href="#1365">1365: </a>    }
-</span><span id="1366" class="l"><a href="#1366">1366: </a>
-</span><span id="1367" class="l"><a href="#1367">1367: </a>    <span class="php-comment">/**
-</span></span><span id="1368" class="l"><a href="#1368">1368: </a><span class="php-comment">     * Parse the OPTIONS request arguments
-</span></span><span id="1369" class="l"><a href="#1369">1369: </a><span class="php-comment">     *
-</span></span><span id="1370" class="l"><a href="#1370">1370: </a><span class="php-comment">     * @access protected
-</span></span><span id="1371" class="l"><a href="#1371">1371: </a><span class="php-comment">     * @return void
-</span></span><span id="1372" class="l"><a href="#1372">1372: </a><span class="php-comment">     */</span>
-</span><span id="1373" class="l"><a href="#1373">1373: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
-</span><span id="1374" class="l"><a href="#1374">1374: </a>    {
-</span><span id="1375" class="l"><a href="#1375">1375: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
-</span><span id="1376" class="l"><a href="#1376">1376: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
-</span><span id="1377" class="l"><a href="#1377">1377: </a>
-</span><span id="1378" class="l"><a href="#1378">1378: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
-</span><span id="1379" class="l"><a href="#1379">1379: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
-</span><span id="1380" class="l"><a href="#1380">1380: </a>    }
+</span><span id="1314" class="l"><a href="#1314">1314: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1315" class="l"><a href="#1315">1315: </a>                }
+</span><span id="1316" class="l"><a href="#1316">1316: </a>            }
+</span><span id="1317" class="l"><a href="#1317">1317: </a>        }
+</span><span id="1318" class="l"><a href="#1318">1318: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1319" class="l"><a href="#1319">1319: </a>    }
+</span><span id="1320" class="l"><a href="#1320">1320: </a>
+</span><span id="1321" class="l"><a href="#1321">1321: </a>    <span class="php-comment">/**
+</span></span><span id="1322" class="l"><a href="#1322">1322: </a><span class="php-comment">     * Parse the GET request arguments
+</span></span><span id="1323" class="l"><a href="#1323">1323: </a><span class="php-comment">     *
+</span></span><span id="1324" class="l"><a href="#1324">1324: </a><span class="php-comment">     * @access protected
+</span></span><span id="1325" class="l"><a href="#1325">1325: </a><span class="php-comment">     * @return void
+</span></span><span id="1326" class="l"><a href="#1326">1326: </a><span class="php-comment">     */</span>
+</span><span id="1327" class="l"><a href="#1327">1327: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
+</span><span id="1328" class="l"><a href="#1328">1328: </a>    {
+</span><span id="1329" class="l"><a href="#1329">1329: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
+</span><span id="1330" class="l"><a href="#1330">1330: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
+</span><span id="1331" class="l"><a href="#1331">1331: </a>    }
+</span><span id="1332" class="l"><a href="#1332">1332: </a>
+</span><span id="1333" class="l"><a href="#1333">1333: </a>    <span class="php-comment">/**
+</span></span><span id="1334" class="l"><a href="#1334">1334: </a><span class="php-comment">     * Parse the POST request arguments
+</span></span><span id="1335" class="l"><a href="#1335">1335: </a><span class="php-comment">     *
+</span></span><span id="1336" class="l"><a href="#1336">1336: </a><span class="php-comment">     * @access protected
+</span></span><span id="1337" class="l"><a href="#1337">1337: </a><span class="php-comment">     * @return void
+</span></span><span id="1338" class="l"><a href="#1338">1338: </a><span class="php-comment">     */</span>
+</span><span id="1339" class="l"><a href="#1339">1339: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
+</span><span id="1340" class="l"><a href="#1340">1340: </a>    {
+</span><span id="1341" class="l"><a href="#1341">1341: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
+</span><span id="1342" class="l"><a href="#1342">1342: </a>
+</span><span id="1343" class="l"><a href="#1343">1343: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1344" class="l"><a href="#1344">1344: </a>        {
+</span><span id="1345" class="l"><a href="#1345">1345: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1346" class="l"><a href="#1346">1346: </a>        }
+</span><span id="1347" class="l"><a href="#1347">1347: </a>    }
+</span><span id="1348" class="l"><a href="#1348">1348: </a>
+</span><span id="1349" class="l"><a href="#1349">1349: </a>    <span class="php-comment">/**
+</span></span><span id="1350" class="l"><a href="#1350">1350: </a><span class="php-comment">     * Parse the PUT request arguments
+</span></span><span id="1351" class="l"><a href="#1351">1351: </a><span class="php-comment">     *
+</span></span><span id="1352" class="l"><a href="#1352">1352: </a><span class="php-comment">     * @access protected
+</span></span><span id="1353" class="l"><a href="#1353">1353: </a><span class="php-comment">     * @return void
+</span></span><span id="1354" class="l"><a href="#1354">1354: </a><span class="php-comment">     */</span>
+</span><span id="1355" class="l"><a href="#1355">1355: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
+</span><span id="1356" class="l"><a href="#1356">1356: </a>    {
+</span><span id="1357" class="l"><a href="#1357">1357: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1358" class="l"><a href="#1358">1358: </a>        {
+</span><span id="1359" class="l"><a href="#1359">1359: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1360" class="l"><a href="#1360">1360: </a>        }
+</span><span id="1361" class="l"><a href="#1361">1361: </a>        <span class="php-keyword1">else</span>
+</span><span id="1362" class="l"><a href="#1362">1362: </a>        {
+</span><span id="1363" class="l"><a href="#1363">1363: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1364" class="l"><a href="#1364">1364: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
+</span><span id="1365" class="l"><a href="#1365">1365: </a>            {
+</span><span id="1366" class="l"><a href="#1366">1366: </a>                <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1367" class="l"><a href="#1367">1367: </a>            }
+</span><span id="1368" class="l"><a href="#1368">1368: </a>        }
+</span><span id="1369" class="l"><a href="#1369">1369: </a>    }
+</span><span id="1370" class="l"><a href="#1370">1370: </a>
+</span><span id="1371" class="l"><a href="#1371">1371: </a>    <span class="php-comment">/**
+</span></span><span id="1372" class="l"><a href="#1372">1372: </a><span class="php-comment">     * Parse the HEAD request arguments
+</span></span><span id="1373" class="l"><a href="#1373">1373: </a><span class="php-comment">     *
+</span></span><span id="1374" class="l"><a href="#1374">1374: </a><span class="php-comment">     * @access protected
+</span></span><span id="1375" class="l"><a href="#1375">1375: </a><span class="php-comment">     * @return void
+</span></span><span id="1376" class="l"><a href="#1376">1376: </a><span class="php-comment">     */</span>
+</span><span id="1377" class="l"><a href="#1377">1377: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
+</span><span id="1378" class="l"><a href="#1378">1378: </a>    {
+</span><span id="1379" class="l"><a href="#1379">1379: </a>        <span class="php-comment">// Parse the HEAD variables</span>
+</span><span id="1380" class="l"><a href="#1380">1380: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
 </span><span id="1381" class="l"><a href="#1381">1381: </a>
-</span><span id="1382" class="l"><a href="#1382">1382: </a>    <span class="php-comment">/**
-</span></span><span id="1383" class="l"><a href="#1383">1383: </a><span class="php-comment">     * Parse the PATCH request arguments
-</span></span><span id="1384" class="l"><a href="#1384">1384: </a><span class="php-comment">     *
-</span></span><span id="1385" class="l"><a href="#1385">1385: </a><span class="php-comment">     * @access protected
-</span></span><span id="1386" class="l"><a href="#1386">1386: </a><span class="php-comment">     * @return void
-</span></span><span id="1387" class="l"><a href="#1387">1387: </a><span class="php-comment">     */</span>
-</span><span id="1388" class="l"><a href="#1388">1388: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
-</span><span id="1389" class="l"><a href="#1389">1389: </a>    {
-</span><span id="1390" class="l"><a href="#1390">1390: </a>        <span class="php-comment">// It might be a HTTP body</span>
-</span><span id="1391" class="l"><a href="#1391">1391: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1392" class="l"><a href="#1392">1392: </a>        {
-</span><span id="1393" class="l"><a href="#1393">1393: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1394" class="l"><a href="#1394">1394: </a>        }
-</span><span id="1395" class="l"><a href="#1395">1395: </a>        <span class="php-keyword1">else</span>
-</span><span id="1396" class="l"><a href="#1396">1396: </a>        {
-</span><span id="1397" class="l"><a href="#1397">1397: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1398" class="l"><a href="#1398">1398: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
-</span><span id="1399" class="l"><a href="#1399">1399: </a>            {
-</span><span id="1400" class="l"><a href="#1400">1400: </a>                <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1401" class="l"><a href="#1401">1401: </a>            }
-</span><span id="1402" class="l"><a href="#1402">1402: </a>        }
-</span><span id="1403" class="l"><a href="#1403">1403: </a>    }
-</span><span id="1404" class="l"><a href="#1404">1404: </a>
-</span><span id="1405" class="l"><a href="#1405">1405: </a>    <span class="php-comment">/**
-</span></span><span id="1406" class="l"><a href="#1406">1406: </a><span class="php-comment">     * Parse the DELETE request arguments
-</span></span><span id="1407" class="l"><a href="#1407">1407: </a><span class="php-comment">     *
-</span></span><span id="1408" class="l"><a href="#1408">1408: </a><span class="php-comment">     * @access protected
-</span></span><span id="1409" class="l"><a href="#1409">1409: </a><span class="php-comment">     * @return void
-</span></span><span id="1410" class="l"><a href="#1410">1410: </a><span class="php-comment">     */</span>
-</span><span id="1411" class="l"><a href="#1411">1411: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
-</span><span id="1412" class="l"><a href="#1412">1412: </a>    {
-</span><span id="1413" class="l"><a href="#1413">1413: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
-</span><span id="1414" class="l"><a href="#1414">1414: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
+</span><span id="1382" class="l"><a href="#1382">1382: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
+</span><span id="1383" class="l"><a href="#1383">1383: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
+</span><span id="1384" class="l"><a href="#1384">1384: </a>    }
+</span><span id="1385" class="l"><a href="#1385">1385: </a>
+</span><span id="1386" class="l"><a href="#1386">1386: </a>    <span class="php-comment">/**
+</span></span><span id="1387" class="l"><a href="#1387">1387: </a><span class="php-comment">     * Parse the OPTIONS request arguments
+</span></span><span id="1388" class="l"><a href="#1388">1388: </a><span class="php-comment">     *
+</span></span><span id="1389" class="l"><a href="#1389">1389: </a><span class="php-comment">     * @access protected
+</span></span><span id="1390" class="l"><a href="#1390">1390: </a><span class="php-comment">     * @return void
+</span></span><span id="1391" class="l"><a href="#1391">1391: </a><span class="php-comment">     */</span>
+</span><span id="1392" class="l"><a href="#1392">1392: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
+</span><span id="1393" class="l"><a href="#1393">1393: </a>    {
+</span><span id="1394" class="l"><a href="#1394">1394: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
+</span><span id="1395" class="l"><a href="#1395">1395: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
+</span><span id="1396" class="l"><a href="#1396">1396: </a>
+</span><span id="1397" class="l"><a href="#1397">1397: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
+</span><span id="1398" class="l"><a href="#1398">1398: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
+</span><span id="1399" class="l"><a href="#1399">1399: </a>    }
+</span><span id="1400" class="l"><a href="#1400">1400: </a>
+</span><span id="1401" class="l"><a href="#1401">1401: </a>    <span class="php-comment">/**
+</span></span><span id="1402" class="l"><a href="#1402">1402: </a><span class="php-comment">     * Parse the PATCH request arguments
+</span></span><span id="1403" class="l"><a href="#1403">1403: </a><span class="php-comment">     *
+</span></span><span id="1404" class="l"><a href="#1404">1404: </a><span class="php-comment">     * @access protected
+</span></span><span id="1405" class="l"><a href="#1405">1405: </a><span class="php-comment">     * @return void
+</span></span><span id="1406" class="l"><a href="#1406">1406: </a><span class="php-comment">     */</span>
+</span><span id="1407" class="l"><a href="#1407">1407: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
+</span><span id="1408" class="l"><a href="#1408">1408: </a>    {
+</span><span id="1409" class="l"><a href="#1409">1409: </a>        <span class="php-comment">// It might be a HTTP body</span>
+</span><span id="1410" class="l"><a href="#1410">1410: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1411" class="l"><a href="#1411">1411: </a>        {
+</span><span id="1412" class="l"><a href="#1412">1412: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1413" class="l"><a href="#1413">1413: </a>        }
+</span><span id="1414" class="l"><a href="#1414">1414: </a>        <span class="php-keyword1">else</span>
 </span><span id="1415" class="l"><a href="#1415">1415: </a>        {
-</span><span id="1416" class="l"><a href="#1416">1416: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1417" class="l"><a href="#1417">1417: </a>        }
-</span><span id="1418" class="l"><a href="#1418">1418: </a>    }
-</span><span id="1419" class="l"><a href="#1419">1419: </a>
-</span><span id="1420" class="l"><a href="#1420">1420: </a>    <span class="php-comment">/**
-</span></span><span id="1421" class="l"><a href="#1421">1421: </a><span class="php-comment">     * Parse the query parameters
-</span></span><span id="1422" class="l"><a href="#1422">1422: </a><span class="php-comment">     *
-</span></span><span id="1423" class="l"><a href="#1423">1423: </a><span class="php-comment">     * @access protected
-</span></span><span id="1424" class="l"><a href="#1424">1424: </a><span class="php-comment">     * @return void
-</span></span><span id="1425" class="l"><a href="#1425">1425: </a><span class="php-comment">     */</span>
-</span><span id="1426" class="l"><a href="#1426">1426: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
-</span><span id="1427" class="l"><a href="#1427">1427: </a>    {
-</span><span id="1428" class="l"><a href="#1428">1428: </a>        <span class="php-comment">// Declare a variable that will hold the REQUEST_URI</span>
-</span><span id="1429" class="l"><a href="#1429">1429: </a>        <span class="php-var">$request_uri</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1430" class="l"><a href="#1430">1430: </a>
-</span><span id="1431" class="l"><a href="#1431">1431: </a>        <span class="php-comment">// If using the commandline version</span>
-</span><span id="1432" class="l"><a href="#1432">1432: </a>        <span class="php-keyword1">if</span> (is_cli())
-</span><span id="1433" class="l"><a href="#1433">1433: </a>        {
-</span><span id="1434" class="l"><a href="#1434">1434: </a>            <span class="php-var">$args</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'argv'</span>);
-</span><span id="1435" class="l"><a href="#1435">1435: </a>            <span class="php-keyword1">unset</span>(<span class="php-var">$args</span>[<span class="php-num">0</span>]);
-</span><span id="1436" class="l"><a href="#1436">1436: </a>
-</span><span id="1437" class="l"><a href="#1437">1437: </a>            <span class="php-comment">// Combine the arguments using '/' as the delimiter</span>
-</span><span id="1438" class="l"><a href="#1438">1438: </a>            <span class="php-var">$request_uri</span> = <span class="php-quote">'/'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'/'</span>, <span class="php-var">$args</span>) . <span class="php-quote">'/'</span>;
-</span><span id="1439" class="l"><a href="#1439">1439: </a>
-</span><span id="1440" class="l"><a href="#1440">1440: </a>            <span class="php-comment">// Set the following server variables (perhaps not required anymore?)</span>
-</span><span id="1441" class="l"><a href="#1441">1441: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1442" class="l"><a href="#1442">1442: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'PATH_INFO'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1443" class="l"><a href="#1443">1443: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'QUERY_STRING'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1444" class="l"><a href="#1444">1444: </a>        }
-</span><span id="1445" class="l"><a href="#1445">1445: </a>        <span class="php-keyword1">else</span>
-</span><span id="1446" class="l"><a href="#1446">1446: </a>        {
-</span><span id="1447" class="l"><a href="#1447">1447: </a>            <span class="php-var">$request_uri</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>);
-</span><span id="1448" class="l"><a href="#1448">1448: </a>        }
+</span><span id="1416" class="l"><a href="#1416">1416: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1417" class="l"><a href="#1417">1417: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
+</span><span id="1418" class="l"><a href="#1418">1418: </a>            {
+</span><span id="1419" class="l"><a href="#1419">1419: </a>                <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1420" class="l"><a href="#1420">1420: </a>            }
+</span><span id="1421" class="l"><a href="#1421">1421: </a>        }
+</span><span id="1422" class="l"><a href="#1422">1422: </a>    }
+</span><span id="1423" class="l"><a href="#1423">1423: </a>
+</span><span id="1424" class="l"><a href="#1424">1424: </a>    <span class="php-comment">/**
+</span></span><span id="1425" class="l"><a href="#1425">1425: </a><span class="php-comment">     * Parse the DELETE request arguments
+</span></span><span id="1426" class="l"><a href="#1426">1426: </a><span class="php-comment">     *
+</span></span><span id="1427" class="l"><a href="#1427">1427: </a><span class="php-comment">     * @access protected
+</span></span><span id="1428" class="l"><a href="#1428">1428: </a><span class="php-comment">     * @return void
+</span></span><span id="1429" class="l"><a href="#1429">1429: </a><span class="php-comment">     */</span>
+</span><span id="1430" class="l"><a href="#1430">1430: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
+</span><span id="1431" class="l"><a href="#1431">1431: </a>    {
+</span><span id="1432" class="l"><a href="#1432">1432: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
+</span><span id="1433" class="l"><a href="#1433">1433: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
+</span><span id="1434" class="l"><a href="#1434">1434: </a>        {
+</span><span id="1435" class="l"><a href="#1435">1435: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1436" class="l"><a href="#1436">1436: </a>        }
+</span><span id="1437" class="l"><a href="#1437">1437: </a>    }
+</span><span id="1438" class="l"><a href="#1438">1438: </a>
+</span><span id="1439" class="l"><a href="#1439">1439: </a>    <span class="php-comment">/**
+</span></span><span id="1440" class="l"><a href="#1440">1440: </a><span class="php-comment">     * Parse the query parameters
+</span></span><span id="1441" class="l"><a href="#1441">1441: </a><span class="php-comment">     *
+</span></span><span id="1442" class="l"><a href="#1442">1442: </a><span class="php-comment">     * @access protected
+</span></span><span id="1443" class="l"><a href="#1443">1443: </a><span class="php-comment">     * @return void
+</span></span><span id="1444" class="l"><a href="#1444">1444: </a><span class="php-comment">     */</span>
+</span><span id="1445" class="l"><a href="#1445">1445: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
+</span><span id="1446" class="l"><a href="#1446">1446: </a>    {
+</span><span id="1447" class="l"><a href="#1447">1447: </a>        <span class="php-comment">// Declare a variable that will hold the REQUEST_URI</span>
+</span><span id="1448" class="l"><a href="#1448">1448: </a>        <span class="php-var">$request_uri</span> = <span class="php-keyword1">NULL</span>;
 </span><span id="1449" class="l"><a href="#1449">1449: </a>
-</span><span id="1450" class="l"><a href="#1450">1450: </a>        <span class="php-comment">// Parse the query parameters from the query string</span>
-</span><span id="1451" class="l"><a href="#1451">1451: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$request_uri</span>, PHP_URL_QUERY), <span class="php-var">$this</span>-&gt;_query_args);
-</span><span id="1452" class="l"><a href="#1452">1452: </a>    }
-</span><span id="1453" class="l"><a href="#1453">1453: </a>
-</span><span id="1454" class="l"><a href="#1454">1454: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
+</span><span id="1450" class="l"><a href="#1450">1450: </a>        <span class="php-comment">// If using the commandline version</span>
+</span><span id="1451" class="l"><a href="#1451">1451: </a>        <span class="php-keyword1">if</span> (is_cli())
+</span><span id="1452" class="l"><a href="#1452">1452: </a>        {
+</span><span id="1453" class="l"><a href="#1453">1453: </a>            <span class="php-var">$args</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'argv'</span>);
+</span><span id="1454" class="l"><a href="#1454">1454: </a>            <span class="php-keyword1">unset</span>(<span class="php-var">$args</span>[<span class="php-num">0</span>]);
 </span><span id="1455" class="l"><a href="#1455">1455: </a>
-</span><span id="1456" class="l"><a href="#1456">1456: </a>    <span class="php-comment">/**
-</span></span><span id="1457" class="l"><a href="#1457">1457: </a><span class="php-comment">     * Retrieve a value from a GET request
-</span></span><span id="1458" class="l"><a href="#1458">1458: </a><span class="php-comment">     *
-</span></span><span id="1459" class="l"><a href="#1459">1459: </a><span class="php-comment">     * @access public
-</span></span><span id="1460" class="l"><a href="#1460">1460: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
-</span></span><span id="1461" class="l"><a href="#1461">1461: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1462" class="l"><a href="#1462">1462: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1463" class="l"><a href="#1463">1463: </a><span class="php-comment">     * @return array|string|NULL Value from the GET request; otherwise, NULL
-</span></span><span id="1464" class="l"><a href="#1464">1464: </a><span class="php-comment">     */</span>
-</span><span id="1465" class="l"><a href="#1465">1465: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1466" class="l"><a href="#1466">1466: </a>    {
-</span><span id="1467" class="l"><a href="#1467">1467: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1468" class="l"><a href="#1468">1468: </a>        {
-</span><span id="1469" class="l"><a href="#1469">1469: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
-</span><span id="1470" class="l"><a href="#1470">1470: </a>        }
-</span><span id="1471" class="l"><a href="#1471">1471: </a>
-</span><span id="1472" class="l"><a href="#1472">1472: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1473" class="l"><a href="#1473">1473: </a>    }
+</span><span id="1456" class="l"><a href="#1456">1456: </a>            <span class="php-comment">// Combine the arguments using '/' as the delimiter</span>
+</span><span id="1457" class="l"><a href="#1457">1457: </a>            <span class="php-var">$request_uri</span> = <span class="php-quote">'/'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'/'</span>, <span class="php-var">$args</span>) . <span class="php-quote">'/'</span>;
+</span><span id="1458" class="l"><a href="#1458">1458: </a>
+</span><span id="1459" class="l"><a href="#1459">1459: </a>            <span class="php-comment">// Set the following server variables (perhaps not required anymore?)</span>
+</span><span id="1460" class="l"><a href="#1460">1460: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1461" class="l"><a href="#1461">1461: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'PATH_INFO'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1462" class="l"><a href="#1462">1462: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'QUERY_STRING'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1463" class="l"><a href="#1463">1463: </a>        }
+</span><span id="1464" class="l"><a href="#1464">1464: </a>        <span class="php-keyword1">else</span>
+</span><span id="1465" class="l"><a href="#1465">1465: </a>        {
+</span><span id="1466" class="l"><a href="#1466">1466: </a>            <span class="php-var">$request_uri</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>);
+</span><span id="1467" class="l"><a href="#1467">1467: </a>        }
+</span><span id="1468" class="l"><a href="#1468">1468: </a>
+</span><span id="1469" class="l"><a href="#1469">1469: </a>        <span class="php-comment">// Parse the query parameters from the query string</span>
+</span><span id="1470" class="l"><a href="#1470">1470: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$request_uri</span>, PHP_URL_QUERY), <span class="php-var">$this</span>-&gt;_query_args);
+</span><span id="1471" class="l"><a href="#1471">1471: </a>    }
+</span><span id="1472" class="l"><a href="#1472">1472: </a>
+</span><span id="1473" class="l"><a href="#1473">1473: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
 </span><span id="1474" class="l"><a href="#1474">1474: </a>
 </span><span id="1475" class="l"><a href="#1475">1475: </a>    <span class="php-comment">/**
-</span></span><span id="1476" class="l"><a href="#1476">1476: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
+</span></span><span id="1476" class="l"><a href="#1476">1476: </a><span class="php-comment">     * Retrieve a value from a GET request
 </span></span><span id="1477" class="l"><a href="#1477">1477: </a><span class="php-comment">     *
 </span></span><span id="1478" class="l"><a href="#1478">1478: </a><span class="php-comment">     * @access public
-</span></span><span id="1479" class="l"><a href="#1479">1479: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
+</span></span><span id="1479" class="l"><a href="#1479">1479: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
 </span></span><span id="1480" class="l"><a href="#1480">1480: </a><span class="php-comment">     * If NULL an array of arguments is returned
 </span></span><span id="1481" class="l"><a href="#1481">1481: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1482" class="l"><a href="#1482">1482: </a><span class="php-comment">     * @return array|string|NULL Value from the OPTIONS request; otherwise, NULL
+</span></span><span id="1482" class="l"><a href="#1482">1482: </a><span class="php-comment">     * @return array|string|NULL Value from the GET request; otherwise, NULL
 </span></span><span id="1483" class="l"><a href="#1483">1483: </a><span class="php-comment">     */</span>
-</span><span id="1484" class="l"><a href="#1484">1484: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1484" class="l"><a href="#1484">1484: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
 </span><span id="1485" class="l"><a href="#1485">1485: </a>    {
 </span><span id="1486" class="l"><a href="#1486">1486: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
 </span><span id="1487" class="l"><a href="#1487">1487: </a>        {
-</span><span id="1488" class="l"><a href="#1488">1488: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
+</span><span id="1488" class="l"><a href="#1488">1488: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
 </span><span id="1489" class="l"><a href="#1489">1489: </a>        }
 </span><span id="1490" class="l"><a href="#1490">1490: </a>
-</span><span id="1491" class="l"><a href="#1491">1491: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1491" class="l"><a href="#1491">1491: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
 </span><span id="1492" class="l"><a href="#1492">1492: </a>    }
 </span><span id="1493" class="l"><a href="#1493">1493: </a>
 </span><span id="1494" class="l"><a href="#1494">1494: </a>    <span class="php-comment">/**
-</span></span><span id="1495" class="l"><a href="#1495">1495: </a><span class="php-comment">     * Retrieve a value from a HEAD request
+</span></span><span id="1495" class="l"><a href="#1495">1495: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
 </span></span><span id="1496" class="l"><a href="#1496">1496: </a><span class="php-comment">     *
 </span></span><span id="1497" class="l"><a href="#1497">1497: </a><span class="php-comment">     * @access public
-</span></span><span id="1498" class="l"><a href="#1498">1498: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
+</span></span><span id="1498" class="l"><a href="#1498">1498: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
 </span></span><span id="1499" class="l"><a href="#1499">1499: </a><span class="php-comment">     * If NULL an array of arguments is returned
 </span></span><span id="1500" class="l"><a href="#1500">1500: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1501" class="l"><a href="#1501">1501: </a><span class="php-comment">     * @return array|string|NULL Value from the HEAD request; otherwise, NULL
+</span></span><span id="1501" class="l"><a href="#1501">1501: </a><span class="php-comment">     * @return array|string|NULL Value from the OPTIONS request; otherwise, NULL
 </span></span><span id="1502" class="l"><a href="#1502">1502: </a><span class="php-comment">     */</span>
-</span><span id="1503" class="l"><a href="#1503">1503: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1503" class="l"><a href="#1503">1503: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
 </span><span id="1504" class="l"><a href="#1504">1504: </a>    {
 </span><span id="1505" class="l"><a href="#1505">1505: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
 </span><span id="1506" class="l"><a href="#1506">1506: </a>        {
-</span><span id="1507" class="l"><a href="#1507">1507: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;head_args;
+</span><span id="1507" class="l"><a href="#1507">1507: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
 </span><span id="1508" class="l"><a href="#1508">1508: </a>        }
 </span><span id="1509" class="l"><a href="#1509">1509: </a>
-</span><span id="1510" class="l"><a href="#1510">1510: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1510" class="l"><a href="#1510">1510: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
 </span><span id="1511" class="l"><a href="#1511">1511: </a>    }
 </span><span id="1512" class="l"><a href="#1512">1512: </a>
 </span><span id="1513" class="l"><a href="#1513">1513: </a>    <span class="php-comment">/**
-</span></span><span id="1514" class="l"><a href="#1514">1514: </a><span class="php-comment">     * Retrieve a value from a POST request
+</span></span><span id="1514" class="l"><a href="#1514">1514: </a><span class="php-comment">     * Retrieve a value from a HEAD request
 </span></span><span id="1515" class="l"><a href="#1515">1515: </a><span class="php-comment">     *
 </span></span><span id="1516" class="l"><a href="#1516">1516: </a><span class="php-comment">     * @access public
-</span></span><span id="1517" class="l"><a href="#1517">1517: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
+</span></span><span id="1517" class="l"><a href="#1517">1517: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
 </span></span><span id="1518" class="l"><a href="#1518">1518: </a><span class="php-comment">     * If NULL an array of arguments is returned
 </span></span><span id="1519" class="l"><a href="#1519">1519: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1520" class="l"><a href="#1520">1520: </a><span class="php-comment">     * @return array|string|NULL Value from the POST request; otherwise, NULL
+</span></span><span id="1520" class="l"><a href="#1520">1520: </a><span class="php-comment">     * @return array|string|NULL Value from the HEAD request; otherwise, NULL
 </span></span><span id="1521" class="l"><a href="#1521">1521: </a><span class="php-comment">     */</span>
-</span><span id="1522" class="l"><a href="#1522">1522: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1522" class="l"><a href="#1522">1522: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
 </span><span id="1523" class="l"><a href="#1523">1523: </a>    {
 </span><span id="1524" class="l"><a href="#1524">1524: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
 </span><span id="1525" class="l"><a href="#1525">1525: </a>        {
-</span><span id="1526" class="l"><a href="#1526">1526: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
+</span><span id="1526" class="l"><a href="#1526">1526: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;head_args;
 </span><span id="1527" class="l"><a href="#1527">1527: </a>        }
 </span><span id="1528" class="l"><a href="#1528">1528: </a>
-</span><span id="1529" class="l"><a href="#1529">1529: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1529" class="l"><a href="#1529">1529: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
 </span><span id="1530" class="l"><a href="#1530">1530: </a>    }
 </span><span id="1531" class="l"><a href="#1531">1531: </a>
 </span><span id="1532" class="l"><a href="#1532">1532: </a>    <span class="php-comment">/**
-</span></span><span id="1533" class="l"><a href="#1533">1533: </a><span class="php-comment">     * Retrieve a value from a PUT request
+</span></span><span id="1533" class="l"><a href="#1533">1533: </a><span class="php-comment">     * Retrieve a value from a POST request
 </span></span><span id="1534" class="l"><a href="#1534">1534: </a><span class="php-comment">     *
 </span></span><span id="1535" class="l"><a href="#1535">1535: </a><span class="php-comment">     * @access public
-</span></span><span id="1536" class="l"><a href="#1536">1536: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
+</span></span><span id="1536" class="l"><a href="#1536">1536: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
 </span></span><span id="1537" class="l"><a href="#1537">1537: </a><span class="php-comment">     * If NULL an array of arguments is returned
 </span></span><span id="1538" class="l"><a href="#1538">1538: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1539" class="l"><a href="#1539">1539: </a><span class="php-comment">     * @return array|string|NULL Value from the PUT request; otherwise, NULL
+</span></span><span id="1539" class="l"><a href="#1539">1539: </a><span class="php-comment">     * @return array|string|NULL Value from the POST request; otherwise, NULL
 </span></span><span id="1540" class="l"><a href="#1540">1540: </a><span class="php-comment">     */</span>
-</span><span id="1541" class="l"><a href="#1541">1541: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1541" class="l"><a href="#1541">1541: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
 </span><span id="1542" class="l"><a href="#1542">1542: </a>    {
 </span><span id="1543" class="l"><a href="#1543">1543: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
 </span><span id="1544" class="l"><a href="#1544">1544: </a>        {
-</span><span id="1545" class="l"><a href="#1545">1545: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
+</span><span id="1545" class="l"><a href="#1545">1545: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
 </span><span id="1546" class="l"><a href="#1546">1546: </a>        }
 </span><span id="1547" class="l"><a href="#1547">1547: </a>
-</span><span id="1548" class="l"><a href="#1548">1548: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1548" class="l"><a href="#1548">1548: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
 </span><span id="1549" class="l"><a href="#1549">1549: </a>    }
 </span><span id="1550" class="l"><a href="#1550">1550: </a>
 </span><span id="1551" class="l"><a href="#1551">1551: </a>    <span class="php-comment">/**
-</span></span><span id="1552" class="l"><a href="#1552">1552: </a><span class="php-comment">     * Retrieve a value from a DELETE request
+</span></span><span id="1552" class="l"><a href="#1552">1552: </a><span class="php-comment">     * Retrieve a value from a PUT request
 </span></span><span id="1553" class="l"><a href="#1553">1553: </a><span class="php-comment">     *
 </span></span><span id="1554" class="l"><a href="#1554">1554: </a><span class="php-comment">     * @access public
-</span></span><span id="1555" class="l"><a href="#1555">1555: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
+</span></span><span id="1555" class="l"><a href="#1555">1555: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
 </span></span><span id="1556" class="l"><a href="#1556">1556: </a><span class="php-comment">     * If NULL an array of arguments is returned
 </span></span><span id="1557" class="l"><a href="#1557">1557: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1558" class="l"><a href="#1558">1558: </a><span class="php-comment">     * @return array|string|NULL Value from the DELETE request; otherwise, NULL
+</span></span><span id="1558" class="l"><a href="#1558">1558: </a><span class="php-comment">     * @return array|string|NULL Value from the PUT request; otherwise, NULL
 </span></span><span id="1559" class="l"><a href="#1559">1559: </a><span class="php-comment">     */</span>
-</span><span id="1560" class="l"><a href="#1560">1560: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1560" class="l"><a href="#1560">1560: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
 </span><span id="1561" class="l"><a href="#1561">1561: </a>    {
 </span><span id="1562" class="l"><a href="#1562">1562: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
 </span><span id="1563" class="l"><a href="#1563">1563: </a>        {
-</span><span id="1564" class="l"><a href="#1564">1564: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
+</span><span id="1564" class="l"><a href="#1564">1564: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
 </span><span id="1565" class="l"><a href="#1565">1565: </a>        }
 </span><span id="1566" class="l"><a href="#1566">1566: </a>
-</span><span id="1567" class="l"><a href="#1567">1567: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1567" class="l"><a href="#1567">1567: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
 </span><span id="1568" class="l"><a href="#1568">1568: </a>    }
 </span><span id="1569" class="l"><a href="#1569">1569: </a>
 </span><span id="1570" class="l"><a href="#1570">1570: </a>    <span class="php-comment">/**
-</span></span><span id="1571" class="l"><a href="#1571">1571: </a><span class="php-comment">     * Retrieve a value from a PATCH request
+</span></span><span id="1571" class="l"><a href="#1571">1571: </a><span class="php-comment">     * Retrieve a value from a DELETE request
 </span></span><span id="1572" class="l"><a href="#1572">1572: </a><span class="php-comment">     *
 </span></span><span id="1573" class="l"><a href="#1573">1573: </a><span class="php-comment">     * @access public
-</span></span><span id="1574" class="l"><a href="#1574">1574: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
+</span></span><span id="1574" class="l"><a href="#1574">1574: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
 </span></span><span id="1575" class="l"><a href="#1575">1575: </a><span class="php-comment">     * If NULL an array of arguments is returned
 </span></span><span id="1576" class="l"><a href="#1576">1576: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1577" class="l"><a href="#1577">1577: </a><span class="php-comment">     * @return array|string|NULL Value from the PATCH request; otherwise, NULL
+</span></span><span id="1577" class="l"><a href="#1577">1577: </a><span class="php-comment">     * @return array|string|NULL Value from the DELETE request; otherwise, NULL
 </span></span><span id="1578" class="l"><a href="#1578">1578: </a><span class="php-comment">     */</span>
-</span><span id="1579" class="l"><a href="#1579">1579: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1579" class="l"><a href="#1579">1579: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
 </span><span id="1580" class="l"><a href="#1580">1580: </a>    {
 </span><span id="1581" class="l"><a href="#1581">1581: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
 </span><span id="1582" class="l"><a href="#1582">1582: </a>        {
-</span><span id="1583" class="l"><a href="#1583">1583: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
+</span><span id="1583" class="l"><a href="#1583">1583: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
 </span><span id="1584" class="l"><a href="#1584">1584: </a>        }
 </span><span id="1585" class="l"><a href="#1585">1585: </a>
-</span><span id="1586" class="l"><a href="#1586">1586: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1586" class="l"><a href="#1586">1586: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
 </span><span id="1587" class="l"><a href="#1587">1587: </a>    }
 </span><span id="1588" class="l"><a href="#1588">1588: </a>
 </span><span id="1589" class="l"><a href="#1589">1589: </a>    <span class="php-comment">/**
-</span></span><span id="1590" class="l"><a href="#1590">1590: </a><span class="php-comment">     * Retrieve a value from the query parameters
+</span></span><span id="1590" class="l"><a href="#1590">1590: </a><span class="php-comment">     * Retrieve a value from a PATCH request
 </span></span><span id="1591" class="l"><a href="#1591">1591: </a><span class="php-comment">     *
 </span></span><span id="1592" class="l"><a href="#1592">1592: </a><span class="php-comment">     * @access public
-</span></span><span id="1593" class="l"><a href="#1593">1593: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
+</span></span><span id="1593" class="l"><a href="#1593">1593: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
 </span></span><span id="1594" class="l"><a href="#1594">1594: </a><span class="php-comment">     * If NULL an array of arguments is returned
 </span></span><span id="1595" class="l"><a href="#1595">1595: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1596" class="l"><a href="#1596">1596: </a><span class="php-comment">     * @return array|string|NULL Value from the query parameters; otherwise, NULL
+</span></span><span id="1596" class="l"><a href="#1596">1596: </a><span class="php-comment">     * @return array|string|NULL Value from the PATCH request; otherwise, NULL
 </span></span><span id="1597" class="l"><a href="#1597">1597: </a><span class="php-comment">     */</span>
-</span><span id="1598" class="l"><a href="#1598">1598: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1598" class="l"><a href="#1598">1598: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
 </span><span id="1599" class="l"><a href="#1599">1599: </a>    {
 </span><span id="1600" class="l"><a href="#1600">1600: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
 </span><span id="1601" class="l"><a href="#1601">1601: </a>        {
-</span><span id="1602" class="l"><a href="#1602">1602: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
+</span><span id="1602" class="l"><a href="#1602">1602: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
 </span><span id="1603" class="l"><a href="#1603">1603: </a>        }
 </span><span id="1604" class="l"><a href="#1604">1604: </a>
-</span><span id="1605" class="l"><a href="#1605">1605: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1605" class="l"><a href="#1605">1605: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
 </span><span id="1606" class="l"><a href="#1606">1606: </a>    }
 </span><span id="1607" class="l"><a href="#1607">1607: </a>
 </span><span id="1608" class="l"><a href="#1608">1608: </a>    <span class="php-comment">/**
-</span></span><span id="1609" class="l"><a href="#1609">1609: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
-</span></span><span id="1610" class="l"><a href="#1610">1610: </a><span class="php-comment">     * prevented.
-</span></span><span id="1611" class="l"><a href="#1611">1611: </a><span class="php-comment">     *
-</span></span><span id="1612" class="l"><a href="#1612">1612: </a><span class="php-comment">     * @access protected
-</span></span><span id="1613" class="l"><a href="#1613">1613: </a><span class="php-comment">     * @param  string $value Input data
-</span></span><span id="1614" class="l"><a href="#1614">1614: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
-</span></span><span id="1615" class="l"><a href="#1615">1615: </a><span class="php-comment">     * @return string
+</span></span><span id="1609" class="l"><a href="#1609">1609: </a><span class="php-comment">     * Retrieve a value from the query parameters
+</span></span><span id="1610" class="l"><a href="#1610">1610: </a><span class="php-comment">     *
+</span></span><span id="1611" class="l"><a href="#1611">1611: </a><span class="php-comment">     * @access public
+</span></span><span id="1612" class="l"><a href="#1612">1612: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
+</span></span><span id="1613" class="l"><a href="#1613">1613: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1614" class="l"><a href="#1614">1614: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1615" class="l"><a href="#1615">1615: </a><span class="php-comment">     * @return array|string|NULL Value from the query parameters; otherwise, NULL
 </span></span><span id="1616" class="l"><a href="#1616">1616: </a><span class="php-comment">     */</span>
-</span><span id="1617" class="l"><a href="#1617">1617: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
+</span><span id="1617" class="l"><a href="#1617">1617: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
 </span><span id="1618" class="l"><a href="#1618">1618: </a>    {
-</span><span id="1619" class="l"><a href="#1619">1619: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) || <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
-</span><span id="1620" class="l"><a href="#1620">1620: </a>
-</span><span id="1621" class="l"><a href="#1621">1621: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
-</span><span id="1622" class="l"><a href="#1622">1622: </a>    }
+</span><span id="1619" class="l"><a href="#1619">1619: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1620" class="l"><a href="#1620">1620: </a>        {
+</span><span id="1621" class="l"><a href="#1621">1621: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
+</span><span id="1622" class="l"><a href="#1622">1622: </a>        }
 </span><span id="1623" class="l"><a href="#1623">1623: </a>
-</span><span id="1624" class="l"><a href="#1624">1624: </a>    <span class="php-comment">/**
-</span></span><span id="1625" class="l"><a href="#1625">1625: </a><span class="php-comment">     * Retrieve the validation errors
-</span></span><span id="1626" class="l"><a href="#1626">1626: </a><span class="php-comment">     *
-</span></span><span id="1627" class="l"><a href="#1627">1627: </a><span class="php-comment">     * @access public
-</span></span><span id="1628" class="l"><a href="#1628">1628: </a><span class="php-comment">     * @return array
-</span></span><span id="1629" class="l"><a href="#1629">1629: </a><span class="php-comment">     */</span>
-</span><span id="1630" class="l"><a href="#1630">1630: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
-</span><span id="1631" class="l"><a href="#1631">1631: </a>    {
-</span><span id="1632" class="l"><a href="#1632">1632: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
-</span><span id="1633" class="l"><a href="#1633">1633: </a>
-</span><span id="1634" class="l"><a href="#1634">1634: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
-</span><span id="1635" class="l"><a href="#1635">1635: </a>    }
-</span><span id="1636" class="l"><a href="#1636">1636: </a>
-</span><span id="1637" class="l"><a href="#1637">1637: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
-</span><span id="1638" class="l"><a href="#1638">1638: </a>
-</span><span id="1639" class="l"><a href="#1639">1639: </a>    <span class="php-comment">/**
-</span></span><span id="1640" class="l"><a href="#1640">1640: </a><span class="php-comment">     * Perform LDAP Authentication
-</span></span><span id="1641" class="l"><a href="#1641">1641: </a><span class="php-comment">     *
-</span></span><span id="1642" class="l"><a href="#1642">1642: </a><span class="php-comment">     * @access protected
-</span></span><span id="1643" class="l"><a href="#1643">1643: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1644" class="l"><a href="#1644">1644: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1645" class="l"><a href="#1645">1645: </a><span class="php-comment">     * @return bool
-</span></span><span id="1646" class="l"><a href="#1646">1646: </a><span class="php-comment">     */</span>
-</span><span id="1647" class="l"><a href="#1647">1647: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1648" class="l"><a href="#1648">1648: </a>    {
-</span><span id="1649" class="l"><a href="#1649">1649: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1650" class="l"><a href="#1650">1650: </a>        {
-</span><span id="1651" class="l"><a href="#1651">1651: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
-</span><span id="1652" class="l"><a href="#1652">1652: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1653" class="l"><a href="#1653">1653: </a>        }
-</span><span id="1654" class="l"><a href="#1654">1654: </a>
-</span><span id="1655" class="l"><a href="#1655">1655: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading configuration'</span>);
-</span><span id="1656" class="l"><a href="#1656">1656: </a>
-</span><span id="1657" class="l"><a href="#1657">1657: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="1658" class="l"><a href="#1658">1658: </a>
-</span><span id="1659" class="l"><a href="#1659">1659: </a>        <span class="php-var">$ldap</span> = [
-</span><span id="1660" class="l"><a href="#1660">1660: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1661" class="l"><a href="#1661">1661: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1662" class="l"><a href="#1662">1662: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1663" class="l"><a href="#1663">1663: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1664" class="l"><a href="#1664">1664: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1665" class="l"><a href="#1665">1665: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1666" class="l"><a href="#1666">1666: </a>        ];
-</span><span id="1667" class="l"><a href="#1667">1667: </a>
-</span><span id="1668" class="l"><a href="#1668">1668: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
-</span><span id="1669" class="l"><a href="#1669">1669: </a>
-</span><span id="1670" class="l"><a href="#1670">1670: </a>        <span class="php-comment">// Connect to the ldap server</span>
-</span><span id="1671" class="l"><a href="#1671">1671: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
-</span><span id="1672" class="l"><a href="#1672">1672: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
-</span><span id="1673" class="l"><a href="#1673">1673: </a>        {
-</span><span id="1674" class="l"><a href="#1674">1674: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>] . <span class="php-quote">' seconds'</span>);
+</span><span id="1624" class="l"><a href="#1624">1624: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1625" class="l"><a href="#1625">1625: </a>    }
+</span><span id="1626" class="l"><a href="#1626">1626: </a>
+</span><span id="1627" class="l"><a href="#1627">1627: </a>    <span class="php-comment">/**
+</span></span><span id="1628" class="l"><a href="#1628">1628: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
+</span></span><span id="1629" class="l"><a href="#1629">1629: </a><span class="php-comment">     * prevented.
+</span></span><span id="1630" class="l"><a href="#1630">1630: </a><span class="php-comment">     *
+</span></span><span id="1631" class="l"><a href="#1631">1631: </a><span class="php-comment">     * @access protected
+</span></span><span id="1632" class="l"><a href="#1632">1632: </a><span class="php-comment">     * @param  string $value Input data
+</span></span><span id="1633" class="l"><a href="#1633">1633: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
+</span></span><span id="1634" class="l"><a href="#1634">1634: </a><span class="php-comment">     * @return string
+</span></span><span id="1635" class="l"><a href="#1635">1635: </a><span class="php-comment">     */</span>
+</span><span id="1636" class="l"><a href="#1636">1636: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
+</span><span id="1637" class="l"><a href="#1637">1637: </a>    {
+</span><span id="1638" class="l"><a href="#1638">1638: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) || <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
+</span><span id="1639" class="l"><a href="#1639">1639: </a>
+</span><span id="1640" class="l"><a href="#1640">1640: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
+</span><span id="1641" class="l"><a href="#1641">1641: </a>    }
+</span><span id="1642" class="l"><a href="#1642">1642: </a>
+</span><span id="1643" class="l"><a href="#1643">1643: </a>    <span class="php-comment">/**
+</span></span><span id="1644" class="l"><a href="#1644">1644: </a><span class="php-comment">     * Retrieve the validation errors
+</span></span><span id="1645" class="l"><a href="#1645">1645: </a><span class="php-comment">     *
+</span></span><span id="1646" class="l"><a href="#1646">1646: </a><span class="php-comment">     * @access public
+</span></span><span id="1647" class="l"><a href="#1647">1647: </a><span class="php-comment">     * @return array
+</span></span><span id="1648" class="l"><a href="#1648">1648: </a><span class="php-comment">     */</span>
+</span><span id="1649" class="l"><a href="#1649">1649: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
+</span><span id="1650" class="l"><a href="#1650">1650: </a>    {
+</span><span id="1651" class="l"><a href="#1651">1651: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
+</span><span id="1652" class="l"><a href="#1652">1652: </a>
+</span><span id="1653" class="l"><a href="#1653">1653: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
+</span><span id="1654" class="l"><a href="#1654">1654: </a>    }
+</span><span id="1655" class="l"><a href="#1655">1655: </a>
+</span><span id="1656" class="l"><a href="#1656">1656: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
+</span><span id="1657" class="l"><a href="#1657">1657: </a>
+</span><span id="1658" class="l"><a href="#1658">1658: </a>    <span class="php-comment">/**
+</span></span><span id="1659" class="l"><a href="#1659">1659: </a><span class="php-comment">     * Perform LDAP Authentication
+</span></span><span id="1660" class="l"><a href="#1660">1660: </a><span class="php-comment">     *
+</span></span><span id="1661" class="l"><a href="#1661">1661: </a><span class="php-comment">     * @access protected
+</span></span><span id="1662" class="l"><a href="#1662">1662: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1663" class="l"><a href="#1663">1663: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1664" class="l"><a href="#1664">1664: </a><span class="php-comment">     * @return bool
+</span></span><span id="1665" class="l"><a href="#1665">1665: </a><span class="php-comment">     */</span>
+</span><span id="1666" class="l"><a href="#1666">1666: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1667" class="l"><a href="#1667">1667: </a>    {
+</span><span id="1668" class="l"><a href="#1668">1668: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1669" class="l"><a href="#1669">1669: </a>        {
+</span><span id="1670" class="l"><a href="#1670">1670: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
+</span><span id="1671" class="l"><a href="#1671">1671: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1672" class="l"><a href="#1672">1672: </a>        }
+</span><span id="1673" class="l"><a href="#1673">1673: </a>
+</span><span id="1674" class="l"><a href="#1674">1674: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading configuration'</span>);
 </span><span id="1675" class="l"><a href="#1675">1675: </a>
-</span><span id="1676" class="l"><a href="#1676">1676: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
+</span><span id="1676" class="l"><a href="#1676">1676: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
 </span><span id="1677" class="l"><a href="#1677">1677: </a>
-</span><span id="1678" class="l"><a href="#1678">1678: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>] . <span class="php-quote">' with dn '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
-</span><span id="1679" class="l"><a href="#1679">1679: </a>
-</span><span id="1680" class="l"><a href="#1680">1680: </a>            <span class="php-comment">// Binding to the ldap server</span>
-</span><span id="1681" class="l"><a href="#1681">1681: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
-</span><span id="1682" class="l"><a href="#1682">1682: </a>
-</span><span id="1683" class="l"><a href="#1683">1683: </a>            <span class="php-comment">// Verify the binding</span>
-</span><span id="1684" class="l"><a href="#1684">1684: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1685" class="l"><a href="#1685">1685: </a>            {
-</span><span id="1686" class="l"><a href="#1686">1686: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind was unsuccessful'</span>);
-</span><span id="1687" class="l"><a href="#1687">1687: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1688" class="l"><a href="#1688">1688: </a>            }
-</span><span id="1689" class="l"><a href="#1689">1689: </a>
-</span><span id="1690" class="l"><a href="#1690">1690: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
-</span><span id="1691" class="l"><a href="#1691">1691: </a>        }
-</span><span id="1692" class="l"><a href="#1692">1692: </a>
-</span><span id="1693" class="l"><a href="#1693">1693: </a>        <span class="php-comment">// Search for user</span>
-</span><span id="1694" class="l"><a href="#1694">1694: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1695" class="l"><a href="#1695">1695: </a>        {
-</span><span id="1696" class="l"><a href="#1696">1696: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span> . <span class="php-var">$username</span> . <span class="php-quote">' not found in search'</span>);
-</span><span id="1697" class="l"><a href="#1697">1697: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1698" class="l"><a href="#1698">1698: </a>        }
-</span><span id="1699" class="l"><a href="#1699">1699: </a>
-</span><span id="1700" class="l"><a href="#1700">1700: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
-</span><span id="1701" class="l"><a href="#1701">1701: </a>        {
-</span><span id="1702" class="l"><a href="#1702">1702: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username '</span> . <span class="php-var">$username</span> . <span class="php-quote">'found more than once'</span>);
-</span><span id="1703" class="l"><a href="#1703">1703: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1704" class="l"><a href="#1704">1704: </a>        }
-</span><span id="1705" class="l"><a href="#1705">1705: </a>
-</span><span id="1706" class="l"><a href="#1706">1706: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1707" class="l"><a href="#1707">1707: </a>        {
-</span><span id="1708" class="l"><a href="#1708">1708: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, entry of search result could not be fetched'</span>);
-</span><span id="1709" class="l"><a href="#1709">1709: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1678" class="l"><a href="#1678">1678: </a>        <span class="php-var">$ldap</span> = [
+</span><span id="1679" class="l"><a href="#1679">1679: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1680" class="l"><a href="#1680">1680: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1681" class="l"><a href="#1681">1681: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1682" class="l"><a href="#1682">1682: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1683" class="l"><a href="#1683">1683: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1684" class="l"><a href="#1684">1684: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1685" class="l"><a href="#1685">1685: </a>        ];
+</span><span id="1686" class="l"><a href="#1686">1686: </a>
+</span><span id="1687" class="l"><a href="#1687">1687: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
+</span><span id="1688" class="l"><a href="#1688">1688: </a>
+</span><span id="1689" class="l"><a href="#1689">1689: </a>        <span class="php-comment">// Connect to the ldap server</span>
+</span><span id="1690" class="l"><a href="#1690">1690: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
+</span><span id="1691" class="l"><a href="#1691">1691: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
+</span><span id="1692" class="l"><a href="#1692">1692: </a>        {
+</span><span id="1693" class="l"><a href="#1693">1693: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>] . <span class="php-quote">' seconds'</span>);
+</span><span id="1694" class="l"><a href="#1694">1694: </a>
+</span><span id="1695" class="l"><a href="#1695">1695: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
+</span><span id="1696" class="l"><a href="#1696">1696: </a>
+</span><span id="1697" class="l"><a href="#1697">1697: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>] . <span class="php-quote">' with dn '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
+</span><span id="1698" class="l"><a href="#1698">1698: </a>
+</span><span id="1699" class="l"><a href="#1699">1699: </a>            <span class="php-comment">// Binding to the ldap server</span>
+</span><span id="1700" class="l"><a href="#1700">1700: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
+</span><span id="1701" class="l"><a href="#1701">1701: </a>
+</span><span id="1702" class="l"><a href="#1702">1702: </a>            <span class="php-comment">// Verify the binding</span>
+</span><span id="1703" class="l"><a href="#1703">1703: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1704" class="l"><a href="#1704">1704: </a>            {
+</span><span id="1705" class="l"><a href="#1705">1705: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind was unsuccessful'</span>);
+</span><span id="1706" class="l"><a href="#1706">1706: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1707" class="l"><a href="#1707">1707: </a>            }
+</span><span id="1708" class="l"><a href="#1708">1708: </a>
+</span><span id="1709" class="l"><a href="#1709">1709: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
 </span><span id="1710" class="l"><a href="#1710">1710: </a>        }
 </span><span id="1711" class="l"><a href="#1711">1711: </a>
-</span><span id="1712" class="l"><a href="#1712">1712: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1713" class="l"><a href="#1713">1713: </a>        {
-</span><span id="1714" class="l"><a href="#1714">1714: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, user-dn could not be fetched'</span>);
-</span><span id="1715" class="l"><a href="#1715">1715: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1716" class="l"><a href="#1716">1716: </a>        }
-</span><span id="1717" class="l"><a href="#1717">1717: </a>
-</span><span id="1718" class="l"><a href="#1718">1718: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
-</span><span id="1719" class="l"><a href="#1719">1719: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1712" class="l"><a href="#1712">1712: </a>        <span class="php-comment">// Search for user</span>
+</span><span id="1713" class="l"><a href="#1713">1713: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1714" class="l"><a href="#1714">1714: </a>        {
+</span><span id="1715" class="l"><a href="#1715">1715: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span> . <span class="php-var">$username</span> . <span class="php-quote">' not found in search'</span>);
+</span><span id="1716" class="l"><a href="#1716">1716: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1717" class="l"><a href="#1717">1717: </a>        }
+</span><span id="1718" class="l"><a href="#1718">1718: </a>
+</span><span id="1719" class="l"><a href="#1719">1719: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
 </span><span id="1720" class="l"><a href="#1720">1720: </a>        {
-</span><span id="1721" class="l"><a href="#1721">1721: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
+</span><span id="1721" class="l"><a href="#1721">1721: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username '</span> . <span class="php-var">$username</span> . <span class="php-quote">'found more than once'</span>);
 </span><span id="1722" class="l"><a href="#1722">1722: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
 </span><span id="1723" class="l"><a href="#1723">1723: </a>        }
 </span><span id="1724" class="l"><a href="#1724">1724: </a>
-</span><span id="1725" class="l"><a href="#1725">1725: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span> . <span class="php-var">$user_dn</span> . <span class="php-quote">' authenticated successfully'</span>);
-</span><span id="1726" class="l"><a href="#1726">1726: </a>
-</span><span id="1727" class="l"><a href="#1727">1727: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
-</span><span id="1728" class="l"><a href="#1728">1728: </a>
-</span><span id="1729" class="l"><a href="#1729">1729: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
+</span><span id="1725" class="l"><a href="#1725">1725: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1726" class="l"><a href="#1726">1726: </a>        {
+</span><span id="1727" class="l"><a href="#1727">1727: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, entry of search result could not be fetched'</span>);
+</span><span id="1728" class="l"><a href="#1728">1728: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1729" class="l"><a href="#1729">1729: </a>        }
 </span><span id="1730" class="l"><a href="#1730">1730: </a>
-</span><span id="1731" class="l"><a href="#1731">1731: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1732" class="l"><a href="#1732">1732: </a>    }
-</span><span id="1733" class="l"><a href="#1733">1733: </a>
-</span><span id="1734" class="l"><a href="#1734">1734: </a>    <span class="php-comment">/**
-</span></span><span id="1735" class="l"><a href="#1735">1735: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
-</span></span><span id="1736" class="l"><a href="#1736">1736: </a><span class="php-comment">     *
-</span></span><span id="1737" class="l"><a href="#1737">1737: </a><span class="php-comment">     * @access protected
-</span></span><span id="1738" class="l"><a href="#1738">1738: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1739" class="l"><a href="#1739">1739: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1740" class="l"><a href="#1740">1740: </a><span class="php-comment">     * @return bool
-</span></span><span id="1741" class="l"><a href="#1741">1741: </a><span class="php-comment">     */</span>
-</span><span id="1742" class="l"><a href="#1742">1742: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1743" class="l"><a href="#1743">1743: </a>    {
-</span><span id="1744" class="l"><a href="#1744">1744: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1745" class="l"><a href="#1745">1745: </a>        {
-</span><span id="1746" class="l"><a href="#1746">1746: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: Failure, empty username'</span>);
-</span><span id="1747" class="l"><a href="#1747">1747: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1748" class="l"><a href="#1748">1748: </a>        }
+</span><span id="1731" class="l"><a href="#1731">1731: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1732" class="l"><a href="#1732">1732: </a>        {
+</span><span id="1733" class="l"><a href="#1733">1733: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, user-dn could not be fetched'</span>);
+</span><span id="1734" class="l"><a href="#1734">1734: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1735" class="l"><a href="#1735">1735: </a>        }
+</span><span id="1736" class="l"><a href="#1736">1736: </a>
+</span><span id="1737" class="l"><a href="#1737">1737: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
+</span><span id="1738" class="l"><a href="#1738">1738: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1739" class="l"><a href="#1739">1739: </a>        {
+</span><span id="1740" class="l"><a href="#1740">1740: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
+</span><span id="1741" class="l"><a href="#1741">1741: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1742" class="l"><a href="#1742">1742: </a>        }
+</span><span id="1743" class="l"><a href="#1743">1743: </a>
+</span><span id="1744" class="l"><a href="#1744">1744: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span> . <span class="php-var">$user_dn</span> . <span class="php-quote">' authenticated successfully'</span>);
+</span><span id="1745" class="l"><a href="#1745">1745: </a>
+</span><span id="1746" class="l"><a href="#1746">1746: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
+</span><span id="1747" class="l"><a href="#1747">1747: </a>
+</span><span id="1748" class="l"><a href="#1748">1748: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
 </span><span id="1749" class="l"><a href="#1749">1749: </a>
-</span><span id="1750" class="l"><a href="#1750">1750: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
-</span><span id="1751" class="l"><a href="#1751">1751: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
+</span><span id="1750" class="l"><a href="#1750">1750: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1751" class="l"><a href="#1751">1751: </a>    }
 </span><span id="1752" class="l"><a href="#1752">1752: </a>
-</span><span id="1753" class="l"><a href="#1753">1753: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
-</span><span id="1754" class="l"><a href="#1754">1754: </a>        {
-</span><span id="1755" class="l"><a href="#1755">1755: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_class'</span>);
-</span><span id="1756" class="l"><a href="#1756">1756: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1757" class="l"><a href="#1757">1757: </a>        }
-</span><span id="1758" class="l"><a href="#1758">1758: </a>
-</span><span id="1759" class="l"><a href="#1759">1759: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
-</span><span id="1760" class="l"><a href="#1760">1760: </a>        {
-</span><span id="1761" class="l"><a href="#1761">1761: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_function'</span>);
-</span><span id="1762" class="l"><a href="#1762">1762: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1763" class="l"><a href="#1763">1763: </a>        }
-</span><span id="1764" class="l"><a href="#1764">1764: </a>
-</span><span id="1765" class="l"><a href="#1765">1765: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1766" class="l"><a href="#1766">1766: </a>        {
-</span><span id="1767" class="l"><a href="#1767">1767: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
-</span><span id="1768" class="l"><a href="#1768">1768: </a>        }
-</span><span id="1769" class="l"><a href="#1769">1769: </a>
-</span><span id="1770" class="l"><a href="#1770">1770: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1771" class="l"><a href="#1771">1771: </a>    }
-</span><span id="1772" class="l"><a href="#1772">1772: </a>
-</span><span id="1773" class="l"><a href="#1773">1773: </a>    <span class="php-comment">/**
-</span></span><span id="1774" class="l"><a href="#1774">1774: </a><span class="php-comment">     * Check if the user is logged in
-</span></span><span id="1775" class="l"><a href="#1775">1775: </a><span class="php-comment">     *
-</span></span><span id="1776" class="l"><a href="#1776">1776: </a><span class="php-comment">     * @access protected
-</span></span><span id="1777" class="l"><a href="#1777">1777: </a><span class="php-comment">     * @param  string $username The user's name
-</span></span><span id="1778" class="l"><a href="#1778">1778: </a><span class="php-comment">     * @param  bool|string $password The user's password
-</span></span><span id="1779" class="l"><a href="#1779">1779: </a><span class="php-comment">     * @return bool
-</span></span><span id="1780" class="l"><a href="#1780">1780: </a><span class="php-comment">     */</span>
-</span><span id="1781" class="l"><a href="#1781">1781: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1782" class="l"><a href="#1782">1782: </a>    {
-</span><span id="1783" class="l"><a href="#1783">1783: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1784" class="l"><a href="#1784">1784: </a>        {
-</span><span id="1785" class="l"><a href="#1785">1785: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1786" class="l"><a href="#1786">1786: </a>        }
-</span><span id="1787" class="l"><a href="#1787">1787: </a>
-</span><span id="1788" class="l"><a href="#1788">1788: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
-</span><span id="1789" class="l"><a href="#1789">1789: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="1790" class="l"><a href="#1790">1790: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
+</span><span id="1753" class="l"><a href="#1753">1753: </a>    <span class="php-comment">/**
+</span></span><span id="1754" class="l"><a href="#1754">1754: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
+</span></span><span id="1755" class="l"><a href="#1755">1755: </a><span class="php-comment">     *
+</span></span><span id="1756" class="l"><a href="#1756">1756: </a><span class="php-comment">     * @access protected
+</span></span><span id="1757" class="l"><a href="#1757">1757: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1758" class="l"><a href="#1758">1758: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1759" class="l"><a href="#1759">1759: </a><span class="php-comment">     * @return bool
+</span></span><span id="1760" class="l"><a href="#1760">1760: </a><span class="php-comment">     */</span>
+</span><span id="1761" class="l"><a href="#1761">1761: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1762" class="l"><a href="#1762">1762: </a>    {
+</span><span id="1763" class="l"><a href="#1763">1763: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1764" class="l"><a href="#1764">1764: </a>        {
+</span><span id="1765" class="l"><a href="#1765">1765: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: Failure, empty username'</span>);
+</span><span id="1766" class="l"><a href="#1766">1766: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1767" class="l"><a href="#1767">1767: </a>        }
+</span><span id="1768" class="l"><a href="#1768">1768: </a>
+</span><span id="1769" class="l"><a href="#1769">1769: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
+</span><span id="1770" class="l"><a href="#1770">1770: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
+</span><span id="1771" class="l"><a href="#1771">1771: </a>
+</span><span id="1772" class="l"><a href="#1772">1772: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
+</span><span id="1773" class="l"><a href="#1773">1773: </a>        {
+</span><span id="1774" class="l"><a href="#1774">1774: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_class'</span>);
+</span><span id="1775" class="l"><a href="#1775">1775: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1776" class="l"><a href="#1776">1776: </a>        }
+</span><span id="1777" class="l"><a href="#1777">1777: </a>
+</span><span id="1778" class="l"><a href="#1778">1778: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
+</span><span id="1779" class="l"><a href="#1779">1779: </a>        {
+</span><span id="1780" class="l"><a href="#1780">1780: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_function'</span>);
+</span><span id="1781" class="l"><a href="#1781">1781: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1782" class="l"><a href="#1782">1782: </a>        }
+</span><span id="1783" class="l"><a href="#1783">1783: </a>
+</span><span id="1784" class="l"><a href="#1784">1784: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1785" class="l"><a href="#1785">1785: </a>        {
+</span><span id="1786" class="l"><a href="#1786">1786: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
+</span><span id="1787" class="l"><a href="#1787">1787: </a>        }
+</span><span id="1788" class="l"><a href="#1788">1788: </a>
+</span><span id="1789" class="l"><a href="#1789">1789: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1790" class="l"><a href="#1790">1790: </a>    }
 </span><span id="1791" class="l"><a href="#1791">1791: </a>
-</span><span id="1792" class="l"><a href="#1792">1792: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
-</span><span id="1793" class="l"><a href="#1793">1793: </a>        {
-</span><span id="1794" class="l"><a href="#1794">1794: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
-</span><span id="1795" class="l"><a href="#1795">1795: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>) . <span class="php-quote">':'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
-</span><span id="1796" class="l"><a href="#1796">1796: </a>        }
-</span><span id="1797" class="l"><a href="#1797">1797: </a>
-</span><span id="1798" class="l"><a href="#1798">1798: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1799" class="l"><a href="#1799">1799: </a>        {
-</span><span id="1800" class="l"><a href="#1800">1800: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1801" class="l"><a href="#1801">1801: </a>        }
-</span><span id="1802" class="l"><a href="#1802">1802: </a>
-</span><span id="1803" class="l"><a href="#1803">1803: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
-</span><span id="1804" class="l"><a href="#1804">1804: </a>        {
-</span><span id="1805" class="l"><a href="#1805">1805: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1792" class="l"><a href="#1792">1792: </a>    <span class="php-comment">/**
+</span></span><span id="1793" class="l"><a href="#1793">1793: </a><span class="php-comment">     * Check if the user is logged in
+</span></span><span id="1794" class="l"><a href="#1794">1794: </a><span class="php-comment">     *
+</span></span><span id="1795" class="l"><a href="#1795">1795: </a><span class="php-comment">     * @access protected
+</span></span><span id="1796" class="l"><a href="#1796">1796: </a><span class="php-comment">     * @param  string $username The user's name
+</span></span><span id="1797" class="l"><a href="#1797">1797: </a><span class="php-comment">     * @param  bool|string $password The user's password
+</span></span><span id="1798" class="l"><a href="#1798">1798: </a><span class="php-comment">     * @return bool
+</span></span><span id="1799" class="l"><a href="#1799">1799: </a><span class="php-comment">     */</span>
+</span><span id="1800" class="l"><a href="#1800">1800: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="1801" class="l"><a href="#1801">1801: </a>    {
+</span><span id="1802" class="l"><a href="#1802">1802: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1803" class="l"><a href="#1803">1803: </a>        {
+</span><span id="1804" class="l"><a href="#1804">1804: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1805" class="l"><a href="#1805">1805: </a>        }
 </span><span id="1806" class="l"><a href="#1806">1806: </a>
-</span><span id="1807" class="l"><a href="#1807">1807: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1808" class="l"><a href="#1808">1808: </a>        }
-</span><span id="1809" class="l"><a href="#1809">1809: </a>
-</span><span id="1810" class="l"><a href="#1810">1810: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
-</span><span id="1811" class="l"><a href="#1811">1811: </a>        {
-</span><span id="1812" class="l"><a href="#1812">1812: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
-</span><span id="1813" class="l"><a href="#1813">1813: </a>
-</span><span id="1814" class="l"><a href="#1814">1814: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1807" class="l"><a href="#1807">1807: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
+</span><span id="1808" class="l"><a href="#1808">1808: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="1809" class="l"><a href="#1809">1809: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
+</span><span id="1810" class="l"><a href="#1810">1810: </a>
+</span><span id="1811" class="l"><a href="#1811">1811: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
+</span><span id="1812" class="l"><a href="#1812">1812: </a>        {
+</span><span id="1813" class="l"><a href="#1813">1813: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
+</span><span id="1814" class="l"><a href="#1814">1814: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>) . <span class="php-quote">':'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
 </span><span id="1815" class="l"><a href="#1815">1815: </a>        }
 </span><span id="1816" class="l"><a href="#1816">1816: </a>
-</span><span id="1817" class="l"><a href="#1817">1817: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1817" class="l"><a href="#1817">1817: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
 </span><span id="1818" class="l"><a href="#1818">1818: </a>        {
 </span><span id="1819" class="l"><a href="#1819">1819: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
 </span><span id="1820" class="l"><a href="#1820">1820: </a>        }
 </span><span id="1821" class="l"><a href="#1821">1821: </a>
-</span><span id="1822" class="l"><a href="#1822">1822: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
+</span><span id="1822" class="l"><a href="#1822">1822: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
 </span><span id="1823" class="l"><a href="#1823">1823: </a>        {
-</span><span id="1824" class="l"><a href="#1824">1824: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1825" class="l"><a href="#1825">1825: </a>        }
-</span><span id="1826" class="l"><a href="#1826">1826: </a>
-</span><span id="1827" class="l"><a href="#1827">1827: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1828" class="l"><a href="#1828">1828: </a>    }
-</span><span id="1829" class="l"><a href="#1829">1829: </a>
-</span><span id="1830" class="l"><a href="#1830">1830: </a>    <span class="php-comment">/**
-</span></span><span id="1831" class="l"><a href="#1831">1831: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
-</span></span><span id="1832" class="l"><a href="#1832">1832: </a><span class="php-comment">     *
-</span></span><span id="1833" class="l"><a href="#1833">1833: </a><span class="php-comment">     * @access protected
-</span></span><span id="1834" class="l"><a href="#1834">1834: </a><span class="php-comment">     * @return void
-</span></span><span id="1835" class="l"><a href="#1835">1835: </a><span class="php-comment">     */</span>
-</span><span id="1836" class="l"><a href="#1836">1836: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
-</span><span id="1837" class="l"><a href="#1837">1837: </a>    {
-</span><span id="1838" class="l"><a href="#1838">1838: </a>        <span class="php-comment">// Get the auth_source config item</span>
-</span><span id="1839" class="l"><a href="#1839">1839: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
+</span><span id="1824" class="l"><a href="#1824">1824: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1825" class="l"><a href="#1825">1825: </a>
+</span><span id="1826" class="l"><a href="#1826">1826: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1827" class="l"><a href="#1827">1827: </a>        }
+</span><span id="1828" class="l"><a href="#1828">1828: </a>
+</span><span id="1829" class="l"><a href="#1829">1829: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
+</span><span id="1830" class="l"><a href="#1830">1830: </a>        {
+</span><span id="1831" class="l"><a href="#1831">1831: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1832" class="l"><a href="#1832">1832: </a>
+</span><span id="1833" class="l"><a href="#1833">1833: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1834" class="l"><a href="#1834">1834: </a>        }
+</span><span id="1835" class="l"><a href="#1835">1835: </a>
+</span><span id="1836" class="l"><a href="#1836">1836: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1837" class="l"><a href="#1837">1837: </a>        {
+</span><span id="1838" class="l"><a href="#1838">1838: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1839" class="l"><a href="#1839">1839: </a>        }
 </span><span id="1840" class="l"><a href="#1840">1840: </a>
-</span><span id="1841" class="l"><a href="#1841">1841: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
-</span><span id="1842" class="l"><a href="#1842">1842: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
-</span><span id="1843" class="l"><a href="#1843">1843: </a>        {
-</span><span id="1844" class="l"><a href="#1844">1844: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1845" class="l"><a href="#1845">1845: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1846" class="l"><a href="#1846">1846: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1847" class="l"><a href="#1847">1847: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not Authorized'</span>
-</span><span id="1848" class="l"><a href="#1848">1848: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="1849" class="l"><a href="#1849">1849: </a>        }
-</span><span id="1850" class="l"><a href="#1850">1850: </a>    }
-</span><span id="1851" class="l"><a href="#1851">1851: </a>
-</span><span id="1852" class="l"><a href="#1852">1852: </a>    <span class="php-comment">/**
-</span></span><span id="1853" class="l"><a href="#1853">1853: </a><span class="php-comment">     * Prepares for basic authentication
-</span></span><span id="1854" class="l"><a href="#1854">1854: </a><span class="php-comment">     *
-</span></span><span id="1855" class="l"><a href="#1855">1855: </a><span class="php-comment">     * @access protected
-</span></span><span id="1856" class="l"><a href="#1856">1856: </a><span class="php-comment">     * @return void
-</span></span><span id="1857" class="l"><a href="#1857">1857: </a><span class="php-comment">     */</span>
-</span><span id="1858" class="l"><a href="#1858">1858: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
-</span><span id="1859" class="l"><a href="#1859">1859: </a>    {
-</span><span id="1860" class="l"><a href="#1860">1860: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1861" class="l"><a href="#1861">1861: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1841" class="l"><a href="#1841">1841: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
+</span><span id="1842" class="l"><a href="#1842">1842: </a>        {
+</span><span id="1843" class="l"><a href="#1843">1843: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1844" class="l"><a href="#1844">1844: </a>        }
+</span><span id="1845" class="l"><a href="#1845">1845: </a>
+</span><span id="1846" class="l"><a href="#1846">1846: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1847" class="l"><a href="#1847">1847: </a>    }
+</span><span id="1848" class="l"><a href="#1848">1848: </a>
+</span><span id="1849" class="l"><a href="#1849">1849: </a>    <span class="php-comment">/**
+</span></span><span id="1850" class="l"><a href="#1850">1850: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
+</span></span><span id="1851" class="l"><a href="#1851">1851: </a><span class="php-comment">     *
+</span></span><span id="1852" class="l"><a href="#1852">1852: </a><span class="php-comment">     * @access protected
+</span></span><span id="1853" class="l"><a href="#1853">1853: </a><span class="php-comment">     * @return void
+</span></span><span id="1854" class="l"><a href="#1854">1854: </a><span class="php-comment">     */</span>
+</span><span id="1855" class="l"><a href="#1855">1855: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
+</span><span id="1856" class="l"><a href="#1856">1856: </a>    {
+</span><span id="1857" class="l"><a href="#1857">1857: </a>        <span class="php-comment">// Get the auth_source config item</span>
+</span><span id="1858" class="l"><a href="#1858">1858: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
+</span><span id="1859" class="l"><a href="#1859">1859: </a>
+</span><span id="1860" class="l"><a href="#1860">1860: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
+</span><span id="1861" class="l"><a href="#1861">1861: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
 </span><span id="1862" class="l"><a href="#1862">1862: </a>        {
-</span><span id="1863" class="l"><a href="#1863">1863: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1864" class="l"><a href="#1864">1864: </a>        }
-</span><span id="1865" class="l"><a href="#1865">1865: </a>
-</span><span id="1866" class="l"><a href="#1866">1866: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
-</span><span id="1867" class="l"><a href="#1867">1867: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
-</span><span id="1868" class="l"><a href="#1868">1868: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
-</span><span id="1869" class="l"><a href="#1869">1869: </a>
-</span><span id="1870" class="l"><a href="#1870">1870: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1871" class="l"><a href="#1871">1871: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1872" class="l"><a href="#1872">1872: </a>        {
-</span><span id="1873" class="l"><a href="#1873">1873: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
-</span><span id="1874" class="l"><a href="#1874">1874: </a>        }
-</span><span id="1875" class="l"><a href="#1875">1875: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1876" class="l"><a href="#1876">1876: </a>        {
-</span><span id="1877" class="l"><a href="#1877">1877: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
-</span><span id="1878" class="l"><a href="#1878">1878: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
-</span><span id="1879" class="l"><a href="#1879">1879: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
-</span><span id="1880" class="l"><a href="#1880">1880: </a>            {
-</span><span id="1881" class="l"><a href="#1881">1881: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
-</span><span id="1882" class="l"><a href="#1882">1882: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
-</span><span id="1883" class="l"><a href="#1883">1883: </a>            }
-</span><span id="1884" class="l"><a href="#1884">1884: </a>        }
-</span><span id="1885" class="l"><a href="#1885">1885: </a>
-</span><span id="1886" class="l"><a href="#1886">1886: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
-</span><span id="1887" class="l"><a href="#1887">1887: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1888" class="l"><a href="#1888">1888: </a>        {
-</span><span id="1889" class="l"><a href="#1889">1889: </a>            <span class="php-var">$this</span>-&gt;_force_login();
-</span><span id="1890" class="l"><a href="#1890">1890: </a>        }
-</span><span id="1891" class="l"><a href="#1891">1891: </a>    }
-</span><span id="1892" class="l"><a href="#1892">1892: </a>
-</span><span id="1893" class="l"><a href="#1893">1893: </a>    <span class="php-comment">/**
-</span></span><span id="1894" class="l"><a href="#1894">1894: </a><span class="php-comment">     * Prepares for digest authentication
-</span></span><span id="1895" class="l"><a href="#1895">1895: </a><span class="php-comment">     *
-</span></span><span id="1896" class="l"><a href="#1896">1896: </a><span class="php-comment">     * @access protected
-</span></span><span id="1897" class="l"><a href="#1897">1897: </a><span class="php-comment">     * @return void
-</span></span><span id="1898" class="l"><a href="#1898">1898: </a><span class="php-comment">     */</span>
-</span><span id="1899" class="l"><a href="#1899">1899: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
-</span><span id="1900" class="l"><a href="#1900">1900: </a>    {
-</span><span id="1901" class="l"><a href="#1901">1901: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1902" class="l"><a href="#1902">1902: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
-</span><span id="1903" class="l"><a href="#1903">1903: </a>        {
-</span><span id="1904" class="l"><a href="#1904">1904: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1905" class="l"><a href="#1905">1905: </a>        }
-</span><span id="1906" class="l"><a href="#1906">1906: </a>
-</span><span id="1907" class="l"><a href="#1907">1907: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
-</span><span id="1908" class="l"><a href="#1908">1908: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
-</span><span id="1909" class="l"><a href="#1909">1909: </a>        <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
-</span><span id="1910" class="l"><a href="#1910">1910: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$digest_string</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1911" class="l"><a href="#1911">1911: </a>        {
-</span><span id="1912" class="l"><a href="#1912">1912: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
-</span><span id="1913" class="l"><a href="#1913">1913: </a>        }
-</span><span id="1914" class="l"><a href="#1914">1914: </a>
-</span><span id="1915" class="l"><a href="#1915">1915: </a>        <span class="php-var">$unique_id</span> = <span class="php-keyword2">uniqid</span>();
-</span><span id="1916" class="l"><a href="#1916">1916: </a>
-</span><span id="1917" class="l"><a href="#1917">1917: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
-</span><span id="1918" class="l"><a href="#1918">1918: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
-</span><span id="1919" class="l"><a href="#1919">1919: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
-</span><span id="1920" class="l"><a href="#1920">1920: </a>        {
-</span><span id="1921" class="l"><a href="#1921">1921: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
-</span><span id="1922" class="l"><a href="#1922">1922: </a>        }
-</span><span id="1923" class="l"><a href="#1923">1923: </a>
-</span><span id="1924" class="l"><a href="#1924">1924: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
-</span><span id="1925" class="l"><a href="#1925">1925: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="1926" class="l"><a href="#1926">1926: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
-</span><span id="1927" class="l"><a href="#1927">1927: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
-</span><span id="1928" class="l"><a href="#1928">1928: </a>
-</span><span id="1929" class="l"><a href="#1929">1929: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config</span>
-</span><span id="1930" class="l"><a href="#1930">1930: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
-</span><span id="1931" class="l"><a href="#1931">1931: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$username</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1932" class="l"><a href="#1932">1932: </a>        {
-</span><span id="1933" class="l"><a href="#1933">1933: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
-</span><span id="1934" class="l"><a href="#1934">1934: </a>        }
+</span><span id="1863" class="l"><a href="#1863">1863: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1864" class="l"><a href="#1864">1864: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1865" class="l"><a href="#1865">1865: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1866" class="l"><a href="#1866">1866: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_unauthorized'</span>]
+</span><span id="1867" class="l"><a href="#1867">1867: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="1868" class="l"><a href="#1868">1868: </a>        }
+</span><span id="1869" class="l"><a href="#1869">1869: </a>    }
+</span><span id="1870" class="l"><a href="#1870">1870: </a>
+</span><span id="1871" class="l"><a href="#1871">1871: </a>    <span class="php-comment">/**
+</span></span><span id="1872" class="l"><a href="#1872">1872: </a><span class="php-comment">     * Prepares for basic authentication
+</span></span><span id="1873" class="l"><a href="#1873">1873: </a><span class="php-comment">     *
+</span></span><span id="1874" class="l"><a href="#1874">1874: </a><span class="php-comment">     * @access protected
+</span></span><span id="1875" class="l"><a href="#1875">1875: </a><span class="php-comment">     * @return void
+</span></span><span id="1876" class="l"><a href="#1876">1876: </a><span class="php-comment">     */</span>
+</span><span id="1877" class="l"><a href="#1877">1877: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
+</span><span id="1878" class="l"><a href="#1878">1878: </a>    {
+</span><span id="1879" class="l"><a href="#1879">1879: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1880" class="l"><a href="#1880">1880: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1881" class="l"><a href="#1881">1881: </a>        {
+</span><span id="1882" class="l"><a href="#1882">1882: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1883" class="l"><a href="#1883">1883: </a>        }
+</span><span id="1884" class="l"><a href="#1884">1884: </a>
+</span><span id="1885" class="l"><a href="#1885">1885: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
+</span><span id="1886" class="l"><a href="#1886">1886: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
+</span><span id="1887" class="l"><a href="#1887">1887: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
+</span><span id="1888" class="l"><a href="#1888">1888: </a>
+</span><span id="1889" class="l"><a href="#1889">1889: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1890" class="l"><a href="#1890">1890: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1891" class="l"><a href="#1891">1891: </a>        {
+</span><span id="1892" class="l"><a href="#1892">1892: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
+</span><span id="1893" class="l"><a href="#1893">1893: </a>        }
+</span><span id="1894" class="l"><a href="#1894">1894: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1895" class="l"><a href="#1895">1895: </a>        {
+</span><span id="1896" class="l"><a href="#1896">1896: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
+</span><span id="1897" class="l"><a href="#1897">1897: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
+</span><span id="1898" class="l"><a href="#1898">1898: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
+</span><span id="1899" class="l"><a href="#1899">1899: </a>            {
+</span><span id="1900" class="l"><a href="#1900">1900: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
+</span><span id="1901" class="l"><a href="#1901">1901: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
+</span><span id="1902" class="l"><a href="#1902">1902: </a>            }
+</span><span id="1903" class="l"><a href="#1903">1903: </a>        }
+</span><span id="1904" class="l"><a href="#1904">1904: </a>
+</span><span id="1905" class="l"><a href="#1905">1905: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
+</span><span id="1906" class="l"><a href="#1906">1906: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1907" class="l"><a href="#1907">1907: </a>        {
+</span><span id="1908" class="l"><a href="#1908">1908: </a>            <span class="php-var">$this</span>-&gt;_force_login();
+</span><span id="1909" class="l"><a href="#1909">1909: </a>        }
+</span><span id="1910" class="l"><a href="#1910">1910: </a>    }
+</span><span id="1911" class="l"><a href="#1911">1911: </a>
+</span><span id="1912" class="l"><a href="#1912">1912: </a>    <span class="php-comment">/**
+</span></span><span id="1913" class="l"><a href="#1913">1913: </a><span class="php-comment">     * Prepares for digest authentication
+</span></span><span id="1914" class="l"><a href="#1914">1914: </a><span class="php-comment">     *
+</span></span><span id="1915" class="l"><a href="#1915">1915: </a><span class="php-comment">     * @access protected
+</span></span><span id="1916" class="l"><a href="#1916">1916: </a><span class="php-comment">     * @return void
+</span></span><span id="1917" class="l"><a href="#1917">1917: </a><span class="php-comment">     */</span>
+</span><span id="1918" class="l"><a href="#1918">1918: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
+</span><span id="1919" class="l"><a href="#1919">1919: </a>    {
+</span><span id="1920" class="l"><a href="#1920">1920: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1921" class="l"><a href="#1921">1921: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1922" class="l"><a href="#1922">1922: </a>        {
+</span><span id="1923" class="l"><a href="#1923">1923: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1924" class="l"><a href="#1924">1924: </a>        }
+</span><span id="1925" class="l"><a href="#1925">1925: </a>
+</span><span id="1926" class="l"><a href="#1926">1926: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
+</span><span id="1927" class="l"><a href="#1927">1927: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
+</span><span id="1928" class="l"><a href="#1928">1928: </a>        <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
+</span><span id="1929" class="l"><a href="#1929">1929: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$digest_string</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1930" class="l"><a href="#1930">1930: </a>        {
+</span><span id="1931" class="l"><a href="#1931">1931: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
+</span><span id="1932" class="l"><a href="#1932">1932: </a>        }
+</span><span id="1933" class="l"><a href="#1933">1933: </a>
+</span><span id="1934" class="l"><a href="#1934">1934: </a>        <span class="php-var">$unique_id</span> = <span class="php-keyword2">uniqid</span>();
 </span><span id="1935" class="l"><a href="#1935">1935: </a>
-</span><span id="1936" class="l"><a href="#1936">1936: </a>        <span class="php-var">$md5</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method) . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
-</span><span id="1937" class="l"><a href="#1937">1937: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$md5</span>);
-</span><span id="1938" class="l"><a href="#1938">1938: </a>
-</span><span id="1939" class="l"><a href="#1939">1939: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
-</span><span id="1940" class="l"><a href="#1940">1940: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
-</span><span id="1941" class="l"><a href="#1941">1941: </a>        {
-</span><span id="1942" class="l"><a href="#1942">1942: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1943" class="l"><a href="#1943">1943: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1944" class="l"><a href="#1944">1944: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-num">0</span>,
-</span><span id="1945" class="l"><a href="#1945">1945: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Invalid credentials'</span>
-</span><span id="1946" class="l"><a href="#1946">1946: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="1947" class="l"><a href="#1947">1947: </a>        }
-</span><span id="1948" class="l"><a href="#1948">1948: </a>    }
-</span><span id="1949" class="l"><a href="#1949">1949: </a>
-</span><span id="1950" class="l"><a href="#1950">1950: </a>    <span class="php-comment">/**
-</span></span><span id="1951" class="l"><a href="#1951">1951: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
-</span></span><span id="1952" class="l"><a href="#1952">1952: </a><span class="php-comment">     *
-</span></span><span id="1953" class="l"><a href="#1953">1953: </a><span class="php-comment">     * @access protected
-</span></span><span id="1954" class="l"><a href="#1954">1954: </a><span class="php-comment">     * @return void
-</span></span><span id="1955" class="l"><a href="#1955">1955: </a><span class="php-comment">     */</span>
-</span><span id="1956" class="l"><a href="#1956">1956: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
-</span><span id="1957" class="l"><a href="#1957">1957: </a>    {
-</span><span id="1958" class="l"><a href="#1958">1958: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
-</span><span id="1959" class="l"><a href="#1959">1959: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
-</span><span id="1960" class="l"><a href="#1960">1960: </a>
-</span><span id="1961" class="l"><a href="#1961">1961: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
-</span><span id="1962" class="l"><a href="#1962">1962: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
-</span><span id="1963" class="l"><a href="#1963">1963: </a>        {
-</span><span id="1964" class="l"><a href="#1964">1964: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1965" class="l"><a href="#1965">1965: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1966" class="l"><a href="#1966">1966: </a>                    <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1967" class="l"><a href="#1967">1967: </a>                    <span class="php-quote">'error'</span> =&gt; <span class="php-quote">'IP Denied'</span>
-</span><span id="1968" class="l"><a href="#1968">1968: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="1969" class="l"><a href="#1969">1969: </a>        }
-</span><span id="1970" class="l"><a href="#1970">1970: </a>    }
-</span><span id="1971" class="l"><a href="#1971">1971: </a>
-</span><span id="1972" class="l"><a href="#1972">1972: </a>    <span class="php-comment">/**
-</span></span><span id="1973" class="l"><a href="#1973">1973: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
-</span></span><span id="1974" class="l"><a href="#1974">1974: </a><span class="php-comment">     *
-</span></span><span id="1975" class="l"><a href="#1975">1975: </a><span class="php-comment">     * @access protected
-</span></span><span id="1976" class="l"><a href="#1976">1976: </a><span class="php-comment">     * @return void
-</span></span><span id="1977" class="l"><a href="#1977">1977: </a><span class="php-comment">     */</span>
-</span><span id="1978" class="l"><a href="#1978">1978: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
-</span><span id="1979" class="l"><a href="#1979">1979: </a>    {
-</span><span id="1980" class="l"><a href="#1980">1980: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
-</span><span id="1981" class="l"><a href="#1981">1981: </a>
-</span><span id="1982" class="l"><a href="#1982">1982: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
-</span><span id="1983" class="l"><a href="#1983">1983: </a>
-</span><span id="1984" class="l"><a href="#1984">1984: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$ip</span>)
-</span><span id="1985" class="l"><a href="#1985">1985: </a>        {
-</span><span id="1986" class="l"><a href="#1986">1986: </a>            <span class="php-comment">// As $ip is a reference, trim leading and trailing whitespace, then store the new value</span>
-</span><span id="1987" class="l"><a href="#1987">1987: </a>            <span class="php-comment">// using the reference</span>
-</span><span id="1988" class="l"><a href="#1988">1988: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
-</span><span id="1989" class="l"><a href="#1989">1989: </a>        }
+</span><span id="1936" class="l"><a href="#1936">1936: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
+</span><span id="1937" class="l"><a href="#1937">1937: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
+</span><span id="1938" class="l"><a href="#1938">1938: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
+</span><span id="1939" class="l"><a href="#1939">1939: </a>        {
+</span><span id="1940" class="l"><a href="#1940">1940: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
+</span><span id="1941" class="l"><a href="#1941">1941: </a>        }
+</span><span id="1942" class="l"><a href="#1942">1942: </a>
+</span><span id="1943" class="l"><a href="#1943">1943: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
+</span><span id="1944" class="l"><a href="#1944">1944: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="1945" class="l"><a href="#1945">1945: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
+</span><span id="1946" class="l"><a href="#1946">1946: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
+</span><span id="1947" class="l"><a href="#1947">1947: </a>
+</span><span id="1948" class="l"><a href="#1948">1948: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config</span>
+</span><span id="1949" class="l"><a href="#1949">1949: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
+</span><span id="1950" class="l"><a href="#1950">1950: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$username</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1951" class="l"><a href="#1951">1951: </a>        {
+</span><span id="1952" class="l"><a href="#1952">1952: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
+</span><span id="1953" class="l"><a href="#1953">1953: </a>        }
+</span><span id="1954" class="l"><a href="#1954">1954: </a>
+</span><span id="1955" class="l"><a href="#1955">1955: </a>        <span class="php-var">$md5</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method) . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
+</span><span id="1956" class="l"><a href="#1956">1956: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$md5</span>);
+</span><span id="1957" class="l"><a href="#1957">1957: </a>
+</span><span id="1958" class="l"><a href="#1958">1958: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
+</span><span id="1959" class="l"><a href="#1959">1959: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
+</span><span id="1960" class="l"><a href="#1960">1960: </a>        {
+</span><span id="1961" class="l"><a href="#1961">1961: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1962" class="l"><a href="#1962">1962: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1963" class="l"><a href="#1963">1963: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1964" class="l"><a href="#1964">1964: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_invalid_credentials'</span>]
+</span><span id="1965" class="l"><a href="#1965">1965: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="1966" class="l"><a href="#1966">1966: </a>        }
+</span><span id="1967" class="l"><a href="#1967">1967: </a>    }
+</span><span id="1968" class="l"><a href="#1968">1968: </a>
+</span><span id="1969" class="l"><a href="#1969">1969: </a>    <span class="php-comment">/**
+</span></span><span id="1970" class="l"><a href="#1970">1970: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
+</span></span><span id="1971" class="l"><a href="#1971">1971: </a><span class="php-comment">     *
+</span></span><span id="1972" class="l"><a href="#1972">1972: </a><span class="php-comment">     * @access protected
+</span></span><span id="1973" class="l"><a href="#1973">1973: </a><span class="php-comment">     * @return void
+</span></span><span id="1974" class="l"><a href="#1974">1974: </a><span class="php-comment">     */</span>
+</span><span id="1975" class="l"><a href="#1975">1975: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
+</span><span id="1976" class="l"><a href="#1976">1976: </a>    {
+</span><span id="1977" class="l"><a href="#1977">1977: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
+</span><span id="1978" class="l"><a href="#1978">1978: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
+</span><span id="1979" class="l"><a href="#1979">1979: </a>
+</span><span id="1980" class="l"><a href="#1980">1980: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
+</span><span id="1981" class="l"><a href="#1981">1981: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
+</span><span id="1982" class="l"><a href="#1982">1982: </a>        {
+</span><span id="1983" class="l"><a href="#1983">1983: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1984" class="l"><a href="#1984">1984: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1985" class="l"><a href="#1985">1985: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1986" class="l"><a href="#1986">1986: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_ip_denied'</span>]
+</span><span id="1987" class="l"><a href="#1987">1987: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="1988" class="l"><a href="#1988">1988: </a>        }
+</span><span id="1989" class="l"><a href="#1989">1989: </a>    }
 </span><span id="1990" class="l"><a href="#1990">1990: </a>
-</span><span id="1991" class="l"><a href="#1991">1991: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1992" class="l"><a href="#1992">1992: </a>        {
-</span><span id="1993" class="l"><a href="#1993">1993: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1994" class="l"><a href="#1994">1994: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1995" class="l"><a href="#1995">1995: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'IP not authorized'</span>
-</span><span id="1996" class="l"><a href="#1996">1996: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="1997" class="l"><a href="#1997">1997: </a>        }
-</span><span id="1998" class="l"><a href="#1998">1998: </a>    }
-</span><span id="1999" class="l"><a href="#1999">1999: </a>
-</span><span id="2000" class="l"><a href="#2000">2000: </a>    <span class="php-comment">/**
-</span></span><span id="2001" class="l"><a href="#2001">2001: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
-</span></span><span id="2002" class="l"><a href="#2002">2002: </a><span class="php-comment">     *
-</span></span><span id="2003" class="l"><a href="#2003">2003: </a><span class="php-comment">     * @access protected
-</span></span><span id="2004" class="l"><a href="#2004">2004: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
-</span></span><span id="2005" class="l"><a href="#2005">2005: </a><span class="php-comment">     * each time
-</span></span><span id="2006" class="l"><a href="#2006">2006: </a><span class="php-comment">     * @return void
-</span></span><span id="2007" class="l"><a href="#2007">2007: </a><span class="php-comment">     */</span>
-</span><span id="2008" class="l"><a href="#2008">2008: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
-</span><span id="2009" class="l"><a href="#2009">2009: </a>    {
-</span><span id="2010" class="l"><a href="#2010">2010: </a>        <span class="php-var">$rest_auth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
-</span><span id="2011" class="l"><a href="#2011">2011: </a>        <span class="php-var">$rest_realm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
-</span><span id="2012" class="l"><a href="#2012">2012: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'basic'</span>)
-</span><span id="2013" class="l"><a href="#2013">2013: </a>        {
-</span><span id="2014" class="l"><a href="#2014">2014: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
-</span><span id="2015" class="l"><a href="#2015">2015: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span> . <span class="php-var">$rest_realm</span> . <span class="php-quote">'&quot;'</span>);
+</span><span id="1991" class="l"><a href="#1991">1991: </a>    <span class="php-comment">/**
+</span></span><span id="1992" class="l"><a href="#1992">1992: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
+</span></span><span id="1993" class="l"><a href="#1993">1993: </a><span class="php-comment">     *
+</span></span><span id="1994" class="l"><a href="#1994">1994: </a><span class="php-comment">     * @access protected
+</span></span><span id="1995" class="l"><a href="#1995">1995: </a><span class="php-comment">     * @return void
+</span></span><span id="1996" class="l"><a href="#1996">1996: </a><span class="php-comment">     */</span>
+</span><span id="1997" class="l"><a href="#1997">1997: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
+</span><span id="1998" class="l"><a href="#1998">1998: </a>    {
+</span><span id="1999" class="l"><a href="#1999">1999: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
+</span><span id="2000" class="l"><a href="#2000">2000: </a>
+</span><span id="2001" class="l"><a href="#2001">2001: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
+</span><span id="2002" class="l"><a href="#2002">2002: </a>
+</span><span id="2003" class="l"><a href="#2003">2003: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$ip</span>)
+</span><span id="2004" class="l"><a href="#2004">2004: </a>        {
+</span><span id="2005" class="l"><a href="#2005">2005: </a>            <span class="php-comment">// As $ip is a reference, trim leading and trailing whitespace, then store the new value</span>
+</span><span id="2006" class="l"><a href="#2006">2006: </a>            <span class="php-comment">// using the reference</span>
+</span><span id="2007" class="l"><a href="#2007">2007: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
+</span><span id="2008" class="l"><a href="#2008">2008: </a>        }
+</span><span id="2009" class="l"><a href="#2009">2009: </a>
+</span><span id="2010" class="l"><a href="#2010">2010: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="2011" class="l"><a href="#2011">2011: </a>        {
+</span><span id="2012" class="l"><a href="#2012">2012: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="2013" class="l"><a href="#2013">2013: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="2014" class="l"><a href="#2014">2014: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_ip_unauthorized'</span>]
+</span><span id="2015" class="l"><a href="#2015">2015: </a>                ], self::HTTP_UNAUTHORIZED);
 </span><span id="2016" class="l"><a href="#2016">2016: </a>        }
-</span><span id="2017" class="l"><a href="#2017">2017: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'digest'</span>)
-</span><span id="2018" class="l"><a href="#2018">2018: </a>        {
-</span><span id="2019" class="l"><a href="#2019">2019: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
-</span><span id="2020" class="l"><a href="#2020">2020: </a>            <span class="php-keyword2">header</span>(
-</span><span id="2021" class="l"><a href="#2021">2021: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span> . <span class="php-var">$rest_realm</span>
-</span><span id="2022" class="l"><a href="#2022">2022: </a>                . <span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span> . <span class="php-var">$nonce</span>
-</span><span id="2023" class="l"><a href="#2023">2023: </a>                . <span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$rest_realm</span>) . <span class="php-quote">'&quot;'</span>);
-</span><span id="2024" class="l"><a href="#2024">2024: </a>        }
-</span><span id="2025" class="l"><a href="#2025">2025: </a>
-</span><span id="2026" class="l"><a href="#2026">2026: </a>        <span class="php-comment">// Display an error response</span>
-</span><span id="2027" class="l"><a href="#2027">2027: </a>        <span class="php-var">$this</span>-&gt;response([
-</span><span id="2028" class="l"><a href="#2028">2028: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="2029" class="l"><a href="#2029">2029: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-quote">'Not authorized'</span>
-</span><span id="2030" class="l"><a href="#2030">2030: </a>            ], self::HTTP_UNAUTHORIZED);
-</span><span id="2031" class="l"><a href="#2031">2031: </a>    }
-</span><span id="2032" class="l"><a href="#2032">2032: </a>
-</span><span id="2033" class="l"><a href="#2033">2033: </a>    <span class="php-comment">/**
-</span></span><span id="2034" class="l"><a href="#2034">2034: </a><span class="php-comment">     * Updates the log table with the total access time
-</span></span><span id="2035" class="l"><a href="#2035">2035: </a><span class="php-comment">     *
-</span></span><span id="2036" class="l"><a href="#2036">2036: </a><span class="php-comment">     * @access protected
-</span></span><span id="2037" class="l"><a href="#2037">2037: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="2038" class="l"><a href="#2038">2038: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="2039" class="l"><a href="#2039">2039: </a><span class="php-comment">     */</span>
-</span><span id="2040" class="l"><a href="#2040">2040: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
-</span><span id="2041" class="l"><a href="#2041">2041: </a>    {
-</span><span id="2042" class="l"><a href="#2042">2042: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
-</span><span id="2043" class="l"><a href="#2043">2043: </a>
-</span><span id="2044" class="l"><a href="#2044">2044: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
-</span><span id="2045" class="l"><a href="#2045">2045: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="2046" class="l"><a href="#2046">2046: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="2047" class="l"><a href="#2047">2047: </a>            ]);
-</span><span id="2048" class="l"><a href="#2048">2048: </a>    }
-</span><span id="2049" class="l"><a href="#2049">2049: </a>
-</span><span id="2050" class="l"><a href="#2050">2050: </a>    <span class="php-comment">/**
-</span></span><span id="2051" class="l"><a href="#2051">2051: </a><span class="php-comment">     * Updates the log table with HTTP response code
-</span></span><span id="2052" class="l"><a href="#2052">2052: </a><span class="php-comment">     *
-</span></span><span id="2053" class="l"><a href="#2053">2053: </a><span class="php-comment">     * @access protected
-</span></span><span id="2054" class="l"><a href="#2054">2054: </a><span class="php-comment">     * @author Justin Chen
-</span></span><span id="2055" class="l"><a href="#2055">2055: </a><span class="php-comment">     * @param $http_code int HTTP status code
-</span></span><span id="2056" class="l"><a href="#2056">2056: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="2057" class="l"><a href="#2057">2057: </a><span class="php-comment">     */</span>
-</span><span id="2058" class="l"><a href="#2058">2058: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
-</span><span id="2059" class="l"><a href="#2059">2059: </a>    {
-</span><span id="2060" class="l"><a href="#2060">2060: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
-</span><span id="2061" class="l"><a href="#2061">2061: </a>
-</span><span id="2062" class="l"><a href="#2062">2062: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
-</span><span id="2063" class="l"><a href="#2063">2063: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="2064" class="l"><a href="#2064">2064: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="2065" class="l"><a href="#2065">2065: </a>        ]);
-</span><span id="2066" class="l"><a href="#2066">2066: </a>    }
-</span><span id="2067" class="l"><a href="#2067">2067: </a>
-</span><span id="2068" class="l"><a href="#2068">2068: </a>    <span class="php-comment">/**
-</span></span><span id="2069" class="l"><a href="#2069">2069: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
-</span></span><span id="2070" class="l"><a href="#2070">2070: </a><span class="php-comment">     *
-</span></span><span id="2071" class="l"><a href="#2071">2071: </a><span class="php-comment">     * @access protected
-</span></span><span id="2072" class="l"><a href="#2072">2072: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
-</span></span><span id="2073" class="l"><a href="#2073">2073: </a><span class="php-comment">     */</span>
-</span><span id="2074" class="l"><a href="#2074">2074: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
-</span><span id="2075" class="l"><a href="#2075">2075: </a>    {
-</span><span id="2076" class="l"><a href="#2076">2076: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
-</span><span id="2077" class="l"><a href="#2077">2077: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="2078" class="l"><a href="#2078">2078: </a>        {
-</span><span id="2079" class="l"><a href="#2079">2079: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="2080" class="l"><a href="#2080">2080: </a>        }
-</span><span id="2081" class="l"><a href="#2081">2081: </a>
-</span><span id="2082" class="l"><a href="#2082">2082: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
-</span><span id="2083" class="l"><a href="#2083">2083: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
-</span><span id="2084" class="l"><a href="#2084">2084: </a>            <span class="php-quote">'/'</span>, [
-</span><span id="2085" class="l"><a href="#2085">2085: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
-</span><span id="2086" class="l"><a href="#2086">2086: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
-</span><span id="2087" class="l"><a href="#2087">2087: </a>        ]);
-</span><span id="2088" class="l"><a href="#2088">2088: </a>
-</span><span id="2089" class="l"><a href="#2089">2089: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
-</span><span id="2090" class="l"><a href="#2090">2090: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
-</span><span id="2091" class="l"><a href="#2091">2091: </a>
-</span><span id="2092" class="l"><a href="#2092">2092: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
-</span><span id="2093" class="l"><a href="#2093">2093: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="2094" class="l"><a href="#2094">2094: </a>            -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="2095" class="l"><a href="#2095">2095: </a>            -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
-</span><span id="2096" class="l"><a href="#2096">2096: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
-</span><span id="2097" class="l"><a href="#2097">2097: </a>            -&gt;num_rows() &gt; <span class="php-num">0</span>;
-</span><span id="2098" class="l"><a href="#2098">2098: </a>    }
-</span><span id="2099" class="l"><a href="#2099">2099: </a>
-</span><span id="2100" class="l"><a href="#2100">2100: </a>}
-</span><span id="2101" class="l"><a href="#2101">2101: </a></span></code></pre>
+</span><span id="2017" class="l"><a href="#2017">2017: </a>    }
+</span><span id="2018" class="l"><a href="#2018">2018: </a>
+</span><span id="2019" class="l"><a href="#2019">2019: </a>    <span class="php-comment">/**
+</span></span><span id="2020" class="l"><a href="#2020">2020: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
+</span></span><span id="2021" class="l"><a href="#2021">2021: </a><span class="php-comment">     *
+</span></span><span id="2022" class="l"><a href="#2022">2022: </a><span class="php-comment">     * @access protected
+</span></span><span id="2023" class="l"><a href="#2023">2023: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
+</span></span><span id="2024" class="l"><a href="#2024">2024: </a><span class="php-comment">     * each time
+</span></span><span id="2025" class="l"><a href="#2025">2025: </a><span class="php-comment">     * @return void
+</span></span><span id="2026" class="l"><a href="#2026">2026: </a><span class="php-comment">     */</span>
+</span><span id="2027" class="l"><a href="#2027">2027: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
+</span><span id="2028" class="l"><a href="#2028">2028: </a>    {
+</span><span id="2029" class="l"><a href="#2029">2029: </a>        <span class="php-var">$rest_auth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
+</span><span id="2030" class="l"><a href="#2030">2030: </a>        <span class="php-var">$rest_realm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
+</span><span id="2031" class="l"><a href="#2031">2031: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'basic'</span>)
+</span><span id="2032" class="l"><a href="#2032">2032: </a>        {
+</span><span id="2033" class="l"><a href="#2033">2033: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
+</span><span id="2034" class="l"><a href="#2034">2034: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span> . <span class="php-var">$rest_realm</span> . <span class="php-quote">'&quot;'</span>);
+</span><span id="2035" class="l"><a href="#2035">2035: </a>        }
+</span><span id="2036" class="l"><a href="#2036">2036: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'digest'</span>)
+</span><span id="2037" class="l"><a href="#2037">2037: </a>        {
+</span><span id="2038" class="l"><a href="#2038">2038: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
+</span><span id="2039" class="l"><a href="#2039">2039: </a>            <span class="php-keyword2">header</span>(
+</span><span id="2040" class="l"><a href="#2040">2040: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span> . <span class="php-var">$rest_realm</span>
+</span><span id="2041" class="l"><a href="#2041">2041: </a>                . <span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span> . <span class="php-var">$nonce</span>
+</span><span id="2042" class="l"><a href="#2042">2042: </a>                . <span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$rest_realm</span>) . <span class="php-quote">'&quot;'</span>);
+</span><span id="2043" class="l"><a href="#2043">2043: </a>        }
+</span><span id="2044" class="l"><a href="#2044">2044: </a>
+</span><span id="2045" class="l"><a href="#2045">2045: </a>        <span class="php-comment">// Display an error response</span>
+</span><span id="2046" class="l"><a href="#2046">2046: </a>        <span class="php-var">$this</span>-&gt;response([
+</span><span id="2047" class="l"><a href="#2047">2047: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="2048" class="l"><a href="#2048">2048: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_unauthorized'</span>]
+</span><span id="2049" class="l"><a href="#2049">2049: </a>            ], self::HTTP_UNAUTHORIZED);
+</span><span id="2050" class="l"><a href="#2050">2050: </a>    }
+</span><span id="2051" class="l"><a href="#2051">2051: </a>
+</span><span id="2052" class="l"><a href="#2052">2052: </a>    <span class="php-comment">/**
+</span></span><span id="2053" class="l"><a href="#2053">2053: </a><span class="php-comment">     * Updates the log table with the total access time
+</span></span><span id="2054" class="l"><a href="#2054">2054: </a><span class="php-comment">     *
+</span></span><span id="2055" class="l"><a href="#2055">2055: </a><span class="php-comment">     * @access protected
+</span></span><span id="2056" class="l"><a href="#2056">2056: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="2057" class="l"><a href="#2057">2057: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="2058" class="l"><a href="#2058">2058: </a><span class="php-comment">     */</span>
+</span><span id="2059" class="l"><a href="#2059">2059: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
+</span><span id="2060" class="l"><a href="#2060">2060: </a>    {
+</span><span id="2061" class="l"><a href="#2061">2061: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
+</span><span id="2062" class="l"><a href="#2062">2062: </a>
+</span><span id="2063" class="l"><a href="#2063">2063: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
+</span><span id="2064" class="l"><a href="#2064">2064: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="2065" class="l"><a href="#2065">2065: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="2066" class="l"><a href="#2066">2066: </a>            ]);
+</span><span id="2067" class="l"><a href="#2067">2067: </a>    }
+</span><span id="2068" class="l"><a href="#2068">2068: </a>
+</span><span id="2069" class="l"><a href="#2069">2069: </a>    <span class="php-comment">/**
+</span></span><span id="2070" class="l"><a href="#2070">2070: </a><span class="php-comment">     * Updates the log table with HTTP response code
+</span></span><span id="2071" class="l"><a href="#2071">2071: </a><span class="php-comment">     *
+</span></span><span id="2072" class="l"><a href="#2072">2072: </a><span class="php-comment">     * @access protected
+</span></span><span id="2073" class="l"><a href="#2073">2073: </a><span class="php-comment">     * @author Justin Chen
+</span></span><span id="2074" class="l"><a href="#2074">2074: </a><span class="php-comment">     * @param $http_code int HTTP status code
+</span></span><span id="2075" class="l"><a href="#2075">2075: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="2076" class="l"><a href="#2076">2076: </a><span class="php-comment">     */</span>
+</span><span id="2077" class="l"><a href="#2077">2077: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
+</span><span id="2078" class="l"><a href="#2078">2078: </a>    {
+</span><span id="2079" class="l"><a href="#2079">2079: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
+</span><span id="2080" class="l"><a href="#2080">2080: </a>
+</span><span id="2081" class="l"><a href="#2081">2081: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
+</span><span id="2082" class="l"><a href="#2082">2082: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="2083" class="l"><a href="#2083">2083: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="2084" class="l"><a href="#2084">2084: </a>        ]);
+</span><span id="2085" class="l"><a href="#2085">2085: </a>    }
+</span><span id="2086" class="l"><a href="#2086">2086: </a>
+</span><span id="2087" class="l"><a href="#2087">2087: </a>    <span class="php-comment">/**
+</span></span><span id="2088" class="l"><a href="#2088">2088: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
+</span></span><span id="2089" class="l"><a href="#2089">2089: </a><span class="php-comment">     *
+</span></span><span id="2090" class="l"><a href="#2090">2090: </a><span class="php-comment">     * @access protected
+</span></span><span id="2091" class="l"><a href="#2091">2091: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
+</span></span><span id="2092" class="l"><a href="#2092">2092: </a><span class="php-comment">     */</span>
+</span><span id="2093" class="l"><a href="#2093">2093: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
+</span><span id="2094" class="l"><a href="#2094">2094: </a>    {
+</span><span id="2095" class="l"><a href="#2095">2095: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
+</span><span id="2096" class="l"><a href="#2096">2096: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="2097" class="l"><a href="#2097">2097: </a>        {
+</span><span id="2098" class="l"><a href="#2098">2098: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="2099" class="l"><a href="#2099">2099: </a>        }
+</span><span id="2100" class="l"><a href="#2100">2100: </a>
+</span><span id="2101" class="l"><a href="#2101">2101: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
+</span><span id="2102" class="l"><a href="#2102">2102: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
+</span><span id="2103" class="l"><a href="#2103">2103: </a>            <span class="php-quote">'/'</span>, [
+</span><span id="2104" class="l"><a href="#2104">2104: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
+</span><span id="2105" class="l"><a href="#2105">2105: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
+</span><span id="2106" class="l"><a href="#2106">2106: </a>        ]);
+</span><span id="2107" class="l"><a href="#2107">2107: </a>
+</span><span id="2108" class="l"><a href="#2108">2108: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
+</span><span id="2109" class="l"><a href="#2109">2109: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
+</span><span id="2110" class="l"><a href="#2110">2110: </a>
+</span><span id="2111" class="l"><a href="#2111">2111: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
+</span><span id="2112" class="l"><a href="#2112">2112: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="2113" class="l"><a href="#2113">2113: </a>            -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="2114" class="l"><a href="#2114">2114: </a>            -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
+</span><span id="2115" class="l"><a href="#2115">2115: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
+</span><span id="2116" class="l"><a href="#2116">2116: </a>            -&gt;num_rows() &gt; <span class="php-num">0</span>;
+</span><span id="2117" class="l"><a href="#2117">2117: </a>    }
+</span><span id="2118" class="l"><a href="#2118">2118: </a>
+</span><span id="2119" class="l"><a href="#2119">2119: </a>}
+</span><span id="2120" class="l"><a href="#2120">2120: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
 <script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Rest_server.html b/documentation/source-class-Rest_server.html
index ab5c4b5d..4a18ebd3 100644
--- a/documentation/source-class-Rest_server.html
+++ b/documentation/source-class-Rest_server.html
@@ -93,25 +93,26 @@ <h3>Classes</h3>
 	</div>
 
 <pre><code><span id="1" class="l"><a href="#1"> 1: </a><span class="xlang">&lt;?php</span>
-</span><span id="2" class="l"><a href="#2"> 2: </a><span class="php-keyword2">defined</span>(<span class="php-quote">'BASEPATH'</span>) <span class="php-keyword1">OR</span> <span class="php-keyword1">exit</span>(<span class="php-quote">'No direct script access allowed'</span>);
-</span><span id="3" class="l"><a href="#3"> 3: </a>
-</span><span id="4" class="l"><a href="#4"> 4: </a><span class="php-keyword1">class</span> Rest_server <span class="php-keyword1">extends</span> CI_Controller {
-</span><span id="5" class="l"><a href="#5"> 5: </a>
-</span><span id="6" class="l"><a href="#6"> 6: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> index()
-</span><span id="7" class="l"><a href="#7"> 7: </a>    {
-</span><span id="8" class="l"><a href="#8"> 8: </a>        <span class="php-var">$this</span>-&gt;load-&gt;helper(<span class="php-quote">'url'</span>);
-</span><span id="9" class="l"><a href="#9"> 9: </a>
-</span><span id="10" class="l"><a href="#10">10: </a>        <span class="php-var">$this</span>-&gt;load-&gt;view(<span class="php-quote">'rest_server'</span>);
-</span><span id="11" class="l"><a href="#11">11: </a>    }
-</span><span id="12" class="l"><a href="#12">12: </a>}
-</span><span id="13" class="l"><a href="#13">13: </a></span></code></pre>
+</span><span id="2" class="l"><a href="#2"> 2: </a>
+</span><span id="3" class="l"><a href="#3"> 3: </a><span class="php-keyword2">defined</span>(<span class="php-quote">'BASEPATH'</span>) <span class="php-keyword1">OR</span> <span class="php-keyword1">exit</span>(<span class="php-quote">'No direct script access allowed'</span>);
+</span><span id="4" class="l"><a href="#4"> 4: </a>
+</span><span id="5" class="l"><a href="#5"> 5: </a><span class="php-keyword1">class</span> Rest_server <span class="php-keyword1">extends</span> CI_Controller {
+</span><span id="6" class="l"><a href="#6"> 6: </a>
+</span><span id="7" class="l"><a href="#7"> 7: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> index()
+</span><span id="8" class="l"><a href="#8"> 8: </a>    {
+</span><span id="9" class="l"><a href="#9"> 9: </a>        <span class="php-var">$this</span>-&gt;load-&gt;helper(<span class="php-quote">'url'</span>);
+</span><span id="10" class="l"><a href="#10">10: </a>
+</span><span id="11" class="l"><a href="#11">11: </a>        <span class="php-var">$this</span>-&gt;load-&gt;view(<span class="php-quote">'rest_server'</span>);
+</span><span id="12" class="l"><a href="#12">12: </a>    }
+</span><span id="13" class="l"><a href="#13">13: </a>}
+</span><span id="14" class="l"><a href="#14">14: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
 <script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Welcome.html b/documentation/source-class-Welcome.html
index 5dd87266..53bf7995 100644
--- a/documentation/source-class-Welcome.html
+++ b/documentation/source-class-Welcome.html
@@ -126,7 +126,7 @@ <h3>Classes</h3>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?6be0007a8e62523b72688a7820487464033d9c6d"></script>
+<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
 <script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>

From 59d7d5a73147862f3a9dbe9b85565f4e6ecdd563 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 25 Jul 2015 18:26:20 +0300
Subject: [PATCH 135/354] Moved language string to external file

---
 application/config/rest.php                   | 10 ++++
 application/language/english/index.html       | 11 ++++
 .../language/english/rest_controller_lang.php | 17 ++++++
 application/language/index.html               | 11 ++++
 application/libraries/REST_Controller.php     | 53 ++++++++-----------
 5 files changed, 71 insertions(+), 31 deletions(-)
 create mode 100644 application/language/english/index.html
 create mode 100644 application/language/english/rest_controller_lang.php
 create mode 100644 application/language/index.html

diff --git a/application/config/rest.php b/application/config/rest.php
index 2e914fe6..cf75d699 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -477,3 +477,13 @@
 |
 */
 $config['rest_ajax_only'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| REST Language File
+|--------------------------------------------------------------------------
+|
+| Language file to load from the language directory
+|
+*/
+$config['rest_language'] = 'english';
diff --git a/application/language/english/index.html b/application/language/english/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/language/english/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/english/rest_controller_lang.php b/application/language/english/rest_controller_lang.php
new file mode 100644
index 00000000..37305221
--- /dev/null
+++ b/application/language/english/rest_controller_lang.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+* English language
+*/
+
+$lang['text_rest_invalid_api_key'] = 'Invalid API key %s'; // %s is the REST API key
+$lang['text_rest_invalid_credentials'] = 'Invalid credentials';
+$lang['text_rest_ip_denied'] = 'IP denied';
+$lang['text_rest_ip_unauthorized'] = 'IP unauthorized';
+$lang['text_rest_unauthorized'] = 'Unauthorized';
+$lang['text_rest_ajax_only'] = 'Only Ajax requests are only allowed';
+$lang['text_rest_api_key_unauthorized'] = 'This API key does not have access to the requested controller';
+$lang['text_rest_api_key_permissions'] = 'This API key does not have enough permissions';
+$lang['text_rest_api_key_time_limit'] = 'This API key has reached the time limit for this method';
+$lang['text_rest_unknown_method'] = 'Unknown method';
+$lang['text_rest_unsupported'] = 'Unsupported protocol';
diff --git a/application/language/index.html b/application/language/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/language/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index ad38504b..0018c558 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -352,25 +352,6 @@ abstract class REST_Controller extends CI_Controller {
         self::HTTP_NOT_IMPLEMENTED => 'NOT IMPLEMENTED'
     ];
 
-    /**
-     * Language strings for the response message
-     *
-     * @var array
-     */
-    protected $text_lang_strings = [
-        'text_rest_invalid_api_key' => 'Invalid API key %s', // %s is the REST API key
-        'text_rest_invalid_credentials' => 'Invalid credentials',
-        'text_rest_ip_denied' => 'IP denied',
-        'text_rest_ip_unauthorized' => 'IP unauthorized',
-        'text_rest_unauthorized' => 'Unauthorized',
-        'text_rest_ajax_only' => 'Only Ajax requests are only allowed',
-        'text_rest_api_key_unauthorized' => 'This API key does not have access to the requested controller',
-        'text_rest_api_key_permissions' => 'This API key does not have enough permissions',
-        'text_rest_api_key_time_limit' => 'This API key has reached the time limit for this method',
-        'text_rest_unknown_method' => 'Unknown method',
-        'text_rest_unsupported' => 'Unsupported protocol'
-    ];
-
     /**
      * Extend this function to apply additional checking early on in the process
      *
@@ -425,6 +406,16 @@ public function __construct($config = 'rest')
         // At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)
         $this->load->library('format');
 
+        // Get the language
+        $language = $this->config->item('rest_language');
+        if ($language === NULL)
+        {
+            $language = 'english';
+        }
+
+        // Load the language file
+        $this->lang->load('rest_controller', $language);
+
         // Initialise the response, request and rest objects
         $this->request = new stdClass();
         $this->response = new stdClass();
@@ -520,7 +511,7 @@ public function __construct($config = 'rest')
             // Display an error response
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_ajax_only']
+                    $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ajax_only')
                 ], self::HTTP_NOT_ACCEPTABLE);
         }
 
@@ -582,7 +573,7 @@ public function _remap($object_called, $arguments)
         {
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_unsupported']
+                    $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unsupported')
                 ], self::HTTP_FORBIDDEN);
         }
 
@@ -607,7 +598,7 @@ public function _remap($object_called, $arguments)
 
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => sprintf($this->text_lang_strings['text_rest_invalid_api_key'], $this->rest->key)
+                    $this->config->item('rest_message_field_name') => sprintf($this->lang->line('text_rest_invalid_api_key'), $this->rest->key)
                 ], self::HTTP_FORBIDDEN);
         }
 
@@ -621,7 +612,7 @@ public function _remap($object_called, $arguments)
 
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_api_key_unauthorized']
+                    $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_unauthorized')
                 ], self::HTTP_UNAUTHORIZED);
         }
 
@@ -630,7 +621,7 @@ public function _remap($object_called, $arguments)
         {
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_unknown_method']
+                    $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unknown_method')
                 ], self::HTTP_NOT_FOUND);
         }
 
@@ -640,7 +631,7 @@ public function _remap($object_called, $arguments)
             // Check the limit
             if ($this->config->item('rest_enable_limits') && $this->_check_limit($controller_method) === FALSE)
             {
-                $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_api_key_time_limit']];
+                $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_time_limit')];
                 $this->response($response, self::HTTP_UNAUTHORIZED);
             }
 
@@ -657,7 +648,7 @@ public function _remap($object_called, $arguments)
             }
 
             // They don't have good enough perms
-            $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_api_key_permissions']];
+            $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_permissions')];
             $authorized || $this->response($response, self::HTTP_UNAUTHORIZED);
         }
 
@@ -1863,7 +1854,7 @@ protected function _check_php_session()
             // Display an error response
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_unauthorized']
+                    $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized')
                 ], self::HTTP_UNAUTHORIZED);
         }
     }
@@ -1961,7 +1952,7 @@ protected function _prepare_digest_auth()
             // Display an error response
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_invalid_credentials']
+                    $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_invalid_credentials')
                 ], self::HTTP_UNAUTHORIZED);
         }
     }
@@ -1983,7 +1974,7 @@ protected function _check_blacklist_auth()
             // Display an error response
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_ip_denied']
+                    $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_denied')
                 ], self::HTTP_UNAUTHORIZED);
         }
     }
@@ -2011,7 +2002,7 @@ protected function _check_whitelist_auth()
         {
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_ip_unauthorized']
+                    $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_unauthorized')
                 ], self::HTTP_UNAUTHORIZED);
         }
     }
@@ -2045,7 +2036,7 @@ protected function _force_login($nonce = '')
         // Display an error response
         $this->response([
                 $this->config->item('rest_status_field_name') => FALSE,
-                $this->config->item('rest_message_field_name') => $this->text_lang_strings['text_rest_unauthorized']
+                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized')
             ], self::HTTP_UNAUTHORIZED);
     }
 

From ad26eee410ba7ffd14b4d9b20319d2f0d221a744 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 25 Jul 2015 18:31:21 +0300
Subject: [PATCH 136/354] Updated documentation

---
 documentation/class-Example.html              |    3 +-
 documentation/class-Key.html                  |    3 +-
 documentation/class-REST_Controller.html      |  127 +-
 .../source-class-REST_Controller.html         | 3425 ++++++++---------
 4 files changed, 1755 insertions(+), 1803 deletions(-)

diff --git a/documentation/class-Example.html b/documentation/class-Example.html
index 8e22e562..e8af6477 100644
--- a/documentation/class-Example.html
+++ b/documentation/class-Example.html
@@ -432,8 +432,7 @@ <h4>Overrides</h4>
 			<a href="http://github.com/class-REST_Controller.html#$request"><var>$request</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$response"><var>$response</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$rest"><var>$rest</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$rest_format"><var>$rest_format</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$text_lang_strings"><var>$text_lang_strings</var></a>
+			<a href="http://github.com/class-REST_Controller.html#$rest_format"><var>$rest_format</var></a>
 		</code></td>
 	</tr>
 	</table>
diff --git a/documentation/class-Key.html b/documentation/class-Key.html
index 4abc4d24..540d7d3e 100644
--- a/documentation/class-Key.html
+++ b/documentation/class-Key.html
@@ -487,8 +487,7 @@ <h1>Class Key</h1>
 			<a href="http://github.com/class-REST_Controller.html#$request"><var>$request</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$response"><var>$response</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$rest"><var>$rest</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$rest_format"><var>$rest_format</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$text_lang_strings"><var>$text_lang_strings</var></a>
+			<a href="http://github.com/class-REST_Controller.html#$rest_format"><var>$rest_format</var></a>
 		</code></td>
 	</tr>
 	</table>
diff --git a/documentation/class-REST_Controller.html b/documentation/class-REST_Controller.html
index 12271449..fc94cfdb 100644
--- a/documentation/class-REST_Controller.html
+++ b/documentation/class-REST_Controller.html
@@ -137,7 +137,7 @@ <h4>Direct known subclasses</h4>
 				3.0.0<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-2119" title="Go to source code">libraries/REST_Controller.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-2110" title="Go to source code">libraries/REST_Controller.php</a>
 		<br>
 	</div>
 
@@ -157,7 +157,7 @@ <h4>Direct known subclasses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_early_checks">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#374-382" title="Go to source code">early_checks</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#355-363" title="Go to source code">early_checks</a>( )</code>
 
 		<div class="description short">
 			<p>Extend this function to apply additional checking early on in the process</p>
@@ -187,7 +187,7 @@ <h4>Direct known subclasses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___construct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#384-548" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#365-539" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
 
 		<div class="description short">
 			<p>Constructor for the REST API</p>
@@ -223,7 +223,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___destruct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#550-567" title="Go to source code">__destruct</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#541-558" title="Go to source code">__destruct</a>( )</code>
 
 		<div class="description short">
 			<p>Deconstructor</p>
@@ -257,7 +257,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__remap">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#569-686" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#560-677" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var></span> )</code>
 
 		<div class="description short">
 			<p>Requests are not made to methods directly, the request will be for
@@ -298,7 +298,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#688-769" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#679-760" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Takes mixed data and optionally a status code, then creates the response</p>
@@ -338,7 +338,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_set_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#771-784" title="Go to source code">set_response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#762-775" title="Go to source code">set_response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Takes mixed data and optionally a status code, then creates the response
@@ -381,7 +381,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_input_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#786-818" title="Go to source code">_detect_input_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#777-809" title="Go to source code">_detect_input_format</a>( )</code>
 
 		<div class="description short">
 			<p>Get the input format e.g. json or xml</p>
@@ -415,7 +415,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_output_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#820-889" title="Go to source code">_detect_output_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#811-880" title="Go to source code">_detect_output_format</a>( )</code>
 
 		<div class="description short">
 			<p>Detect which format should be used to output the data</p>
@@ -449,7 +449,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_method">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#891-921" title="Go to source code">_detect_method</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#882-912" title="Go to source code">_detect_method</a>( )</code>
 
 		<div class="description short">
 			<p>Get the HTTP request string e.g. get or post</p>
@@ -483,7 +483,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_api_key">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#923-995" title="Go to source code">_detect_api_key</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#914-986" title="Go to source code">_detect_api_key</a>( )</code>
 
 		<div class="description short">
 			<p>See if the user has provided an API key</p>
@@ -517,7 +517,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_lang">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#997-1029" title="Go to source code">_detect_lang</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#988-1020" title="Go to source code">_detect_lang</a>( )</code>
 
 		<div class="description short">
 			<p>Preferred return language</p>
@@ -551,7 +551,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_request">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1031-1057" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1022-1048" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Add the request to the log table</p>
@@ -590,7 +590,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_limit">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1059-1159" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1050-1150" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
 
 		<div class="description short">
 			<p>Check if the requests to a controller method exceed a limit</p>
@@ -629,7 +629,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__auth_override_check">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1161-1319" title="Go to source code">_auth_override_check</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1152-1310" title="Go to source code">_auth_override_check</a>( )</code>
 
 		<div class="description short">
 			<p>Check if there is a specific auth type set for the current class/method/HTTP-method being called</p>
@@ -663,7 +663,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1321-1331" title="Go to source code">_parse_get</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1312-1322" title="Go to source code">_parse_get</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the GET request arguments</p>
@@ -693,7 +693,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1333-1347" title="Go to source code">_parse_post</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1324-1338" title="Go to source code">_parse_post</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the POST request arguments</p>
@@ -723,7 +723,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1349-1369" title="Go to source code">_parse_put</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1340-1360" title="Go to source code">_parse_put</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PUT request arguments</p>
@@ -753,7 +753,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1371-1384" title="Go to source code">_parse_head</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1362-1375" title="Go to source code">_parse_head</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the HEAD request arguments</p>
@@ -783,7 +783,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1386-1399" title="Go to source code">_parse_options</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1377-1390" title="Go to source code">_parse_options</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the OPTIONS request arguments</p>
@@ -813,7 +813,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1401-1422" title="Go to source code">_parse_patch</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1392-1413" title="Go to source code">_parse_patch</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PATCH request arguments</p>
@@ -843,7 +843,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1424-1437" title="Go to source code">_parse_delete</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1415-1428" title="Go to source code">_parse_delete</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the DELETE request arguments</p>
@@ -873,7 +873,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1439-1471" title="Go to source code">_parse_query</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1430-1462" title="Go to source code">_parse_query</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the query parameters</p>
@@ -903,7 +903,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1475-1492" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1466-1483" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a GET request</p>
@@ -945,7 +945,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1494-1511" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1485-1502" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a OPTIONS request</p>
@@ -987,7 +987,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1513-1530" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1504-1521" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a HEAD request</p>
@@ -1029,7 +1029,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1532-1549" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1523-1540" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a POST request</p>
@@ -1071,7 +1071,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1551-1568" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1542-1559" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PUT request</p>
@@ -1113,7 +1113,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1570-1587" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1561-1578" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a DELETE request</p>
@@ -1155,7 +1155,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1589-1606" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1580-1597" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PATCH request</p>
@@ -1197,7 +1197,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1608-1625" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1599-1616" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from the query parameters</p>
@@ -1239,7 +1239,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__xss_clean">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1627-1641" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1618-1632" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
 
 		<div class="description short">
 			<p>Sanitizes data so that Cross Site Scripting Hacks can be
@@ -1282,7 +1282,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_validation_errors">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1643-1654" title="Go to source code">validation_errors</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1634-1645" title="Go to source code">validation_errors</a>( )</code>
 
 		<div class="description short">
 			<p>Retrieve the validation errors</p>
@@ -1316,7 +1316,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_ldap_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1658-1751" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1649-1742" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform LDAP Authentication</p>
@@ -1357,7 +1357,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_library_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1753-1790" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1744-1781" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform Library Authentication - Override this function to change the way the library is called</p>
@@ -1398,7 +1398,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1792-1847" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1783-1838" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Check if the user is logged in</p>
@@ -1439,7 +1439,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_php_session">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1849-1869" title="Go to source code">_check_php_session</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1840-1860" title="Go to source code">_check_php_session</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the user is logged in with a PHP session key</p>
@@ -1469,7 +1469,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_basic_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1871-1910" title="Go to source code">_prepare_basic_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1862-1901" title="Go to source code">_prepare_basic_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for basic authentication</p>
@@ -1499,7 +1499,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_digest_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1912-1967" title="Go to source code">_prepare_digest_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1903-1958" title="Go to source code">_prepare_digest_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for digest authentication</p>
@@ -1529,7 +1529,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_blacklist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1969-1989" title="Go to source code">_check_blacklist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1960-1980" title="Go to source code">_check_blacklist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response</p>
@@ -1559,7 +1559,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_whitelist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1991-2017" title="Go to source code">_check_whitelist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1982-2008" title="Go to source code">_check_whitelist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response</p>
@@ -1589,7 +1589,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__force_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2019-2050" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2010-2041" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
 
 		<div class="description short">
 			<p>Force logging in by setting the WWW-Authenticate header</p>
@@ -1625,7 +1625,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_access_time">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2052-2067" title="Go to source code">_log_access_time</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2043-2058" title="Go to source code">_log_access_time</a>( )</code>
 
 		<div class="description short">
 			<p>Updates the log table with the total access time</p>
@@ -1663,7 +1663,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_response_code">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2069-2085" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2060-2076" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
 
 		<div class="description short">
 			<p>Updates the log table with HTTP response code</p>
@@ -1706,7 +1706,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_access">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2087-2117" title="Go to source code">_check_access</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2078-2108" title="Go to source code">_check_access</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the API key has access to the controller and methods</p>
@@ -3839,43 +3839,6 @@ <h4>Link</h4>
     self::HTTP_CONFLICT =&gt; <span class="php-quote">'CONFLICT'</span>,
     self::HTTP_INTERNAL_SERVER_ERROR =&gt; <span class="php-quote">'INTERNAL SERVER ERROR'</span>,
     self::HTTP_NOT_IMPLEMENTED =&gt; <span class="php-quote">'NOT IMPLEMENTED'</span>
-]</code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="text_lang_strings" id="$text_lang_strings">
-		<td class="attributes"><code>
-			protected  
-			array
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#355-372" title="Go to source code"><var>$text_lang_strings</var></a>
-
-			<div class="description short">
-				<p>Language strings for the response message</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>Language strings for the response message</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$text_lang_strings" class="anchor">#</a>
-				<code>[
-    <span class="php-quote">'text_rest_invalid_api_key'</span> =&gt; <span class="php-quote">'Invalid API key %s'</span>, <span class="php-comment">// %s is the REST API key</span>
-    <span class="php-quote">'text_rest_invalid_credentials'</span> =&gt; <span class="php-quote">'Invalid credentials'</span>,
-    <span class="php-quote">'text_rest_ip_denied'</span> =&gt; <span class="php-quote">'IP denied'</span>,
-    <span class="php-quote">'text_rest_ip_unauthorized'</span> =&gt; <span class="php-quote">'IP unauthorized'</span>,
-    <span class="php-quote">'text_rest_unauthorized'</span> =&gt; <span class="php-quote">'Unauthorized'</span>,
-    <span class="php-quote">'text_rest_ajax_only'</span> =&gt; <span class="php-quote">'Only Ajax requests are only allowed'</span>,
-    <span class="php-quote">'text_rest_api_key_unauthorized'</span> =&gt; <span class="php-quote">'This API key does not have access to the requested controller'</span>,
-    <span class="php-quote">'text_rest_api_key_permissions'</span> =&gt; <span class="php-quote">'This API key does not have enough permissions'</span>,
-    <span class="php-quote">'text_rest_api_key_time_limit'</span> =&gt; <span class="php-quote">'This API key has reached the time limit for this method'</span>,
-    <span class="php-quote">'text_rest_unknown_method'</span> =&gt; <span class="php-quote">'Unknown method'</span>,
-    <span class="php-quote">'text_rest_unsupported'</span> =&gt; <span class="php-quote">'Unsupported protocol'</span>
 ]</code>
 			</div>
 		</td>
diff --git a/documentation/source-class-REST_Controller.html b/documentation/source-class-REST_Controller.html
index e36232ee..5d6c6497 100644
--- a/documentation/source-class-REST_Controller.html
+++ b/documentation/source-class-REST_Controller.html
@@ -447,1771 +447,1762 @@ <h3>Classes</h3>
 </span><span id="353" class="l"><a href="#353"> 353: </a>    ];
 </span><span id="354" class="l"><a href="#354"> 354: </a>
 </span><span id="355" class="l"><a href="#355"> 355: </a>    <span class="php-comment">/**
-</span></span><span id="356" class="l"><a href="#356"> 356: </a><span class="php-comment">     * Language strings for the response message
+</span></span><span id="356" class="l"><a href="#356"> 356: </a><span class="php-comment">     * Extend this function to apply additional checking early on in the process
 </span></span><span id="357" class="l"><a href="#357"> 357: </a><span class="php-comment">     *
-</span></span><span id="358" class="l"><a href="#358"> 358: </a><span class="php-comment">     * @var array
-</span></span><span id="359" class="l"><a href="#359"> 359: </a><span class="php-comment">     */</span>
-</span><span id="360" class="l"><a href="#360"> 360: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$text_lang_strings</span> = [
-</span><span id="361" class="l"><a href="#361"> 361: </a>        <span class="php-quote">'text_rest_invalid_api_key'</span> =&gt; <span class="php-quote">'Invalid API key %s'</span>, <span class="php-comment">// %s is the REST API key</span>
-</span><span id="362" class="l"><a href="#362"> 362: </a>        <span class="php-quote">'text_rest_invalid_credentials'</span> =&gt; <span class="php-quote">'Invalid credentials'</span>,
-</span><span id="363" class="l"><a href="#363"> 363: </a>        <span class="php-quote">'text_rest_ip_denied'</span> =&gt; <span class="php-quote">'IP denied'</span>,
-</span><span id="364" class="l"><a href="#364"> 364: </a>        <span class="php-quote">'text_rest_ip_unauthorized'</span> =&gt; <span class="php-quote">'IP unauthorized'</span>,
-</span><span id="365" class="l"><a href="#365"> 365: </a>        <span class="php-quote">'text_rest_unauthorized'</span> =&gt; <span class="php-quote">'Unauthorized'</span>,
-</span><span id="366" class="l"><a href="#366"> 366: </a>        <span class="php-quote">'text_rest_ajax_only'</span> =&gt; <span class="php-quote">'Only Ajax requests are only allowed'</span>,
-</span><span id="367" class="l"><a href="#367"> 367: </a>        <span class="php-quote">'text_rest_api_key_unauthorized'</span> =&gt; <span class="php-quote">'This API key does not have access to the requested controller'</span>,
-</span><span id="368" class="l"><a href="#368"> 368: </a>        <span class="php-quote">'text_rest_api_key_permissions'</span> =&gt; <span class="php-quote">'This API key does not have enough permissions'</span>,
-</span><span id="369" class="l"><a href="#369"> 369: </a>        <span class="php-quote">'text_rest_api_key_time_limit'</span> =&gt; <span class="php-quote">'This API key has reached the time limit for this method'</span>,
-</span><span id="370" class="l"><a href="#370"> 370: </a>        <span class="php-quote">'text_rest_unknown_method'</span> =&gt; <span class="php-quote">'Unknown method'</span>,
-</span><span id="371" class="l"><a href="#371"> 371: </a>        <span class="php-quote">'text_rest_unsupported'</span> =&gt; <span class="php-quote">'Unsupported protocol'</span>
-</span><span id="372" class="l"><a href="#372"> 372: </a>    ];
-</span><span id="373" class="l"><a href="#373"> 373: </a>
-</span><span id="374" class="l"><a href="#374"> 374: </a>    <span class="php-comment">/**
-</span></span><span id="375" class="l"><a href="#375"> 375: </a><span class="php-comment">     * Extend this function to apply additional checking early on in the process
-</span></span><span id="376" class="l"><a href="#376"> 376: </a><span class="php-comment">     *
-</span></span><span id="377" class="l"><a href="#377"> 377: </a><span class="php-comment">     * @access protected
-</span></span><span id="378" class="l"><a href="#378"> 378: </a><span class="php-comment">     * @return void
-</span></span><span id="379" class="l"><a href="#379"> 379: </a><span class="php-comment">     */</span>
-</span><span id="380" class="l"><a href="#380"> 380: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> early_checks()
-</span><span id="381" class="l"><a href="#381"> 381: </a>    {
-</span><span id="382" class="l"><a href="#382"> 382: </a>    }
-</span><span id="383" class="l"><a href="#383"> 383: </a>
-</span><span id="384" class="l"><a href="#384"> 384: </a>    <span class="php-comment">/**
-</span></span><span id="385" class="l"><a href="#385"> 385: </a><span class="php-comment">     * Constructor for the REST API
-</span></span><span id="386" class="l"><a href="#386"> 386: </a><span class="php-comment">     *
-</span></span><span id="387" class="l"><a href="#387"> 387: </a><span class="php-comment">     * @access public
-</span></span><span id="388" class="l"><a href="#388"> 388: </a><span class="php-comment">     * @param string $config Configuration filename minus the file extension
-</span></span><span id="389" class="l"><a href="#389"> 389: </a><span class="php-comment">     * e.g: my_rest.php is passed as 'my_rest'
-</span></span><span id="390" class="l"><a href="#390"> 390: </a><span class="php-comment">     * @return void
-</span></span><span id="391" class="l"><a href="#391"> 391: </a><span class="php-comment">     */</span>
-</span><span id="392" class="l"><a href="#392"> 392: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$config</span> = <span class="php-quote">'rest'</span>)
-</span><span id="393" class="l"><a href="#393"> 393: </a>    {
-</span><span id="394" class="l"><a href="#394"> 394: </a>        parent::__construct();
+</span></span><span id="358" class="l"><a href="#358"> 358: </a><span class="php-comment">     * @access protected
+</span></span><span id="359" class="l"><a href="#359"> 359: </a><span class="php-comment">     * @return void
+</span></span><span id="360" class="l"><a href="#360"> 360: </a><span class="php-comment">     */</span>
+</span><span id="361" class="l"><a href="#361"> 361: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> early_checks()
+</span><span id="362" class="l"><a href="#362"> 362: </a>    {
+</span><span id="363" class="l"><a href="#363"> 363: </a>    }
+</span><span id="364" class="l"><a href="#364"> 364: </a>
+</span><span id="365" class="l"><a href="#365"> 365: </a>    <span class="php-comment">/**
+</span></span><span id="366" class="l"><a href="#366"> 366: </a><span class="php-comment">     * Constructor for the REST API
+</span></span><span id="367" class="l"><a href="#367"> 367: </a><span class="php-comment">     *
+</span></span><span id="368" class="l"><a href="#368"> 368: </a><span class="php-comment">     * @access public
+</span></span><span id="369" class="l"><a href="#369"> 369: </a><span class="php-comment">     * @param string $config Configuration filename minus the file extension
+</span></span><span id="370" class="l"><a href="#370"> 370: </a><span class="php-comment">     * e.g: my_rest.php is passed as 'my_rest'
+</span></span><span id="371" class="l"><a href="#371"> 371: </a><span class="php-comment">     * @return void
+</span></span><span id="372" class="l"><a href="#372"> 372: </a><span class="php-comment">     */</span>
+</span><span id="373" class="l"><a href="#373"> 373: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$config</span> = <span class="php-quote">'rest'</span>)
+</span><span id="374" class="l"><a href="#374"> 374: </a>    {
+</span><span id="375" class="l"><a href="#375"> 375: </a>        parent::__construct();
+</span><span id="376" class="l"><a href="#376"> 376: </a>
+</span><span id="377" class="l"><a href="#377"> 377: </a>        <span class="php-comment">// Disable XML Entity (security vulnerability)</span>
+</span><span id="378" class="l"><a href="#378"> 378: </a>        <span class="php-keyword2">libxml_disable_entity_loader</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="379" class="l"><a href="#379"> 379: </a>
+</span><span id="380" class="l"><a href="#380"> 380: </a>        <span class="php-comment">// Check to see if PHP is equal to or greater than 5.4.x</span>
+</span><span id="381" class="l"><a href="#381"> 381: </a>        <span class="php-keyword1">if</span> (is_php(<span class="php-quote">'5.4'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="382" class="l"><a href="#382"> 382: </a>        {
+</span><span id="383" class="l"><a href="#383"> 383: </a>            <span class="php-comment">// CodeIgniter 3 is recommended for v5.4 or above</span>
+</span><span id="384" class="l"><a href="#384"> 384: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'Using PHP v'</span> . PHP_VERSION . <span class="php-quote">', though PHP v5.4 or greater is required'</span>);
+</span><span id="385" class="l"><a href="#385"> 385: </a>        }
+</span><span id="386" class="l"><a href="#386"> 386: </a>
+</span><span id="387" class="l"><a href="#387"> 387: </a>        <span class="php-comment">// Check to see if this is CI 3.x</span>
+</span><span id="388" class="l"><a href="#388"> 388: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">explode</span>(<span class="php-quote">'.'</span>, CI_VERSION, <span class="php-num">2</span>)[<span class="php-num">0</span>] &lt; <span class="php-num">3</span>)
+</span><span id="389" class="l"><a href="#389"> 389: </a>        {
+</span><span id="390" class="l"><a href="#390"> 390: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
+</span><span id="391" class="l"><a href="#391"> 391: </a>        }
+</span><span id="392" class="l"><a href="#392"> 392: </a>
+</span><span id="393" class="l"><a href="#393"> 393: </a>        <span class="php-comment">// Set the default value of global xss filtering. Same approach as CodeIgniter 3</span>
+</span><span id="394" class="l"><a href="#394"> 394: </a>        <span class="php-var">$this</span>-&gt;_enable_xss = (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'global_xss_filtering'</span>) === <span class="php-keyword1">TRUE</span>);
 </span><span id="395" class="l"><a href="#395"> 395: </a>
-</span><span id="396" class="l"><a href="#396"> 396: </a>        <span class="php-comment">// Disable XML Entity (security vulnerability)</span>
-</span><span id="397" class="l"><a href="#397"> 397: </a>        <span class="php-keyword2">libxml_disable_entity_loader</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="398" class="l"><a href="#398"> 398: </a>
-</span><span id="399" class="l"><a href="#399"> 399: </a>        <span class="php-comment">// Check to see if PHP is equal to or greater than 5.4.x</span>
-</span><span id="400" class="l"><a href="#400"> 400: </a>        <span class="php-keyword1">if</span> (is_php(<span class="php-quote">'5.4'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="401" class="l"><a href="#401"> 401: </a>        {
-</span><span id="402" class="l"><a href="#402"> 402: </a>            <span class="php-comment">// CodeIgniter 3 is recommended for v5.4 or above</span>
-</span><span id="403" class="l"><a href="#403"> 403: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'Using PHP v'</span> . PHP_VERSION . <span class="php-quote">', though PHP v5.4 or greater is required'</span>);
-</span><span id="404" class="l"><a href="#404"> 404: </a>        }
+</span><span id="396" class="l"><a href="#396"> 396: </a>        <span class="php-comment">// Don't try to parse template variables like {elapsed_time} and {memory_usage}</span>
+</span><span id="397" class="l"><a href="#397"> 397: </a>        <span class="php-comment">// when output is displayed for not damaging data accidentally</span>
+</span><span id="398" class="l"><a href="#398"> 398: </a>        <span class="php-var">$this</span>-&gt;output-&gt;parse_exec_vars = <span class="php-keyword1">FALSE</span>;
+</span><span id="399" class="l"><a href="#399"> 399: </a>
+</span><span id="400" class="l"><a href="#400"> 400: </a>        <span class="php-comment">// Start the timer for how long the request takes</span>
+</span><span id="401" class="l"><a href="#401"> 401: </a>        <span class="php-var">$this</span>-&gt;_start_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="402" class="l"><a href="#402"> 402: </a>
+</span><span id="403" class="l"><a href="#403"> 403: </a>        <span class="php-comment">// Load the rest.php configuration file</span>
+</span><span id="404" class="l"><a href="#404"> 404: </a>        <span class="php-var">$this</span>-&gt;load-&gt;config(<span class="php-var">$config</span>);
 </span><span id="405" class="l"><a href="#405"> 405: </a>
-</span><span id="406" class="l"><a href="#406"> 406: </a>        <span class="php-comment">// Check to see if this is CI 3.x</span>
-</span><span id="407" class="l"><a href="#407"> 407: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">explode</span>(<span class="php-quote">'.'</span>, CI_VERSION, <span class="php-num">2</span>)[<span class="php-num">0</span>] &lt; <span class="php-num">3</span>)
-</span><span id="408" class="l"><a href="#408"> 408: </a>        {
-</span><span id="409" class="l"><a href="#409"> 409: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
-</span><span id="410" class="l"><a href="#410"> 410: </a>        }
-</span><span id="411" class="l"><a href="#411"> 411: </a>
-</span><span id="412" class="l"><a href="#412"> 412: </a>        <span class="php-comment">// Set the default value of global xss filtering. Same approach as CodeIgniter 3</span>
-</span><span id="413" class="l"><a href="#413"> 413: </a>        <span class="php-var">$this</span>-&gt;_enable_xss = (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'global_xss_filtering'</span>) === <span class="php-keyword1">TRUE</span>);
-</span><span id="414" class="l"><a href="#414"> 414: </a>
-</span><span id="415" class="l"><a href="#415"> 415: </a>        <span class="php-comment">// Don't try to parse template variables like {elapsed_time} and {memory_usage}</span>
-</span><span id="416" class="l"><a href="#416"> 416: </a>        <span class="php-comment">// when output is displayed for not damaging data accidentally</span>
-</span><span id="417" class="l"><a href="#417"> 417: </a>        <span class="php-var">$this</span>-&gt;output-&gt;parse_exec_vars = <span class="php-keyword1">FALSE</span>;
+</span><span id="406" class="l"><a href="#406"> 406: </a>        <span class="php-comment">// At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)</span>
+</span><span id="407" class="l"><a href="#407"> 407: </a>        <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-quote">'format'</span>);
+</span><span id="408" class="l"><a href="#408"> 408: </a>
+</span><span id="409" class="l"><a href="#409"> 409: </a>        <span class="php-comment">// Get the language</span>
+</span><span id="410" class="l"><a href="#410"> 410: </a>        <span class="php-var">$language</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_language'</span>);
+</span><span id="411" class="l"><a href="#411"> 411: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$language</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="412" class="l"><a href="#412"> 412: </a>        {
+</span><span id="413" class="l"><a href="#413"> 413: </a>            <span class="php-var">$language</span> = <span class="php-quote">'english'</span>;
+</span><span id="414" class="l"><a href="#414"> 414: </a>        }
+</span><span id="415" class="l"><a href="#415"> 415: </a>
+</span><span id="416" class="l"><a href="#416"> 416: </a>        <span class="php-comment">// Load the language file</span>
+</span><span id="417" class="l"><a href="#417"> 417: </a>        <span class="php-var">$this</span>-&gt;lang-&gt;load(<span class="php-quote">'rest_controller'</span>, <span class="php-var">$language</span>);
 </span><span id="418" class="l"><a href="#418"> 418: </a>
-</span><span id="419" class="l"><a href="#419"> 419: </a>        <span class="php-comment">// Start the timer for how long the request takes</span>
-</span><span id="420" class="l"><a href="#420"> 420: </a>        <span class="php-var">$this</span>-&gt;_start_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="421" class="l"><a href="#421"> 421: </a>
-</span><span id="422" class="l"><a href="#422"> 422: </a>        <span class="php-comment">// Load the rest.php configuration file</span>
-</span><span id="423" class="l"><a href="#423"> 423: </a>        <span class="php-var">$this</span>-&gt;load-&gt;config(<span class="php-var">$config</span>);
-</span><span id="424" class="l"><a href="#424"> 424: </a>
-</span><span id="425" class="l"><a href="#425"> 425: </a>        <span class="php-comment">// At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)</span>
-</span><span id="426" class="l"><a href="#426"> 426: </a>        <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-quote">'format'</span>);
-</span><span id="427" class="l"><a href="#427"> 427: </a>
-</span><span id="428" class="l"><a href="#428"> 428: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
-</span><span id="429" class="l"><a href="#429"> 429: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
-</span><span id="430" class="l"><a href="#430"> 430: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
-</span><span id="431" class="l"><a href="#431"> 431: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
+</span><span id="419" class="l"><a href="#419"> 419: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
+</span><span id="420" class="l"><a href="#420"> 420: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
+</span><span id="421" class="l"><a href="#421"> 421: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
+</span><span id="422" class="l"><a href="#422"> 422: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
+</span><span id="423" class="l"><a href="#423"> 423: </a>
+</span><span id="424" class="l"><a href="#424"> 424: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
+</span><span id="425" class="l"><a href="#425"> 425: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="426" class="l"><a href="#426"> 426: </a>        {
+</span><span id="427" class="l"><a href="#427"> 427: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
+</span><span id="428" class="l"><a href="#428"> 428: </a>        }
+</span><span id="429" class="l"><a href="#429"> 429: </a>
+</span><span id="430" class="l"><a href="#430"> 430: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
+</span><span id="431" class="l"><a href="#431"> 431: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
 </span><span id="432" class="l"><a href="#432"> 432: </a>
-</span><span id="433" class="l"><a href="#433"> 433: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
-</span><span id="434" class="l"><a href="#434"> 434: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="435" class="l"><a href="#435"> 435: </a>        {
-</span><span id="436" class="l"><a href="#436"> 436: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
-</span><span id="437" class="l"><a href="#437"> 437: </a>        }
-</span><span id="438" class="l"><a href="#438"> 438: </a>
-</span><span id="439" class="l"><a href="#439"> 439: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
-</span><span id="440" class="l"><a href="#440"> 440: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
+</span><span id="433" class="l"><a href="#433"> 433: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
+</span><span id="434" class="l"><a href="#434"> 434: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
+</span><span id="435" class="l"><a href="#435"> 435: </a>
+</span><span id="436" class="l"><a href="#436"> 436: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
+</span><span id="437" class="l"><a href="#437"> 437: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
+</span><span id="438" class="l"><a href="#438"> 438: </a>        {
+</span><span id="439" class="l"><a href="#439"> 439: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = [];
+</span><span id="440" class="l"><a href="#440"> 440: </a>        }
 </span><span id="441" class="l"><a href="#441"> 441: </a>
-</span><span id="442" class="l"><a href="#442"> 442: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
-</span><span id="443" class="l"><a href="#443"> 443: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
+</span><span id="442" class="l"><a href="#442"> 442: </a>        <span class="php-comment">// Set up the query parameters</span>
+</span><span id="443" class="l"><a href="#443"> 443: </a>        <span class="php-var">$this</span>-&gt;_parse_query();
 </span><span id="444" class="l"><a href="#444"> 444: </a>
-</span><span id="445" class="l"><a href="#445"> 445: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
-</span><span id="446" class="l"><a href="#446"> 446: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
-</span><span id="447" class="l"><a href="#447"> 447: </a>        {
-</span><span id="448" class="l"><a href="#448"> 448: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = [];
-</span><span id="449" class="l"><a href="#449"> 449: </a>        }
+</span><span id="445" class="l"><a href="#445"> 445: </a>        <span class="php-comment">// Set up the GET variables</span>
+</span><span id="446" class="l"><a href="#446"> 446: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
+</span><span id="447" class="l"><a href="#447"> 447: </a>
+</span><span id="448" class="l"><a href="#448"> 448: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
+</span><span id="449" class="l"><a href="#449"> 449: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
 </span><span id="450" class="l"><a href="#450"> 450: </a>
-</span><span id="451" class="l"><a href="#451"> 451: </a>        <span class="php-comment">// Set up the query parameters</span>
-</span><span id="452" class="l"><a href="#452"> 452: </a>        <span class="php-var">$this</span>-&gt;_parse_query();
+</span><span id="451" class="l"><a href="#451"> 451: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
+</span><span id="452" class="l"><a href="#452"> 452: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
 </span><span id="453" class="l"><a href="#453"> 453: </a>
-</span><span id="454" class="l"><a href="#454"> 454: </a>        <span class="php-comment">// Set up the GET variables</span>
-</span><span id="455" class="l"><a href="#455"> 455: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
-</span><span id="456" class="l"><a href="#456"> 456: </a>
-</span><span id="457" class="l"><a href="#457"> 457: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
-</span><span id="458" class="l"><a href="#458"> 458: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
-</span><span id="459" class="l"><a href="#459"> 459: </a>
-</span><span id="460" class="l"><a href="#460"> 460: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
-</span><span id="461" class="l"><a href="#461"> 461: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
-</span><span id="462" class="l"><a href="#462"> 462: </a>
-</span><span id="463" class="l"><a href="#463"> 463: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
-</span><span id="464" class="l"><a href="#464"> 464: </a>
-</span><span id="465" class="l"><a href="#465"> 465: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
-</span><span id="466" class="l"><a href="#466"> 466: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
-</span><span id="467" class="l"><a href="#467"> 467: </a>        {
-</span><span id="468" class="l"><a href="#468"> 468: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
-</span><span id="469" class="l"><a href="#469"> 469: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
-</span><span id="470" class="l"><a href="#470"> 470: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
-</span><span id="471" class="l"><a href="#471"> 471: </a>        }
-</span><span id="472" class="l"><a href="#472"> 472: </a>
-</span><span id="473" class="l"><a href="#473"> 473: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
-</span><span id="474" class="l"><a href="#474"> 474: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
-</span><span id="475" class="l"><a href="#475"> 475: </a>            <span class="php-var">$this</span>-&gt;_get_args,
-</span><span id="476" class="l"><a href="#476"> 476: </a>            <span class="php-var">$this</span>-&gt;_options_args,
-</span><span id="477" class="l"><a href="#477"> 477: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
-</span><span id="478" class="l"><a href="#478"> 478: </a>            <span class="php-var">$this</span>-&gt;_head_args,
-</span><span id="479" class="l"><a href="#479"> 479: </a>            <span class="php-var">$this</span>-&gt;_put_args,
-</span><span id="480" class="l"><a href="#480"> 480: </a>            <span class="php-var">$this</span>-&gt;_post_args,
-</span><span id="481" class="l"><a href="#481"> 481: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
-</span><span id="482" class="l"><a href="#482"> 482: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}
-</span><span id="483" class="l"><a href="#483"> 483: </a>        );
+</span><span id="454" class="l"><a href="#454"> 454: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
+</span><span id="455" class="l"><a href="#455"> 455: </a>
+</span><span id="456" class="l"><a href="#456"> 456: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
+</span><span id="457" class="l"><a href="#457"> 457: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
+</span><span id="458" class="l"><a href="#458"> 458: </a>        {
+</span><span id="459" class="l"><a href="#459"> 459: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
+</span><span id="460" class="l"><a href="#460"> 460: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
+</span><span id="461" class="l"><a href="#461"> 461: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
+</span><span id="462" class="l"><a href="#462"> 462: </a>        }
+</span><span id="463" class="l"><a href="#463"> 463: </a>
+</span><span id="464" class="l"><a href="#464"> 464: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
+</span><span id="465" class="l"><a href="#465"> 465: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
+</span><span id="466" class="l"><a href="#466"> 466: </a>            <span class="php-var">$this</span>-&gt;_get_args,
+</span><span id="467" class="l"><a href="#467"> 467: </a>            <span class="php-var">$this</span>-&gt;_options_args,
+</span><span id="468" class="l"><a href="#468"> 468: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
+</span><span id="469" class="l"><a href="#469"> 469: </a>            <span class="php-var">$this</span>-&gt;_head_args,
+</span><span id="470" class="l"><a href="#470"> 470: </a>            <span class="php-var">$this</span>-&gt;_put_args,
+</span><span id="471" class="l"><a href="#471"> 471: </a>            <span class="php-var">$this</span>-&gt;_post_args,
+</span><span id="472" class="l"><a href="#472"> 472: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
+</span><span id="473" class="l"><a href="#473"> 473: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}
+</span><span id="474" class="l"><a href="#474"> 474: </a>        );
+</span><span id="475" class="l"><a href="#475"> 475: </a>
+</span><span id="476" class="l"><a href="#476"> 476: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
+</span><span id="477" class="l"><a href="#477"> 477: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
+</span><span id="478" class="l"><a href="#478"> 478: </a>
+</span><span id="479" class="l"><a href="#479"> 479: </a>        <span class="php-comment">// Which language should the data be returned in?</span>
+</span><span id="480" class="l"><a href="#480"> 480: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
+</span><span id="481" class="l"><a href="#481"> 481: </a>
+</span><span id="482" class="l"><a href="#482"> 482: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
+</span><span id="483" class="l"><a href="#483"> 483: </a>        <span class="php-var">$this</span>-&gt;early_checks();
 </span><span id="484" class="l"><a href="#484"> 484: </a>
-</span><span id="485" class="l"><a href="#485"> 485: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
-</span><span id="486" class="l"><a href="#486"> 486: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
-</span><span id="487" class="l"><a href="#487"> 487: </a>
-</span><span id="488" class="l"><a href="#488"> 488: </a>        <span class="php-comment">// Which language should the data be returned in?</span>
-</span><span id="489" class="l"><a href="#489"> 489: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
+</span><span id="485" class="l"><a href="#485"> 485: </a>        <span class="php-comment">// Load DB if its enabled</span>
+</span><span id="486" class="l"><a href="#486"> 486: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
+</span><span id="487" class="l"><a href="#487"> 487: </a>        {
+</span><span id="488" class="l"><a href="#488"> 488: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
+</span><span id="489" class="l"><a href="#489"> 489: </a>        }
 </span><span id="490" class="l"><a href="#490"> 490: </a>
-</span><span id="491" class="l"><a href="#491"> 491: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
-</span><span id="492" class="l"><a href="#492"> 492: </a>        <span class="php-var">$this</span>-&gt;early_checks();
-</span><span id="493" class="l"><a href="#493"> 493: </a>
-</span><span id="494" class="l"><a href="#494"> 494: </a>        <span class="php-comment">// Load DB if its enabled</span>
-</span><span id="495" class="l"><a href="#495"> 495: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
-</span><span id="496" class="l"><a href="#496"> 496: </a>        {
-</span><span id="497" class="l"><a href="#497"> 497: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
-</span><span id="498" class="l"><a href="#498"> 498: </a>        }
-</span><span id="499" class="l"><a href="#499"> 499: </a>
-</span><span id="500" class="l"><a href="#500"> 500: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
-</span><span id="501" class="l"><a href="#501"> 501: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
-</span><span id="502" class="l"><a href="#502"> 502: </a>        {
-</span><span id="503" class="l"><a href="#503"> 503: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
-</span><span id="504" class="l"><a href="#504"> 504: </a>        }
-</span><span id="505" class="l"><a href="#505"> 505: </a>
-</span><span id="506" class="l"><a href="#506"> 506: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
-</span><span id="507" class="l"><a href="#507"> 507: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
-</span><span id="508" class="l"><a href="#508"> 508: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
-</span><span id="509" class="l"><a href="#509"> 509: </a>
-</span><span id="510" class="l"><a href="#510"> 510: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
-</span><span id="511" class="l"><a href="#511"> 511: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
-</span><span id="512" class="l"><a href="#512"> 512: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
-</span><span id="513" class="l"><a href="#513"> 513: </a>        {
-</span><span id="514" class="l"><a href="#514"> 514: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
-</span><span id="515" class="l"><a href="#515"> 515: </a>        }
-</span><span id="516" class="l"><a href="#516"> 516: </a>
-</span><span id="517" class="l"><a href="#517"> 517: </a>        <span class="php-comment">// Only allow ajax requests</span>
-</span><span id="518" class="l"><a href="#518"> 518: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
-</span><span id="519" class="l"><a href="#519"> 519: </a>        {
-</span><span id="520" class="l"><a href="#520"> 520: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="521" class="l"><a href="#521"> 521: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="522" class="l"><a href="#522"> 522: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="523" class="l"><a href="#523"> 523: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_ajax_only'</span>]
-</span><span id="524" class="l"><a href="#524"> 524: </a>                ], self::HTTP_NOT_ACCEPTABLE);
-</span><span id="525" class="l"><a href="#525"> 525: </a>        }
-</span><span id="526" class="l"><a href="#526"> 526: </a>
-</span><span id="527" class="l"><a href="#527"> 527: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
-</span><span id="528" class="l"><a href="#528"> 528: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; !(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
-</span><span id="529" class="l"><a href="#529"> 529: </a>        {
-</span><span id="530" class="l"><a href="#530"> 530: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="531" class="l"><a href="#531"> 531: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
-</span><span id="532" class="l"><a href="#532"> 532: </a>            {
-</span><span id="533" class="l"><a href="#533"> 533: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
-</span><span id="534" class="l"><a href="#534"> 534: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="535" class="l"><a href="#535"> 535: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="536" class="l"><a href="#536"> 536: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
-</span><span id="537" class="l"><a href="#537"> 537: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="538" class="l"><a href="#538"> 538: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="539" class="l"><a href="#539"> 539: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
-</span><span id="540" class="l"><a href="#540"> 540: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="541" class="l"><a href="#541"> 541: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="542" class="l"><a href="#542"> 542: </a>            }
-</span><span id="543" class="l"><a href="#543"> 543: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="544" class="l"><a href="#544"> 544: </a>            {
-</span><span id="545" class="l"><a href="#545"> 545: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="546" class="l"><a href="#546"> 546: </a>            }
-</span><span id="547" class="l"><a href="#547"> 547: </a>        }
-</span><span id="548" class="l"><a href="#548"> 548: </a>    }
-</span><span id="549" class="l"><a href="#549"> 549: </a>
-</span><span id="550" class="l"><a href="#550"> 550: </a>    <span class="php-comment">/**
-</span></span><span id="551" class="l"><a href="#551"> 551: </a><span class="php-comment">     * Deconstructor
-</span></span><span id="552" class="l"><a href="#552"> 552: </a><span class="php-comment">     *
-</span></span><span id="553" class="l"><a href="#553"> 553: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="554" class="l"><a href="#554"> 554: </a><span class="php-comment">     * @access public
-</span></span><span id="555" class="l"><a href="#555"> 555: </a><span class="php-comment">     * @return void
-</span></span><span id="556" class="l"><a href="#556"> 556: </a><span class="php-comment">     */</span>
-</span><span id="557" class="l"><a href="#557"> 557: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
-</span><span id="558" class="l"><a href="#558"> 558: </a>    {
-</span><span id="559" class="l"><a href="#559"> 559: </a>        <span class="php-comment">// Get the current timestamp</span>
-</span><span id="560" class="l"><a href="#560"> 560: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="561" class="l"><a href="#561"> 561: </a>
-</span><span id="562" class="l"><a href="#562"> 562: </a>        <span class="php-comment">// Log the loading time to the log table</span>
-</span><span id="563" class="l"><a href="#563"> 563: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="564" class="l"><a href="#564"> 564: </a>        {
-</span><span id="565" class="l"><a href="#565"> 565: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
-</span><span id="566" class="l"><a href="#566"> 566: </a>        }
-</span><span id="567" class="l"><a href="#567"> 567: </a>    }
-</span><span id="568" class="l"><a href="#568"> 568: </a>
-</span><span id="569" class="l"><a href="#569"> 569: </a>    <span class="php-comment">/**
-</span></span><span id="570" class="l"><a href="#570"> 570: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
-</span></span><span id="571" class="l"><a href="#571"> 571: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
-</span></span><span id="572" class="l"><a href="#572"> 572: </a><span class="php-comment">     * Controller method.
-</span></span><span id="573" class="l"><a href="#573"> 573: </a><span class="php-comment">     *
-</span></span><span id="574" class="l"><a href="#574"> 574: </a><span class="php-comment">     * @access public
-</span></span><span id="575" class="l"><a href="#575"> 575: </a><span class="php-comment">     * @param  string $object_called
-</span></span><span id="576" class="l"><a href="#576"> 576: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method.
-</span></span><span id="577" class="l"><a href="#577"> 577: </a><span class="php-comment">     */</span>
-</span><span id="578" class="l"><a href="#578"> 578: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span>)
-</span><span id="579" class="l"><a href="#579"> 579: </a>    {
-</span><span id="580" class="l"><a href="#580"> 580: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
-</span><span id="581" class="l"><a href="#581"> 581: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
-</span><span id="582" class="l"><a href="#582"> 582: </a>        {
-</span><span id="583" class="l"><a href="#583"> 583: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="584" class="l"><a href="#584"> 584: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="585" class="l"><a href="#585"> 585: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_unsupported'</span>]
-</span><span id="586" class="l"><a href="#586"> 586: </a>                ], self::HTTP_FORBIDDEN);
-</span><span id="587" class="l"><a href="#587"> 587: </a>        }
-</span><span id="588" class="l"><a href="#588"> 588: </a>
-</span><span id="589" class="l"><a href="#589"> 589: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
-</span><span id="590" class="l"><a href="#590"> 590: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
-</span><span id="591" class="l"><a href="#591"> 591: </a>
-</span><span id="592" class="l"><a href="#592"> 592: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span> . <span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method;
-</span><span id="593" class="l"><a href="#593"> 593: </a>
-</span><span id="594" class="l"><a href="#594"> 594: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
-</span><span id="595" class="l"><a href="#595"> 595: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] === <span class="php-keyword1">FALSE</span>);
-</span><span id="596" class="l"><a href="#596"> 596: </a>
-</span><span id="597" class="l"><a href="#597"> 597: </a>        <span class="php-comment">// Use keys for this method?</span>
-</span><span id="598" class="l"><a href="#598"> 598: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] === <span class="php-keyword1">FALSE</span>);
-</span><span id="599" class="l"><a href="#599"> 599: </a>
-</span><span id="600" class="l"><a href="#600"> 600: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here.</span>
-</span><span id="601" class="l"><a href="#601"> 601: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
-</span><span id="602" class="l"><a href="#602"> 602: </a>        {
-</span><span id="603" class="l"><a href="#603"> 603: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="604" class="l"><a href="#604"> 604: </a>            {
-</span><span id="605" class="l"><a href="#605"> 605: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="606" class="l"><a href="#606"> 606: </a>            }
-</span><span id="607" class="l"><a href="#607"> 607: </a>
-</span><span id="608" class="l"><a href="#608"> 608: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="609" class="l"><a href="#609"> 609: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="610" class="l"><a href="#610"> 610: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-keyword2">sprintf</span>(<span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_invalid_api_key'</span>], <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="611" class="l"><a href="#611"> 611: </a>                ], self::HTTP_FORBIDDEN);
-</span><span id="612" class="l"><a href="#612"> 612: </a>        }
-</span><span id="613" class="l"><a href="#613"> 613: </a>
-</span><span id="614" class="l"><a href="#614"> 614: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller.</span>
-</span><span id="615" class="l"><a href="#615"> 615: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
-</span><span id="616" class="l"><a href="#616"> 616: </a>        {
-</span><span id="617" class="l"><a href="#617"> 617: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="618" class="l"><a href="#618"> 618: </a>            {
-</span><span id="619" class="l"><a href="#619"> 619: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="620" class="l"><a href="#620"> 620: </a>            }
-</span><span id="621" class="l"><a href="#621"> 621: </a>
+</span><span id="491" class="l"><a href="#491"> 491: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
+</span><span id="492" class="l"><a href="#492"> 492: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
+</span><span id="493" class="l"><a href="#493"> 493: </a>        {
+</span><span id="494" class="l"><a href="#494"> 494: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
+</span><span id="495" class="l"><a href="#495"> 495: </a>        }
+</span><span id="496" class="l"><a href="#496"> 496: </a>
+</span><span id="497" class="l"><a href="#497"> 497: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
+</span><span id="498" class="l"><a href="#498"> 498: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
+</span><span id="499" class="l"><a href="#499"> 499: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
+</span><span id="500" class="l"><a href="#500"> 500: </a>
+</span><span id="501" class="l"><a href="#501"> 501: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
+</span><span id="502" class="l"><a href="#502"> 502: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
+</span><span id="503" class="l"><a href="#503"> 503: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
+</span><span id="504" class="l"><a href="#504"> 504: </a>        {
+</span><span id="505" class="l"><a href="#505"> 505: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
+</span><span id="506" class="l"><a href="#506"> 506: </a>        }
+</span><span id="507" class="l"><a href="#507"> 507: </a>
+</span><span id="508" class="l"><a href="#508"> 508: </a>        <span class="php-comment">// Only allow ajax requests</span>
+</span><span id="509" class="l"><a href="#509"> 509: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
+</span><span id="510" class="l"><a href="#510"> 510: </a>        {
+</span><span id="511" class="l"><a href="#511"> 511: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="512" class="l"><a href="#512"> 512: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="513" class="l"><a href="#513"> 513: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="514" class="l"><a href="#514"> 514: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ajax_only'</span>)
+</span><span id="515" class="l"><a href="#515"> 515: </a>                ], self::HTTP_NOT_ACCEPTABLE);
+</span><span id="516" class="l"><a href="#516"> 516: </a>        }
+</span><span id="517" class="l"><a href="#517"> 517: </a>
+</span><span id="518" class="l"><a href="#518"> 518: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
+</span><span id="519" class="l"><a href="#519"> 519: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; !(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
+</span><span id="520" class="l"><a href="#520"> 520: </a>        {
+</span><span id="521" class="l"><a href="#521"> 521: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="522" class="l"><a href="#522"> 522: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
+</span><span id="523" class="l"><a href="#523"> 523: </a>            {
+</span><span id="524" class="l"><a href="#524"> 524: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
+</span><span id="525" class="l"><a href="#525"> 525: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="526" class="l"><a href="#526"> 526: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="527" class="l"><a href="#527"> 527: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
+</span><span id="528" class="l"><a href="#528"> 528: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="529" class="l"><a href="#529"> 529: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="530" class="l"><a href="#530"> 530: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
+</span><span id="531" class="l"><a href="#531"> 531: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="532" class="l"><a href="#532"> 532: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="533" class="l"><a href="#533"> 533: </a>            }
+</span><span id="534" class="l"><a href="#534"> 534: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="535" class="l"><a href="#535"> 535: </a>            {
+</span><span id="536" class="l"><a href="#536"> 536: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="537" class="l"><a href="#537"> 537: </a>            }
+</span><span id="538" class="l"><a href="#538"> 538: </a>        }
+</span><span id="539" class="l"><a href="#539"> 539: </a>    }
+</span><span id="540" class="l"><a href="#540"> 540: </a>
+</span><span id="541" class="l"><a href="#541"> 541: </a>    <span class="php-comment">/**
+</span></span><span id="542" class="l"><a href="#542"> 542: </a><span class="php-comment">     * Deconstructor
+</span></span><span id="543" class="l"><a href="#543"> 543: </a><span class="php-comment">     *
+</span></span><span id="544" class="l"><a href="#544"> 544: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="545" class="l"><a href="#545"> 545: </a><span class="php-comment">     * @access public
+</span></span><span id="546" class="l"><a href="#546"> 546: </a><span class="php-comment">     * @return void
+</span></span><span id="547" class="l"><a href="#547"> 547: </a><span class="php-comment">     */</span>
+</span><span id="548" class="l"><a href="#548"> 548: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
+</span><span id="549" class="l"><a href="#549"> 549: </a>    {
+</span><span id="550" class="l"><a href="#550"> 550: </a>        <span class="php-comment">// Get the current timestamp</span>
+</span><span id="551" class="l"><a href="#551"> 551: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="552" class="l"><a href="#552"> 552: </a>
+</span><span id="553" class="l"><a href="#553"> 553: </a>        <span class="php-comment">// Log the loading time to the log table</span>
+</span><span id="554" class="l"><a href="#554"> 554: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="555" class="l"><a href="#555"> 555: </a>        {
+</span><span id="556" class="l"><a href="#556"> 556: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
+</span><span id="557" class="l"><a href="#557"> 557: </a>        }
+</span><span id="558" class="l"><a href="#558"> 558: </a>    }
+</span><span id="559" class="l"><a href="#559"> 559: </a>
+</span><span id="560" class="l"><a href="#560"> 560: </a>    <span class="php-comment">/**
+</span></span><span id="561" class="l"><a href="#561"> 561: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
+</span></span><span id="562" class="l"><a href="#562"> 562: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
+</span></span><span id="563" class="l"><a href="#563"> 563: </a><span class="php-comment">     * Controller method.
+</span></span><span id="564" class="l"><a href="#564"> 564: </a><span class="php-comment">     *
+</span></span><span id="565" class="l"><a href="#565"> 565: </a><span class="php-comment">     * @access public
+</span></span><span id="566" class="l"><a href="#566"> 566: </a><span class="php-comment">     * @param  string $object_called
+</span></span><span id="567" class="l"><a href="#567"> 567: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method.
+</span></span><span id="568" class="l"><a href="#568"> 568: </a><span class="php-comment">     */</span>
+</span><span id="569" class="l"><a href="#569"> 569: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span>)
+</span><span id="570" class="l"><a href="#570"> 570: </a>    {
+</span><span id="571" class="l"><a href="#571"> 571: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
+</span><span id="572" class="l"><a href="#572"> 572: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
+</span><span id="573" class="l"><a href="#573"> 573: </a>        {
+</span><span id="574" class="l"><a href="#574"> 574: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="575" class="l"><a href="#575"> 575: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="576" class="l"><a href="#576"> 576: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unsupported'</span>)
+</span><span id="577" class="l"><a href="#577"> 577: </a>                ], self::HTTP_FORBIDDEN);
+</span><span id="578" class="l"><a href="#578"> 578: </a>        }
+</span><span id="579" class="l"><a href="#579"> 579: </a>
+</span><span id="580" class="l"><a href="#580"> 580: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
+</span><span id="581" class="l"><a href="#581"> 581: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
+</span><span id="582" class="l"><a href="#582"> 582: </a>
+</span><span id="583" class="l"><a href="#583"> 583: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span> . <span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method;
+</span><span id="584" class="l"><a href="#584"> 584: </a>
+</span><span id="585" class="l"><a href="#585"> 585: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
+</span><span id="586" class="l"><a href="#586"> 586: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] === <span class="php-keyword1">FALSE</span>);
+</span><span id="587" class="l"><a href="#587"> 587: </a>
+</span><span id="588" class="l"><a href="#588"> 588: </a>        <span class="php-comment">// Use keys for this method?</span>
+</span><span id="589" class="l"><a href="#589"> 589: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] === <span class="php-keyword1">FALSE</span>);
+</span><span id="590" class="l"><a href="#590"> 590: </a>
+</span><span id="591" class="l"><a href="#591"> 591: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here.</span>
+</span><span id="592" class="l"><a href="#592"> 592: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
+</span><span id="593" class="l"><a href="#593"> 593: </a>        {
+</span><span id="594" class="l"><a href="#594"> 594: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="595" class="l"><a href="#595"> 595: </a>            {
+</span><span id="596" class="l"><a href="#596"> 596: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="597" class="l"><a href="#597"> 597: </a>            }
+</span><span id="598" class="l"><a href="#598"> 598: </a>
+</span><span id="599" class="l"><a href="#599"> 599: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="600" class="l"><a href="#600"> 600: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="601" class="l"><a href="#601"> 601: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-keyword2">sprintf</span>(<span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_invalid_api_key'</span>), <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="602" class="l"><a href="#602"> 602: </a>                ], self::HTTP_FORBIDDEN);
+</span><span id="603" class="l"><a href="#603"> 603: </a>        }
+</span><span id="604" class="l"><a href="#604"> 604: </a>
+</span><span id="605" class="l"><a href="#605"> 605: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller.</span>
+</span><span id="606" class="l"><a href="#606"> 606: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
+</span><span id="607" class="l"><a href="#607"> 607: </a>        {
+</span><span id="608" class="l"><a href="#608"> 608: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="609" class="l"><a href="#609"> 609: </a>            {
+</span><span id="610" class="l"><a href="#610"> 610: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="611" class="l"><a href="#611"> 611: </a>            }
+</span><span id="612" class="l"><a href="#612"> 612: </a>
+</span><span id="613" class="l"><a href="#613"> 613: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="614" class="l"><a href="#614"> 614: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="615" class="l"><a href="#615"> 615: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_unauthorized'</span>)
+</span><span id="616" class="l"><a href="#616"> 616: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="617" class="l"><a href="#617"> 617: </a>        }
+</span><span id="618" class="l"><a href="#618"> 618: </a>
+</span><span id="619" class="l"><a href="#619"> 619: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
+</span><span id="620" class="l"><a href="#620"> 620: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="621" class="l"><a href="#621"> 621: </a>        {
 </span><span id="622" class="l"><a href="#622"> 622: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="623" class="l"><a href="#623"> 623: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="624" class="l"><a href="#624"> 624: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_api_key_unauthorized'</span>]
-</span><span id="625" class="l"><a href="#625"> 625: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="624" class="l"><a href="#624"> 624: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unknown_method'</span>)
+</span><span id="625" class="l"><a href="#625"> 625: </a>                ], self::HTTP_NOT_FOUND);
 </span><span id="626" class="l"><a href="#626"> 626: </a>        }
 </span><span id="627" class="l"><a href="#627"> 627: </a>
-</span><span id="628" class="l"><a href="#628"> 628: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
-</span><span id="629" class="l"><a href="#629"> 629: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="628" class="l"><a href="#628"> 628: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
+</span><span id="629" class="l"><a href="#629"> 629: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
 </span><span id="630" class="l"><a href="#630"> 630: </a>        {
-</span><span id="631" class="l"><a href="#631"> 631: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="632" class="l"><a href="#632"> 632: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="633" class="l"><a href="#633"> 633: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_unknown_method'</span>]
-</span><span id="634" class="l"><a href="#634"> 634: </a>                ], self::HTTP_NOT_FOUND);
-</span><span id="635" class="l"><a href="#635"> 635: </a>        }
-</span><span id="636" class="l"><a href="#636"> 636: </a>
-</span><span id="637" class="l"><a href="#637"> 637: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
-</span><span id="638" class="l"><a href="#638"> 638: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="639" class="l"><a href="#639"> 639: </a>        {
-</span><span id="640" class="l"><a href="#640"> 640: </a>            <span class="php-comment">// Check the limit</span>
-</span><span id="641" class="l"><a href="#641"> 641: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="642" class="l"><a href="#642"> 642: </a>            {
-</span><span id="643" class="l"><a href="#643"> 643: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_api_key_time_limit'</span>]];
-</span><span id="644" class="l"><a href="#644"> 644: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
-</span><span id="645" class="l"><a href="#645"> 645: </a>            }
-</span><span id="646" class="l"><a href="#646"> 646: </a>
-</span><span id="647" class="l"><a href="#647"> 647: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
-</span><span id="648" class="l"><a href="#648"> 648: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
+</span><span id="631" class="l"><a href="#631"> 631: </a>            <span class="php-comment">// Check the limit</span>
+</span><span id="632" class="l"><a href="#632"> 632: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="633" class="l"><a href="#633"> 633: </a>            {
+</span><span id="634" class="l"><a href="#634"> 634: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_time_limit'</span>)];
+</span><span id="635" class="l"><a href="#635"> 635: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
+</span><span id="636" class="l"><a href="#636"> 636: </a>            }
+</span><span id="637" class="l"><a href="#637"> 637: </a>
+</span><span id="638" class="l"><a href="#638"> 638: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
+</span><span id="639" class="l"><a href="#639"> 639: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
+</span><span id="640" class="l"><a href="#640"> 640: </a>
+</span><span id="641" class="l"><a href="#641"> 641: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
+</span><span id="642" class="l"><a href="#642"> 642: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
+</span><span id="643" class="l"><a href="#643"> 643: </a>
+</span><span id="644" class="l"><a href="#644"> 644: </a>            <span class="php-comment">// IM TELLIN!</span>
+</span><span id="645" class="l"><a href="#645"> 645: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="646" class="l"><a href="#646"> 646: </a>            {
+</span><span id="647" class="l"><a href="#647"> 647: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
+</span><span id="648" class="l"><a href="#648"> 648: </a>            }
 </span><span id="649" class="l"><a href="#649"> 649: </a>
-</span><span id="650" class="l"><a href="#650"> 650: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
-</span><span id="651" class="l"><a href="#651"> 651: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
-</span><span id="652" class="l"><a href="#652"> 652: </a>
-</span><span id="653" class="l"><a href="#653"> 653: </a>            <span class="php-comment">// IM TELLIN!</span>
-</span><span id="654" class="l"><a href="#654"> 654: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="655" class="l"><a href="#655"> 655: </a>            {
-</span><span id="656" class="l"><a href="#656"> 656: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
-</span><span id="657" class="l"><a href="#657"> 657: </a>            }
-</span><span id="658" class="l"><a href="#658"> 658: </a>
-</span><span id="659" class="l"><a href="#659"> 659: </a>            <span class="php-comment">// They don't have good enough perms</span>
-</span><span id="660" class="l"><a href="#660"> 660: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_api_key_permissions'</span>]];
-</span><span id="661" class="l"><a href="#661"> 661: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
-</span><span id="662" class="l"><a href="#662"> 662: </a>        }
-</span><span id="663" class="l"><a href="#663"> 663: </a>
-</span><span id="664" class="l"><a href="#664"> 664: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
-</span><span id="665" class="l"><a href="#665"> 665: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="666" class="l"><a href="#666"> 666: </a>        {
-</span><span id="667" class="l"><a href="#667"> 667: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
-</span><span id="668" class="l"><a href="#668"> 668: </a>        }
-</span><span id="669" class="l"><a href="#669"> 669: </a>
-</span><span id="670" class="l"><a href="#670"> 670: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
-</span><span id="671" class="l"><a href="#671"> 671: </a>        <span class="php-keyword1">try</span>
-</span><span id="672" class="l"><a href="#672"> 672: </a>        {
-</span><span id="673" class="l"><a href="#673"> 673: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
-</span><span id="674" class="l"><a href="#674"> 674: </a>        }
-</span><span id="675" class="l"><a href="#675"> 675: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
-</span><span id="676" class="l"><a href="#676"> 676: </a>        {
-</span><span id="677" class="l"><a href="#677"> 677: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
-</span><span id="678" class="l"><a href="#678"> 678: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="679" class="l"><a href="#679"> 679: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="680" class="l"><a href="#680"> 680: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
-</span><span id="681" class="l"><a href="#681"> 681: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
-</span><span id="682" class="l"><a href="#682"> 682: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
-</span><span id="683" class="l"><a href="#683"> 683: </a>                    ]
-</span><span id="684" class="l"><a href="#684"> 684: </a>                ], self::HTTP_INTERNAL_SERVER_ERROR);
-</span><span id="685" class="l"><a href="#685"> 685: </a>        }
-</span><span id="686" class="l"><a href="#686"> 686: </a>    }
-</span><span id="687" class="l"><a href="#687"> 687: </a>
-</span><span id="688" class="l"><a href="#688"> 688: </a>    <span class="php-comment">/**
-</span></span><span id="689" class="l"><a href="#689"> 689: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
-</span></span><span id="690" class="l"><a href="#690"> 690: </a><span class="php-comment">     *
-</span></span><span id="691" class="l"><a href="#691"> 691: </a><span class="php-comment">     * @access public
-</span></span><span id="692" class="l"><a href="#692"> 692: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
-</span></span><span id="693" class="l"><a href="#693"> 693: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
-</span></span><span id="694" class="l"><a href="#694"> 694: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
-</span></span><span id="695" class="l"><a href="#695"> 695: </a><span class="php-comment">     * running the script; otherwise, exit
-</span></span><span id="696" class="l"><a href="#696"> 696: </a><span class="php-comment">     */</span>
-</span><span id="697" class="l"><a href="#697"> 697: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="698" class="l"><a href="#698"> 698: </a>    {
-</span><span id="699" class="l"><a href="#699"> 699: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
-</span><span id="700" class="l"><a href="#700"> 700: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="701" class="l"><a href="#701"> 701: </a>        {
-</span><span id="702" class="l"><a href="#702"> 702: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
-</span><span id="703" class="l"><a href="#703"> 703: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
+</span><span id="650" class="l"><a href="#650"> 650: </a>            <span class="php-comment">// They don't have good enough perms</span>
+</span><span id="651" class="l"><a href="#651"> 651: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_permissions'</span>)];
+</span><span id="652" class="l"><a href="#652"> 652: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
+</span><span id="653" class="l"><a href="#653"> 653: </a>        }
+</span><span id="654" class="l"><a href="#654"> 654: </a>
+</span><span id="655" class="l"><a href="#655"> 655: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
+</span><span id="656" class="l"><a href="#656"> 656: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="657" class="l"><a href="#657"> 657: </a>        {
+</span><span id="658" class="l"><a href="#658"> 658: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
+</span><span id="659" class="l"><a href="#659"> 659: </a>        }
+</span><span id="660" class="l"><a href="#660"> 660: </a>
+</span><span id="661" class="l"><a href="#661"> 661: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
+</span><span id="662" class="l"><a href="#662"> 662: </a>        <span class="php-keyword1">try</span>
+</span><span id="663" class="l"><a href="#663"> 663: </a>        {
+</span><span id="664" class="l"><a href="#664"> 664: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
+</span><span id="665" class="l"><a href="#665"> 665: </a>        }
+</span><span id="666" class="l"><a href="#666"> 666: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
+</span><span id="667" class="l"><a href="#667"> 667: </a>        {
+</span><span id="668" class="l"><a href="#668"> 668: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
+</span><span id="669" class="l"><a href="#669"> 669: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="670" class="l"><a href="#670"> 670: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="671" class="l"><a href="#671"> 671: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
+</span><span id="672" class="l"><a href="#672"> 672: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
+</span><span id="673" class="l"><a href="#673"> 673: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
+</span><span id="674" class="l"><a href="#674"> 674: </a>                    ]
+</span><span id="675" class="l"><a href="#675"> 675: </a>                ], self::HTTP_INTERNAL_SERVER_ERROR);
+</span><span id="676" class="l"><a href="#676"> 676: </a>        }
+</span><span id="677" class="l"><a href="#677"> 677: </a>    }
+</span><span id="678" class="l"><a href="#678"> 678: </a>
+</span><span id="679" class="l"><a href="#679"> 679: </a>    <span class="php-comment">/**
+</span></span><span id="680" class="l"><a href="#680"> 680: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
+</span></span><span id="681" class="l"><a href="#681"> 681: </a><span class="php-comment">     *
+</span></span><span id="682" class="l"><a href="#682"> 682: </a><span class="php-comment">     * @access public
+</span></span><span id="683" class="l"><a href="#683"> 683: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
+</span></span><span id="684" class="l"><a href="#684"> 684: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
+</span></span><span id="685" class="l"><a href="#685"> 685: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
+</span></span><span id="686" class="l"><a href="#686"> 686: </a><span class="php-comment">     * running the script; otherwise, exit
+</span></span><span id="687" class="l"><a href="#687"> 687: </a><span class="php-comment">     */</span>
+</span><span id="688" class="l"><a href="#688"> 688: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="689" class="l"><a href="#689"> 689: </a>    {
+</span><span id="690" class="l"><a href="#690"> 690: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
+</span><span id="691" class="l"><a href="#691"> 691: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="692" class="l"><a href="#692"> 692: </a>        {
+</span><span id="693" class="l"><a href="#693"> 693: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
+</span><span id="694" class="l"><a href="#694"> 694: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
+</span><span id="695" class="l"><a href="#695"> 695: </a>        }
+</span><span id="696" class="l"><a href="#696"> 696: </a>
+</span><span id="697" class="l"><a href="#697"> 697: </a>        <span class="php-comment">// Set the output as NULL by default</span>
+</span><span id="698" class="l"><a href="#698"> 698: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="699" class="l"><a href="#699"> 699: </a>
+</span><span id="700" class="l"><a href="#700"> 700: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
+</span><span id="701" class="l"><a href="#701"> 701: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="702" class="l"><a href="#702"> 702: </a>        {
+</span><span id="703" class="l"><a href="#703"> 703: </a>            <span class="php-var">$http_code</span> = self::HTTP_NOT_FOUND;
 </span><span id="704" class="l"><a href="#704"> 704: </a>        }
 </span><span id="705" class="l"><a href="#705"> 705: </a>
-</span><span id="706" class="l"><a href="#706"> 706: </a>        <span class="php-comment">// Set the output as NULL by default</span>
-</span><span id="707" class="l"><a href="#707"> 707: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="708" class="l"><a href="#708"> 708: </a>
-</span><span id="709" class="l"><a href="#709"> 709: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
-</span><span id="710" class="l"><a href="#710"> 710: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="711" class="l"><a href="#711"> 711: </a>        {
-</span><span id="712" class="l"><a href="#712"> 712: </a>            <span class="php-var">$http_code</span> = self::HTTP_NOT_FOUND;
-</span><span id="713" class="l"><a href="#713"> 713: </a>        }
-</span><span id="714" class="l"><a href="#714"> 714: </a>
-</span><span id="715" class="l"><a href="#715"> 715: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
-</span><span id="716" class="l"><a href="#716"> 716: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="717" class="l"><a href="#717"> 717: </a>        {
-</span><span id="718" class="l"><a href="#718"> 718: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
-</span><span id="719" class="l"><a href="#719"> 719: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
-</span><span id="720" class="l"><a href="#720"> 720: </a>            {
-</span><span id="721" class="l"><a href="#721"> 721: </a>                <span class="php-comment">// Set the format header</span>
-</span><span id="722" class="l"><a href="#722"> 722: </a>                <span class="php-var">$this</span>-&gt;output-&gt;set_content_type(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format], <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
-</span><span id="723" class="l"><a href="#723"> 723: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
-</span><span id="724" class="l"><a href="#724"> 724: </a>
-</span><span id="725" class="l"><a href="#725"> 725: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error.</span>
-</span><span id="726" class="l"><a href="#726"> 726: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
-</span><span id="727" class="l"><a href="#727"> 727: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
-</span><span id="728" class="l"><a href="#728"> 728: </a>                {
-</span><span id="729" class="l"><a href="#729"> 729: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="730" class="l"><a href="#730"> 730: </a>                }
-</span><span id="731" class="l"><a href="#731"> 731: </a>            }
-</span><span id="732" class="l"><a href="#732"> 732: </a>            <span class="php-keyword1">else</span>
-</span><span id="733" class="l"><a href="#733"> 733: </a>            {
-</span><span id="734" class="l"><a href="#734"> 734: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
-</span><span id="735" class="l"><a href="#735"> 735: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
-</span><span id="736" class="l"><a href="#736"> 736: </a>                {
-</span><span id="737" class="l"><a href="#737"> 737: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="738" class="l"><a href="#738"> 738: </a>                }
-</span><span id="739" class="l"><a href="#739"> 739: </a>
-</span><span id="740" class="l"><a href="#740"> 740: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
-</span><span id="741" class="l"><a href="#741"> 741: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
-</span><span id="742" class="l"><a href="#742"> 742: </a>            }
-</span><span id="743" class="l"><a href="#743"> 743: </a>        }
-</span><span id="744" class="l"><a href="#744"> 744: </a>
-</span><span id="745" class="l"><a href="#745"> 745: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
-</span><span id="746" class="l"><a href="#746"> 746: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
-</span><span id="747" class="l"><a href="#747"> 747: </a>        <span class="php-comment">// correct HTTP status code</span>
-</span><span id="748" class="l"><a href="#748"> 748: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = self::HTTP_OK;
-</span><span id="749" class="l"><a href="#749"> 749: </a>
-</span><span id="750" class="l"><a href="#750"> 750: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_status_header(<span class="php-var">$http_code</span>);
+</span><span id="706" class="l"><a href="#706"> 706: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
+</span><span id="707" class="l"><a href="#707"> 707: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="708" class="l"><a href="#708"> 708: </a>        {
+</span><span id="709" class="l"><a href="#709"> 709: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
+</span><span id="710" class="l"><a href="#710"> 710: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
+</span><span id="711" class="l"><a href="#711"> 711: </a>            {
+</span><span id="712" class="l"><a href="#712"> 712: </a>                <span class="php-comment">// Set the format header</span>
+</span><span id="713" class="l"><a href="#713"> 713: </a>                <span class="php-var">$this</span>-&gt;output-&gt;set_content_type(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format], <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
+</span><span id="714" class="l"><a href="#714"> 714: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
+</span><span id="715" class="l"><a href="#715"> 715: </a>
+</span><span id="716" class="l"><a href="#716"> 716: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error.</span>
+</span><span id="717" class="l"><a href="#717"> 717: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
+</span><span id="718" class="l"><a href="#718"> 718: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
+</span><span id="719" class="l"><a href="#719"> 719: </a>                {
+</span><span id="720" class="l"><a href="#720"> 720: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="721" class="l"><a href="#721"> 721: </a>                }
+</span><span id="722" class="l"><a href="#722"> 722: </a>            }
+</span><span id="723" class="l"><a href="#723"> 723: </a>            <span class="php-keyword1">else</span>
+</span><span id="724" class="l"><a href="#724"> 724: </a>            {
+</span><span id="725" class="l"><a href="#725"> 725: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
+</span><span id="726" class="l"><a href="#726"> 726: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
+</span><span id="727" class="l"><a href="#727"> 727: </a>                {
+</span><span id="728" class="l"><a href="#728"> 728: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="729" class="l"><a href="#729"> 729: </a>                }
+</span><span id="730" class="l"><a href="#730"> 730: </a>
+</span><span id="731" class="l"><a href="#731"> 731: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
+</span><span id="732" class="l"><a href="#732"> 732: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
+</span><span id="733" class="l"><a href="#733"> 733: </a>            }
+</span><span id="734" class="l"><a href="#734"> 734: </a>        }
+</span><span id="735" class="l"><a href="#735"> 735: </a>
+</span><span id="736" class="l"><a href="#736"> 736: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
+</span><span id="737" class="l"><a href="#737"> 737: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
+</span><span id="738" class="l"><a href="#738"> 738: </a>        <span class="php-comment">// correct HTTP status code</span>
+</span><span id="739" class="l"><a href="#739"> 739: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = self::HTTP_OK;
+</span><span id="740" class="l"><a href="#740"> 740: </a>
+</span><span id="741" class="l"><a href="#741"> 741: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_status_header(<span class="php-var">$http_code</span>);
+</span><span id="742" class="l"><a href="#742"> 742: </a>
+</span><span id="743" class="l"><a href="#743"> 743: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
+</span><span id="744" class="l"><a href="#744"> 744: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="745" class="l"><a href="#745"> 745: </a>        {
+</span><span id="746" class="l"><a href="#746"> 746: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
+</span><span id="747" class="l"><a href="#747"> 747: </a>        }
+</span><span id="748" class="l"><a href="#748"> 748: </a>
+</span><span id="749" class="l"><a href="#749"> 749: </a>        <span class="php-comment">// Output the data</span>
+</span><span id="750" class="l"><a href="#750"> 750: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_output(<span class="php-var">$output</span>);
 </span><span id="751" class="l"><a href="#751"> 751: </a>
-</span><span id="752" class="l"><a href="#752"> 752: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
-</span><span id="753" class="l"><a href="#753"> 753: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="754" class="l"><a href="#754"> 754: </a>        {
-</span><span id="755" class="l"><a href="#755"> 755: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
-</span><span id="756" class="l"><a href="#756"> 756: </a>        }
-</span><span id="757" class="l"><a href="#757"> 757: </a>
-</span><span id="758" class="l"><a href="#758"> 758: </a>        <span class="php-comment">// Output the data</span>
-</span><span id="759" class="l"><a href="#759"> 759: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_output(<span class="php-var">$output</span>);
-</span><span id="760" class="l"><a href="#760"> 760: </a>
-</span><span id="761" class="l"><a href="#761"> 761: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="762" class="l"><a href="#762"> 762: </a>        {
-</span><span id="763" class="l"><a href="#763"> 763: </a>            <span class="php-comment">// Display the data and exit execution</span>
-</span><span id="764" class="l"><a href="#764"> 764: </a>            <span class="php-var">$this</span>-&gt;output-&gt;_display();
-</span><span id="765" class="l"><a href="#765"> 765: </a>            <span class="php-keyword1">exit</span>;
-</span><span id="766" class="l"><a href="#766"> 766: </a>        }
-</span><span id="767" class="l"><a href="#767"> 767: </a>
-</span><span id="768" class="l"><a href="#768"> 768: </a>        <span class="php-comment">// Otherwise dump the output automatically</span>
-</span><span id="769" class="l"><a href="#769"> 769: </a>    }
-</span><span id="770" class="l"><a href="#770"> 770: </a>
-</span><span id="771" class="l"><a href="#771"> 771: </a>    <span class="php-comment">/**
-</span></span><span id="772" class="l"><a href="#772"> 772: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
-</span></span><span id="773" class="l"><a href="#773"> 773: </a><span class="php-comment">     * within the buffers of the Output class. The response is sent to the client
-</span></span><span id="774" class="l"><a href="#774"> 774: </a><span class="php-comment">     * lately by the framework, after the current controller's method termination.
-</span></span><span id="775" class="l"><a href="#775"> 775: </a><span class="php-comment">     * All the hooks after the controller's method termination are executable.
-</span></span><span id="776" class="l"><a href="#776"> 776: </a><span class="php-comment">     *
-</span></span><span id="777" class="l"><a href="#777"> 777: </a><span class="php-comment">     * @access public
-</span></span><span id="778" class="l"><a href="#778"> 778: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
-</span></span><span id="779" class="l"><a href="#779"> 779: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
-</span></span><span id="780" class="l"><a href="#780"> 780: </a><span class="php-comment">     */</span>
-</span><span id="781" class="l"><a href="#781"> 781: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> set_response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="782" class="l"><a href="#782"> 782: </a>    {
-</span><span id="783" class="l"><a href="#783"> 783: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$data</span>, <span class="php-var">$http_code</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="784" class="l"><a href="#784"> 784: </a>    }
-</span><span id="785" class="l"><a href="#785"> 785: </a>
-</span><span id="786" class="l"><a href="#786"> 786: </a>    <span class="php-comment">/**
-</span></span><span id="787" class="l"><a href="#787"> 787: </a><span class="php-comment">     * Get the input format e.g. json or xml
-</span></span><span id="788" class="l"><a href="#788"> 788: </a><span class="php-comment">     *
-</span></span><span id="789" class="l"><a href="#789"> 789: </a><span class="php-comment">     * @access protected
-</span></span><span id="790" class="l"><a href="#790"> 790: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
-</span></span><span id="791" class="l"><a href="#791"> 791: </a><span class="php-comment">     */</span>
-</span><span id="792" class="l"><a href="#792"> 792: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
-</span><span id="793" class="l"><a href="#793"> 793: </a>    {
-</span><span id="794" class="l"><a href="#794"> 794: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
-</span><span id="795" class="l"><a href="#795"> 795: </a>        <span class="php-var">$content_type</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
-</span><span id="796" class="l"><a href="#796"> 796: </a>
-</span><span id="797" class="l"><a href="#797"> 797: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$content_type</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="798" class="l"><a href="#798"> 798: </a>        {
-</span><span id="799" class="l"><a href="#799"> 799: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="800" class="l"><a href="#800"> 800: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
-</span><span id="801" class="l"><a href="#801"> 801: </a>            {
-</span><span id="802" class="l"><a href="#802"> 802: </a>                <span class="php-comment">// $key = format e.g. csv</span>
-</span><span id="803" class="l"><a href="#803"> 803: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
-</span><span id="804" class="l"><a href="#804"> 804: </a>
-</span><span id="805" class="l"><a href="#805"> 805: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
-</span><span id="806" class="l"><a href="#806"> 806: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
-</span><span id="807" class="l"><a href="#807"> 807: </a>                <span class="php-var">$content_type</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$content_type</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$content_type</span>)) : <span class="php-var">$content_type</span>);
-</span><span id="808" class="l"><a href="#808"> 808: </a>
-</span><span id="809" class="l"><a href="#809"> 809: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
-</span><span id="810" class="l"><a href="#810"> 810: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$content_type</span> === <span class="php-var">$value</span>)
-</span><span id="811" class="l"><a href="#811"> 811: </a>                {
-</span><span id="812" class="l"><a href="#812"> 812: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
-</span><span id="813" class="l"><a href="#813"> 813: </a>                }
-</span><span id="814" class="l"><a href="#814"> 814: </a>            }
-</span><span id="815" class="l"><a href="#815"> 815: </a>        }
-</span><span id="816" class="l"><a href="#816"> 816: </a>
-</span><span id="817" class="l"><a href="#817"> 817: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="818" class="l"><a href="#818"> 818: </a>    }
-</span><span id="819" class="l"><a href="#819"> 819: </a>
-</span><span id="820" class="l"><a href="#820"> 820: </a>    <span class="php-comment">/**
-</span></span><span id="821" class="l"><a href="#821"> 821: </a><span class="php-comment">     * Detect which format should be used to output the data
-</span></span><span id="822" class="l"><a href="#822"> 822: </a><span class="php-comment">     *
-</span></span><span id="823" class="l"><a href="#823"> 823: </a><span class="php-comment">     * @access protected
-</span></span><span id="824" class="l"><a href="#824"> 824: </a><span class="php-comment">     * @return mixed|NULL|string Output format
-</span></span><span id="825" class="l"><a href="#825"> 825: </a><span class="php-comment">     */</span>
-</span><span id="826" class="l"><a href="#826"> 826: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
-</span><span id="827" class="l"><a href="#827"> 827: </a>    {
-</span><span id="828" class="l"><a href="#828"> 828: </a>        <span class="php-comment">// Concatenate formats to a regex pattern e.g. \.(csv|json|xml)</span>
-</span><span id="829" class="l"><a href="#829"> 829: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')($|\/)/'</span>;
-</span><span id="830" class="l"><a href="#830"> 830: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="831" class="l"><a href="#831"> 831: </a>
-</span><span id="832" class="l"><a href="#832"> 832: </a>        <span class="php-comment">// Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2</span>
-</span><span id="833" class="l"><a href="#833"> 833: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
-</span><span id="834" class="l"><a href="#834"> 834: </a>        {
-</span><span id="835" class="l"><a href="#835"> 835: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
-</span><span id="836" class="l"><a href="#836"> 836: </a>        }
-</span><span id="837" class="l"><a href="#837"> 837: </a>
-</span><span id="838" class="l"><a href="#838"> 838: </a>        <span class="php-comment">// Get the format parameter named as 'format'</span>
-</span><span id="839" class="l"><a href="#839"> 839: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]))
-</span><span id="840" class="l"><a href="#840"> 840: </a>        {
-</span><span id="841" class="l"><a href="#841"> 841: </a>            <span class="php-var">$format</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]);
+</span><span id="752" class="l"><a href="#752"> 752: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="753" class="l"><a href="#753"> 753: </a>        {
+</span><span id="754" class="l"><a href="#754"> 754: </a>            <span class="php-comment">// Display the data and exit execution</span>
+</span><span id="755" class="l"><a href="#755"> 755: </a>            <span class="php-var">$this</span>-&gt;output-&gt;_display();
+</span><span id="756" class="l"><a href="#756"> 756: </a>            <span class="php-keyword1">exit</span>;
+</span><span id="757" class="l"><a href="#757"> 757: </a>        }
+</span><span id="758" class="l"><a href="#758"> 758: </a>
+</span><span id="759" class="l"><a href="#759"> 759: </a>        <span class="php-comment">// Otherwise dump the output automatically</span>
+</span><span id="760" class="l"><a href="#760"> 760: </a>    }
+</span><span id="761" class="l"><a href="#761"> 761: </a>
+</span><span id="762" class="l"><a href="#762"> 762: </a>    <span class="php-comment">/**
+</span></span><span id="763" class="l"><a href="#763"> 763: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
+</span></span><span id="764" class="l"><a href="#764"> 764: </a><span class="php-comment">     * within the buffers of the Output class. The response is sent to the client
+</span></span><span id="765" class="l"><a href="#765"> 765: </a><span class="php-comment">     * lately by the framework, after the current controller's method termination.
+</span></span><span id="766" class="l"><a href="#766"> 766: </a><span class="php-comment">     * All the hooks after the controller's method termination are executable.
+</span></span><span id="767" class="l"><a href="#767"> 767: </a><span class="php-comment">     *
+</span></span><span id="768" class="l"><a href="#768"> 768: </a><span class="php-comment">     * @access public
+</span></span><span id="769" class="l"><a href="#769"> 769: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
+</span></span><span id="770" class="l"><a href="#770"> 770: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
+</span></span><span id="771" class="l"><a href="#771"> 771: </a><span class="php-comment">     */</span>
+</span><span id="772" class="l"><a href="#772"> 772: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> set_response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="773" class="l"><a href="#773"> 773: </a>    {
+</span><span id="774" class="l"><a href="#774"> 774: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$data</span>, <span class="php-var">$http_code</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="775" class="l"><a href="#775"> 775: </a>    }
+</span><span id="776" class="l"><a href="#776"> 776: </a>
+</span><span id="777" class="l"><a href="#777"> 777: </a>    <span class="php-comment">/**
+</span></span><span id="778" class="l"><a href="#778"> 778: </a><span class="php-comment">     * Get the input format e.g. json or xml
+</span></span><span id="779" class="l"><a href="#779"> 779: </a><span class="php-comment">     *
+</span></span><span id="780" class="l"><a href="#780"> 780: </a><span class="php-comment">     * @access protected
+</span></span><span id="781" class="l"><a href="#781"> 781: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
+</span></span><span id="782" class="l"><a href="#782"> 782: </a><span class="php-comment">     */</span>
+</span><span id="783" class="l"><a href="#783"> 783: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
+</span><span id="784" class="l"><a href="#784"> 784: </a>    {
+</span><span id="785" class="l"><a href="#785"> 785: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
+</span><span id="786" class="l"><a href="#786"> 786: </a>        <span class="php-var">$content_type</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
+</span><span id="787" class="l"><a href="#787"> 787: </a>
+</span><span id="788" class="l"><a href="#788"> 788: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$content_type</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="789" class="l"><a href="#789"> 789: </a>        {
+</span><span id="790" class="l"><a href="#790"> 790: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="791" class="l"><a href="#791"> 791: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
+</span><span id="792" class="l"><a href="#792"> 792: </a>            {
+</span><span id="793" class="l"><a href="#793"> 793: </a>                <span class="php-comment">// $key = format e.g. csv</span>
+</span><span id="794" class="l"><a href="#794"> 794: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
+</span><span id="795" class="l"><a href="#795"> 795: </a>
+</span><span id="796" class="l"><a href="#796"> 796: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
+</span><span id="797" class="l"><a href="#797"> 797: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
+</span><span id="798" class="l"><a href="#798"> 798: </a>                <span class="php-var">$content_type</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$content_type</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$content_type</span>)) : <span class="php-var">$content_type</span>);
+</span><span id="799" class="l"><a href="#799"> 799: </a>
+</span><span id="800" class="l"><a href="#800"> 800: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
+</span><span id="801" class="l"><a href="#801"> 801: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$content_type</span> === <span class="php-var">$value</span>)
+</span><span id="802" class="l"><a href="#802"> 802: </a>                {
+</span><span id="803" class="l"><a href="#803"> 803: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
+</span><span id="804" class="l"><a href="#804"> 804: </a>                }
+</span><span id="805" class="l"><a href="#805"> 805: </a>            }
+</span><span id="806" class="l"><a href="#806"> 806: </a>        }
+</span><span id="807" class="l"><a href="#807"> 807: </a>
+</span><span id="808" class="l"><a href="#808"> 808: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="809" class="l"><a href="#809"> 809: </a>    }
+</span><span id="810" class="l"><a href="#810"> 810: </a>
+</span><span id="811" class="l"><a href="#811"> 811: </a>    <span class="php-comment">/**
+</span></span><span id="812" class="l"><a href="#812"> 812: </a><span class="php-comment">     * Detect which format should be used to output the data
+</span></span><span id="813" class="l"><a href="#813"> 813: </a><span class="php-comment">     *
+</span></span><span id="814" class="l"><a href="#814"> 814: </a><span class="php-comment">     * @access protected
+</span></span><span id="815" class="l"><a href="#815"> 815: </a><span class="php-comment">     * @return mixed|NULL|string Output format
+</span></span><span id="816" class="l"><a href="#816"> 816: </a><span class="php-comment">     */</span>
+</span><span id="817" class="l"><a href="#817"> 817: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
+</span><span id="818" class="l"><a href="#818"> 818: </a>    {
+</span><span id="819" class="l"><a href="#819"> 819: </a>        <span class="php-comment">// Concatenate formats to a regex pattern e.g. \.(csv|json|xml)</span>
+</span><span id="820" class="l"><a href="#820"> 820: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')($|\/)/'</span>;
+</span><span id="821" class="l"><a href="#821"> 821: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="822" class="l"><a href="#822"> 822: </a>
+</span><span id="823" class="l"><a href="#823"> 823: </a>        <span class="php-comment">// Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2</span>
+</span><span id="824" class="l"><a href="#824"> 824: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
+</span><span id="825" class="l"><a href="#825"> 825: </a>        {
+</span><span id="826" class="l"><a href="#826"> 826: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
+</span><span id="827" class="l"><a href="#827"> 827: </a>        }
+</span><span id="828" class="l"><a href="#828"> 828: </a>
+</span><span id="829" class="l"><a href="#829"> 829: </a>        <span class="php-comment">// Get the format parameter named as 'format'</span>
+</span><span id="830" class="l"><a href="#830"> 830: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]))
+</span><span id="831" class="l"><a href="#831"> 831: </a>        {
+</span><span id="832" class="l"><a href="#832"> 832: </a>            <span class="php-var">$format</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]);
+</span><span id="833" class="l"><a href="#833"> 833: </a>
+</span><span id="834" class="l"><a href="#834"> 834: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]) === <span class="php-keyword1">TRUE</span>)
+</span><span id="835" class="l"><a href="#835"> 835: </a>            {
+</span><span id="836" class="l"><a href="#836"> 836: </a>                <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="837" class="l"><a href="#837"> 837: </a>            }
+</span><span id="838" class="l"><a href="#838"> 838: </a>        }
+</span><span id="839" class="l"><a href="#839"> 839: </a>
+</span><span id="840" class="l"><a href="#840"> 840: </a>        <span class="php-comment">// Get the HTTP_ACCEPT server variable</span>
+</span><span id="841" class="l"><a href="#841"> 841: </a>        <span class="php-var">$http_accept</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>);
 </span><span id="842" class="l"><a href="#842"> 842: </a>
-</span><span id="843" class="l"><a href="#843"> 843: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]) === <span class="php-keyword1">TRUE</span>)
-</span><span id="844" class="l"><a href="#844"> 844: </a>            {
-</span><span id="845" class="l"><a href="#845"> 845: </a>                <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="846" class="l"><a href="#846"> 846: </a>            }
-</span><span id="847" class="l"><a href="#847"> 847: </a>        }
-</span><span id="848" class="l"><a href="#848"> 848: </a>
-</span><span id="849" class="l"><a href="#849"> 849: </a>        <span class="php-comment">// Get the HTTP_ACCEPT server variable</span>
-</span><span id="850" class="l"><a href="#850"> 850: </a>        <span class="php-var">$http_accept</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>);
-</span><span id="851" class="l"><a href="#851"> 851: </a>
-</span><span id="852" class="l"><a href="#852"> 852: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT server variable</span>
-</span><span id="853" class="l"><a href="#853"> 853: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$http_accept</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="854" class="l"><a href="#854"> 854: </a>        {
-</span><span id="855" class="l"><a href="#855"> 855: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="856" class="l"><a href="#856"> 856: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
-</span><span id="857" class="l"><a href="#857"> 857: </a>            {
-</span><span id="858" class="l"><a href="#858"> 858: </a>                <span class="php-comment">// Has this format been requested?</span>
-</span><span id="859" class="l"><a href="#859"> 859: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="860" class="l"><a href="#860"> 860: </a>                {
-</span><span id="861" class="l"><a href="#861"> 861: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
-</span><span id="862" class="l"><a href="#862"> 862: </a>                    {
-</span><span id="863" class="l"><a href="#863"> 863: </a>                        <span class="php-comment">// If not HTML or XML assume it's correct</span>
-</span><span id="864" class="l"><a href="#864"> 864: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="865" class="l"><a href="#865"> 865: </a>                    }
-</span><span id="866" class="l"><a href="#866"> 866: </a>                    <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="867" class="l"><a href="#867"> 867: </a>                    {
-</span><span id="868" class="l"><a href="#868"> 868: </a>                        <span class="php-comment">// HTML or XML have shown up as a match</span>
-</span><span id="869" class="l"><a href="#869"> 869: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
-</span><span id="870" class="l"><a href="#870"> 870: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="871" class="l"><a href="#871"> 871: </a>                    }
-</span><span id="872" class="l"><a href="#872"> 872: </a>                    <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="873" class="l"><a href="#873"> 873: </a>                    {
-</span><span id="874" class="l"><a href="#874"> 874: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
-</span><span id="875" class="l"><a href="#875"> 875: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="876" class="l"><a href="#876"> 876: </a>                    }
-</span><span id="877" class="l"><a href="#877"> 877: </a>                }
-</span><span id="878" class="l"><a href="#878"> 878: </a>            }
-</span><span id="879" class="l"><a href="#879"> 879: </a>        }
-</span><span id="880" class="l"><a href="#880"> 880: </a>
-</span><span id="881" class="l"><a href="#881"> 881: </a>        <span class="php-comment">// Check if the controller has a default format</span>
-</span><span id="882" class="l"><a href="#882"> 882: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
-</span><span id="883" class="l"><a href="#883"> 883: </a>        {
-</span><span id="884" class="l"><a href="#884"> 884: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
-</span><span id="885" class="l"><a href="#885"> 885: </a>        }
-</span><span id="886" class="l"><a href="#886"> 886: </a>
-</span><span id="887" class="l"><a href="#887"> 887: </a>        <span class="php-comment">// Obtain the default format from the configuration</span>
-</span><span id="888" class="l"><a href="#888"> 888: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
-</span><span id="889" class="l"><a href="#889"> 889: </a>    }
-</span><span id="890" class="l"><a href="#890"> 890: </a>
-</span><span id="891" class="l"><a href="#891"> 891: </a>    <span class="php-comment">/**
-</span></span><span id="892" class="l"><a href="#892"> 892: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
-</span></span><span id="893" class="l"><a href="#893"> 893: </a><span class="php-comment">     *
-</span></span><span id="894" class="l"><a href="#894"> 894: </a><span class="php-comment">     * @access protected
-</span></span><span id="895" class="l"><a href="#895"> 895: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
-</span></span><span id="896" class="l"><a href="#896"> 896: </a><span class="php-comment">     */</span>
-</span><span id="897" class="l"><a href="#897"> 897: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
-</span><span id="898" class="l"><a href="#898"> 898: </a>    {
-</span><span id="899" class="l"><a href="#899"> 899: </a>        <span class="php-comment">// Declare a variable to store the method</span>
-</span><span id="900" class="l"><a href="#900"> 900: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="843" class="l"><a href="#843"> 843: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT server variable</span>
+</span><span id="844" class="l"><a href="#844"> 844: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$http_accept</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="845" class="l"><a href="#845"> 845: </a>        {
+</span><span id="846" class="l"><a href="#846"> 846: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="847" class="l"><a href="#847"> 847: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
+</span><span id="848" class="l"><a href="#848"> 848: </a>            {
+</span><span id="849" class="l"><a href="#849"> 849: </a>                <span class="php-comment">// Has this format been requested?</span>
+</span><span id="850" class="l"><a href="#850"> 850: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="851" class="l"><a href="#851"> 851: </a>                {
+</span><span id="852" class="l"><a href="#852"> 852: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
+</span><span id="853" class="l"><a href="#853"> 853: </a>                    {
+</span><span id="854" class="l"><a href="#854"> 854: </a>                        <span class="php-comment">// If not HTML or XML assume it's correct</span>
+</span><span id="855" class="l"><a href="#855"> 855: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="856" class="l"><a href="#856"> 856: </a>                    }
+</span><span id="857" class="l"><a href="#857"> 857: </a>                    <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="858" class="l"><a href="#858"> 858: </a>                    {
+</span><span id="859" class="l"><a href="#859"> 859: </a>                        <span class="php-comment">// HTML or XML have shown up as a match</span>
+</span><span id="860" class="l"><a href="#860"> 860: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
+</span><span id="861" class="l"><a href="#861"> 861: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="862" class="l"><a href="#862"> 862: </a>                    }
+</span><span id="863" class="l"><a href="#863"> 863: </a>                    <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="864" class="l"><a href="#864"> 864: </a>                    {
+</span><span id="865" class="l"><a href="#865"> 865: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
+</span><span id="866" class="l"><a href="#866"> 866: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="867" class="l"><a href="#867"> 867: </a>                    }
+</span><span id="868" class="l"><a href="#868"> 868: </a>                }
+</span><span id="869" class="l"><a href="#869"> 869: </a>            }
+</span><span id="870" class="l"><a href="#870"> 870: </a>        }
+</span><span id="871" class="l"><a href="#871"> 871: </a>
+</span><span id="872" class="l"><a href="#872"> 872: </a>        <span class="php-comment">// Check if the controller has a default format</span>
+</span><span id="873" class="l"><a href="#873"> 873: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
+</span><span id="874" class="l"><a href="#874"> 874: </a>        {
+</span><span id="875" class="l"><a href="#875"> 875: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
+</span><span id="876" class="l"><a href="#876"> 876: </a>        }
+</span><span id="877" class="l"><a href="#877"> 877: </a>
+</span><span id="878" class="l"><a href="#878"> 878: </a>        <span class="php-comment">// Obtain the default format from the configuration</span>
+</span><span id="879" class="l"><a href="#879"> 879: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
+</span><span id="880" class="l"><a href="#880"> 880: </a>    }
+</span><span id="881" class="l"><a href="#881"> 881: </a>
+</span><span id="882" class="l"><a href="#882"> 882: </a>    <span class="php-comment">/**
+</span></span><span id="883" class="l"><a href="#883"> 883: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
+</span></span><span id="884" class="l"><a href="#884"> 884: </a><span class="php-comment">     *
+</span></span><span id="885" class="l"><a href="#885"> 885: </a><span class="php-comment">     * @access protected
+</span></span><span id="886" class="l"><a href="#886"> 886: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
+</span></span><span id="887" class="l"><a href="#887"> 887: </a><span class="php-comment">     */</span>
+</span><span id="888" class="l"><a href="#888"> 888: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
+</span><span id="889" class="l"><a href="#889"> 889: </a>    {
+</span><span id="890" class="l"><a href="#890"> 890: </a>        <span class="php-comment">// Declare a variable to store the method</span>
+</span><span id="891" class="l"><a href="#891"> 891: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="892" class="l"><a href="#892"> 892: </a>
+</span><span id="893" class="l"><a href="#893"> 893: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
+</span><span id="894" class="l"><a href="#894"> 894: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="895" class="l"><a href="#895"> 895: </a>        {
+</span><span id="896" class="l"><a href="#896"> 896: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
+</span><span id="897" class="l"><a href="#897"> 897: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="898" class="l"><a href="#898"> 898: </a>            {
+</span><span id="899" class="l"><a href="#899"> 899: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
+</span><span id="900" class="l"><a href="#900"> 900: </a>            }
 </span><span id="901" class="l"><a href="#901"> 901: </a>
-</span><span id="902" class="l"><a href="#902"> 902: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
-</span><span id="903" class="l"><a href="#903"> 903: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="904" class="l"><a href="#904"> 904: </a>        {
-</span><span id="905" class="l"><a href="#905"> 905: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
-</span><span id="906" class="l"><a href="#906"> 906: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="907" class="l"><a href="#907"> 907: </a>            {
-</span><span id="908" class="l"><a href="#908"> 908: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
-</span><span id="909" class="l"><a href="#909"> 909: </a>            }
+</span><span id="902" class="l"><a href="#902"> 902: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
+</span><span id="903" class="l"><a href="#903"> 903: </a>        }
+</span><span id="904" class="l"><a href="#904"> 904: </a>
+</span><span id="905" class="l"><a href="#905"> 905: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
+</span><span id="906" class="l"><a href="#906"> 906: </a>        {
+</span><span id="907" class="l"><a href="#907"> 907: </a>            <span class="php-comment">// Get the request method as a lowercase string.</span>
+</span><span id="908" class="l"><a href="#908"> 908: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
+</span><span id="909" class="l"><a href="#909"> 909: </a>        }
 </span><span id="910" class="l"><a href="#910"> 910: </a>
-</span><span id="911" class="l"><a href="#911"> 911: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
-</span><span id="912" class="l"><a href="#912"> 912: </a>        }
+</span><span id="911" class="l"><a href="#911"> 911: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
+</span><span id="912" class="l"><a href="#912"> 912: </a>    }
 </span><span id="913" class="l"><a href="#913"> 913: </a>
-</span><span id="914" class="l"><a href="#914"> 914: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
-</span><span id="915" class="l"><a href="#915"> 915: </a>        {
-</span><span id="916" class="l"><a href="#916"> 916: </a>            <span class="php-comment">// Get the request method as a lowercase string.</span>
-</span><span id="917" class="l"><a href="#917"> 917: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
-</span><span id="918" class="l"><a href="#918"> 918: </a>        }
-</span><span id="919" class="l"><a href="#919"> 919: </a>
-</span><span id="920" class="l"><a href="#920"> 920: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
-</span><span id="921" class="l"><a href="#921"> 921: </a>    }
-</span><span id="922" class="l"><a href="#922"> 922: </a>
-</span><span id="923" class="l"><a href="#923"> 923: </a>    <span class="php-comment">/**
-</span></span><span id="924" class="l"><a href="#924"> 924: </a><span class="php-comment">     * See if the user has provided an API key
-</span></span><span id="925" class="l"><a href="#925"> 925: </a><span class="php-comment">     *
-</span></span><span id="926" class="l"><a href="#926"> 926: </a><span class="php-comment">     * @access protected
-</span></span><span id="927" class="l"><a href="#927"> 927: </a><span class="php-comment">     * @return bool
-</span></span><span id="928" class="l"><a href="#928"> 928: </a><span class="php-comment">     */</span>
-</span><span id="929" class="l"><a href="#929"> 929: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
-</span><span id="930" class="l"><a href="#930"> 930: </a>    {
-</span><span id="931" class="l"><a href="#931"> 931: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
-</span><span id="932" class="l"><a href="#932"> 932: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
-</span><span id="933" class="l"><a href="#933"> 933: </a>
-</span><span id="934" class="l"><a href="#934"> 934: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
-</span><span id="935" class="l"><a href="#935"> 935: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
-</span><span id="936" class="l"><a href="#936"> 936: </a>
-</span><span id="937" class="l"><a href="#937"> 937: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="938" class="l"><a href="#938"> 938: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
-</span><span id="939" class="l"><a href="#939"> 939: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
-</span><span id="940" class="l"><a href="#940"> 940: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
-</span><span id="941" class="l"><a href="#941"> 941: </a>
-</span><span id="942" class="l"><a href="#942"> 942: </a>        <span class="php-comment">// Find the key from server or arguments</span>
-</span><span id="943" class="l"><a href="#943"> 943: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
-</span><span id="944" class="l"><a href="#944"> 944: </a>        {
-</span><span id="945" class="l"><a href="#945"> 945: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
-</span><span id="946" class="l"><a href="#946"> 946: </a>            {
-</span><span id="947" class="l"><a href="#947"> 947: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="948" class="l"><a href="#948"> 948: </a>            }
-</span><span id="949" class="l"><a href="#949"> 949: </a>
-</span><span id="950" class="l"><a href="#950"> 950: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
-</span><span id="951" class="l"><a href="#951"> 951: </a>
-</span><span id="952" class="l"><a href="#952"> 952: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
-</span><span id="953" class="l"><a href="#953"> 953: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
-</span><span id="954" class="l"><a href="#954"> 954: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
-</span><span id="955" class="l"><a href="#955"> 955: </a>
-</span><span id="956" class="l"><a href="#956"> 956: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
-</span><span id="957" class="l"><a href="#957"> 957: </a>
-</span><span id="958" class="l"><a href="#958"> 958: </a>            <span class="php-comment">/*
-</span></span><span id="959" class="l"><a href="#959"> 959: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
-</span></span><span id="960" class="l"><a href="#960"> 960: </a><span class="php-comment">             * of valid ip addresses stored in the database.
-</span></span><span id="961" class="l"><a href="#961"> 961: </a><span class="php-comment">             */</span>
-</span><span id="962" class="l"><a href="#962"> 962: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
-</span><span id="963" class="l"><a href="#963"> 963: </a>            {
-</span><span id="964" class="l"><a href="#964"> 964: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
-</span><span id="965" class="l"><a href="#965"> 965: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
-</span><span id="966" class="l"><a href="#966"> 966: </a>                {
-</span><span id="967" class="l"><a href="#967"> 967: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
-</span><span id="968" class="l"><a href="#968"> 968: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
-</span><span id="969" class="l"><a href="#969"> 969: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
-</span><span id="970" class="l"><a href="#970"> 970: </a>
-</span><span id="971" class="l"><a href="#971"> 971: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
-</span><span id="972" class="l"><a href="#972"> 972: </a>                    {
-</span><span id="973" class="l"><a href="#973"> 973: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() === <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
-</span><span id="974" class="l"><a href="#974"> 974: </a>                        {
-</span><span id="975" class="l"><a href="#975"> 975: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
-</span><span id="976" class="l"><a href="#976"> 976: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
-</span><span id="977" class="l"><a href="#977"> 977: </a>                            <span class="php-keyword1">break</span>;
-</span><span id="978" class="l"><a href="#978"> 978: </a>                        }
-</span><span id="979" class="l"><a href="#979"> 979: </a>                    }
+</span><span id="914" class="l"><a href="#914"> 914: </a>    <span class="php-comment">/**
+</span></span><span id="915" class="l"><a href="#915"> 915: </a><span class="php-comment">     * See if the user has provided an API key
+</span></span><span id="916" class="l"><a href="#916"> 916: </a><span class="php-comment">     *
+</span></span><span id="917" class="l"><a href="#917"> 917: </a><span class="php-comment">     * @access protected
+</span></span><span id="918" class="l"><a href="#918"> 918: </a><span class="php-comment">     * @return bool
+</span></span><span id="919" class="l"><a href="#919"> 919: </a><span class="php-comment">     */</span>
+</span><span id="920" class="l"><a href="#920"> 920: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
+</span><span id="921" class="l"><a href="#921"> 921: </a>    {
+</span><span id="922" class="l"><a href="#922"> 922: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
+</span><span id="923" class="l"><a href="#923"> 923: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
+</span><span id="924" class="l"><a href="#924"> 924: </a>
+</span><span id="925" class="l"><a href="#925"> 925: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
+</span><span id="926" class="l"><a href="#926"> 926: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
+</span><span id="927" class="l"><a href="#927"> 927: </a>
+</span><span id="928" class="l"><a href="#928"> 928: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="929" class="l"><a href="#929"> 929: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
+</span><span id="930" class="l"><a href="#930"> 930: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
+</span><span id="931" class="l"><a href="#931"> 931: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
+</span><span id="932" class="l"><a href="#932"> 932: </a>
+</span><span id="933" class="l"><a href="#933"> 933: </a>        <span class="php-comment">// Find the key from server or arguments</span>
+</span><span id="934" class="l"><a href="#934"> 934: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
+</span><span id="935" class="l"><a href="#935"> 935: </a>        {
+</span><span id="936" class="l"><a href="#936"> 936: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
+</span><span id="937" class="l"><a href="#937"> 937: </a>            {
+</span><span id="938" class="l"><a href="#938"> 938: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="939" class="l"><a href="#939"> 939: </a>            }
+</span><span id="940" class="l"><a href="#940"> 940: </a>
+</span><span id="941" class="l"><a href="#941"> 941: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
+</span><span id="942" class="l"><a href="#942"> 942: </a>
+</span><span id="943" class="l"><a href="#943"> 943: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
+</span><span id="944" class="l"><a href="#944"> 944: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
+</span><span id="945" class="l"><a href="#945"> 945: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
+</span><span id="946" class="l"><a href="#946"> 946: </a>
+</span><span id="947" class="l"><a href="#947"> 947: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
+</span><span id="948" class="l"><a href="#948"> 948: </a>
+</span><span id="949" class="l"><a href="#949"> 949: </a>            <span class="php-comment">/*
+</span></span><span id="950" class="l"><a href="#950"> 950: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
+</span></span><span id="951" class="l"><a href="#951"> 951: </a><span class="php-comment">             * of valid ip addresses stored in the database.
+</span></span><span id="952" class="l"><a href="#952"> 952: </a><span class="php-comment">             */</span>
+</span><span id="953" class="l"><a href="#953"> 953: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
+</span><span id="954" class="l"><a href="#954"> 954: </a>            {
+</span><span id="955" class="l"><a href="#955"> 955: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
+</span><span id="956" class="l"><a href="#956"> 956: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
+</span><span id="957" class="l"><a href="#957"> 957: </a>                {
+</span><span id="958" class="l"><a href="#958"> 958: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
+</span><span id="959" class="l"><a href="#959"> 959: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
+</span><span id="960" class="l"><a href="#960"> 960: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
+</span><span id="961" class="l"><a href="#961"> 961: </a>
+</span><span id="962" class="l"><a href="#962"> 962: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
+</span><span id="963" class="l"><a href="#963"> 963: </a>                    {
+</span><span id="964" class="l"><a href="#964"> 964: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() === <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
+</span><span id="965" class="l"><a href="#965"> 965: </a>                        {
+</span><span id="966" class="l"><a href="#966"> 966: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
+</span><span id="967" class="l"><a href="#967"> 967: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
+</span><span id="968" class="l"><a href="#968"> 968: </a>                            <span class="php-keyword1">break</span>;
+</span><span id="969" class="l"><a href="#969"> 969: </a>                        }
+</span><span id="970" class="l"><a href="#970"> 970: </a>                    }
+</span><span id="971" class="l"><a href="#971"> 971: </a>
+</span><span id="972" class="l"><a href="#972"> 972: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
+</span><span id="973" class="l"><a href="#973"> 973: </a>                }
+</span><span id="974" class="l"><a href="#974"> 974: </a>                <span class="php-keyword1">else</span>
+</span><span id="975" class="l"><a href="#975"> 975: </a>                {
+</span><span id="976" class="l"><a href="#976"> 976: </a>                    <span class="php-comment">// There should be at least one IP address for this private key.</span>
+</span><span id="977" class="l"><a href="#977"> 977: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="978" class="l"><a href="#978"> 978: </a>                }
+</span><span id="979" class="l"><a href="#979"> 979: </a>            }
 </span><span id="980" class="l"><a href="#980"> 980: </a>
-</span><span id="981" class="l"><a href="#981"> 981: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
-</span><span id="982" class="l"><a href="#982"> 982: </a>                }
-</span><span id="983" class="l"><a href="#983"> 983: </a>                <span class="php-keyword1">else</span>
-</span><span id="984" class="l"><a href="#984"> 984: </a>                {
-</span><span id="985" class="l"><a href="#985"> 985: </a>                    <span class="php-comment">// There should be at least one IP address for this private key.</span>
-</span><span id="986" class="l"><a href="#986"> 986: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="987" class="l"><a href="#987"> 987: </a>                }
-</span><span id="988" class="l"><a href="#988"> 988: </a>            }
-</span><span id="989" class="l"><a href="#989"> 989: </a>
-</span><span id="990" class="l"><a href="#990"> 990: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="991" class="l"><a href="#991"> 991: </a>        }
-</span><span id="992" class="l"><a href="#992"> 992: </a>
-</span><span id="993" class="l"><a href="#993"> 993: </a>        <span class="php-comment">// No key has been sent</span>
-</span><span id="994" class="l"><a href="#994"> 994: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="995" class="l"><a href="#995"> 995: </a>    }
-</span><span id="996" class="l"><a href="#996"> 996: </a>
-</span><span id="997" class="l"><a href="#997"> 997: </a>    <span class="php-comment">/**
-</span></span><span id="998" class="l"><a href="#998"> 998: </a><span class="php-comment">     * Preferred return language
-</span></span><span id="999" class="l"><a href="#999"> 999: </a><span class="php-comment">     *
-</span></span><span id="1000" class="l"><a href="#1000">1000: </a><span class="php-comment">     * @access protected
-</span></span><span id="1001" class="l"><a href="#1001">1001: </a><span class="php-comment">     * @return string|NULL The language code
-</span></span><span id="1002" class="l"><a href="#1002">1002: </a><span class="php-comment">     */</span>
-</span><span id="1003" class="l"><a href="#1003">1003: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
-</span><span id="1004" class="l"><a href="#1004">1004: </a>    {
-</span><span id="1005" class="l"><a href="#1005">1005: </a>        <span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>);
-</span><span id="1006" class="l"><a href="#1006">1006: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$lang</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1007" class="l"><a href="#1007">1007: </a>        {
-</span><span id="1008" class="l"><a href="#1008">1008: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="1009" class="l"><a href="#1009">1009: </a>        }
-</span><span id="1010" class="l"><a href="#1010">1010: </a>
-</span><span id="1011" class="l"><a href="#1011">1011: </a>        <span class="php-comment">// It appears more than one language has been sent using a comma delimiter</span>
-</span><span id="1012" class="l"><a href="#1012">1012: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="1013" class="l"><a href="#1013">1013: </a>        {
-</span><span id="1014" class="l"><a href="#1014">1014: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
-</span><span id="1015" class="l"><a href="#1015">1015: </a>
-</span><span id="1016" class="l"><a href="#1016">1016: </a>            <span class="php-var">$return_langs</span> = [];
-</span><span id="1017" class="l"><a href="#1017">1017: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
-</span><span id="1018" class="l"><a href="#1018">1018: </a>            {
-</span><span id="1019" class="l"><a href="#1019">1019: </a>                <span class="php-comment">// Remove weight and trim leading and trailing whitespace</span>
-</span><span id="1020" class="l"><a href="#1020">1020: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
-</span><span id="1021" class="l"><a href="#1021">1021: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
-</span><span id="1022" class="l"><a href="#1022">1022: </a>            }
-</span><span id="1023" class="l"><a href="#1023">1023: </a>
-</span><span id="1024" class="l"><a href="#1024">1024: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
-</span><span id="1025" class="l"><a href="#1025">1025: </a>        }
-</span><span id="1026" class="l"><a href="#1026">1026: </a>
-</span><span id="1027" class="l"><a href="#1027">1027: </a>        <span class="php-comment">// Otherwise simply return as a string</span>
-</span><span id="1028" class="l"><a href="#1028">1028: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
-</span><span id="1029" class="l"><a href="#1029">1029: </a>    }
-</span><span id="1030" class="l"><a href="#1030">1030: </a>
-</span><span id="1031" class="l"><a href="#1031">1031: </a>    <span class="php-comment">/**
-</span></span><span id="1032" class="l"><a href="#1032">1032: </a><span class="php-comment">     * Add the request to the log table
-</span></span><span id="1033" class="l"><a href="#1033">1033: </a><span class="php-comment">     *
-</span></span><span id="1034" class="l"><a href="#1034">1034: </a><span class="php-comment">     * @access protected
-</span></span><span id="1035" class="l"><a href="#1035">1035: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
-</span></span><span id="1036" class="l"><a href="#1036">1036: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
-</span></span><span id="1037" class="l"><a href="#1037">1037: </a><span class="php-comment">     */</span>
-</span><span id="1038" class="l"><a href="#1038">1038: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1039" class="l"><a href="#1039">1039: </a>    {
-</span><span id="1040" class="l"><a href="#1040">1040: </a>        <span class="php-comment">// Insert the request into the log table</span>
-</span><span id="1041" class="l"><a href="#1041">1041: </a>        <span class="php-var">$is_inserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1042" class="l"><a href="#1042">1042: </a>            -&gt;insert(
-</span><span id="1043" class="l"><a href="#1043">1043: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
-</span><span id="1044" class="l"><a href="#1044">1044: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
-</span><span id="1045" class="l"><a href="#1045">1045: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
-</span><span id="1046" class="l"><a href="#1046">1046: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
-</span><span id="1047" class="l"><a href="#1047">1047: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="1048" class="l"><a href="#1048">1048: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
-</span><span id="1049" class="l"><a href="#1049">1049: </a>                <span class="php-quote">'time'</span> =&gt; now(), <span class="php-comment">// Used to be: function_exists('now') ? now() : time()</span>
-</span><span id="1050" class="l"><a href="#1050">1050: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
-</span><span id="1051" class="l"><a href="#1051">1051: </a>            ]);
-</span><span id="1052" class="l"><a href="#1052">1052: </a>
-</span><span id="1053" class="l"><a href="#1053">1053: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
-</span><span id="1054" class="l"><a href="#1054">1054: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
-</span><span id="1055" class="l"><a href="#1055">1055: </a>
-</span><span id="1056" class="l"><a href="#1056">1056: </a>        <span class="php-keyword1">return</span> <span class="php-var">$is_inserted</span>;
-</span><span id="1057" class="l"><a href="#1057">1057: </a>    }
-</span><span id="1058" class="l"><a href="#1058">1058: </a>
-</span><span id="1059" class="l"><a href="#1059">1059: </a>    <span class="php-comment">/**
-</span></span><span id="1060" class="l"><a href="#1060">1060: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
-</span></span><span id="1061" class="l"><a href="#1061">1061: </a><span class="php-comment">     *
-</span></span><span id="1062" class="l"><a href="#1062">1062: </a><span class="php-comment">     * @access protected
-</span></span><span id="1063" class="l"><a href="#1063">1063: </a><span class="php-comment">     * @param  string $controller_method The method being called
-</span></span><span id="1064" class="l"><a href="#1064">1064: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
-</span></span><span id="1065" class="l"><a href="#1065">1065: </a><span class="php-comment">     */</span>
-</span><span id="1066" class="l"><a href="#1066">1066: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
-</span><span id="1067" class="l"><a href="#1067">1067: </a>    {
-</span><span id="1068" class="l"><a href="#1068">1068: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
-</span><span id="1069" class="l"><a href="#1069">1069: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1070" class="l"><a href="#1070">1070: </a>        {
-</span><span id="1071" class="l"><a href="#1071">1071: </a>            <span class="php-comment">// Everything is fine</span>
-</span><span id="1072" class="l"><a href="#1072">1072: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1073" class="l"><a href="#1073">1073: </a>        }
-</span><span id="1074" class="l"><a href="#1074">1074: </a>
-</span><span id="1075" class="l"><a href="#1075">1075: </a>        <span class="php-keyword1">switch</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_method'</span>))
-</span><span id="1076" class="l"><a href="#1076">1076: </a>        {
-</span><span id="1077" class="l"><a href="#1077">1077: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'API_KEY'</span>:
-</span><span id="1078" class="l"><a href="#1078">1078: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'api-key:'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>);
-</span><span id="1079" class="l"><a href="#1079">1079: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>;
-</span><span id="1080" class="l"><a href="#1080">1080: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1081" class="l"><a href="#1081">1081: </a>
-</span><span id="1082" class="l"><a href="#1082">1082: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'METHOD_NAME'</span>:
-</span><span id="1083" class="l"><a href="#1083">1083: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'method-name:'</span> . <span class="php-var">$controller_method</span>;
-</span><span id="1084" class="l"><a href="#1084">1084: </a>            <span class="php-var">$limited_method_name</span> =  <span class="php-var">$controller_method</span>;
-</span><span id="1085" class="l"><a href="#1085">1085: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1086" class="l"><a href="#1086">1086: </a>
-</span><span id="1087" class="l"><a href="#1087">1087: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'ROUTED_URL'</span>:
-</span><span id="1088" class="l"><a href="#1088">1088: </a>          <span class="php-keyword1">default</span>:
-</span><span id="1089" class="l"><a href="#1089">1089: </a>            <span class="php-var">$limited_uri</span> = <span class="php-var">$this</span>-&gt;uri-&gt;ruri_string();
-</span><span id="1090" class="l"><a href="#1090">1090: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$limited_uri</span>), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
-</span><span id="1091" class="l"><a href="#1091">1091: </a>            {
-</span><span id="1092" class="l"><a href="#1092">1092: </a>                <span class="php-var">$limited_uri</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$limited_uri</span>,<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format) - <span class="php-num">1</span>);
-</span><span id="1093" class="l"><a href="#1093">1093: </a>            }
-</span><span id="1094" class="l"><a href="#1094">1094: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'uri:'</span> . <span class="php-var">$limited_uri</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method; <span class="php-comment">// It's good to differentiate GET from PUT</span>
-</span><span id="1095" class="l"><a href="#1095">1095: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-var">$controller_method</span>;
-</span><span id="1096" class="l"><a href="#1096">1096: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1097" class="l"><a href="#1097">1097: </a>        }
+</span><span id="981" class="l"><a href="#981"> 981: </a>            <span class="php-keyword1">return</span> <span class="php-var">$row</span>;
+</span><span id="982" class="l"><a href="#982"> 982: </a>        }
+</span><span id="983" class="l"><a href="#983"> 983: </a>
+</span><span id="984" class="l"><a href="#984"> 984: </a>        <span class="php-comment">// No key has been sent</span>
+</span><span id="985" class="l"><a href="#985"> 985: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="986" class="l"><a href="#986"> 986: </a>    }
+</span><span id="987" class="l"><a href="#987"> 987: </a>
+</span><span id="988" class="l"><a href="#988"> 988: </a>    <span class="php-comment">/**
+</span></span><span id="989" class="l"><a href="#989"> 989: </a><span class="php-comment">     * Preferred return language
+</span></span><span id="990" class="l"><a href="#990"> 990: </a><span class="php-comment">     *
+</span></span><span id="991" class="l"><a href="#991"> 991: </a><span class="php-comment">     * @access protected
+</span></span><span id="992" class="l"><a href="#992"> 992: </a><span class="php-comment">     * @return string|NULL The language code
+</span></span><span id="993" class="l"><a href="#993"> 993: </a><span class="php-comment">     */</span>
+</span><span id="994" class="l"><a href="#994"> 994: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
+</span><span id="995" class="l"><a href="#995"> 995: </a>    {
+</span><span id="996" class="l"><a href="#996"> 996: </a>        <span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>);
+</span><span id="997" class="l"><a href="#997"> 997: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$lang</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="998" class="l"><a href="#998"> 998: </a>        {
+</span><span id="999" class="l"><a href="#999"> 999: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="1000" class="l"><a href="#1000">1000: </a>        }
+</span><span id="1001" class="l"><a href="#1001">1001: </a>
+</span><span id="1002" class="l"><a href="#1002">1002: </a>        <span class="php-comment">// It appears more than one language has been sent using a comma delimiter</span>
+</span><span id="1003" class="l"><a href="#1003">1003: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="1004" class="l"><a href="#1004">1004: </a>        {
+</span><span id="1005" class="l"><a href="#1005">1005: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
+</span><span id="1006" class="l"><a href="#1006">1006: </a>
+</span><span id="1007" class="l"><a href="#1007">1007: </a>            <span class="php-var">$return_langs</span> = [];
+</span><span id="1008" class="l"><a href="#1008">1008: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
+</span><span id="1009" class="l"><a href="#1009">1009: </a>            {
+</span><span id="1010" class="l"><a href="#1010">1010: </a>                <span class="php-comment">// Remove weight and trim leading and trailing whitespace</span>
+</span><span id="1011" class="l"><a href="#1011">1011: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
+</span><span id="1012" class="l"><a href="#1012">1012: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
+</span><span id="1013" class="l"><a href="#1013">1013: </a>            }
+</span><span id="1014" class="l"><a href="#1014">1014: </a>
+</span><span id="1015" class="l"><a href="#1015">1015: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
+</span><span id="1016" class="l"><a href="#1016">1016: </a>        }
+</span><span id="1017" class="l"><a href="#1017">1017: </a>
+</span><span id="1018" class="l"><a href="#1018">1018: </a>        <span class="php-comment">// Otherwise simply return as a string</span>
+</span><span id="1019" class="l"><a href="#1019">1019: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
+</span><span id="1020" class="l"><a href="#1020">1020: </a>    }
+</span><span id="1021" class="l"><a href="#1021">1021: </a>
+</span><span id="1022" class="l"><a href="#1022">1022: </a>    <span class="php-comment">/**
+</span></span><span id="1023" class="l"><a href="#1023">1023: </a><span class="php-comment">     * Add the request to the log table
+</span></span><span id="1024" class="l"><a href="#1024">1024: </a><span class="php-comment">     *
+</span></span><span id="1025" class="l"><a href="#1025">1025: </a><span class="php-comment">     * @access protected
+</span></span><span id="1026" class="l"><a href="#1026">1026: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
+</span></span><span id="1027" class="l"><a href="#1027">1027: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
+</span></span><span id="1028" class="l"><a href="#1028">1028: </a><span class="php-comment">     */</span>
+</span><span id="1029" class="l"><a href="#1029">1029: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="1030" class="l"><a href="#1030">1030: </a>    {
+</span><span id="1031" class="l"><a href="#1031">1031: </a>        <span class="php-comment">// Insert the request into the log table</span>
+</span><span id="1032" class="l"><a href="#1032">1032: </a>        <span class="php-var">$is_inserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1033" class="l"><a href="#1033">1033: </a>            -&gt;insert(
+</span><span id="1034" class="l"><a href="#1034">1034: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
+</span><span id="1035" class="l"><a href="#1035">1035: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
+</span><span id="1036" class="l"><a href="#1036">1036: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
+</span><span id="1037" class="l"><a href="#1037">1037: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
+</span><span id="1038" class="l"><a href="#1038">1038: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="1039" class="l"><a href="#1039">1039: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
+</span><span id="1040" class="l"><a href="#1040">1040: </a>                <span class="php-quote">'time'</span> =&gt; now(), <span class="php-comment">// Used to be: function_exists('now') ? now() : time()</span>
+</span><span id="1041" class="l"><a href="#1041">1041: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
+</span><span id="1042" class="l"><a href="#1042">1042: </a>            ]);
+</span><span id="1043" class="l"><a href="#1043">1043: </a>
+</span><span id="1044" class="l"><a href="#1044">1044: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
+</span><span id="1045" class="l"><a href="#1045">1045: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
+</span><span id="1046" class="l"><a href="#1046">1046: </a>
+</span><span id="1047" class="l"><a href="#1047">1047: </a>        <span class="php-keyword1">return</span> <span class="php-var">$is_inserted</span>;
+</span><span id="1048" class="l"><a href="#1048">1048: </a>    }
+</span><span id="1049" class="l"><a href="#1049">1049: </a>
+</span><span id="1050" class="l"><a href="#1050">1050: </a>    <span class="php-comment">/**
+</span></span><span id="1051" class="l"><a href="#1051">1051: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
+</span></span><span id="1052" class="l"><a href="#1052">1052: </a><span class="php-comment">     *
+</span></span><span id="1053" class="l"><a href="#1053">1053: </a><span class="php-comment">     * @access protected
+</span></span><span id="1054" class="l"><a href="#1054">1054: </a><span class="php-comment">     * @param  string $controller_method The method being called
+</span></span><span id="1055" class="l"><a href="#1055">1055: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
+</span></span><span id="1056" class="l"><a href="#1056">1056: </a><span class="php-comment">     */</span>
+</span><span id="1057" class="l"><a href="#1057">1057: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
+</span><span id="1058" class="l"><a href="#1058">1058: </a>    {
+</span><span id="1059" class="l"><a href="#1059">1059: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
+</span><span id="1060" class="l"><a href="#1060">1060: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1061" class="l"><a href="#1061">1061: </a>        {
+</span><span id="1062" class="l"><a href="#1062">1062: </a>            <span class="php-comment">// Everything is fine</span>
+</span><span id="1063" class="l"><a href="#1063">1063: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1064" class="l"><a href="#1064">1064: </a>        }
+</span><span id="1065" class="l"><a href="#1065">1065: </a>
+</span><span id="1066" class="l"><a href="#1066">1066: </a>        <span class="php-keyword1">switch</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_method'</span>))
+</span><span id="1067" class="l"><a href="#1067">1067: </a>        {
+</span><span id="1068" class="l"><a href="#1068">1068: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'API_KEY'</span>:
+</span><span id="1069" class="l"><a href="#1069">1069: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'api-key:'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>);
+</span><span id="1070" class="l"><a href="#1070">1070: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>;
+</span><span id="1071" class="l"><a href="#1071">1071: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1072" class="l"><a href="#1072">1072: </a>
+</span><span id="1073" class="l"><a href="#1073">1073: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'METHOD_NAME'</span>:
+</span><span id="1074" class="l"><a href="#1074">1074: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'method-name:'</span> . <span class="php-var">$controller_method</span>;
+</span><span id="1075" class="l"><a href="#1075">1075: </a>            <span class="php-var">$limited_method_name</span> =  <span class="php-var">$controller_method</span>;
+</span><span id="1076" class="l"><a href="#1076">1076: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1077" class="l"><a href="#1077">1077: </a>
+</span><span id="1078" class="l"><a href="#1078">1078: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'ROUTED_URL'</span>:
+</span><span id="1079" class="l"><a href="#1079">1079: </a>          <span class="php-keyword1">default</span>:
+</span><span id="1080" class="l"><a href="#1080">1080: </a>            <span class="php-var">$limited_uri</span> = <span class="php-var">$this</span>-&gt;uri-&gt;ruri_string();
+</span><span id="1081" class="l"><a href="#1081">1081: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$limited_uri</span>), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
+</span><span id="1082" class="l"><a href="#1082">1082: </a>            {
+</span><span id="1083" class="l"><a href="#1083">1083: </a>                <span class="php-var">$limited_uri</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$limited_uri</span>,<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format) - <span class="php-num">1</span>);
+</span><span id="1084" class="l"><a href="#1084">1084: </a>            }
+</span><span id="1085" class="l"><a href="#1085">1085: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'uri:'</span> . <span class="php-var">$limited_uri</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method; <span class="php-comment">// It's good to differentiate GET from PUT</span>
+</span><span id="1086" class="l"><a href="#1086">1086: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-var">$controller_method</span>;
+</span><span id="1087" class="l"><a href="#1087">1087: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1088" class="l"><a href="#1088">1088: </a>        }
+</span><span id="1089" class="l"><a href="#1089">1089: </a>
+</span><span id="1090" class="l"><a href="#1090">1090: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span> )
+</span><span id="1091" class="l"><a href="#1091">1091: </a>        {
+</span><span id="1092" class="l"><a href="#1092">1092: </a>            <span class="php-comment">// Everything is fine</span>
+</span><span id="1093" class="l"><a href="#1093">1093: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1094" class="l"><a href="#1094">1094: </a>        }
+</span><span id="1095" class="l"><a href="#1095">1095: </a>
+</span><span id="1096" class="l"><a href="#1096">1096: </a>        <span class="php-comment">// How many times can you get to this method in a defined time_limit (default: 1 hour)?</span>
+</span><span id="1097" class="l"><a href="#1097">1097: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>];
 </span><span id="1098" class="l"><a href="#1098">1098: </a>
-</span><span id="1099" class="l"><a href="#1099">1099: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span> )
-</span><span id="1100" class="l"><a href="#1100">1100: </a>        {
-</span><span id="1101" class="l"><a href="#1101">1101: </a>            <span class="php-comment">// Everything is fine</span>
-</span><span id="1102" class="l"><a href="#1102">1102: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1103" class="l"><a href="#1103">1103: </a>        }
-</span><span id="1104" class="l"><a href="#1104">1104: </a>
-</span><span id="1105" class="l"><a href="#1105">1105: </a>        <span class="php-comment">// How many times can you get to this method in a defined time_limit (default: 1 hour)?</span>
-</span><span id="1106" class="l"><a href="#1106">1106: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>];
+</span><span id="1099" class="l"><a href="#1099">1099: </a>        <span class="php-var">$time_limit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>] : <span class="php-num">3600</span>); <span class="php-comment">// 3600 = 60 * 60</span>
+</span><span id="1100" class="l"><a href="#1100">1100: </a>
+</span><span id="1101" class="l"><a href="#1101">1101: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
+</span><span id="1102" class="l"><a href="#1102">1102: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1103" class="l"><a href="#1103">1103: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1104" class="l"><a href="#1104">1104: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1105" class="l"><a href="#1105">1105: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
+</span><span id="1106" class="l"><a href="#1106">1106: </a>            -&gt;row();
 </span><span id="1107" class="l"><a href="#1107">1107: </a>
-</span><span id="1108" class="l"><a href="#1108">1108: </a>        <span class="php-var">$time_limit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>] : <span class="php-num">3600</span>); <span class="php-comment">// 3600 = 60 * 60</span>
-</span><span id="1109" class="l"><a href="#1109">1109: </a>
-</span><span id="1110" class="l"><a href="#1110">1110: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
-</span><span id="1111" class="l"><a href="#1111">1111: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1112" class="l"><a href="#1112">1112: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1113" class="l"><a href="#1113">1113: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1114" class="l"><a href="#1114">1114: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
-</span><span id="1115" class="l"><a href="#1115">1115: </a>            -&gt;row();
-</span><span id="1116" class="l"><a href="#1116">1116: </a>
-</span><span id="1117" class="l"><a href="#1117">1117: </a>        <span class="php-comment">// No calls have been made for this key</span>
-</span><span id="1118" class="l"><a href="#1118">1118: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1119" class="l"><a href="#1119">1119: </a>        {
-</span><span id="1120" class="l"><a href="#1120">1120: </a>            <span class="php-comment">// Create a new row for the following key</span>
-</span><span id="1121" class="l"><a href="#1121">1121: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
-</span><span id="1122" class="l"><a href="#1122">1122: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$limited_uri</span>,
-</span><span id="1123" class="l"><a href="#1123">1123: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="1124" class="l"><a href="#1124">1124: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
-</span><span id="1125" class="l"><a href="#1125">1125: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
-</span><span id="1126" class="l"><a href="#1126">1126: </a>            ]);
-</span><span id="1127" class="l"><a href="#1127">1127: </a>        }
-</span><span id="1128" class="l"><a href="#1128">1128: </a>
-</span><span id="1129" class="l"><a href="#1129">1129: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
-</span><span id="1130" class="l"><a href="#1130">1130: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$time_limit</span>))
-</span><span id="1131" class="l"><a href="#1131">1131: </a>        {
-</span><span id="1132" class="l"><a href="#1132">1132: </a>            <span class="php-comment">// Reset the started period and count</span>
-</span><span id="1133" class="l"><a href="#1133">1133: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1134" class="l"><a href="#1134">1134: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1135" class="l"><a href="#1135">1135: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
-</span><span id="1136" class="l"><a href="#1136">1136: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
-</span><span id="1137" class="l"><a href="#1137">1137: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
-</span><span id="1138" class="l"><a href="#1138">1138: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1139" class="l"><a href="#1139">1139: </a>        }
+</span><span id="1108" class="l"><a href="#1108">1108: </a>        <span class="php-comment">// No calls have been made for this key</span>
+</span><span id="1109" class="l"><a href="#1109">1109: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1110" class="l"><a href="#1110">1110: </a>        {
+</span><span id="1111" class="l"><a href="#1111">1111: </a>            <span class="php-comment">// Create a new row for the following key</span>
+</span><span id="1112" class="l"><a href="#1112">1112: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
+</span><span id="1113" class="l"><a href="#1113">1113: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$limited_uri</span>,
+</span><span id="1114" class="l"><a href="#1114">1114: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="1115" class="l"><a href="#1115">1115: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
+</span><span id="1116" class="l"><a href="#1116">1116: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
+</span><span id="1117" class="l"><a href="#1117">1117: </a>            ]);
+</span><span id="1118" class="l"><a href="#1118">1118: </a>        }
+</span><span id="1119" class="l"><a href="#1119">1119: </a>
+</span><span id="1120" class="l"><a href="#1120">1120: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
+</span><span id="1121" class="l"><a href="#1121">1121: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$time_limit</span>))
+</span><span id="1122" class="l"><a href="#1122">1122: </a>        {
+</span><span id="1123" class="l"><a href="#1123">1123: </a>            <span class="php-comment">// Reset the started period and count</span>
+</span><span id="1124" class="l"><a href="#1124">1124: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1125" class="l"><a href="#1125">1125: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1126" class="l"><a href="#1126">1126: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
+</span><span id="1127" class="l"><a href="#1127">1127: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
+</span><span id="1128" class="l"><a href="#1128">1128: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
+</span><span id="1129" class="l"><a href="#1129">1129: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1130" class="l"><a href="#1130">1130: </a>        }
+</span><span id="1131" class="l"><a href="#1131">1131: </a>
+</span><span id="1132" class="l"><a href="#1132">1132: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
+</span><span id="1133" class="l"><a href="#1133">1133: </a>        <span class="php-keyword1">else</span>
+</span><span id="1134" class="l"><a href="#1134">1134: </a>        {
+</span><span id="1135" class="l"><a href="#1135">1135: </a>            <span class="php-comment">// The limit has been exceeded</span>
+</span><span id="1136" class="l"><a href="#1136">1136: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
+</span><span id="1137" class="l"><a href="#1137">1137: </a>            {
+</span><span id="1138" class="l"><a href="#1138">1138: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1139" class="l"><a href="#1139">1139: </a>            }
 </span><span id="1140" class="l"><a href="#1140">1140: </a>
-</span><span id="1141" class="l"><a href="#1141">1141: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
-</span><span id="1142" class="l"><a href="#1142">1142: </a>        <span class="php-keyword1">else</span>
-</span><span id="1143" class="l"><a href="#1143">1143: </a>        {
-</span><span id="1144" class="l"><a href="#1144">1144: </a>            <span class="php-comment">// The limit has been exceeded</span>
-</span><span id="1145" class="l"><a href="#1145">1145: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
-</span><span id="1146" class="l"><a href="#1146">1146: </a>            {
-</span><span id="1147" class="l"><a href="#1147">1147: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1148" class="l"><a href="#1148">1148: </a>            }
-</span><span id="1149" class="l"><a href="#1149">1149: </a>
-</span><span id="1150" class="l"><a href="#1150">1150: </a>            <span class="php-comment">// Increase the count by one</span>
-</span><span id="1151" class="l"><a href="#1151">1151: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1152" class="l"><a href="#1152">1152: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1153" class="l"><a href="#1153">1153: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1154" class="l"><a href="#1154">1154: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
-</span><span id="1155" class="l"><a href="#1155">1155: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1156" class="l"><a href="#1156">1156: </a>        }
-</span><span id="1157" class="l"><a href="#1157">1157: </a>
-</span><span id="1158" class="l"><a href="#1158">1158: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1159" class="l"><a href="#1159">1159: </a>    }
-</span><span id="1160" class="l"><a href="#1160">1160: </a>
-</span><span id="1161" class="l"><a href="#1161">1161: </a>    <span class="php-comment">/**
-</span></span><span id="1162" class="l"><a href="#1162">1162: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method/HTTP-method being called
-</span></span><span id="1163" class="l"><a href="#1163">1163: </a><span class="php-comment">     *
-</span></span><span id="1164" class="l"><a href="#1164">1164: </a><span class="php-comment">     * @access protected
-</span></span><span id="1165" class="l"><a href="#1165">1165: </a><span class="php-comment">     * @return bool
-</span></span><span id="1166" class="l"><a href="#1166">1166: </a><span class="php-comment">     */</span>
-</span><span id="1167" class="l"><a href="#1167">1167: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
-</span><span id="1168" class="l"><a href="#1168">1168: </a>    {
-</span><span id="1169" class="l"><a href="#1169">1169: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
-</span><span id="1170" class="l"><a href="#1170">1170: </a>        <span class="php-var">$auth_override_class_method</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
-</span><span id="1171" class="l"><a href="#1171">1171: </a>
-</span><span id="1172" class="l"><a href="#1172">1172: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
-</span><span id="1173" class="l"><a href="#1173">1173: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>))
-</span><span id="1174" class="l"><a href="#1174">1174: </a>        {
-</span><span id="1175" class="l"><a href="#1175">1175: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="1176" class="l"><a href="#1176">1176: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>])) <span class="php-comment">// Check for class overrides</span>
-</span><span id="1177" class="l"><a href="#1177">1177: </a>            {
-</span><span id="1178" class="l"><a href="#1178">1178: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1179" class="l"><a href="#1179">1179: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'none'</span>)
-</span><span id="1180" class="l"><a href="#1180">1180: </a>                {
-</span><span id="1181" class="l"><a href="#1181">1181: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1182" class="l"><a href="#1182">1182: </a>                }
-</span><span id="1183" class="l"><a href="#1183">1183: </a>
-</span><span id="1184" class="l"><a href="#1184">1184: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1185" class="l"><a href="#1185">1185: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'basic'</span>)
-</span><span id="1186" class="l"><a href="#1186">1186: </a>                {
-</span><span id="1187" class="l"><a href="#1187">1187: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1188" class="l"><a href="#1188">1188: </a>
-</span><span id="1189" class="l"><a href="#1189">1189: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1190" class="l"><a href="#1190">1190: </a>                }
-</span><span id="1191" class="l"><a href="#1191">1191: </a>
-</span><span id="1192" class="l"><a href="#1192">1192: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1193" class="l"><a href="#1193">1193: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'digest'</span>)
-</span><span id="1194" class="l"><a href="#1194">1194: </a>                {
-</span><span id="1195" class="l"><a href="#1195">1195: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1196" class="l"><a href="#1196">1196: </a>
-</span><span id="1197" class="l"><a href="#1197">1197: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1198" class="l"><a href="#1198">1198: </a>                }
+</span><span id="1141" class="l"><a href="#1141">1141: </a>            <span class="php-comment">// Increase the count by one</span>
+</span><span id="1142" class="l"><a href="#1142">1142: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1143" class="l"><a href="#1143">1143: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1144" class="l"><a href="#1144">1144: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1145" class="l"><a href="#1145">1145: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
+</span><span id="1146" class="l"><a href="#1146">1146: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1147" class="l"><a href="#1147">1147: </a>        }
+</span><span id="1148" class="l"><a href="#1148">1148: </a>
+</span><span id="1149" class="l"><a href="#1149">1149: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1150" class="l"><a href="#1150">1150: </a>    }
+</span><span id="1151" class="l"><a href="#1151">1151: </a>
+</span><span id="1152" class="l"><a href="#1152">1152: </a>    <span class="php-comment">/**
+</span></span><span id="1153" class="l"><a href="#1153">1153: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method/HTTP-method being called
+</span></span><span id="1154" class="l"><a href="#1154">1154: </a><span class="php-comment">     *
+</span></span><span id="1155" class="l"><a href="#1155">1155: </a><span class="php-comment">     * @access protected
+</span></span><span id="1156" class="l"><a href="#1156">1156: </a><span class="php-comment">     * @return bool
+</span></span><span id="1157" class="l"><a href="#1157">1157: </a><span class="php-comment">     */</span>
+</span><span id="1158" class="l"><a href="#1158">1158: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
+</span><span id="1159" class="l"><a href="#1159">1159: </a>    {
+</span><span id="1160" class="l"><a href="#1160">1160: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
+</span><span id="1161" class="l"><a href="#1161">1161: </a>        <span class="php-var">$auth_override_class_method</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
+</span><span id="1162" class="l"><a href="#1162">1162: </a>
+</span><span id="1163" class="l"><a href="#1163">1163: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
+</span><span id="1164" class="l"><a href="#1164">1164: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>))
+</span><span id="1165" class="l"><a href="#1165">1165: </a>        {
+</span><span id="1166" class="l"><a href="#1166">1166: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
+</span><span id="1167" class="l"><a href="#1167">1167: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>])) <span class="php-comment">// Check for class overrides</span>
+</span><span id="1168" class="l"><a href="#1168">1168: </a>            {
+</span><span id="1169" class="l"><a href="#1169">1169: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1170" class="l"><a href="#1170">1170: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'none'</span>)
+</span><span id="1171" class="l"><a href="#1171">1171: </a>                {
+</span><span id="1172" class="l"><a href="#1172">1172: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1173" class="l"><a href="#1173">1173: </a>                }
+</span><span id="1174" class="l"><a href="#1174">1174: </a>
+</span><span id="1175" class="l"><a href="#1175">1175: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1176" class="l"><a href="#1176">1176: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'basic'</span>)
+</span><span id="1177" class="l"><a href="#1177">1177: </a>                {
+</span><span id="1178" class="l"><a href="#1178">1178: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1179" class="l"><a href="#1179">1179: </a>
+</span><span id="1180" class="l"><a href="#1180">1180: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1181" class="l"><a href="#1181">1181: </a>                }
+</span><span id="1182" class="l"><a href="#1182">1182: </a>
+</span><span id="1183" class="l"><a href="#1183">1183: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1184" class="l"><a href="#1184">1184: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'digest'</span>)
+</span><span id="1185" class="l"><a href="#1185">1185: </a>                {
+</span><span id="1186" class="l"><a href="#1186">1186: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1187" class="l"><a href="#1187">1187: </a>
+</span><span id="1188" class="l"><a href="#1188">1188: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1189" class="l"><a href="#1189">1189: </a>                }
+</span><span id="1190" class="l"><a href="#1190">1190: </a>
+</span><span id="1191" class="l"><a href="#1191">1191: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1192" class="l"><a href="#1192">1192: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1193" class="l"><a href="#1193">1193: </a>                {
+</span><span id="1194" class="l"><a href="#1194">1194: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1195" class="l"><a href="#1195">1195: </a>
+</span><span id="1196" class="l"><a href="#1196">1196: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1197" class="l"><a href="#1197">1197: </a>                }
+</span><span id="1198" class="l"><a href="#1198">1198: </a>            }
 </span><span id="1199" class="l"><a href="#1199">1199: </a>
-</span><span id="1200" class="l"><a href="#1200">1200: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1201" class="l"><a href="#1201">1201: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1202" class="l"><a href="#1202">1202: </a>                {
-</span><span id="1203" class="l"><a href="#1203">1203: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1204" class="l"><a href="#1204">1204: </a>
-</span><span id="1205" class="l"><a href="#1205">1205: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1206" class="l"><a href="#1206">1206: </a>                }
-</span><span id="1207" class="l"><a href="#1207">1207: </a>            }
+</span><span id="1200" class="l"><a href="#1200">1200: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
+</span><span id="1201" class="l"><a href="#1201">1201: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
+</span><span id="1202" class="l"><a href="#1202">1202: </a>            {
+</span><span id="1203" class="l"><a href="#1203">1203: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1204" class="l"><a href="#1204">1204: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'none'</span>)
+</span><span id="1205" class="l"><a href="#1205">1205: </a>                {
+</span><span id="1206" class="l"><a href="#1206">1206: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1207" class="l"><a href="#1207">1207: </a>                }
 </span><span id="1208" class="l"><a href="#1208">1208: </a>
-</span><span id="1209" class="l"><a href="#1209">1209: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
-</span><span id="1210" class="l"><a href="#1210">1210: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
-</span><span id="1211" class="l"><a href="#1211">1211: </a>            {
-</span><span id="1212" class="l"><a href="#1212">1212: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1213" class="l"><a href="#1213">1213: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'none'</span>)
-</span><span id="1214" class="l"><a href="#1214">1214: </a>                {
-</span><span id="1215" class="l"><a href="#1215">1215: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1216" class="l"><a href="#1216">1216: </a>                }
-</span><span id="1217" class="l"><a href="#1217">1217: </a>
-</span><span id="1218" class="l"><a href="#1218">1218: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1219" class="l"><a href="#1219">1219: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'basic'</span>)
-</span><span id="1220" class="l"><a href="#1220">1220: </a>                {
-</span><span id="1221" class="l"><a href="#1221">1221: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1222" class="l"><a href="#1222">1222: </a>
-</span><span id="1223" class="l"><a href="#1223">1223: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1224" class="l"><a href="#1224">1224: </a>                }
-</span><span id="1225" class="l"><a href="#1225">1225: </a>
-</span><span id="1226" class="l"><a href="#1226">1226: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1227" class="l"><a href="#1227">1227: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'digest'</span>)
-</span><span id="1228" class="l"><a href="#1228">1228: </a>                {
-</span><span id="1229" class="l"><a href="#1229">1229: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1230" class="l"><a href="#1230">1230: </a>
-</span><span id="1231" class="l"><a href="#1231">1231: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1232" class="l"><a href="#1232">1232: </a>                }
-</span><span id="1233" class="l"><a href="#1233">1233: </a>
-</span><span id="1234" class="l"><a href="#1234">1234: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1235" class="l"><a href="#1235">1235: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1236" class="l"><a href="#1236">1236: </a>                {
-</span><span id="1237" class="l"><a href="#1237">1237: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1238" class="l"><a href="#1238">1238: </a>
-</span><span id="1239" class="l"><a href="#1239">1239: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1240" class="l"><a href="#1240">1240: </a>                }
-</span><span id="1241" class="l"><a href="#1241">1241: </a>            }
-</span><span id="1242" class="l"><a href="#1242">1242: </a>        }
-</span><span id="1243" class="l"><a href="#1243">1243: </a>
-</span><span id="1244" class="l"><a href="#1244">1244: </a>        <span class="php-comment">// Assign the class/method/HTTP-method auth type override array from the config</span>
-</span><span id="1245" class="l"><a href="#1245">1245: </a>        <span class="php-var">$auth_override_class_method_http</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method_http'</span>);
-</span><span id="1246" class="l"><a href="#1246">1246: </a>
-</span><span id="1247" class="l"><a href="#1247">1247: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
-</span><span id="1248" class="l"><a href="#1248">1248: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>))
-</span><span id="1249" class="l"><a href="#1249">1249: </a>        {
-</span><span id="1250" class="l"><a href="#1250">1250: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="1251" class="l"><a href="#1251">1251: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method]))
-</span><span id="1252" class="l"><a href="#1252">1252: </a>            {
-</span><span id="1253" class="l"><a href="#1253">1253: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1254" class="l"><a href="#1254">1254: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
-</span><span id="1255" class="l"><a href="#1255">1255: </a>                {
-</span><span id="1256" class="l"><a href="#1256">1256: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1257" class="l"><a href="#1257">1257: </a>                }
-</span><span id="1258" class="l"><a href="#1258">1258: </a>
-</span><span id="1259" class="l"><a href="#1259">1259: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1260" class="l"><a href="#1260">1260: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
-</span><span id="1261" class="l"><a href="#1261">1261: </a>                {
-</span><span id="1262" class="l"><a href="#1262">1262: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1263" class="l"><a href="#1263">1263: </a>
-</span><span id="1264" class="l"><a href="#1264">1264: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1265" class="l"><a href="#1265">1265: </a>                }
-</span><span id="1266" class="l"><a href="#1266">1266: </a>
-</span><span id="1267" class="l"><a href="#1267">1267: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1268" class="l"><a href="#1268">1268: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
-</span><span id="1269" class="l"><a href="#1269">1269: </a>                {
-</span><span id="1270" class="l"><a href="#1270">1270: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1271" class="l"><a href="#1271">1271: </a>
-</span><span id="1272" class="l"><a href="#1272">1272: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1273" class="l"><a href="#1273">1273: </a>                }
+</span><span id="1209" class="l"><a href="#1209">1209: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1210" class="l"><a href="#1210">1210: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'basic'</span>)
+</span><span id="1211" class="l"><a href="#1211">1211: </a>                {
+</span><span id="1212" class="l"><a href="#1212">1212: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1213" class="l"><a href="#1213">1213: </a>
+</span><span id="1214" class="l"><a href="#1214">1214: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1215" class="l"><a href="#1215">1215: </a>                }
+</span><span id="1216" class="l"><a href="#1216">1216: </a>
+</span><span id="1217" class="l"><a href="#1217">1217: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1218" class="l"><a href="#1218">1218: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'digest'</span>)
+</span><span id="1219" class="l"><a href="#1219">1219: </a>                {
+</span><span id="1220" class="l"><a href="#1220">1220: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1221" class="l"><a href="#1221">1221: </a>
+</span><span id="1222" class="l"><a href="#1222">1222: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1223" class="l"><a href="#1223">1223: </a>                }
+</span><span id="1224" class="l"><a href="#1224">1224: </a>
+</span><span id="1225" class="l"><a href="#1225">1225: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1226" class="l"><a href="#1226">1226: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1227" class="l"><a href="#1227">1227: </a>                {
+</span><span id="1228" class="l"><a href="#1228">1228: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1229" class="l"><a href="#1229">1229: </a>
+</span><span id="1230" class="l"><a href="#1230">1230: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1231" class="l"><a href="#1231">1231: </a>                }
+</span><span id="1232" class="l"><a href="#1232">1232: </a>            }
+</span><span id="1233" class="l"><a href="#1233">1233: </a>        }
+</span><span id="1234" class="l"><a href="#1234">1234: </a>
+</span><span id="1235" class="l"><a href="#1235">1235: </a>        <span class="php-comment">// Assign the class/method/HTTP-method auth type override array from the config</span>
+</span><span id="1236" class="l"><a href="#1236">1236: </a>        <span class="php-var">$auth_override_class_method_http</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method_http'</span>);
+</span><span id="1237" class="l"><a href="#1237">1237: </a>
+</span><span id="1238" class="l"><a href="#1238">1238: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
+</span><span id="1239" class="l"><a href="#1239">1239: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>))
+</span><span id="1240" class="l"><a href="#1240">1240: </a>        {
+</span><span id="1241" class="l"><a href="#1241">1241: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
+</span><span id="1242" class="l"><a href="#1242">1242: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method]))
+</span><span id="1243" class="l"><a href="#1243">1243: </a>            {
+</span><span id="1244" class="l"><a href="#1244">1244: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1245" class="l"><a href="#1245">1245: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
+</span><span id="1246" class="l"><a href="#1246">1246: </a>                {
+</span><span id="1247" class="l"><a href="#1247">1247: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1248" class="l"><a href="#1248">1248: </a>                }
+</span><span id="1249" class="l"><a href="#1249">1249: </a>
+</span><span id="1250" class="l"><a href="#1250">1250: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1251" class="l"><a href="#1251">1251: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
+</span><span id="1252" class="l"><a href="#1252">1252: </a>                {
+</span><span id="1253" class="l"><a href="#1253">1253: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1254" class="l"><a href="#1254">1254: </a>
+</span><span id="1255" class="l"><a href="#1255">1255: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1256" class="l"><a href="#1256">1256: </a>                }
+</span><span id="1257" class="l"><a href="#1257">1257: </a>
+</span><span id="1258" class="l"><a href="#1258">1258: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1259" class="l"><a href="#1259">1259: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
+</span><span id="1260" class="l"><a href="#1260">1260: </a>                {
+</span><span id="1261" class="l"><a href="#1261">1261: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1262" class="l"><a href="#1262">1262: </a>
+</span><span id="1263" class="l"><a href="#1263">1263: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1264" class="l"><a href="#1264">1264: </a>                }
+</span><span id="1265" class="l"><a href="#1265">1265: </a>
+</span><span id="1266" class="l"><a href="#1266">1266: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1267" class="l"><a href="#1267">1267: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1268" class="l"><a href="#1268">1268: </a>                {
+</span><span id="1269" class="l"><a href="#1269">1269: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1270" class="l"><a href="#1270">1270: </a>
+</span><span id="1271" class="l"><a href="#1271">1271: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1272" class="l"><a href="#1272">1272: </a>                }
+</span><span id="1273" class="l"><a href="#1273">1273: </a>            }
 </span><span id="1274" class="l"><a href="#1274">1274: </a>
-</span><span id="1275" class="l"><a href="#1275">1275: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1276" class="l"><a href="#1276">1276: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1277" class="l"><a href="#1277">1277: </a>                {
-</span><span id="1278" class="l"><a href="#1278">1278: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1279" class="l"><a href="#1279">1279: </a>
-</span><span id="1280" class="l"><a href="#1280">1280: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1281" class="l"><a href="#1281">1281: </a>                }
-</span><span id="1282" class="l"><a href="#1282">1282: </a>            }
+</span><span id="1275" class="l"><a href="#1275">1275: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method/HTTP-method being called</span>
+</span><span id="1276" class="l"><a href="#1276">1276: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method]))
+</span><span id="1277" class="l"><a href="#1277">1277: </a>            {
+</span><span id="1278" class="l"><a href="#1278">1278: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1279" class="l"><a href="#1279">1279: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
+</span><span id="1280" class="l"><a href="#1280">1280: </a>                {
+</span><span id="1281" class="l"><a href="#1281">1281: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1282" class="l"><a href="#1282">1282: </a>                }
 </span><span id="1283" class="l"><a href="#1283">1283: </a>
-</span><span id="1284" class="l"><a href="#1284">1284: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method/HTTP-method being called</span>
-</span><span id="1285" class="l"><a href="#1285">1285: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method]))
-</span><span id="1286" class="l"><a href="#1286">1286: </a>            {
-</span><span id="1287" class="l"><a href="#1287">1287: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1288" class="l"><a href="#1288">1288: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
-</span><span id="1289" class="l"><a href="#1289">1289: </a>                {
-</span><span id="1290" class="l"><a href="#1290">1290: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1291" class="l"><a href="#1291">1291: </a>                }
-</span><span id="1292" class="l"><a href="#1292">1292: </a>
-</span><span id="1293" class="l"><a href="#1293">1293: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1294" class="l"><a href="#1294">1294: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
-</span><span id="1295" class="l"><a href="#1295">1295: </a>                {
-</span><span id="1296" class="l"><a href="#1296">1296: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1297" class="l"><a href="#1297">1297: </a>
-</span><span id="1298" class="l"><a href="#1298">1298: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1299" class="l"><a href="#1299">1299: </a>                }
-</span><span id="1300" class="l"><a href="#1300">1300: </a>
-</span><span id="1301" class="l"><a href="#1301">1301: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1302" class="l"><a href="#1302">1302: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
-</span><span id="1303" class="l"><a href="#1303">1303: </a>                {
-</span><span id="1304" class="l"><a href="#1304">1304: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1305" class="l"><a href="#1305">1305: </a>
-</span><span id="1306" class="l"><a href="#1306">1306: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1307" class="l"><a href="#1307">1307: </a>                }
-</span><span id="1308" class="l"><a href="#1308">1308: </a>
-</span><span id="1309" class="l"><a href="#1309">1309: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1310" class="l"><a href="#1310">1310: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1311" class="l"><a href="#1311">1311: </a>                {
-</span><span id="1312" class="l"><a href="#1312">1312: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1313" class="l"><a href="#1313">1313: </a>
-</span><span id="1314" class="l"><a href="#1314">1314: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1315" class="l"><a href="#1315">1315: </a>                }
-</span><span id="1316" class="l"><a href="#1316">1316: </a>            }
-</span><span id="1317" class="l"><a href="#1317">1317: </a>        }
-</span><span id="1318" class="l"><a href="#1318">1318: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1319" class="l"><a href="#1319">1319: </a>    }
-</span><span id="1320" class="l"><a href="#1320">1320: </a>
-</span><span id="1321" class="l"><a href="#1321">1321: </a>    <span class="php-comment">/**
-</span></span><span id="1322" class="l"><a href="#1322">1322: </a><span class="php-comment">     * Parse the GET request arguments
-</span></span><span id="1323" class="l"><a href="#1323">1323: </a><span class="php-comment">     *
-</span></span><span id="1324" class="l"><a href="#1324">1324: </a><span class="php-comment">     * @access protected
-</span></span><span id="1325" class="l"><a href="#1325">1325: </a><span class="php-comment">     * @return void
-</span></span><span id="1326" class="l"><a href="#1326">1326: </a><span class="php-comment">     */</span>
-</span><span id="1327" class="l"><a href="#1327">1327: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
-</span><span id="1328" class="l"><a href="#1328">1328: </a>    {
-</span><span id="1329" class="l"><a href="#1329">1329: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
-</span><span id="1330" class="l"><a href="#1330">1330: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
-</span><span id="1331" class="l"><a href="#1331">1331: </a>    }
-</span><span id="1332" class="l"><a href="#1332">1332: </a>
-</span><span id="1333" class="l"><a href="#1333">1333: </a>    <span class="php-comment">/**
-</span></span><span id="1334" class="l"><a href="#1334">1334: </a><span class="php-comment">     * Parse the POST request arguments
-</span></span><span id="1335" class="l"><a href="#1335">1335: </a><span class="php-comment">     *
-</span></span><span id="1336" class="l"><a href="#1336">1336: </a><span class="php-comment">     * @access protected
-</span></span><span id="1337" class="l"><a href="#1337">1337: </a><span class="php-comment">     * @return void
-</span></span><span id="1338" class="l"><a href="#1338">1338: </a><span class="php-comment">     */</span>
-</span><span id="1339" class="l"><a href="#1339">1339: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
-</span><span id="1340" class="l"><a href="#1340">1340: </a>    {
-</span><span id="1341" class="l"><a href="#1341">1341: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
-</span><span id="1342" class="l"><a href="#1342">1342: </a>
-</span><span id="1343" class="l"><a href="#1343">1343: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1344" class="l"><a href="#1344">1344: </a>        {
-</span><span id="1345" class="l"><a href="#1345">1345: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1346" class="l"><a href="#1346">1346: </a>        }
-</span><span id="1347" class="l"><a href="#1347">1347: </a>    }
-</span><span id="1348" class="l"><a href="#1348">1348: </a>
-</span><span id="1349" class="l"><a href="#1349">1349: </a>    <span class="php-comment">/**
-</span></span><span id="1350" class="l"><a href="#1350">1350: </a><span class="php-comment">     * Parse the PUT request arguments
-</span></span><span id="1351" class="l"><a href="#1351">1351: </a><span class="php-comment">     *
-</span></span><span id="1352" class="l"><a href="#1352">1352: </a><span class="php-comment">     * @access protected
-</span></span><span id="1353" class="l"><a href="#1353">1353: </a><span class="php-comment">     * @return void
-</span></span><span id="1354" class="l"><a href="#1354">1354: </a><span class="php-comment">     */</span>
-</span><span id="1355" class="l"><a href="#1355">1355: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
-</span><span id="1356" class="l"><a href="#1356">1356: </a>    {
-</span><span id="1357" class="l"><a href="#1357">1357: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1358" class="l"><a href="#1358">1358: </a>        {
-</span><span id="1359" class="l"><a href="#1359">1359: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1360" class="l"><a href="#1360">1360: </a>        }
-</span><span id="1361" class="l"><a href="#1361">1361: </a>        <span class="php-keyword1">else</span>
-</span><span id="1362" class="l"><a href="#1362">1362: </a>        {
-</span><span id="1363" class="l"><a href="#1363">1363: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1364" class="l"><a href="#1364">1364: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
-</span><span id="1365" class="l"><a href="#1365">1365: </a>            {
-</span><span id="1366" class="l"><a href="#1366">1366: </a>                <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1367" class="l"><a href="#1367">1367: </a>            }
-</span><span id="1368" class="l"><a href="#1368">1368: </a>        }
-</span><span id="1369" class="l"><a href="#1369">1369: </a>    }
-</span><span id="1370" class="l"><a href="#1370">1370: </a>
-</span><span id="1371" class="l"><a href="#1371">1371: </a>    <span class="php-comment">/**
-</span></span><span id="1372" class="l"><a href="#1372">1372: </a><span class="php-comment">     * Parse the HEAD request arguments
-</span></span><span id="1373" class="l"><a href="#1373">1373: </a><span class="php-comment">     *
-</span></span><span id="1374" class="l"><a href="#1374">1374: </a><span class="php-comment">     * @access protected
-</span></span><span id="1375" class="l"><a href="#1375">1375: </a><span class="php-comment">     * @return void
-</span></span><span id="1376" class="l"><a href="#1376">1376: </a><span class="php-comment">     */</span>
-</span><span id="1377" class="l"><a href="#1377">1377: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
-</span><span id="1378" class="l"><a href="#1378">1378: </a>    {
-</span><span id="1379" class="l"><a href="#1379">1379: </a>        <span class="php-comment">// Parse the HEAD variables</span>
-</span><span id="1380" class="l"><a href="#1380">1380: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
-</span><span id="1381" class="l"><a href="#1381">1381: </a>
-</span><span id="1382" class="l"><a href="#1382">1382: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
-</span><span id="1383" class="l"><a href="#1383">1383: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
-</span><span id="1384" class="l"><a href="#1384">1384: </a>    }
-</span><span id="1385" class="l"><a href="#1385">1385: </a>
-</span><span id="1386" class="l"><a href="#1386">1386: </a>    <span class="php-comment">/**
-</span></span><span id="1387" class="l"><a href="#1387">1387: </a><span class="php-comment">     * Parse the OPTIONS request arguments
-</span></span><span id="1388" class="l"><a href="#1388">1388: </a><span class="php-comment">     *
-</span></span><span id="1389" class="l"><a href="#1389">1389: </a><span class="php-comment">     * @access protected
-</span></span><span id="1390" class="l"><a href="#1390">1390: </a><span class="php-comment">     * @return void
-</span></span><span id="1391" class="l"><a href="#1391">1391: </a><span class="php-comment">     */</span>
-</span><span id="1392" class="l"><a href="#1392">1392: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
-</span><span id="1393" class="l"><a href="#1393">1393: </a>    {
-</span><span id="1394" class="l"><a href="#1394">1394: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
-</span><span id="1395" class="l"><a href="#1395">1395: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
-</span><span id="1396" class="l"><a href="#1396">1396: </a>
-</span><span id="1397" class="l"><a href="#1397">1397: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
-</span><span id="1398" class="l"><a href="#1398">1398: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
-</span><span id="1399" class="l"><a href="#1399">1399: </a>    }
-</span><span id="1400" class="l"><a href="#1400">1400: </a>
-</span><span id="1401" class="l"><a href="#1401">1401: </a>    <span class="php-comment">/**
-</span></span><span id="1402" class="l"><a href="#1402">1402: </a><span class="php-comment">     * Parse the PATCH request arguments
-</span></span><span id="1403" class="l"><a href="#1403">1403: </a><span class="php-comment">     *
-</span></span><span id="1404" class="l"><a href="#1404">1404: </a><span class="php-comment">     * @access protected
-</span></span><span id="1405" class="l"><a href="#1405">1405: </a><span class="php-comment">     * @return void
-</span></span><span id="1406" class="l"><a href="#1406">1406: </a><span class="php-comment">     */</span>
-</span><span id="1407" class="l"><a href="#1407">1407: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
-</span><span id="1408" class="l"><a href="#1408">1408: </a>    {
-</span><span id="1409" class="l"><a href="#1409">1409: </a>        <span class="php-comment">// It might be a HTTP body</span>
-</span><span id="1410" class="l"><a href="#1410">1410: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1411" class="l"><a href="#1411">1411: </a>        {
-</span><span id="1412" class="l"><a href="#1412">1412: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1413" class="l"><a href="#1413">1413: </a>        }
-</span><span id="1414" class="l"><a href="#1414">1414: </a>        <span class="php-keyword1">else</span>
-</span><span id="1415" class="l"><a href="#1415">1415: </a>        {
-</span><span id="1416" class="l"><a href="#1416">1416: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1417" class="l"><a href="#1417">1417: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
-</span><span id="1418" class="l"><a href="#1418">1418: </a>            {
-</span><span id="1419" class="l"><a href="#1419">1419: </a>                <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1420" class="l"><a href="#1420">1420: </a>            }
-</span><span id="1421" class="l"><a href="#1421">1421: </a>        }
-</span><span id="1422" class="l"><a href="#1422">1422: </a>    }
-</span><span id="1423" class="l"><a href="#1423">1423: </a>
-</span><span id="1424" class="l"><a href="#1424">1424: </a>    <span class="php-comment">/**
-</span></span><span id="1425" class="l"><a href="#1425">1425: </a><span class="php-comment">     * Parse the DELETE request arguments
-</span></span><span id="1426" class="l"><a href="#1426">1426: </a><span class="php-comment">     *
-</span></span><span id="1427" class="l"><a href="#1427">1427: </a><span class="php-comment">     * @access protected
-</span></span><span id="1428" class="l"><a href="#1428">1428: </a><span class="php-comment">     * @return void
-</span></span><span id="1429" class="l"><a href="#1429">1429: </a><span class="php-comment">     */</span>
-</span><span id="1430" class="l"><a href="#1430">1430: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
-</span><span id="1431" class="l"><a href="#1431">1431: </a>    {
-</span><span id="1432" class="l"><a href="#1432">1432: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
-</span><span id="1433" class="l"><a href="#1433">1433: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
-</span><span id="1434" class="l"><a href="#1434">1434: </a>        {
-</span><span id="1435" class="l"><a href="#1435">1435: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1436" class="l"><a href="#1436">1436: </a>        }
-</span><span id="1437" class="l"><a href="#1437">1437: </a>    }
-</span><span id="1438" class="l"><a href="#1438">1438: </a>
-</span><span id="1439" class="l"><a href="#1439">1439: </a>    <span class="php-comment">/**
-</span></span><span id="1440" class="l"><a href="#1440">1440: </a><span class="php-comment">     * Parse the query parameters
-</span></span><span id="1441" class="l"><a href="#1441">1441: </a><span class="php-comment">     *
-</span></span><span id="1442" class="l"><a href="#1442">1442: </a><span class="php-comment">     * @access protected
-</span></span><span id="1443" class="l"><a href="#1443">1443: </a><span class="php-comment">     * @return void
-</span></span><span id="1444" class="l"><a href="#1444">1444: </a><span class="php-comment">     */</span>
-</span><span id="1445" class="l"><a href="#1445">1445: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
-</span><span id="1446" class="l"><a href="#1446">1446: </a>    {
-</span><span id="1447" class="l"><a href="#1447">1447: </a>        <span class="php-comment">// Declare a variable that will hold the REQUEST_URI</span>
-</span><span id="1448" class="l"><a href="#1448">1448: </a>        <span class="php-var">$request_uri</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1284" class="l"><a href="#1284">1284: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1285" class="l"><a href="#1285">1285: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
+</span><span id="1286" class="l"><a href="#1286">1286: </a>                {
+</span><span id="1287" class="l"><a href="#1287">1287: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1288" class="l"><a href="#1288">1288: </a>
+</span><span id="1289" class="l"><a href="#1289">1289: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1290" class="l"><a href="#1290">1290: </a>                }
+</span><span id="1291" class="l"><a href="#1291">1291: </a>
+</span><span id="1292" class="l"><a href="#1292">1292: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1293" class="l"><a href="#1293">1293: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
+</span><span id="1294" class="l"><a href="#1294">1294: </a>                {
+</span><span id="1295" class="l"><a href="#1295">1295: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1296" class="l"><a href="#1296">1296: </a>
+</span><span id="1297" class="l"><a href="#1297">1297: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1298" class="l"><a href="#1298">1298: </a>                }
+</span><span id="1299" class="l"><a href="#1299">1299: </a>
+</span><span id="1300" class="l"><a href="#1300">1300: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1301" class="l"><a href="#1301">1301: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1302" class="l"><a href="#1302">1302: </a>                {
+</span><span id="1303" class="l"><a href="#1303">1303: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1304" class="l"><a href="#1304">1304: </a>
+</span><span id="1305" class="l"><a href="#1305">1305: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1306" class="l"><a href="#1306">1306: </a>                }
+</span><span id="1307" class="l"><a href="#1307">1307: </a>            }
+</span><span id="1308" class="l"><a href="#1308">1308: </a>        }
+</span><span id="1309" class="l"><a href="#1309">1309: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1310" class="l"><a href="#1310">1310: </a>    }
+</span><span id="1311" class="l"><a href="#1311">1311: </a>
+</span><span id="1312" class="l"><a href="#1312">1312: </a>    <span class="php-comment">/**
+</span></span><span id="1313" class="l"><a href="#1313">1313: </a><span class="php-comment">     * Parse the GET request arguments
+</span></span><span id="1314" class="l"><a href="#1314">1314: </a><span class="php-comment">     *
+</span></span><span id="1315" class="l"><a href="#1315">1315: </a><span class="php-comment">     * @access protected
+</span></span><span id="1316" class="l"><a href="#1316">1316: </a><span class="php-comment">     * @return void
+</span></span><span id="1317" class="l"><a href="#1317">1317: </a><span class="php-comment">     */</span>
+</span><span id="1318" class="l"><a href="#1318">1318: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
+</span><span id="1319" class="l"><a href="#1319">1319: </a>    {
+</span><span id="1320" class="l"><a href="#1320">1320: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
+</span><span id="1321" class="l"><a href="#1321">1321: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
+</span><span id="1322" class="l"><a href="#1322">1322: </a>    }
+</span><span id="1323" class="l"><a href="#1323">1323: </a>
+</span><span id="1324" class="l"><a href="#1324">1324: </a>    <span class="php-comment">/**
+</span></span><span id="1325" class="l"><a href="#1325">1325: </a><span class="php-comment">     * Parse the POST request arguments
+</span></span><span id="1326" class="l"><a href="#1326">1326: </a><span class="php-comment">     *
+</span></span><span id="1327" class="l"><a href="#1327">1327: </a><span class="php-comment">     * @access protected
+</span></span><span id="1328" class="l"><a href="#1328">1328: </a><span class="php-comment">     * @return void
+</span></span><span id="1329" class="l"><a href="#1329">1329: </a><span class="php-comment">     */</span>
+</span><span id="1330" class="l"><a href="#1330">1330: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
+</span><span id="1331" class="l"><a href="#1331">1331: </a>    {
+</span><span id="1332" class="l"><a href="#1332">1332: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
+</span><span id="1333" class="l"><a href="#1333">1333: </a>
+</span><span id="1334" class="l"><a href="#1334">1334: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1335" class="l"><a href="#1335">1335: </a>        {
+</span><span id="1336" class="l"><a href="#1336">1336: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1337" class="l"><a href="#1337">1337: </a>        }
+</span><span id="1338" class="l"><a href="#1338">1338: </a>    }
+</span><span id="1339" class="l"><a href="#1339">1339: </a>
+</span><span id="1340" class="l"><a href="#1340">1340: </a>    <span class="php-comment">/**
+</span></span><span id="1341" class="l"><a href="#1341">1341: </a><span class="php-comment">     * Parse the PUT request arguments
+</span></span><span id="1342" class="l"><a href="#1342">1342: </a><span class="php-comment">     *
+</span></span><span id="1343" class="l"><a href="#1343">1343: </a><span class="php-comment">     * @access protected
+</span></span><span id="1344" class="l"><a href="#1344">1344: </a><span class="php-comment">     * @return void
+</span></span><span id="1345" class="l"><a href="#1345">1345: </a><span class="php-comment">     */</span>
+</span><span id="1346" class="l"><a href="#1346">1346: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
+</span><span id="1347" class="l"><a href="#1347">1347: </a>    {
+</span><span id="1348" class="l"><a href="#1348">1348: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1349" class="l"><a href="#1349">1349: </a>        {
+</span><span id="1350" class="l"><a href="#1350">1350: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1351" class="l"><a href="#1351">1351: </a>        }
+</span><span id="1352" class="l"><a href="#1352">1352: </a>        <span class="php-keyword1">else</span>
+</span><span id="1353" class="l"><a href="#1353">1353: </a>        {
+</span><span id="1354" class="l"><a href="#1354">1354: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1355" class="l"><a href="#1355">1355: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
+</span><span id="1356" class="l"><a href="#1356">1356: </a>            {
+</span><span id="1357" class="l"><a href="#1357">1357: </a>                <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1358" class="l"><a href="#1358">1358: </a>            }
+</span><span id="1359" class="l"><a href="#1359">1359: </a>        }
+</span><span id="1360" class="l"><a href="#1360">1360: </a>    }
+</span><span id="1361" class="l"><a href="#1361">1361: </a>
+</span><span id="1362" class="l"><a href="#1362">1362: </a>    <span class="php-comment">/**
+</span></span><span id="1363" class="l"><a href="#1363">1363: </a><span class="php-comment">     * Parse the HEAD request arguments
+</span></span><span id="1364" class="l"><a href="#1364">1364: </a><span class="php-comment">     *
+</span></span><span id="1365" class="l"><a href="#1365">1365: </a><span class="php-comment">     * @access protected
+</span></span><span id="1366" class="l"><a href="#1366">1366: </a><span class="php-comment">     * @return void
+</span></span><span id="1367" class="l"><a href="#1367">1367: </a><span class="php-comment">     */</span>
+</span><span id="1368" class="l"><a href="#1368">1368: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
+</span><span id="1369" class="l"><a href="#1369">1369: </a>    {
+</span><span id="1370" class="l"><a href="#1370">1370: </a>        <span class="php-comment">// Parse the HEAD variables</span>
+</span><span id="1371" class="l"><a href="#1371">1371: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
+</span><span id="1372" class="l"><a href="#1372">1372: </a>
+</span><span id="1373" class="l"><a href="#1373">1373: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
+</span><span id="1374" class="l"><a href="#1374">1374: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
+</span><span id="1375" class="l"><a href="#1375">1375: </a>    }
+</span><span id="1376" class="l"><a href="#1376">1376: </a>
+</span><span id="1377" class="l"><a href="#1377">1377: </a>    <span class="php-comment">/**
+</span></span><span id="1378" class="l"><a href="#1378">1378: </a><span class="php-comment">     * Parse the OPTIONS request arguments
+</span></span><span id="1379" class="l"><a href="#1379">1379: </a><span class="php-comment">     *
+</span></span><span id="1380" class="l"><a href="#1380">1380: </a><span class="php-comment">     * @access protected
+</span></span><span id="1381" class="l"><a href="#1381">1381: </a><span class="php-comment">     * @return void
+</span></span><span id="1382" class="l"><a href="#1382">1382: </a><span class="php-comment">     */</span>
+</span><span id="1383" class="l"><a href="#1383">1383: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
+</span><span id="1384" class="l"><a href="#1384">1384: </a>    {
+</span><span id="1385" class="l"><a href="#1385">1385: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
+</span><span id="1386" class="l"><a href="#1386">1386: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
+</span><span id="1387" class="l"><a href="#1387">1387: </a>
+</span><span id="1388" class="l"><a href="#1388">1388: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
+</span><span id="1389" class="l"><a href="#1389">1389: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
+</span><span id="1390" class="l"><a href="#1390">1390: </a>    }
+</span><span id="1391" class="l"><a href="#1391">1391: </a>
+</span><span id="1392" class="l"><a href="#1392">1392: </a>    <span class="php-comment">/**
+</span></span><span id="1393" class="l"><a href="#1393">1393: </a><span class="php-comment">     * Parse the PATCH request arguments
+</span></span><span id="1394" class="l"><a href="#1394">1394: </a><span class="php-comment">     *
+</span></span><span id="1395" class="l"><a href="#1395">1395: </a><span class="php-comment">     * @access protected
+</span></span><span id="1396" class="l"><a href="#1396">1396: </a><span class="php-comment">     * @return void
+</span></span><span id="1397" class="l"><a href="#1397">1397: </a><span class="php-comment">     */</span>
+</span><span id="1398" class="l"><a href="#1398">1398: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
+</span><span id="1399" class="l"><a href="#1399">1399: </a>    {
+</span><span id="1400" class="l"><a href="#1400">1400: </a>        <span class="php-comment">// It might be a HTTP body</span>
+</span><span id="1401" class="l"><a href="#1401">1401: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1402" class="l"><a href="#1402">1402: </a>        {
+</span><span id="1403" class="l"><a href="#1403">1403: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1404" class="l"><a href="#1404">1404: </a>        }
+</span><span id="1405" class="l"><a href="#1405">1405: </a>        <span class="php-keyword1">else</span>
+</span><span id="1406" class="l"><a href="#1406">1406: </a>        {
+</span><span id="1407" class="l"><a href="#1407">1407: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1408" class="l"><a href="#1408">1408: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
+</span><span id="1409" class="l"><a href="#1409">1409: </a>            {
+</span><span id="1410" class="l"><a href="#1410">1410: </a>                <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1411" class="l"><a href="#1411">1411: </a>            }
+</span><span id="1412" class="l"><a href="#1412">1412: </a>        }
+</span><span id="1413" class="l"><a href="#1413">1413: </a>    }
+</span><span id="1414" class="l"><a href="#1414">1414: </a>
+</span><span id="1415" class="l"><a href="#1415">1415: </a>    <span class="php-comment">/**
+</span></span><span id="1416" class="l"><a href="#1416">1416: </a><span class="php-comment">     * Parse the DELETE request arguments
+</span></span><span id="1417" class="l"><a href="#1417">1417: </a><span class="php-comment">     *
+</span></span><span id="1418" class="l"><a href="#1418">1418: </a><span class="php-comment">     * @access protected
+</span></span><span id="1419" class="l"><a href="#1419">1419: </a><span class="php-comment">     * @return void
+</span></span><span id="1420" class="l"><a href="#1420">1420: </a><span class="php-comment">     */</span>
+</span><span id="1421" class="l"><a href="#1421">1421: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
+</span><span id="1422" class="l"><a href="#1422">1422: </a>    {
+</span><span id="1423" class="l"><a href="#1423">1423: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
+</span><span id="1424" class="l"><a href="#1424">1424: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
+</span><span id="1425" class="l"><a href="#1425">1425: </a>        {
+</span><span id="1426" class="l"><a href="#1426">1426: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1427" class="l"><a href="#1427">1427: </a>        }
+</span><span id="1428" class="l"><a href="#1428">1428: </a>    }
+</span><span id="1429" class="l"><a href="#1429">1429: </a>
+</span><span id="1430" class="l"><a href="#1430">1430: </a>    <span class="php-comment">/**
+</span></span><span id="1431" class="l"><a href="#1431">1431: </a><span class="php-comment">     * Parse the query parameters
+</span></span><span id="1432" class="l"><a href="#1432">1432: </a><span class="php-comment">     *
+</span></span><span id="1433" class="l"><a href="#1433">1433: </a><span class="php-comment">     * @access protected
+</span></span><span id="1434" class="l"><a href="#1434">1434: </a><span class="php-comment">     * @return void
+</span></span><span id="1435" class="l"><a href="#1435">1435: </a><span class="php-comment">     */</span>
+</span><span id="1436" class="l"><a href="#1436">1436: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
+</span><span id="1437" class="l"><a href="#1437">1437: </a>    {
+</span><span id="1438" class="l"><a href="#1438">1438: </a>        <span class="php-comment">// Declare a variable that will hold the REQUEST_URI</span>
+</span><span id="1439" class="l"><a href="#1439">1439: </a>        <span class="php-var">$request_uri</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1440" class="l"><a href="#1440">1440: </a>
+</span><span id="1441" class="l"><a href="#1441">1441: </a>        <span class="php-comment">// If using the commandline version</span>
+</span><span id="1442" class="l"><a href="#1442">1442: </a>        <span class="php-keyword1">if</span> (is_cli())
+</span><span id="1443" class="l"><a href="#1443">1443: </a>        {
+</span><span id="1444" class="l"><a href="#1444">1444: </a>            <span class="php-var">$args</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'argv'</span>);
+</span><span id="1445" class="l"><a href="#1445">1445: </a>            <span class="php-keyword1">unset</span>(<span class="php-var">$args</span>[<span class="php-num">0</span>]);
+</span><span id="1446" class="l"><a href="#1446">1446: </a>
+</span><span id="1447" class="l"><a href="#1447">1447: </a>            <span class="php-comment">// Combine the arguments using '/' as the delimiter</span>
+</span><span id="1448" class="l"><a href="#1448">1448: </a>            <span class="php-var">$request_uri</span> = <span class="php-quote">'/'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'/'</span>, <span class="php-var">$args</span>) . <span class="php-quote">'/'</span>;
 </span><span id="1449" class="l"><a href="#1449">1449: </a>
-</span><span id="1450" class="l"><a href="#1450">1450: </a>        <span class="php-comment">// If using the commandline version</span>
-</span><span id="1451" class="l"><a href="#1451">1451: </a>        <span class="php-keyword1">if</span> (is_cli())
-</span><span id="1452" class="l"><a href="#1452">1452: </a>        {
-</span><span id="1453" class="l"><a href="#1453">1453: </a>            <span class="php-var">$args</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'argv'</span>);
-</span><span id="1454" class="l"><a href="#1454">1454: </a>            <span class="php-keyword1">unset</span>(<span class="php-var">$args</span>[<span class="php-num">0</span>]);
-</span><span id="1455" class="l"><a href="#1455">1455: </a>
-</span><span id="1456" class="l"><a href="#1456">1456: </a>            <span class="php-comment">// Combine the arguments using '/' as the delimiter</span>
-</span><span id="1457" class="l"><a href="#1457">1457: </a>            <span class="php-var">$request_uri</span> = <span class="php-quote">'/'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'/'</span>, <span class="php-var">$args</span>) . <span class="php-quote">'/'</span>;
-</span><span id="1458" class="l"><a href="#1458">1458: </a>
-</span><span id="1459" class="l"><a href="#1459">1459: </a>            <span class="php-comment">// Set the following server variables (perhaps not required anymore?)</span>
-</span><span id="1460" class="l"><a href="#1460">1460: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1461" class="l"><a href="#1461">1461: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'PATH_INFO'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1462" class="l"><a href="#1462">1462: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'QUERY_STRING'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1463" class="l"><a href="#1463">1463: </a>        }
-</span><span id="1464" class="l"><a href="#1464">1464: </a>        <span class="php-keyword1">else</span>
-</span><span id="1465" class="l"><a href="#1465">1465: </a>        {
-</span><span id="1466" class="l"><a href="#1466">1466: </a>            <span class="php-var">$request_uri</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>);
-</span><span id="1467" class="l"><a href="#1467">1467: </a>        }
-</span><span id="1468" class="l"><a href="#1468">1468: </a>
-</span><span id="1469" class="l"><a href="#1469">1469: </a>        <span class="php-comment">// Parse the query parameters from the query string</span>
-</span><span id="1470" class="l"><a href="#1470">1470: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$request_uri</span>, PHP_URL_QUERY), <span class="php-var">$this</span>-&gt;_query_args);
-</span><span id="1471" class="l"><a href="#1471">1471: </a>    }
-</span><span id="1472" class="l"><a href="#1472">1472: </a>
-</span><span id="1473" class="l"><a href="#1473">1473: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
-</span><span id="1474" class="l"><a href="#1474">1474: </a>
-</span><span id="1475" class="l"><a href="#1475">1475: </a>    <span class="php-comment">/**
-</span></span><span id="1476" class="l"><a href="#1476">1476: </a><span class="php-comment">     * Retrieve a value from a GET request
-</span></span><span id="1477" class="l"><a href="#1477">1477: </a><span class="php-comment">     *
-</span></span><span id="1478" class="l"><a href="#1478">1478: </a><span class="php-comment">     * @access public
-</span></span><span id="1479" class="l"><a href="#1479">1479: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
-</span></span><span id="1480" class="l"><a href="#1480">1480: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1481" class="l"><a href="#1481">1481: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1482" class="l"><a href="#1482">1482: </a><span class="php-comment">     * @return array|string|NULL Value from the GET request; otherwise, NULL
-</span></span><span id="1483" class="l"><a href="#1483">1483: </a><span class="php-comment">     */</span>
-</span><span id="1484" class="l"><a href="#1484">1484: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1485" class="l"><a href="#1485">1485: </a>    {
-</span><span id="1486" class="l"><a href="#1486">1486: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1487" class="l"><a href="#1487">1487: </a>        {
-</span><span id="1488" class="l"><a href="#1488">1488: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
-</span><span id="1489" class="l"><a href="#1489">1489: </a>        }
-</span><span id="1490" class="l"><a href="#1490">1490: </a>
-</span><span id="1491" class="l"><a href="#1491">1491: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1492" class="l"><a href="#1492">1492: </a>    }
-</span><span id="1493" class="l"><a href="#1493">1493: </a>
-</span><span id="1494" class="l"><a href="#1494">1494: </a>    <span class="php-comment">/**
-</span></span><span id="1495" class="l"><a href="#1495">1495: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
-</span></span><span id="1496" class="l"><a href="#1496">1496: </a><span class="php-comment">     *
-</span></span><span id="1497" class="l"><a href="#1497">1497: </a><span class="php-comment">     * @access public
-</span></span><span id="1498" class="l"><a href="#1498">1498: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
-</span></span><span id="1499" class="l"><a href="#1499">1499: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1500" class="l"><a href="#1500">1500: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1501" class="l"><a href="#1501">1501: </a><span class="php-comment">     * @return array|string|NULL Value from the OPTIONS request; otherwise, NULL
-</span></span><span id="1502" class="l"><a href="#1502">1502: </a><span class="php-comment">     */</span>
-</span><span id="1503" class="l"><a href="#1503">1503: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1504" class="l"><a href="#1504">1504: </a>    {
-</span><span id="1505" class="l"><a href="#1505">1505: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1506" class="l"><a href="#1506">1506: </a>        {
-</span><span id="1507" class="l"><a href="#1507">1507: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
-</span><span id="1508" class="l"><a href="#1508">1508: </a>        }
-</span><span id="1509" class="l"><a href="#1509">1509: </a>
-</span><span id="1510" class="l"><a href="#1510">1510: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1511" class="l"><a href="#1511">1511: </a>    }
-</span><span id="1512" class="l"><a href="#1512">1512: </a>
-</span><span id="1513" class="l"><a href="#1513">1513: </a>    <span class="php-comment">/**
-</span></span><span id="1514" class="l"><a href="#1514">1514: </a><span class="php-comment">     * Retrieve a value from a HEAD request
-</span></span><span id="1515" class="l"><a href="#1515">1515: </a><span class="php-comment">     *
-</span></span><span id="1516" class="l"><a href="#1516">1516: </a><span class="php-comment">     * @access public
-</span></span><span id="1517" class="l"><a href="#1517">1517: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
-</span></span><span id="1518" class="l"><a href="#1518">1518: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1519" class="l"><a href="#1519">1519: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1520" class="l"><a href="#1520">1520: </a><span class="php-comment">     * @return array|string|NULL Value from the HEAD request; otherwise, NULL
-</span></span><span id="1521" class="l"><a href="#1521">1521: </a><span class="php-comment">     */</span>
-</span><span id="1522" class="l"><a href="#1522">1522: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1523" class="l"><a href="#1523">1523: </a>    {
-</span><span id="1524" class="l"><a href="#1524">1524: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1525" class="l"><a href="#1525">1525: </a>        {
-</span><span id="1526" class="l"><a href="#1526">1526: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;head_args;
-</span><span id="1527" class="l"><a href="#1527">1527: </a>        }
-</span><span id="1528" class="l"><a href="#1528">1528: </a>
-</span><span id="1529" class="l"><a href="#1529">1529: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1530" class="l"><a href="#1530">1530: </a>    }
-</span><span id="1531" class="l"><a href="#1531">1531: </a>
-</span><span id="1532" class="l"><a href="#1532">1532: </a>    <span class="php-comment">/**
-</span></span><span id="1533" class="l"><a href="#1533">1533: </a><span class="php-comment">     * Retrieve a value from a POST request
-</span></span><span id="1534" class="l"><a href="#1534">1534: </a><span class="php-comment">     *
-</span></span><span id="1535" class="l"><a href="#1535">1535: </a><span class="php-comment">     * @access public
-</span></span><span id="1536" class="l"><a href="#1536">1536: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
-</span></span><span id="1537" class="l"><a href="#1537">1537: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1538" class="l"><a href="#1538">1538: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1539" class="l"><a href="#1539">1539: </a><span class="php-comment">     * @return array|string|NULL Value from the POST request; otherwise, NULL
-</span></span><span id="1540" class="l"><a href="#1540">1540: </a><span class="php-comment">     */</span>
-</span><span id="1541" class="l"><a href="#1541">1541: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1542" class="l"><a href="#1542">1542: </a>    {
-</span><span id="1543" class="l"><a href="#1543">1543: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1544" class="l"><a href="#1544">1544: </a>        {
-</span><span id="1545" class="l"><a href="#1545">1545: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
-</span><span id="1546" class="l"><a href="#1546">1546: </a>        }
-</span><span id="1547" class="l"><a href="#1547">1547: </a>
-</span><span id="1548" class="l"><a href="#1548">1548: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1549" class="l"><a href="#1549">1549: </a>    }
-</span><span id="1550" class="l"><a href="#1550">1550: </a>
-</span><span id="1551" class="l"><a href="#1551">1551: </a>    <span class="php-comment">/**
-</span></span><span id="1552" class="l"><a href="#1552">1552: </a><span class="php-comment">     * Retrieve a value from a PUT request
-</span></span><span id="1553" class="l"><a href="#1553">1553: </a><span class="php-comment">     *
-</span></span><span id="1554" class="l"><a href="#1554">1554: </a><span class="php-comment">     * @access public
-</span></span><span id="1555" class="l"><a href="#1555">1555: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
-</span></span><span id="1556" class="l"><a href="#1556">1556: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1557" class="l"><a href="#1557">1557: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1558" class="l"><a href="#1558">1558: </a><span class="php-comment">     * @return array|string|NULL Value from the PUT request; otherwise, NULL
-</span></span><span id="1559" class="l"><a href="#1559">1559: </a><span class="php-comment">     */</span>
-</span><span id="1560" class="l"><a href="#1560">1560: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1561" class="l"><a href="#1561">1561: </a>    {
-</span><span id="1562" class="l"><a href="#1562">1562: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1563" class="l"><a href="#1563">1563: </a>        {
-</span><span id="1564" class="l"><a href="#1564">1564: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
-</span><span id="1565" class="l"><a href="#1565">1565: </a>        }
-</span><span id="1566" class="l"><a href="#1566">1566: </a>
-</span><span id="1567" class="l"><a href="#1567">1567: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1568" class="l"><a href="#1568">1568: </a>    }
-</span><span id="1569" class="l"><a href="#1569">1569: </a>
-</span><span id="1570" class="l"><a href="#1570">1570: </a>    <span class="php-comment">/**
-</span></span><span id="1571" class="l"><a href="#1571">1571: </a><span class="php-comment">     * Retrieve a value from a DELETE request
-</span></span><span id="1572" class="l"><a href="#1572">1572: </a><span class="php-comment">     *
-</span></span><span id="1573" class="l"><a href="#1573">1573: </a><span class="php-comment">     * @access public
-</span></span><span id="1574" class="l"><a href="#1574">1574: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
-</span></span><span id="1575" class="l"><a href="#1575">1575: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1576" class="l"><a href="#1576">1576: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1577" class="l"><a href="#1577">1577: </a><span class="php-comment">     * @return array|string|NULL Value from the DELETE request; otherwise, NULL
-</span></span><span id="1578" class="l"><a href="#1578">1578: </a><span class="php-comment">     */</span>
-</span><span id="1579" class="l"><a href="#1579">1579: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1580" class="l"><a href="#1580">1580: </a>    {
-</span><span id="1581" class="l"><a href="#1581">1581: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1582" class="l"><a href="#1582">1582: </a>        {
-</span><span id="1583" class="l"><a href="#1583">1583: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
-</span><span id="1584" class="l"><a href="#1584">1584: </a>        }
-</span><span id="1585" class="l"><a href="#1585">1585: </a>
-</span><span id="1586" class="l"><a href="#1586">1586: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1587" class="l"><a href="#1587">1587: </a>    }
-</span><span id="1588" class="l"><a href="#1588">1588: </a>
-</span><span id="1589" class="l"><a href="#1589">1589: </a>    <span class="php-comment">/**
-</span></span><span id="1590" class="l"><a href="#1590">1590: </a><span class="php-comment">     * Retrieve a value from a PATCH request
-</span></span><span id="1591" class="l"><a href="#1591">1591: </a><span class="php-comment">     *
-</span></span><span id="1592" class="l"><a href="#1592">1592: </a><span class="php-comment">     * @access public
-</span></span><span id="1593" class="l"><a href="#1593">1593: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
-</span></span><span id="1594" class="l"><a href="#1594">1594: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1595" class="l"><a href="#1595">1595: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1596" class="l"><a href="#1596">1596: </a><span class="php-comment">     * @return array|string|NULL Value from the PATCH request; otherwise, NULL
-</span></span><span id="1597" class="l"><a href="#1597">1597: </a><span class="php-comment">     */</span>
-</span><span id="1598" class="l"><a href="#1598">1598: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1599" class="l"><a href="#1599">1599: </a>    {
-</span><span id="1600" class="l"><a href="#1600">1600: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1601" class="l"><a href="#1601">1601: </a>        {
-</span><span id="1602" class="l"><a href="#1602">1602: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
-</span><span id="1603" class="l"><a href="#1603">1603: </a>        }
-</span><span id="1604" class="l"><a href="#1604">1604: </a>
-</span><span id="1605" class="l"><a href="#1605">1605: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1606" class="l"><a href="#1606">1606: </a>    }
-</span><span id="1607" class="l"><a href="#1607">1607: </a>
-</span><span id="1608" class="l"><a href="#1608">1608: </a>    <span class="php-comment">/**
-</span></span><span id="1609" class="l"><a href="#1609">1609: </a><span class="php-comment">     * Retrieve a value from the query parameters
-</span></span><span id="1610" class="l"><a href="#1610">1610: </a><span class="php-comment">     *
-</span></span><span id="1611" class="l"><a href="#1611">1611: </a><span class="php-comment">     * @access public
-</span></span><span id="1612" class="l"><a href="#1612">1612: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
-</span></span><span id="1613" class="l"><a href="#1613">1613: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1614" class="l"><a href="#1614">1614: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1615" class="l"><a href="#1615">1615: </a><span class="php-comment">     * @return array|string|NULL Value from the query parameters; otherwise, NULL
-</span></span><span id="1616" class="l"><a href="#1616">1616: </a><span class="php-comment">     */</span>
-</span><span id="1617" class="l"><a href="#1617">1617: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1618" class="l"><a href="#1618">1618: </a>    {
-</span><span id="1619" class="l"><a href="#1619">1619: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1620" class="l"><a href="#1620">1620: </a>        {
-</span><span id="1621" class="l"><a href="#1621">1621: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
-</span><span id="1622" class="l"><a href="#1622">1622: </a>        }
-</span><span id="1623" class="l"><a href="#1623">1623: </a>
-</span><span id="1624" class="l"><a href="#1624">1624: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1625" class="l"><a href="#1625">1625: </a>    }
-</span><span id="1626" class="l"><a href="#1626">1626: </a>
-</span><span id="1627" class="l"><a href="#1627">1627: </a>    <span class="php-comment">/**
-</span></span><span id="1628" class="l"><a href="#1628">1628: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
-</span></span><span id="1629" class="l"><a href="#1629">1629: </a><span class="php-comment">     * prevented.
-</span></span><span id="1630" class="l"><a href="#1630">1630: </a><span class="php-comment">     *
-</span></span><span id="1631" class="l"><a href="#1631">1631: </a><span class="php-comment">     * @access protected
-</span></span><span id="1632" class="l"><a href="#1632">1632: </a><span class="php-comment">     * @param  string $value Input data
-</span></span><span id="1633" class="l"><a href="#1633">1633: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
-</span></span><span id="1634" class="l"><a href="#1634">1634: </a><span class="php-comment">     * @return string
-</span></span><span id="1635" class="l"><a href="#1635">1635: </a><span class="php-comment">     */</span>
-</span><span id="1636" class="l"><a href="#1636">1636: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
-</span><span id="1637" class="l"><a href="#1637">1637: </a>    {
-</span><span id="1638" class="l"><a href="#1638">1638: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) || <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
-</span><span id="1639" class="l"><a href="#1639">1639: </a>
-</span><span id="1640" class="l"><a href="#1640">1640: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
-</span><span id="1641" class="l"><a href="#1641">1641: </a>    }
-</span><span id="1642" class="l"><a href="#1642">1642: </a>
-</span><span id="1643" class="l"><a href="#1643">1643: </a>    <span class="php-comment">/**
-</span></span><span id="1644" class="l"><a href="#1644">1644: </a><span class="php-comment">     * Retrieve the validation errors
-</span></span><span id="1645" class="l"><a href="#1645">1645: </a><span class="php-comment">     *
-</span></span><span id="1646" class="l"><a href="#1646">1646: </a><span class="php-comment">     * @access public
-</span></span><span id="1647" class="l"><a href="#1647">1647: </a><span class="php-comment">     * @return array
-</span></span><span id="1648" class="l"><a href="#1648">1648: </a><span class="php-comment">     */</span>
-</span><span id="1649" class="l"><a href="#1649">1649: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
-</span><span id="1650" class="l"><a href="#1650">1650: </a>    {
-</span><span id="1651" class="l"><a href="#1651">1651: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
-</span><span id="1652" class="l"><a href="#1652">1652: </a>
-</span><span id="1653" class="l"><a href="#1653">1653: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
-</span><span id="1654" class="l"><a href="#1654">1654: </a>    }
-</span><span id="1655" class="l"><a href="#1655">1655: </a>
-</span><span id="1656" class="l"><a href="#1656">1656: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
-</span><span id="1657" class="l"><a href="#1657">1657: </a>
-</span><span id="1658" class="l"><a href="#1658">1658: </a>    <span class="php-comment">/**
-</span></span><span id="1659" class="l"><a href="#1659">1659: </a><span class="php-comment">     * Perform LDAP Authentication
-</span></span><span id="1660" class="l"><a href="#1660">1660: </a><span class="php-comment">     *
-</span></span><span id="1661" class="l"><a href="#1661">1661: </a><span class="php-comment">     * @access protected
-</span></span><span id="1662" class="l"><a href="#1662">1662: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1663" class="l"><a href="#1663">1663: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1664" class="l"><a href="#1664">1664: </a><span class="php-comment">     * @return bool
-</span></span><span id="1665" class="l"><a href="#1665">1665: </a><span class="php-comment">     */</span>
-</span><span id="1666" class="l"><a href="#1666">1666: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1667" class="l"><a href="#1667">1667: </a>    {
-</span><span id="1668" class="l"><a href="#1668">1668: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1669" class="l"><a href="#1669">1669: </a>        {
-</span><span id="1670" class="l"><a href="#1670">1670: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
-</span><span id="1671" class="l"><a href="#1671">1671: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1672" class="l"><a href="#1672">1672: </a>        }
-</span><span id="1673" class="l"><a href="#1673">1673: </a>
-</span><span id="1674" class="l"><a href="#1674">1674: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading configuration'</span>);
-</span><span id="1675" class="l"><a href="#1675">1675: </a>
-</span><span id="1676" class="l"><a href="#1676">1676: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="1450" class="l"><a href="#1450">1450: </a>            <span class="php-comment">// Set the following server variables (perhaps not required anymore?)</span>
+</span><span id="1451" class="l"><a href="#1451">1451: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1452" class="l"><a href="#1452">1452: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'PATH_INFO'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1453" class="l"><a href="#1453">1453: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'QUERY_STRING'</span>] = <span class="php-var">$request_uri</span>;
+</span><span id="1454" class="l"><a href="#1454">1454: </a>        }
+</span><span id="1455" class="l"><a href="#1455">1455: </a>        <span class="php-keyword1">else</span>
+</span><span id="1456" class="l"><a href="#1456">1456: </a>        {
+</span><span id="1457" class="l"><a href="#1457">1457: </a>            <span class="php-var">$request_uri</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>);
+</span><span id="1458" class="l"><a href="#1458">1458: </a>        }
+</span><span id="1459" class="l"><a href="#1459">1459: </a>
+</span><span id="1460" class="l"><a href="#1460">1460: </a>        <span class="php-comment">// Parse the query parameters from the query string</span>
+</span><span id="1461" class="l"><a href="#1461">1461: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$request_uri</span>, PHP_URL_QUERY), <span class="php-var">$this</span>-&gt;_query_args);
+</span><span id="1462" class="l"><a href="#1462">1462: </a>    }
+</span><span id="1463" class="l"><a href="#1463">1463: </a>
+</span><span id="1464" class="l"><a href="#1464">1464: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
+</span><span id="1465" class="l"><a href="#1465">1465: </a>
+</span><span id="1466" class="l"><a href="#1466">1466: </a>    <span class="php-comment">/**
+</span></span><span id="1467" class="l"><a href="#1467">1467: </a><span class="php-comment">     * Retrieve a value from a GET request
+</span></span><span id="1468" class="l"><a href="#1468">1468: </a><span class="php-comment">     *
+</span></span><span id="1469" class="l"><a href="#1469">1469: </a><span class="php-comment">     * @access public
+</span></span><span id="1470" class="l"><a href="#1470">1470: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
+</span></span><span id="1471" class="l"><a href="#1471">1471: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1472" class="l"><a href="#1472">1472: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1473" class="l"><a href="#1473">1473: </a><span class="php-comment">     * @return array|string|NULL Value from the GET request; otherwise, NULL
+</span></span><span id="1474" class="l"><a href="#1474">1474: </a><span class="php-comment">     */</span>
+</span><span id="1475" class="l"><a href="#1475">1475: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1476" class="l"><a href="#1476">1476: </a>    {
+</span><span id="1477" class="l"><a href="#1477">1477: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1478" class="l"><a href="#1478">1478: </a>        {
+</span><span id="1479" class="l"><a href="#1479">1479: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
+</span><span id="1480" class="l"><a href="#1480">1480: </a>        }
+</span><span id="1481" class="l"><a href="#1481">1481: </a>
+</span><span id="1482" class="l"><a href="#1482">1482: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1483" class="l"><a href="#1483">1483: </a>    }
+</span><span id="1484" class="l"><a href="#1484">1484: </a>
+</span><span id="1485" class="l"><a href="#1485">1485: </a>    <span class="php-comment">/**
+</span></span><span id="1486" class="l"><a href="#1486">1486: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
+</span></span><span id="1487" class="l"><a href="#1487">1487: </a><span class="php-comment">     *
+</span></span><span id="1488" class="l"><a href="#1488">1488: </a><span class="php-comment">     * @access public
+</span></span><span id="1489" class="l"><a href="#1489">1489: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
+</span></span><span id="1490" class="l"><a href="#1490">1490: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1491" class="l"><a href="#1491">1491: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1492" class="l"><a href="#1492">1492: </a><span class="php-comment">     * @return array|string|NULL Value from the OPTIONS request; otherwise, NULL
+</span></span><span id="1493" class="l"><a href="#1493">1493: </a><span class="php-comment">     */</span>
+</span><span id="1494" class="l"><a href="#1494">1494: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1495" class="l"><a href="#1495">1495: </a>    {
+</span><span id="1496" class="l"><a href="#1496">1496: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1497" class="l"><a href="#1497">1497: </a>        {
+</span><span id="1498" class="l"><a href="#1498">1498: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
+</span><span id="1499" class="l"><a href="#1499">1499: </a>        }
+</span><span id="1500" class="l"><a href="#1500">1500: </a>
+</span><span id="1501" class="l"><a href="#1501">1501: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1502" class="l"><a href="#1502">1502: </a>    }
+</span><span id="1503" class="l"><a href="#1503">1503: </a>
+</span><span id="1504" class="l"><a href="#1504">1504: </a>    <span class="php-comment">/**
+</span></span><span id="1505" class="l"><a href="#1505">1505: </a><span class="php-comment">     * Retrieve a value from a HEAD request
+</span></span><span id="1506" class="l"><a href="#1506">1506: </a><span class="php-comment">     *
+</span></span><span id="1507" class="l"><a href="#1507">1507: </a><span class="php-comment">     * @access public
+</span></span><span id="1508" class="l"><a href="#1508">1508: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
+</span></span><span id="1509" class="l"><a href="#1509">1509: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1510" class="l"><a href="#1510">1510: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1511" class="l"><a href="#1511">1511: </a><span class="php-comment">     * @return array|string|NULL Value from the HEAD request; otherwise, NULL
+</span></span><span id="1512" class="l"><a href="#1512">1512: </a><span class="php-comment">     */</span>
+</span><span id="1513" class="l"><a href="#1513">1513: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1514" class="l"><a href="#1514">1514: </a>    {
+</span><span id="1515" class="l"><a href="#1515">1515: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1516" class="l"><a href="#1516">1516: </a>        {
+</span><span id="1517" class="l"><a href="#1517">1517: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;head_args;
+</span><span id="1518" class="l"><a href="#1518">1518: </a>        }
+</span><span id="1519" class="l"><a href="#1519">1519: </a>
+</span><span id="1520" class="l"><a href="#1520">1520: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1521" class="l"><a href="#1521">1521: </a>    }
+</span><span id="1522" class="l"><a href="#1522">1522: </a>
+</span><span id="1523" class="l"><a href="#1523">1523: </a>    <span class="php-comment">/**
+</span></span><span id="1524" class="l"><a href="#1524">1524: </a><span class="php-comment">     * Retrieve a value from a POST request
+</span></span><span id="1525" class="l"><a href="#1525">1525: </a><span class="php-comment">     *
+</span></span><span id="1526" class="l"><a href="#1526">1526: </a><span class="php-comment">     * @access public
+</span></span><span id="1527" class="l"><a href="#1527">1527: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
+</span></span><span id="1528" class="l"><a href="#1528">1528: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1529" class="l"><a href="#1529">1529: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1530" class="l"><a href="#1530">1530: </a><span class="php-comment">     * @return array|string|NULL Value from the POST request; otherwise, NULL
+</span></span><span id="1531" class="l"><a href="#1531">1531: </a><span class="php-comment">     */</span>
+</span><span id="1532" class="l"><a href="#1532">1532: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1533" class="l"><a href="#1533">1533: </a>    {
+</span><span id="1534" class="l"><a href="#1534">1534: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1535" class="l"><a href="#1535">1535: </a>        {
+</span><span id="1536" class="l"><a href="#1536">1536: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
+</span><span id="1537" class="l"><a href="#1537">1537: </a>        }
+</span><span id="1538" class="l"><a href="#1538">1538: </a>
+</span><span id="1539" class="l"><a href="#1539">1539: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1540" class="l"><a href="#1540">1540: </a>    }
+</span><span id="1541" class="l"><a href="#1541">1541: </a>
+</span><span id="1542" class="l"><a href="#1542">1542: </a>    <span class="php-comment">/**
+</span></span><span id="1543" class="l"><a href="#1543">1543: </a><span class="php-comment">     * Retrieve a value from a PUT request
+</span></span><span id="1544" class="l"><a href="#1544">1544: </a><span class="php-comment">     *
+</span></span><span id="1545" class="l"><a href="#1545">1545: </a><span class="php-comment">     * @access public
+</span></span><span id="1546" class="l"><a href="#1546">1546: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
+</span></span><span id="1547" class="l"><a href="#1547">1547: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1548" class="l"><a href="#1548">1548: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1549" class="l"><a href="#1549">1549: </a><span class="php-comment">     * @return array|string|NULL Value from the PUT request; otherwise, NULL
+</span></span><span id="1550" class="l"><a href="#1550">1550: </a><span class="php-comment">     */</span>
+</span><span id="1551" class="l"><a href="#1551">1551: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1552" class="l"><a href="#1552">1552: </a>    {
+</span><span id="1553" class="l"><a href="#1553">1553: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1554" class="l"><a href="#1554">1554: </a>        {
+</span><span id="1555" class="l"><a href="#1555">1555: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
+</span><span id="1556" class="l"><a href="#1556">1556: </a>        }
+</span><span id="1557" class="l"><a href="#1557">1557: </a>
+</span><span id="1558" class="l"><a href="#1558">1558: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1559" class="l"><a href="#1559">1559: </a>    }
+</span><span id="1560" class="l"><a href="#1560">1560: </a>
+</span><span id="1561" class="l"><a href="#1561">1561: </a>    <span class="php-comment">/**
+</span></span><span id="1562" class="l"><a href="#1562">1562: </a><span class="php-comment">     * Retrieve a value from a DELETE request
+</span></span><span id="1563" class="l"><a href="#1563">1563: </a><span class="php-comment">     *
+</span></span><span id="1564" class="l"><a href="#1564">1564: </a><span class="php-comment">     * @access public
+</span></span><span id="1565" class="l"><a href="#1565">1565: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
+</span></span><span id="1566" class="l"><a href="#1566">1566: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1567" class="l"><a href="#1567">1567: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1568" class="l"><a href="#1568">1568: </a><span class="php-comment">     * @return array|string|NULL Value from the DELETE request; otherwise, NULL
+</span></span><span id="1569" class="l"><a href="#1569">1569: </a><span class="php-comment">     */</span>
+</span><span id="1570" class="l"><a href="#1570">1570: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1571" class="l"><a href="#1571">1571: </a>    {
+</span><span id="1572" class="l"><a href="#1572">1572: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1573" class="l"><a href="#1573">1573: </a>        {
+</span><span id="1574" class="l"><a href="#1574">1574: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
+</span><span id="1575" class="l"><a href="#1575">1575: </a>        }
+</span><span id="1576" class="l"><a href="#1576">1576: </a>
+</span><span id="1577" class="l"><a href="#1577">1577: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1578" class="l"><a href="#1578">1578: </a>    }
+</span><span id="1579" class="l"><a href="#1579">1579: </a>
+</span><span id="1580" class="l"><a href="#1580">1580: </a>    <span class="php-comment">/**
+</span></span><span id="1581" class="l"><a href="#1581">1581: </a><span class="php-comment">     * Retrieve a value from a PATCH request
+</span></span><span id="1582" class="l"><a href="#1582">1582: </a><span class="php-comment">     *
+</span></span><span id="1583" class="l"><a href="#1583">1583: </a><span class="php-comment">     * @access public
+</span></span><span id="1584" class="l"><a href="#1584">1584: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
+</span></span><span id="1585" class="l"><a href="#1585">1585: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1586" class="l"><a href="#1586">1586: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1587" class="l"><a href="#1587">1587: </a><span class="php-comment">     * @return array|string|NULL Value from the PATCH request; otherwise, NULL
+</span></span><span id="1588" class="l"><a href="#1588">1588: </a><span class="php-comment">     */</span>
+</span><span id="1589" class="l"><a href="#1589">1589: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1590" class="l"><a href="#1590">1590: </a>    {
+</span><span id="1591" class="l"><a href="#1591">1591: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1592" class="l"><a href="#1592">1592: </a>        {
+</span><span id="1593" class="l"><a href="#1593">1593: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
+</span><span id="1594" class="l"><a href="#1594">1594: </a>        }
+</span><span id="1595" class="l"><a href="#1595">1595: </a>
+</span><span id="1596" class="l"><a href="#1596">1596: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1597" class="l"><a href="#1597">1597: </a>    }
+</span><span id="1598" class="l"><a href="#1598">1598: </a>
+</span><span id="1599" class="l"><a href="#1599">1599: </a>    <span class="php-comment">/**
+</span></span><span id="1600" class="l"><a href="#1600">1600: </a><span class="php-comment">     * Retrieve a value from the query parameters
+</span></span><span id="1601" class="l"><a href="#1601">1601: </a><span class="php-comment">     *
+</span></span><span id="1602" class="l"><a href="#1602">1602: </a><span class="php-comment">     * @access public
+</span></span><span id="1603" class="l"><a href="#1603">1603: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
+</span></span><span id="1604" class="l"><a href="#1604">1604: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1605" class="l"><a href="#1605">1605: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1606" class="l"><a href="#1606">1606: </a><span class="php-comment">     * @return array|string|NULL Value from the query parameters; otherwise, NULL
+</span></span><span id="1607" class="l"><a href="#1607">1607: </a><span class="php-comment">     */</span>
+</span><span id="1608" class="l"><a href="#1608">1608: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1609" class="l"><a href="#1609">1609: </a>    {
+</span><span id="1610" class="l"><a href="#1610">1610: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1611" class="l"><a href="#1611">1611: </a>        {
+</span><span id="1612" class="l"><a href="#1612">1612: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
+</span><span id="1613" class="l"><a href="#1613">1613: </a>        }
+</span><span id="1614" class="l"><a href="#1614">1614: </a>
+</span><span id="1615" class="l"><a href="#1615">1615: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1616" class="l"><a href="#1616">1616: </a>    }
+</span><span id="1617" class="l"><a href="#1617">1617: </a>
+</span><span id="1618" class="l"><a href="#1618">1618: </a>    <span class="php-comment">/**
+</span></span><span id="1619" class="l"><a href="#1619">1619: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
+</span></span><span id="1620" class="l"><a href="#1620">1620: </a><span class="php-comment">     * prevented.
+</span></span><span id="1621" class="l"><a href="#1621">1621: </a><span class="php-comment">     *
+</span></span><span id="1622" class="l"><a href="#1622">1622: </a><span class="php-comment">     * @access protected
+</span></span><span id="1623" class="l"><a href="#1623">1623: </a><span class="php-comment">     * @param  string $value Input data
+</span></span><span id="1624" class="l"><a href="#1624">1624: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
+</span></span><span id="1625" class="l"><a href="#1625">1625: </a><span class="php-comment">     * @return string
+</span></span><span id="1626" class="l"><a href="#1626">1626: </a><span class="php-comment">     */</span>
+</span><span id="1627" class="l"><a href="#1627">1627: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
+</span><span id="1628" class="l"><a href="#1628">1628: </a>    {
+</span><span id="1629" class="l"><a href="#1629">1629: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) || <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
+</span><span id="1630" class="l"><a href="#1630">1630: </a>
+</span><span id="1631" class="l"><a href="#1631">1631: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
+</span><span id="1632" class="l"><a href="#1632">1632: </a>    }
+</span><span id="1633" class="l"><a href="#1633">1633: </a>
+</span><span id="1634" class="l"><a href="#1634">1634: </a>    <span class="php-comment">/**
+</span></span><span id="1635" class="l"><a href="#1635">1635: </a><span class="php-comment">     * Retrieve the validation errors
+</span></span><span id="1636" class="l"><a href="#1636">1636: </a><span class="php-comment">     *
+</span></span><span id="1637" class="l"><a href="#1637">1637: </a><span class="php-comment">     * @access public
+</span></span><span id="1638" class="l"><a href="#1638">1638: </a><span class="php-comment">     * @return array
+</span></span><span id="1639" class="l"><a href="#1639">1639: </a><span class="php-comment">     */</span>
+</span><span id="1640" class="l"><a href="#1640">1640: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
+</span><span id="1641" class="l"><a href="#1641">1641: </a>    {
+</span><span id="1642" class="l"><a href="#1642">1642: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
+</span><span id="1643" class="l"><a href="#1643">1643: </a>
+</span><span id="1644" class="l"><a href="#1644">1644: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
+</span><span id="1645" class="l"><a href="#1645">1645: </a>    }
+</span><span id="1646" class="l"><a href="#1646">1646: </a>
+</span><span id="1647" class="l"><a href="#1647">1647: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
+</span><span id="1648" class="l"><a href="#1648">1648: </a>
+</span><span id="1649" class="l"><a href="#1649">1649: </a>    <span class="php-comment">/**
+</span></span><span id="1650" class="l"><a href="#1650">1650: </a><span class="php-comment">     * Perform LDAP Authentication
+</span></span><span id="1651" class="l"><a href="#1651">1651: </a><span class="php-comment">     *
+</span></span><span id="1652" class="l"><a href="#1652">1652: </a><span class="php-comment">     * @access protected
+</span></span><span id="1653" class="l"><a href="#1653">1653: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1654" class="l"><a href="#1654">1654: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1655" class="l"><a href="#1655">1655: </a><span class="php-comment">     * @return bool
+</span></span><span id="1656" class="l"><a href="#1656">1656: </a><span class="php-comment">     */</span>
+</span><span id="1657" class="l"><a href="#1657">1657: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1658" class="l"><a href="#1658">1658: </a>    {
+</span><span id="1659" class="l"><a href="#1659">1659: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1660" class="l"><a href="#1660">1660: </a>        {
+</span><span id="1661" class="l"><a href="#1661">1661: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
+</span><span id="1662" class="l"><a href="#1662">1662: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1663" class="l"><a href="#1663">1663: </a>        }
+</span><span id="1664" class="l"><a href="#1664">1664: </a>
+</span><span id="1665" class="l"><a href="#1665">1665: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading configuration'</span>);
+</span><span id="1666" class="l"><a href="#1666">1666: </a>
+</span><span id="1667" class="l"><a href="#1667">1667: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="1668" class="l"><a href="#1668">1668: </a>
+</span><span id="1669" class="l"><a href="#1669">1669: </a>        <span class="php-var">$ldap</span> = [
+</span><span id="1670" class="l"><a href="#1670">1670: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1671" class="l"><a href="#1671">1671: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1672" class="l"><a href="#1672">1672: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1673" class="l"><a href="#1673">1673: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1674" class="l"><a href="#1674">1674: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1675" class="l"><a href="#1675">1675: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1676" class="l"><a href="#1676">1676: </a>        ];
 </span><span id="1677" class="l"><a href="#1677">1677: </a>
-</span><span id="1678" class="l"><a href="#1678">1678: </a>        <span class="php-var">$ldap</span> = [
-</span><span id="1679" class="l"><a href="#1679">1679: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1680" class="l"><a href="#1680">1680: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1681" class="l"><a href="#1681">1681: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1682" class="l"><a href="#1682">1682: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1683" class="l"><a href="#1683">1683: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1684" class="l"><a href="#1684">1684: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1685" class="l"><a href="#1685">1685: </a>        ];
-</span><span id="1686" class="l"><a href="#1686">1686: </a>
-</span><span id="1687" class="l"><a href="#1687">1687: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
-</span><span id="1688" class="l"><a href="#1688">1688: </a>
-</span><span id="1689" class="l"><a href="#1689">1689: </a>        <span class="php-comment">// Connect to the ldap server</span>
-</span><span id="1690" class="l"><a href="#1690">1690: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
-</span><span id="1691" class="l"><a href="#1691">1691: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
-</span><span id="1692" class="l"><a href="#1692">1692: </a>        {
-</span><span id="1693" class="l"><a href="#1693">1693: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>] . <span class="php-quote">' seconds'</span>);
-</span><span id="1694" class="l"><a href="#1694">1694: </a>
-</span><span id="1695" class="l"><a href="#1695">1695: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
-</span><span id="1696" class="l"><a href="#1696">1696: </a>
-</span><span id="1697" class="l"><a href="#1697">1697: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>] . <span class="php-quote">' with dn '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
-</span><span id="1698" class="l"><a href="#1698">1698: </a>
-</span><span id="1699" class="l"><a href="#1699">1699: </a>            <span class="php-comment">// Binding to the ldap server</span>
-</span><span id="1700" class="l"><a href="#1700">1700: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
-</span><span id="1701" class="l"><a href="#1701">1701: </a>
-</span><span id="1702" class="l"><a href="#1702">1702: </a>            <span class="php-comment">// Verify the binding</span>
-</span><span id="1703" class="l"><a href="#1703">1703: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1704" class="l"><a href="#1704">1704: </a>            {
-</span><span id="1705" class="l"><a href="#1705">1705: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind was unsuccessful'</span>);
-</span><span id="1706" class="l"><a href="#1706">1706: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1707" class="l"><a href="#1707">1707: </a>            }
-</span><span id="1708" class="l"><a href="#1708">1708: </a>
-</span><span id="1709" class="l"><a href="#1709">1709: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
-</span><span id="1710" class="l"><a href="#1710">1710: </a>        }
-</span><span id="1711" class="l"><a href="#1711">1711: </a>
-</span><span id="1712" class="l"><a href="#1712">1712: </a>        <span class="php-comment">// Search for user</span>
-</span><span id="1713" class="l"><a href="#1713">1713: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1714" class="l"><a href="#1714">1714: </a>        {
-</span><span id="1715" class="l"><a href="#1715">1715: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span> . <span class="php-var">$username</span> . <span class="php-quote">' not found in search'</span>);
-</span><span id="1716" class="l"><a href="#1716">1716: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1717" class="l"><a href="#1717">1717: </a>        }
-</span><span id="1718" class="l"><a href="#1718">1718: </a>
-</span><span id="1719" class="l"><a href="#1719">1719: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
-</span><span id="1720" class="l"><a href="#1720">1720: </a>        {
-</span><span id="1721" class="l"><a href="#1721">1721: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username '</span> . <span class="php-var">$username</span> . <span class="php-quote">'found more than once'</span>);
-</span><span id="1722" class="l"><a href="#1722">1722: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1723" class="l"><a href="#1723">1723: </a>        }
-</span><span id="1724" class="l"><a href="#1724">1724: </a>
-</span><span id="1725" class="l"><a href="#1725">1725: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1726" class="l"><a href="#1726">1726: </a>        {
-</span><span id="1727" class="l"><a href="#1727">1727: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, entry of search result could not be fetched'</span>);
-</span><span id="1728" class="l"><a href="#1728">1728: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1729" class="l"><a href="#1729">1729: </a>        }
-</span><span id="1730" class="l"><a href="#1730">1730: </a>
-</span><span id="1731" class="l"><a href="#1731">1731: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1732" class="l"><a href="#1732">1732: </a>        {
-</span><span id="1733" class="l"><a href="#1733">1733: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, user-dn could not be fetched'</span>);
-</span><span id="1734" class="l"><a href="#1734">1734: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1735" class="l"><a href="#1735">1735: </a>        }
+</span><span id="1678" class="l"><a href="#1678">1678: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
+</span><span id="1679" class="l"><a href="#1679">1679: </a>
+</span><span id="1680" class="l"><a href="#1680">1680: </a>        <span class="php-comment">// Connect to the ldap server</span>
+</span><span id="1681" class="l"><a href="#1681">1681: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
+</span><span id="1682" class="l"><a href="#1682">1682: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
+</span><span id="1683" class="l"><a href="#1683">1683: </a>        {
+</span><span id="1684" class="l"><a href="#1684">1684: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>] . <span class="php-quote">' seconds'</span>);
+</span><span id="1685" class="l"><a href="#1685">1685: </a>
+</span><span id="1686" class="l"><a href="#1686">1686: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
+</span><span id="1687" class="l"><a href="#1687">1687: </a>
+</span><span id="1688" class="l"><a href="#1688">1688: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>] . <span class="php-quote">' with dn '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
+</span><span id="1689" class="l"><a href="#1689">1689: </a>
+</span><span id="1690" class="l"><a href="#1690">1690: </a>            <span class="php-comment">// Binding to the ldap server</span>
+</span><span id="1691" class="l"><a href="#1691">1691: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
+</span><span id="1692" class="l"><a href="#1692">1692: </a>
+</span><span id="1693" class="l"><a href="#1693">1693: </a>            <span class="php-comment">// Verify the binding</span>
+</span><span id="1694" class="l"><a href="#1694">1694: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1695" class="l"><a href="#1695">1695: </a>            {
+</span><span id="1696" class="l"><a href="#1696">1696: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind was unsuccessful'</span>);
+</span><span id="1697" class="l"><a href="#1697">1697: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1698" class="l"><a href="#1698">1698: </a>            }
+</span><span id="1699" class="l"><a href="#1699">1699: </a>
+</span><span id="1700" class="l"><a href="#1700">1700: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
+</span><span id="1701" class="l"><a href="#1701">1701: </a>        }
+</span><span id="1702" class="l"><a href="#1702">1702: </a>
+</span><span id="1703" class="l"><a href="#1703">1703: </a>        <span class="php-comment">// Search for user</span>
+</span><span id="1704" class="l"><a href="#1704">1704: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1705" class="l"><a href="#1705">1705: </a>        {
+</span><span id="1706" class="l"><a href="#1706">1706: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span> . <span class="php-var">$username</span> . <span class="php-quote">' not found in search'</span>);
+</span><span id="1707" class="l"><a href="#1707">1707: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1708" class="l"><a href="#1708">1708: </a>        }
+</span><span id="1709" class="l"><a href="#1709">1709: </a>
+</span><span id="1710" class="l"><a href="#1710">1710: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
+</span><span id="1711" class="l"><a href="#1711">1711: </a>        {
+</span><span id="1712" class="l"><a href="#1712">1712: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username '</span> . <span class="php-var">$username</span> . <span class="php-quote">'found more than once'</span>);
+</span><span id="1713" class="l"><a href="#1713">1713: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1714" class="l"><a href="#1714">1714: </a>        }
+</span><span id="1715" class="l"><a href="#1715">1715: </a>
+</span><span id="1716" class="l"><a href="#1716">1716: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1717" class="l"><a href="#1717">1717: </a>        {
+</span><span id="1718" class="l"><a href="#1718">1718: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, entry of search result could not be fetched'</span>);
+</span><span id="1719" class="l"><a href="#1719">1719: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1720" class="l"><a href="#1720">1720: </a>        }
+</span><span id="1721" class="l"><a href="#1721">1721: </a>
+</span><span id="1722" class="l"><a href="#1722">1722: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1723" class="l"><a href="#1723">1723: </a>        {
+</span><span id="1724" class="l"><a href="#1724">1724: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, user-dn could not be fetched'</span>);
+</span><span id="1725" class="l"><a href="#1725">1725: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1726" class="l"><a href="#1726">1726: </a>        }
+</span><span id="1727" class="l"><a href="#1727">1727: </a>
+</span><span id="1728" class="l"><a href="#1728">1728: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
+</span><span id="1729" class="l"><a href="#1729">1729: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1730" class="l"><a href="#1730">1730: </a>        {
+</span><span id="1731" class="l"><a href="#1731">1731: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
+</span><span id="1732" class="l"><a href="#1732">1732: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1733" class="l"><a href="#1733">1733: </a>        }
+</span><span id="1734" class="l"><a href="#1734">1734: </a>
+</span><span id="1735" class="l"><a href="#1735">1735: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span> . <span class="php-var">$user_dn</span> . <span class="php-quote">' authenticated successfully'</span>);
 </span><span id="1736" class="l"><a href="#1736">1736: </a>
-</span><span id="1737" class="l"><a href="#1737">1737: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
-</span><span id="1738" class="l"><a href="#1738">1738: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1739" class="l"><a href="#1739">1739: </a>        {
-</span><span id="1740" class="l"><a href="#1740">1740: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
-</span><span id="1741" class="l"><a href="#1741">1741: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1742" class="l"><a href="#1742">1742: </a>        }
+</span><span id="1737" class="l"><a href="#1737">1737: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
+</span><span id="1738" class="l"><a href="#1738">1738: </a>
+</span><span id="1739" class="l"><a href="#1739">1739: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
+</span><span id="1740" class="l"><a href="#1740">1740: </a>
+</span><span id="1741" class="l"><a href="#1741">1741: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1742" class="l"><a href="#1742">1742: </a>    }
 </span><span id="1743" class="l"><a href="#1743">1743: </a>
-</span><span id="1744" class="l"><a href="#1744">1744: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span> . <span class="php-var">$user_dn</span> . <span class="php-quote">' authenticated successfully'</span>);
-</span><span id="1745" class="l"><a href="#1745">1745: </a>
-</span><span id="1746" class="l"><a href="#1746">1746: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
-</span><span id="1747" class="l"><a href="#1747">1747: </a>
-</span><span id="1748" class="l"><a href="#1748">1748: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
-</span><span id="1749" class="l"><a href="#1749">1749: </a>
-</span><span id="1750" class="l"><a href="#1750">1750: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1751" class="l"><a href="#1751">1751: </a>    }
-</span><span id="1752" class="l"><a href="#1752">1752: </a>
-</span><span id="1753" class="l"><a href="#1753">1753: </a>    <span class="php-comment">/**
-</span></span><span id="1754" class="l"><a href="#1754">1754: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
-</span></span><span id="1755" class="l"><a href="#1755">1755: </a><span class="php-comment">     *
-</span></span><span id="1756" class="l"><a href="#1756">1756: </a><span class="php-comment">     * @access protected
-</span></span><span id="1757" class="l"><a href="#1757">1757: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1758" class="l"><a href="#1758">1758: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1759" class="l"><a href="#1759">1759: </a><span class="php-comment">     * @return bool
-</span></span><span id="1760" class="l"><a href="#1760">1760: </a><span class="php-comment">     */</span>
-</span><span id="1761" class="l"><a href="#1761">1761: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1762" class="l"><a href="#1762">1762: </a>    {
-</span><span id="1763" class="l"><a href="#1763">1763: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1744" class="l"><a href="#1744">1744: </a>    <span class="php-comment">/**
+</span></span><span id="1745" class="l"><a href="#1745">1745: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
+</span></span><span id="1746" class="l"><a href="#1746">1746: </a><span class="php-comment">     *
+</span></span><span id="1747" class="l"><a href="#1747">1747: </a><span class="php-comment">     * @access protected
+</span></span><span id="1748" class="l"><a href="#1748">1748: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1749" class="l"><a href="#1749">1749: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1750" class="l"><a href="#1750">1750: </a><span class="php-comment">     * @return bool
+</span></span><span id="1751" class="l"><a href="#1751">1751: </a><span class="php-comment">     */</span>
+</span><span id="1752" class="l"><a href="#1752">1752: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1753" class="l"><a href="#1753">1753: </a>    {
+</span><span id="1754" class="l"><a href="#1754">1754: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1755" class="l"><a href="#1755">1755: </a>        {
+</span><span id="1756" class="l"><a href="#1756">1756: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: Failure, empty username'</span>);
+</span><span id="1757" class="l"><a href="#1757">1757: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1758" class="l"><a href="#1758">1758: </a>        }
+</span><span id="1759" class="l"><a href="#1759">1759: </a>
+</span><span id="1760" class="l"><a href="#1760">1760: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
+</span><span id="1761" class="l"><a href="#1761">1761: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
+</span><span id="1762" class="l"><a href="#1762">1762: </a>
+</span><span id="1763" class="l"><a href="#1763">1763: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
 </span><span id="1764" class="l"><a href="#1764">1764: </a>        {
-</span><span id="1765" class="l"><a href="#1765">1765: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: Failure, empty username'</span>);
+</span><span id="1765" class="l"><a href="#1765">1765: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_class'</span>);
 </span><span id="1766" class="l"><a href="#1766">1766: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
 </span><span id="1767" class="l"><a href="#1767">1767: </a>        }
 </span><span id="1768" class="l"><a href="#1768">1768: </a>
-</span><span id="1769" class="l"><a href="#1769">1769: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
-</span><span id="1770" class="l"><a href="#1770">1770: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
-</span><span id="1771" class="l"><a href="#1771">1771: </a>
-</span><span id="1772" class="l"><a href="#1772">1772: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
-</span><span id="1773" class="l"><a href="#1773">1773: </a>        {
-</span><span id="1774" class="l"><a href="#1774">1774: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_class'</span>);
-</span><span id="1775" class="l"><a href="#1775">1775: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1776" class="l"><a href="#1776">1776: </a>        }
-</span><span id="1777" class="l"><a href="#1777">1777: </a>
-</span><span id="1778" class="l"><a href="#1778">1778: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
-</span><span id="1779" class="l"><a href="#1779">1779: </a>        {
-</span><span id="1780" class="l"><a href="#1780">1780: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_function'</span>);
-</span><span id="1781" class="l"><a href="#1781">1781: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1782" class="l"><a href="#1782">1782: </a>        }
-</span><span id="1783" class="l"><a href="#1783">1783: </a>
-</span><span id="1784" class="l"><a href="#1784">1784: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1785" class="l"><a href="#1785">1785: </a>        {
-</span><span id="1786" class="l"><a href="#1786">1786: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
-</span><span id="1787" class="l"><a href="#1787">1787: </a>        }
-</span><span id="1788" class="l"><a href="#1788">1788: </a>
-</span><span id="1789" class="l"><a href="#1789">1789: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1790" class="l"><a href="#1790">1790: </a>    }
-</span><span id="1791" class="l"><a href="#1791">1791: </a>
-</span><span id="1792" class="l"><a href="#1792">1792: </a>    <span class="php-comment">/**
-</span></span><span id="1793" class="l"><a href="#1793">1793: </a><span class="php-comment">     * Check if the user is logged in
-</span></span><span id="1794" class="l"><a href="#1794">1794: </a><span class="php-comment">     *
-</span></span><span id="1795" class="l"><a href="#1795">1795: </a><span class="php-comment">     * @access protected
-</span></span><span id="1796" class="l"><a href="#1796">1796: </a><span class="php-comment">     * @param  string $username The user's name
-</span></span><span id="1797" class="l"><a href="#1797">1797: </a><span class="php-comment">     * @param  bool|string $password The user's password
-</span></span><span id="1798" class="l"><a href="#1798">1798: </a><span class="php-comment">     * @return bool
-</span></span><span id="1799" class="l"><a href="#1799">1799: </a><span class="php-comment">     */</span>
-</span><span id="1800" class="l"><a href="#1800">1800: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1801" class="l"><a href="#1801">1801: </a>    {
-</span><span id="1802" class="l"><a href="#1802">1802: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1769" class="l"><a href="#1769">1769: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
+</span><span id="1770" class="l"><a href="#1770">1770: </a>        {
+</span><span id="1771" class="l"><a href="#1771">1771: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_function'</span>);
+</span><span id="1772" class="l"><a href="#1772">1772: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1773" class="l"><a href="#1773">1773: </a>        }
+</span><span id="1774" class="l"><a href="#1774">1774: </a>
+</span><span id="1775" class="l"><a href="#1775">1775: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1776" class="l"><a href="#1776">1776: </a>        {
+</span><span id="1777" class="l"><a href="#1777">1777: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
+</span><span id="1778" class="l"><a href="#1778">1778: </a>        }
+</span><span id="1779" class="l"><a href="#1779">1779: </a>
+</span><span id="1780" class="l"><a href="#1780">1780: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1781" class="l"><a href="#1781">1781: </a>    }
+</span><span id="1782" class="l"><a href="#1782">1782: </a>
+</span><span id="1783" class="l"><a href="#1783">1783: </a>    <span class="php-comment">/**
+</span></span><span id="1784" class="l"><a href="#1784">1784: </a><span class="php-comment">     * Check if the user is logged in
+</span></span><span id="1785" class="l"><a href="#1785">1785: </a><span class="php-comment">     *
+</span></span><span id="1786" class="l"><a href="#1786">1786: </a><span class="php-comment">     * @access protected
+</span></span><span id="1787" class="l"><a href="#1787">1787: </a><span class="php-comment">     * @param  string $username The user's name
+</span></span><span id="1788" class="l"><a href="#1788">1788: </a><span class="php-comment">     * @param  bool|string $password The user's password
+</span></span><span id="1789" class="l"><a href="#1789">1789: </a><span class="php-comment">     * @return bool
+</span></span><span id="1790" class="l"><a href="#1790">1790: </a><span class="php-comment">     */</span>
+</span><span id="1791" class="l"><a href="#1791">1791: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="1792" class="l"><a href="#1792">1792: </a>    {
+</span><span id="1793" class="l"><a href="#1793">1793: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1794" class="l"><a href="#1794">1794: </a>        {
+</span><span id="1795" class="l"><a href="#1795">1795: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1796" class="l"><a href="#1796">1796: </a>        }
+</span><span id="1797" class="l"><a href="#1797">1797: </a>
+</span><span id="1798" class="l"><a href="#1798">1798: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
+</span><span id="1799" class="l"><a href="#1799">1799: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="1800" class="l"><a href="#1800">1800: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
+</span><span id="1801" class="l"><a href="#1801">1801: </a>
+</span><span id="1802" class="l"><a href="#1802">1802: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
 </span><span id="1803" class="l"><a href="#1803">1803: </a>        {
-</span><span id="1804" class="l"><a href="#1804">1804: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1805" class="l"><a href="#1805">1805: </a>        }
-</span><span id="1806" class="l"><a href="#1806">1806: </a>
-</span><span id="1807" class="l"><a href="#1807">1807: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
-</span><span id="1808" class="l"><a href="#1808">1808: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="1809" class="l"><a href="#1809">1809: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
-</span><span id="1810" class="l"><a href="#1810">1810: </a>
-</span><span id="1811" class="l"><a href="#1811">1811: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
-</span><span id="1812" class="l"><a href="#1812">1812: </a>        {
-</span><span id="1813" class="l"><a href="#1813">1813: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
-</span><span id="1814" class="l"><a href="#1814">1814: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>) . <span class="php-quote">':'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
-</span><span id="1815" class="l"><a href="#1815">1815: </a>        }
+</span><span id="1804" class="l"><a href="#1804">1804: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
+</span><span id="1805" class="l"><a href="#1805">1805: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>) . <span class="php-quote">':'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
+</span><span id="1806" class="l"><a href="#1806">1806: </a>        }
+</span><span id="1807" class="l"><a href="#1807">1807: </a>
+</span><span id="1808" class="l"><a href="#1808">1808: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1809" class="l"><a href="#1809">1809: </a>        {
+</span><span id="1810" class="l"><a href="#1810">1810: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1811" class="l"><a href="#1811">1811: </a>        }
+</span><span id="1812" class="l"><a href="#1812">1812: </a>
+</span><span id="1813" class="l"><a href="#1813">1813: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
+</span><span id="1814" class="l"><a href="#1814">1814: </a>        {
+</span><span id="1815" class="l"><a href="#1815">1815: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
 </span><span id="1816" class="l"><a href="#1816">1816: </a>
-</span><span id="1817" class="l"><a href="#1817">1817: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1818" class="l"><a href="#1818">1818: </a>        {
-</span><span id="1819" class="l"><a href="#1819">1819: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1820" class="l"><a href="#1820">1820: </a>        }
-</span><span id="1821" class="l"><a href="#1821">1821: </a>
-</span><span id="1822" class="l"><a href="#1822">1822: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
-</span><span id="1823" class="l"><a href="#1823">1823: </a>        {
-</span><span id="1824" class="l"><a href="#1824">1824: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
-</span><span id="1825" class="l"><a href="#1825">1825: </a>
-</span><span id="1826" class="l"><a href="#1826">1826: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1827" class="l"><a href="#1827">1827: </a>        }
-</span><span id="1828" class="l"><a href="#1828">1828: </a>
-</span><span id="1829" class="l"><a href="#1829">1829: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
-</span><span id="1830" class="l"><a href="#1830">1830: </a>        {
-</span><span id="1831" class="l"><a href="#1831">1831: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
-</span><span id="1832" class="l"><a href="#1832">1832: </a>
-</span><span id="1833" class="l"><a href="#1833">1833: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1834" class="l"><a href="#1834">1834: </a>        }
-</span><span id="1835" class="l"><a href="#1835">1835: </a>
-</span><span id="1836" class="l"><a href="#1836">1836: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1837" class="l"><a href="#1837">1837: </a>        {
-</span><span id="1838" class="l"><a href="#1838">1838: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1839" class="l"><a href="#1839">1839: </a>        }
-</span><span id="1840" class="l"><a href="#1840">1840: </a>
-</span><span id="1841" class="l"><a href="#1841">1841: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
-</span><span id="1842" class="l"><a href="#1842">1842: </a>        {
-</span><span id="1843" class="l"><a href="#1843">1843: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1844" class="l"><a href="#1844">1844: </a>        }
-</span><span id="1845" class="l"><a href="#1845">1845: </a>
-</span><span id="1846" class="l"><a href="#1846">1846: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1847" class="l"><a href="#1847">1847: </a>    }
-</span><span id="1848" class="l"><a href="#1848">1848: </a>
-</span><span id="1849" class="l"><a href="#1849">1849: </a>    <span class="php-comment">/**
-</span></span><span id="1850" class="l"><a href="#1850">1850: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
-</span></span><span id="1851" class="l"><a href="#1851">1851: </a><span class="php-comment">     *
-</span></span><span id="1852" class="l"><a href="#1852">1852: </a><span class="php-comment">     * @access protected
-</span></span><span id="1853" class="l"><a href="#1853">1853: </a><span class="php-comment">     * @return void
-</span></span><span id="1854" class="l"><a href="#1854">1854: </a><span class="php-comment">     */</span>
-</span><span id="1855" class="l"><a href="#1855">1855: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
-</span><span id="1856" class="l"><a href="#1856">1856: </a>    {
-</span><span id="1857" class="l"><a href="#1857">1857: </a>        <span class="php-comment">// Get the auth_source config item</span>
-</span><span id="1858" class="l"><a href="#1858">1858: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
-</span><span id="1859" class="l"><a href="#1859">1859: </a>
-</span><span id="1860" class="l"><a href="#1860">1860: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
-</span><span id="1861" class="l"><a href="#1861">1861: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
-</span><span id="1862" class="l"><a href="#1862">1862: </a>        {
-</span><span id="1863" class="l"><a href="#1863">1863: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1864" class="l"><a href="#1864">1864: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1865" class="l"><a href="#1865">1865: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1866" class="l"><a href="#1866">1866: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_unauthorized'</span>]
-</span><span id="1867" class="l"><a href="#1867">1867: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="1868" class="l"><a href="#1868">1868: </a>        }
-</span><span id="1869" class="l"><a href="#1869">1869: </a>    }
-</span><span id="1870" class="l"><a href="#1870">1870: </a>
-</span><span id="1871" class="l"><a href="#1871">1871: </a>    <span class="php-comment">/**
-</span></span><span id="1872" class="l"><a href="#1872">1872: </a><span class="php-comment">     * Prepares for basic authentication
-</span></span><span id="1873" class="l"><a href="#1873">1873: </a><span class="php-comment">     *
-</span></span><span id="1874" class="l"><a href="#1874">1874: </a><span class="php-comment">     * @access protected
-</span></span><span id="1875" class="l"><a href="#1875">1875: </a><span class="php-comment">     * @return void
-</span></span><span id="1876" class="l"><a href="#1876">1876: </a><span class="php-comment">     */</span>
-</span><span id="1877" class="l"><a href="#1877">1877: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
-</span><span id="1878" class="l"><a href="#1878">1878: </a>    {
-</span><span id="1879" class="l"><a href="#1879">1879: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1880" class="l"><a href="#1880">1880: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
-</span><span id="1881" class="l"><a href="#1881">1881: </a>        {
-</span><span id="1882" class="l"><a href="#1882">1882: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1883" class="l"><a href="#1883">1883: </a>        }
-</span><span id="1884" class="l"><a href="#1884">1884: </a>
-</span><span id="1885" class="l"><a href="#1885">1885: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
-</span><span id="1886" class="l"><a href="#1886">1886: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
-</span><span id="1887" class="l"><a href="#1887">1887: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
-</span><span id="1888" class="l"><a href="#1888">1888: </a>
-</span><span id="1889" class="l"><a href="#1889">1889: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1890" class="l"><a href="#1890">1890: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1891" class="l"><a href="#1891">1891: </a>        {
-</span><span id="1892" class="l"><a href="#1892">1892: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
-</span><span id="1893" class="l"><a href="#1893">1893: </a>        }
-</span><span id="1894" class="l"><a href="#1894">1894: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1895" class="l"><a href="#1895">1895: </a>        {
-</span><span id="1896" class="l"><a href="#1896">1896: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
-</span><span id="1897" class="l"><a href="#1897">1897: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
-</span><span id="1898" class="l"><a href="#1898">1898: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
-</span><span id="1899" class="l"><a href="#1899">1899: </a>            {
-</span><span id="1900" class="l"><a href="#1900">1900: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
-</span><span id="1901" class="l"><a href="#1901">1901: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
-</span><span id="1902" class="l"><a href="#1902">1902: </a>            }
-</span><span id="1903" class="l"><a href="#1903">1903: </a>        }
-</span><span id="1904" class="l"><a href="#1904">1904: </a>
-</span><span id="1905" class="l"><a href="#1905">1905: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
-</span><span id="1906" class="l"><a href="#1906">1906: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1907" class="l"><a href="#1907">1907: </a>        {
-</span><span id="1908" class="l"><a href="#1908">1908: </a>            <span class="php-var">$this</span>-&gt;_force_login();
-</span><span id="1909" class="l"><a href="#1909">1909: </a>        }
-</span><span id="1910" class="l"><a href="#1910">1910: </a>    }
-</span><span id="1911" class="l"><a href="#1911">1911: </a>
-</span><span id="1912" class="l"><a href="#1912">1912: </a>    <span class="php-comment">/**
-</span></span><span id="1913" class="l"><a href="#1913">1913: </a><span class="php-comment">     * Prepares for digest authentication
-</span></span><span id="1914" class="l"><a href="#1914">1914: </a><span class="php-comment">     *
-</span></span><span id="1915" class="l"><a href="#1915">1915: </a><span class="php-comment">     * @access protected
-</span></span><span id="1916" class="l"><a href="#1916">1916: </a><span class="php-comment">     * @return void
-</span></span><span id="1917" class="l"><a href="#1917">1917: </a><span class="php-comment">     */</span>
-</span><span id="1918" class="l"><a href="#1918">1918: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
-</span><span id="1919" class="l"><a href="#1919">1919: </a>    {
-</span><span id="1920" class="l"><a href="#1920">1920: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1921" class="l"><a href="#1921">1921: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
-</span><span id="1922" class="l"><a href="#1922">1922: </a>        {
-</span><span id="1923" class="l"><a href="#1923">1923: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1924" class="l"><a href="#1924">1924: </a>        }
-</span><span id="1925" class="l"><a href="#1925">1925: </a>
-</span><span id="1926" class="l"><a href="#1926">1926: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
-</span><span id="1927" class="l"><a href="#1927">1927: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
-</span><span id="1928" class="l"><a href="#1928">1928: </a>        <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
-</span><span id="1929" class="l"><a href="#1929">1929: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$digest_string</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1817" class="l"><a href="#1817">1817: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1818" class="l"><a href="#1818">1818: </a>        }
+</span><span id="1819" class="l"><a href="#1819">1819: </a>
+</span><span id="1820" class="l"><a href="#1820">1820: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
+</span><span id="1821" class="l"><a href="#1821">1821: </a>        {
+</span><span id="1822" class="l"><a href="#1822">1822: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1823" class="l"><a href="#1823">1823: </a>
+</span><span id="1824" class="l"><a href="#1824">1824: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1825" class="l"><a href="#1825">1825: </a>        }
+</span><span id="1826" class="l"><a href="#1826">1826: </a>
+</span><span id="1827" class="l"><a href="#1827">1827: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1828" class="l"><a href="#1828">1828: </a>        {
+</span><span id="1829" class="l"><a href="#1829">1829: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1830" class="l"><a href="#1830">1830: </a>        }
+</span><span id="1831" class="l"><a href="#1831">1831: </a>
+</span><span id="1832" class="l"><a href="#1832">1832: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
+</span><span id="1833" class="l"><a href="#1833">1833: </a>        {
+</span><span id="1834" class="l"><a href="#1834">1834: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1835" class="l"><a href="#1835">1835: </a>        }
+</span><span id="1836" class="l"><a href="#1836">1836: </a>
+</span><span id="1837" class="l"><a href="#1837">1837: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1838" class="l"><a href="#1838">1838: </a>    }
+</span><span id="1839" class="l"><a href="#1839">1839: </a>
+</span><span id="1840" class="l"><a href="#1840">1840: </a>    <span class="php-comment">/**
+</span></span><span id="1841" class="l"><a href="#1841">1841: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
+</span></span><span id="1842" class="l"><a href="#1842">1842: </a><span class="php-comment">     *
+</span></span><span id="1843" class="l"><a href="#1843">1843: </a><span class="php-comment">     * @access protected
+</span></span><span id="1844" class="l"><a href="#1844">1844: </a><span class="php-comment">     * @return void
+</span></span><span id="1845" class="l"><a href="#1845">1845: </a><span class="php-comment">     */</span>
+</span><span id="1846" class="l"><a href="#1846">1846: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
+</span><span id="1847" class="l"><a href="#1847">1847: </a>    {
+</span><span id="1848" class="l"><a href="#1848">1848: </a>        <span class="php-comment">// Get the auth_source config item</span>
+</span><span id="1849" class="l"><a href="#1849">1849: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
+</span><span id="1850" class="l"><a href="#1850">1850: </a>
+</span><span id="1851" class="l"><a href="#1851">1851: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
+</span><span id="1852" class="l"><a href="#1852">1852: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
+</span><span id="1853" class="l"><a href="#1853">1853: </a>        {
+</span><span id="1854" class="l"><a href="#1854">1854: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1855" class="l"><a href="#1855">1855: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1856" class="l"><a href="#1856">1856: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1857" class="l"><a href="#1857">1857: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unauthorized'</span>)
+</span><span id="1858" class="l"><a href="#1858">1858: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="1859" class="l"><a href="#1859">1859: </a>        }
+</span><span id="1860" class="l"><a href="#1860">1860: </a>    }
+</span><span id="1861" class="l"><a href="#1861">1861: </a>
+</span><span id="1862" class="l"><a href="#1862">1862: </a>    <span class="php-comment">/**
+</span></span><span id="1863" class="l"><a href="#1863">1863: </a><span class="php-comment">     * Prepares for basic authentication
+</span></span><span id="1864" class="l"><a href="#1864">1864: </a><span class="php-comment">     *
+</span></span><span id="1865" class="l"><a href="#1865">1865: </a><span class="php-comment">     * @access protected
+</span></span><span id="1866" class="l"><a href="#1866">1866: </a><span class="php-comment">     * @return void
+</span></span><span id="1867" class="l"><a href="#1867">1867: </a><span class="php-comment">     */</span>
+</span><span id="1868" class="l"><a href="#1868">1868: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
+</span><span id="1869" class="l"><a href="#1869">1869: </a>    {
+</span><span id="1870" class="l"><a href="#1870">1870: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1871" class="l"><a href="#1871">1871: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1872" class="l"><a href="#1872">1872: </a>        {
+</span><span id="1873" class="l"><a href="#1873">1873: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1874" class="l"><a href="#1874">1874: </a>        }
+</span><span id="1875" class="l"><a href="#1875">1875: </a>
+</span><span id="1876" class="l"><a href="#1876">1876: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
+</span><span id="1877" class="l"><a href="#1877">1877: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
+</span><span id="1878" class="l"><a href="#1878">1878: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
+</span><span id="1879" class="l"><a href="#1879">1879: </a>
+</span><span id="1880" class="l"><a href="#1880">1880: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1881" class="l"><a href="#1881">1881: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1882" class="l"><a href="#1882">1882: </a>        {
+</span><span id="1883" class="l"><a href="#1883">1883: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
+</span><span id="1884" class="l"><a href="#1884">1884: </a>        }
+</span><span id="1885" class="l"><a href="#1885">1885: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1886" class="l"><a href="#1886">1886: </a>        {
+</span><span id="1887" class="l"><a href="#1887">1887: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
+</span><span id="1888" class="l"><a href="#1888">1888: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
+</span><span id="1889" class="l"><a href="#1889">1889: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
+</span><span id="1890" class="l"><a href="#1890">1890: </a>            {
+</span><span id="1891" class="l"><a href="#1891">1891: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
+</span><span id="1892" class="l"><a href="#1892">1892: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
+</span><span id="1893" class="l"><a href="#1893">1893: </a>            }
+</span><span id="1894" class="l"><a href="#1894">1894: </a>        }
+</span><span id="1895" class="l"><a href="#1895">1895: </a>
+</span><span id="1896" class="l"><a href="#1896">1896: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
+</span><span id="1897" class="l"><a href="#1897">1897: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1898" class="l"><a href="#1898">1898: </a>        {
+</span><span id="1899" class="l"><a href="#1899">1899: </a>            <span class="php-var">$this</span>-&gt;_force_login();
+</span><span id="1900" class="l"><a href="#1900">1900: </a>        }
+</span><span id="1901" class="l"><a href="#1901">1901: </a>    }
+</span><span id="1902" class="l"><a href="#1902">1902: </a>
+</span><span id="1903" class="l"><a href="#1903">1903: </a>    <span class="php-comment">/**
+</span></span><span id="1904" class="l"><a href="#1904">1904: </a><span class="php-comment">     * Prepares for digest authentication
+</span></span><span id="1905" class="l"><a href="#1905">1905: </a><span class="php-comment">     *
+</span></span><span id="1906" class="l"><a href="#1906">1906: </a><span class="php-comment">     * @access protected
+</span></span><span id="1907" class="l"><a href="#1907">1907: </a><span class="php-comment">     * @return void
+</span></span><span id="1908" class="l"><a href="#1908">1908: </a><span class="php-comment">     */</span>
+</span><span id="1909" class="l"><a href="#1909">1909: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
+</span><span id="1910" class="l"><a href="#1910">1910: </a>    {
+</span><span id="1911" class="l"><a href="#1911">1911: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1912" class="l"><a href="#1912">1912: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1913" class="l"><a href="#1913">1913: </a>        {
+</span><span id="1914" class="l"><a href="#1914">1914: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1915" class="l"><a href="#1915">1915: </a>        }
+</span><span id="1916" class="l"><a href="#1916">1916: </a>
+</span><span id="1917" class="l"><a href="#1917">1917: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
+</span><span id="1918" class="l"><a href="#1918">1918: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
+</span><span id="1919" class="l"><a href="#1919">1919: </a>        <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
+</span><span id="1920" class="l"><a href="#1920">1920: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$digest_string</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1921" class="l"><a href="#1921">1921: </a>        {
+</span><span id="1922" class="l"><a href="#1922">1922: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
+</span><span id="1923" class="l"><a href="#1923">1923: </a>        }
+</span><span id="1924" class="l"><a href="#1924">1924: </a>
+</span><span id="1925" class="l"><a href="#1925">1925: </a>        <span class="php-var">$unique_id</span> = <span class="php-keyword2">uniqid</span>();
+</span><span id="1926" class="l"><a href="#1926">1926: </a>
+</span><span id="1927" class="l"><a href="#1927">1927: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
+</span><span id="1928" class="l"><a href="#1928">1928: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
+</span><span id="1929" class="l"><a href="#1929">1929: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
 </span><span id="1930" class="l"><a href="#1930">1930: </a>        {
-</span><span id="1931" class="l"><a href="#1931">1931: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
+</span><span id="1931" class="l"><a href="#1931">1931: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
 </span><span id="1932" class="l"><a href="#1932">1932: </a>        }
 </span><span id="1933" class="l"><a href="#1933">1933: </a>
-</span><span id="1934" class="l"><a href="#1934">1934: </a>        <span class="php-var">$unique_id</span> = <span class="php-keyword2">uniqid</span>();
-</span><span id="1935" class="l"><a href="#1935">1935: </a>
-</span><span id="1936" class="l"><a href="#1936">1936: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
-</span><span id="1937" class="l"><a href="#1937">1937: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
-</span><span id="1938" class="l"><a href="#1938">1938: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
-</span><span id="1939" class="l"><a href="#1939">1939: </a>        {
-</span><span id="1940" class="l"><a href="#1940">1940: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
-</span><span id="1941" class="l"><a href="#1941">1941: </a>        }
-</span><span id="1942" class="l"><a href="#1942">1942: </a>
-</span><span id="1943" class="l"><a href="#1943">1943: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
-</span><span id="1944" class="l"><a href="#1944">1944: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="1945" class="l"><a href="#1945">1945: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
-</span><span id="1946" class="l"><a href="#1946">1946: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
-</span><span id="1947" class="l"><a href="#1947">1947: </a>
-</span><span id="1948" class="l"><a href="#1948">1948: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config</span>
-</span><span id="1949" class="l"><a href="#1949">1949: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
-</span><span id="1950" class="l"><a href="#1950">1950: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$username</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1934" class="l"><a href="#1934">1934: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
+</span><span id="1935" class="l"><a href="#1935">1935: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="1936" class="l"><a href="#1936">1936: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
+</span><span id="1937" class="l"><a href="#1937">1937: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
+</span><span id="1938" class="l"><a href="#1938">1938: </a>
+</span><span id="1939" class="l"><a href="#1939">1939: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config</span>
+</span><span id="1940" class="l"><a href="#1940">1940: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
+</span><span id="1941" class="l"><a href="#1941">1941: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$username</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1942" class="l"><a href="#1942">1942: </a>        {
+</span><span id="1943" class="l"><a href="#1943">1943: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
+</span><span id="1944" class="l"><a href="#1944">1944: </a>        }
+</span><span id="1945" class="l"><a href="#1945">1945: </a>
+</span><span id="1946" class="l"><a href="#1946">1946: </a>        <span class="php-var">$md5</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method) . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
+</span><span id="1947" class="l"><a href="#1947">1947: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$md5</span>);
+</span><span id="1948" class="l"><a href="#1948">1948: </a>
+</span><span id="1949" class="l"><a href="#1949">1949: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
+</span><span id="1950" class="l"><a href="#1950">1950: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
 </span><span id="1951" class="l"><a href="#1951">1951: </a>        {
-</span><span id="1952" class="l"><a href="#1952">1952: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
-</span><span id="1953" class="l"><a href="#1953">1953: </a>        }
-</span><span id="1954" class="l"><a href="#1954">1954: </a>
-</span><span id="1955" class="l"><a href="#1955">1955: </a>        <span class="php-var">$md5</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method) . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
-</span><span id="1956" class="l"><a href="#1956">1956: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$md5</span>);
-</span><span id="1957" class="l"><a href="#1957">1957: </a>
-</span><span id="1958" class="l"><a href="#1958">1958: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
-</span><span id="1959" class="l"><a href="#1959">1959: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
-</span><span id="1960" class="l"><a href="#1960">1960: </a>        {
-</span><span id="1961" class="l"><a href="#1961">1961: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1962" class="l"><a href="#1962">1962: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1963" class="l"><a href="#1963">1963: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1964" class="l"><a href="#1964">1964: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_invalid_credentials'</span>]
-</span><span id="1965" class="l"><a href="#1965">1965: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="1966" class="l"><a href="#1966">1966: </a>        }
-</span><span id="1967" class="l"><a href="#1967">1967: </a>    }
-</span><span id="1968" class="l"><a href="#1968">1968: </a>
-</span><span id="1969" class="l"><a href="#1969">1969: </a>    <span class="php-comment">/**
-</span></span><span id="1970" class="l"><a href="#1970">1970: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
-</span></span><span id="1971" class="l"><a href="#1971">1971: </a><span class="php-comment">     *
-</span></span><span id="1972" class="l"><a href="#1972">1972: </a><span class="php-comment">     * @access protected
-</span></span><span id="1973" class="l"><a href="#1973">1973: </a><span class="php-comment">     * @return void
-</span></span><span id="1974" class="l"><a href="#1974">1974: </a><span class="php-comment">     */</span>
-</span><span id="1975" class="l"><a href="#1975">1975: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
-</span><span id="1976" class="l"><a href="#1976">1976: </a>    {
-</span><span id="1977" class="l"><a href="#1977">1977: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
-</span><span id="1978" class="l"><a href="#1978">1978: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
-</span><span id="1979" class="l"><a href="#1979">1979: </a>
-</span><span id="1980" class="l"><a href="#1980">1980: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
-</span><span id="1981" class="l"><a href="#1981">1981: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
-</span><span id="1982" class="l"><a href="#1982">1982: </a>        {
-</span><span id="1983" class="l"><a href="#1983">1983: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1984" class="l"><a href="#1984">1984: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1985" class="l"><a href="#1985">1985: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1986" class="l"><a href="#1986">1986: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_ip_denied'</span>]
-</span><span id="1987" class="l"><a href="#1987">1987: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="1988" class="l"><a href="#1988">1988: </a>        }
-</span><span id="1989" class="l"><a href="#1989">1989: </a>    }
-</span><span id="1990" class="l"><a href="#1990">1990: </a>
-</span><span id="1991" class="l"><a href="#1991">1991: </a>    <span class="php-comment">/**
-</span></span><span id="1992" class="l"><a href="#1992">1992: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
-</span></span><span id="1993" class="l"><a href="#1993">1993: </a><span class="php-comment">     *
-</span></span><span id="1994" class="l"><a href="#1994">1994: </a><span class="php-comment">     * @access protected
-</span></span><span id="1995" class="l"><a href="#1995">1995: </a><span class="php-comment">     * @return void
-</span></span><span id="1996" class="l"><a href="#1996">1996: </a><span class="php-comment">     */</span>
-</span><span id="1997" class="l"><a href="#1997">1997: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
-</span><span id="1998" class="l"><a href="#1998">1998: </a>    {
-</span><span id="1999" class="l"><a href="#1999">1999: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
+</span><span id="1952" class="l"><a href="#1952">1952: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1953" class="l"><a href="#1953">1953: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1954" class="l"><a href="#1954">1954: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1955" class="l"><a href="#1955">1955: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_invalid_credentials'</span>)
+</span><span id="1956" class="l"><a href="#1956">1956: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="1957" class="l"><a href="#1957">1957: </a>        }
+</span><span id="1958" class="l"><a href="#1958">1958: </a>    }
+</span><span id="1959" class="l"><a href="#1959">1959: </a>
+</span><span id="1960" class="l"><a href="#1960">1960: </a>    <span class="php-comment">/**
+</span></span><span id="1961" class="l"><a href="#1961">1961: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
+</span></span><span id="1962" class="l"><a href="#1962">1962: </a><span class="php-comment">     *
+</span></span><span id="1963" class="l"><a href="#1963">1963: </a><span class="php-comment">     * @access protected
+</span></span><span id="1964" class="l"><a href="#1964">1964: </a><span class="php-comment">     * @return void
+</span></span><span id="1965" class="l"><a href="#1965">1965: </a><span class="php-comment">     */</span>
+</span><span id="1966" class="l"><a href="#1966">1966: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
+</span><span id="1967" class="l"><a href="#1967">1967: </a>    {
+</span><span id="1968" class="l"><a href="#1968">1968: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
+</span><span id="1969" class="l"><a href="#1969">1969: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
+</span><span id="1970" class="l"><a href="#1970">1970: </a>
+</span><span id="1971" class="l"><a href="#1971">1971: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
+</span><span id="1972" class="l"><a href="#1972">1972: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
+</span><span id="1973" class="l"><a href="#1973">1973: </a>        {
+</span><span id="1974" class="l"><a href="#1974">1974: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1975" class="l"><a href="#1975">1975: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1976" class="l"><a href="#1976">1976: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1977" class="l"><a href="#1977">1977: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ip_denied'</span>)
+</span><span id="1978" class="l"><a href="#1978">1978: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="1979" class="l"><a href="#1979">1979: </a>        }
+</span><span id="1980" class="l"><a href="#1980">1980: </a>    }
+</span><span id="1981" class="l"><a href="#1981">1981: </a>
+</span><span id="1982" class="l"><a href="#1982">1982: </a>    <span class="php-comment">/**
+</span></span><span id="1983" class="l"><a href="#1983">1983: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
+</span></span><span id="1984" class="l"><a href="#1984">1984: </a><span class="php-comment">     *
+</span></span><span id="1985" class="l"><a href="#1985">1985: </a><span class="php-comment">     * @access protected
+</span></span><span id="1986" class="l"><a href="#1986">1986: </a><span class="php-comment">     * @return void
+</span></span><span id="1987" class="l"><a href="#1987">1987: </a><span class="php-comment">     */</span>
+</span><span id="1988" class="l"><a href="#1988">1988: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
+</span><span id="1989" class="l"><a href="#1989">1989: </a>    {
+</span><span id="1990" class="l"><a href="#1990">1990: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
+</span><span id="1991" class="l"><a href="#1991">1991: </a>
+</span><span id="1992" class="l"><a href="#1992">1992: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
+</span><span id="1993" class="l"><a href="#1993">1993: </a>
+</span><span id="1994" class="l"><a href="#1994">1994: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$ip</span>)
+</span><span id="1995" class="l"><a href="#1995">1995: </a>        {
+</span><span id="1996" class="l"><a href="#1996">1996: </a>            <span class="php-comment">// As $ip is a reference, trim leading and trailing whitespace, then store the new value</span>
+</span><span id="1997" class="l"><a href="#1997">1997: </a>            <span class="php-comment">// using the reference</span>
+</span><span id="1998" class="l"><a href="#1998">1998: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
+</span><span id="1999" class="l"><a href="#1999">1999: </a>        }
 </span><span id="2000" class="l"><a href="#2000">2000: </a>
-</span><span id="2001" class="l"><a href="#2001">2001: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
-</span><span id="2002" class="l"><a href="#2002">2002: </a>
-</span><span id="2003" class="l"><a href="#2003">2003: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$ip</span>)
-</span><span id="2004" class="l"><a href="#2004">2004: </a>        {
-</span><span id="2005" class="l"><a href="#2005">2005: </a>            <span class="php-comment">// As $ip is a reference, trim leading and trailing whitespace, then store the new value</span>
-</span><span id="2006" class="l"><a href="#2006">2006: </a>            <span class="php-comment">// using the reference</span>
-</span><span id="2007" class="l"><a href="#2007">2007: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
-</span><span id="2008" class="l"><a href="#2008">2008: </a>        }
+</span><span id="2001" class="l"><a href="#2001">2001: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="2002" class="l"><a href="#2002">2002: </a>        {
+</span><span id="2003" class="l"><a href="#2003">2003: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="2004" class="l"><a href="#2004">2004: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="2005" class="l"><a href="#2005">2005: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ip_unauthorized'</span>)
+</span><span id="2006" class="l"><a href="#2006">2006: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="2007" class="l"><a href="#2007">2007: </a>        }
+</span><span id="2008" class="l"><a href="#2008">2008: </a>    }
 </span><span id="2009" class="l"><a href="#2009">2009: </a>
-</span><span id="2010" class="l"><a href="#2010">2010: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="2011" class="l"><a href="#2011">2011: </a>        {
-</span><span id="2012" class="l"><a href="#2012">2012: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="2013" class="l"><a href="#2013">2013: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="2014" class="l"><a href="#2014">2014: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_ip_unauthorized'</span>]
-</span><span id="2015" class="l"><a href="#2015">2015: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="2016" class="l"><a href="#2016">2016: </a>        }
-</span><span id="2017" class="l"><a href="#2017">2017: </a>    }
-</span><span id="2018" class="l"><a href="#2018">2018: </a>
-</span><span id="2019" class="l"><a href="#2019">2019: </a>    <span class="php-comment">/**
-</span></span><span id="2020" class="l"><a href="#2020">2020: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
-</span></span><span id="2021" class="l"><a href="#2021">2021: </a><span class="php-comment">     *
-</span></span><span id="2022" class="l"><a href="#2022">2022: </a><span class="php-comment">     * @access protected
-</span></span><span id="2023" class="l"><a href="#2023">2023: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
-</span></span><span id="2024" class="l"><a href="#2024">2024: </a><span class="php-comment">     * each time
-</span></span><span id="2025" class="l"><a href="#2025">2025: </a><span class="php-comment">     * @return void
-</span></span><span id="2026" class="l"><a href="#2026">2026: </a><span class="php-comment">     */</span>
-</span><span id="2027" class="l"><a href="#2027">2027: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
-</span><span id="2028" class="l"><a href="#2028">2028: </a>    {
-</span><span id="2029" class="l"><a href="#2029">2029: </a>        <span class="php-var">$rest_auth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
-</span><span id="2030" class="l"><a href="#2030">2030: </a>        <span class="php-var">$rest_realm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
-</span><span id="2031" class="l"><a href="#2031">2031: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'basic'</span>)
-</span><span id="2032" class="l"><a href="#2032">2032: </a>        {
-</span><span id="2033" class="l"><a href="#2033">2033: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
-</span><span id="2034" class="l"><a href="#2034">2034: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span> . <span class="php-var">$rest_realm</span> . <span class="php-quote">'&quot;'</span>);
-</span><span id="2035" class="l"><a href="#2035">2035: </a>        }
-</span><span id="2036" class="l"><a href="#2036">2036: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'digest'</span>)
-</span><span id="2037" class="l"><a href="#2037">2037: </a>        {
-</span><span id="2038" class="l"><a href="#2038">2038: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
-</span><span id="2039" class="l"><a href="#2039">2039: </a>            <span class="php-keyword2">header</span>(
-</span><span id="2040" class="l"><a href="#2040">2040: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span> . <span class="php-var">$rest_realm</span>
-</span><span id="2041" class="l"><a href="#2041">2041: </a>                . <span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span> . <span class="php-var">$nonce</span>
-</span><span id="2042" class="l"><a href="#2042">2042: </a>                . <span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$rest_realm</span>) . <span class="php-quote">'&quot;'</span>);
-</span><span id="2043" class="l"><a href="#2043">2043: </a>        }
-</span><span id="2044" class="l"><a href="#2044">2044: </a>
-</span><span id="2045" class="l"><a href="#2045">2045: </a>        <span class="php-comment">// Display an error response</span>
-</span><span id="2046" class="l"><a href="#2046">2046: </a>        <span class="php-var">$this</span>-&gt;response([
-</span><span id="2047" class="l"><a href="#2047">2047: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="2048" class="l"><a href="#2048">2048: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;text_lang_strings[<span class="php-quote">'text_rest_unauthorized'</span>]
-</span><span id="2049" class="l"><a href="#2049">2049: </a>            ], self::HTTP_UNAUTHORIZED);
-</span><span id="2050" class="l"><a href="#2050">2050: </a>    }
-</span><span id="2051" class="l"><a href="#2051">2051: </a>
-</span><span id="2052" class="l"><a href="#2052">2052: </a>    <span class="php-comment">/**
-</span></span><span id="2053" class="l"><a href="#2053">2053: </a><span class="php-comment">     * Updates the log table with the total access time
-</span></span><span id="2054" class="l"><a href="#2054">2054: </a><span class="php-comment">     *
-</span></span><span id="2055" class="l"><a href="#2055">2055: </a><span class="php-comment">     * @access protected
-</span></span><span id="2056" class="l"><a href="#2056">2056: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="2057" class="l"><a href="#2057">2057: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="2058" class="l"><a href="#2058">2058: </a><span class="php-comment">     */</span>
-</span><span id="2059" class="l"><a href="#2059">2059: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
-</span><span id="2060" class="l"><a href="#2060">2060: </a>    {
-</span><span id="2061" class="l"><a href="#2061">2061: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
-</span><span id="2062" class="l"><a href="#2062">2062: </a>
-</span><span id="2063" class="l"><a href="#2063">2063: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
-</span><span id="2064" class="l"><a href="#2064">2064: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="2065" class="l"><a href="#2065">2065: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="2066" class="l"><a href="#2066">2066: </a>            ]);
-</span><span id="2067" class="l"><a href="#2067">2067: </a>    }
-</span><span id="2068" class="l"><a href="#2068">2068: </a>
-</span><span id="2069" class="l"><a href="#2069">2069: </a>    <span class="php-comment">/**
-</span></span><span id="2070" class="l"><a href="#2070">2070: </a><span class="php-comment">     * Updates the log table with HTTP response code
-</span></span><span id="2071" class="l"><a href="#2071">2071: </a><span class="php-comment">     *
-</span></span><span id="2072" class="l"><a href="#2072">2072: </a><span class="php-comment">     * @access protected
-</span></span><span id="2073" class="l"><a href="#2073">2073: </a><span class="php-comment">     * @author Justin Chen
-</span></span><span id="2074" class="l"><a href="#2074">2074: </a><span class="php-comment">     * @param $http_code int HTTP status code
-</span></span><span id="2075" class="l"><a href="#2075">2075: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="2076" class="l"><a href="#2076">2076: </a><span class="php-comment">     */</span>
-</span><span id="2077" class="l"><a href="#2077">2077: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
-</span><span id="2078" class="l"><a href="#2078">2078: </a>    {
-</span><span id="2079" class="l"><a href="#2079">2079: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
-</span><span id="2080" class="l"><a href="#2080">2080: </a>
-</span><span id="2081" class="l"><a href="#2081">2081: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
-</span><span id="2082" class="l"><a href="#2082">2082: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="2083" class="l"><a href="#2083">2083: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="2084" class="l"><a href="#2084">2084: </a>        ]);
-</span><span id="2085" class="l"><a href="#2085">2085: </a>    }
-</span><span id="2086" class="l"><a href="#2086">2086: </a>
-</span><span id="2087" class="l"><a href="#2087">2087: </a>    <span class="php-comment">/**
-</span></span><span id="2088" class="l"><a href="#2088">2088: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
-</span></span><span id="2089" class="l"><a href="#2089">2089: </a><span class="php-comment">     *
-</span></span><span id="2090" class="l"><a href="#2090">2090: </a><span class="php-comment">     * @access protected
-</span></span><span id="2091" class="l"><a href="#2091">2091: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
-</span></span><span id="2092" class="l"><a href="#2092">2092: </a><span class="php-comment">     */</span>
-</span><span id="2093" class="l"><a href="#2093">2093: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
-</span><span id="2094" class="l"><a href="#2094">2094: </a>    {
-</span><span id="2095" class="l"><a href="#2095">2095: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
-</span><span id="2096" class="l"><a href="#2096">2096: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="2097" class="l"><a href="#2097">2097: </a>        {
-</span><span id="2098" class="l"><a href="#2098">2098: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="2099" class="l"><a href="#2099">2099: </a>        }
-</span><span id="2100" class="l"><a href="#2100">2100: </a>
-</span><span id="2101" class="l"><a href="#2101">2101: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
-</span><span id="2102" class="l"><a href="#2102">2102: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
-</span><span id="2103" class="l"><a href="#2103">2103: </a>            <span class="php-quote">'/'</span>, [
-</span><span id="2104" class="l"><a href="#2104">2104: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
-</span><span id="2105" class="l"><a href="#2105">2105: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
-</span><span id="2106" class="l"><a href="#2106">2106: </a>        ]);
-</span><span id="2107" class="l"><a href="#2107">2107: </a>
-</span><span id="2108" class="l"><a href="#2108">2108: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
-</span><span id="2109" class="l"><a href="#2109">2109: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
-</span><span id="2110" class="l"><a href="#2110">2110: </a>
-</span><span id="2111" class="l"><a href="#2111">2111: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
-</span><span id="2112" class="l"><a href="#2112">2112: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="2113" class="l"><a href="#2113">2113: </a>            -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="2114" class="l"><a href="#2114">2114: </a>            -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
-</span><span id="2115" class="l"><a href="#2115">2115: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
-</span><span id="2116" class="l"><a href="#2116">2116: </a>            -&gt;num_rows() &gt; <span class="php-num">0</span>;
-</span><span id="2117" class="l"><a href="#2117">2117: </a>    }
-</span><span id="2118" class="l"><a href="#2118">2118: </a>
-</span><span id="2119" class="l"><a href="#2119">2119: </a>}
-</span><span id="2120" class="l"><a href="#2120">2120: </a></span></code></pre>
+</span><span id="2010" class="l"><a href="#2010">2010: </a>    <span class="php-comment">/**
+</span></span><span id="2011" class="l"><a href="#2011">2011: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
+</span></span><span id="2012" class="l"><a href="#2012">2012: </a><span class="php-comment">     *
+</span></span><span id="2013" class="l"><a href="#2013">2013: </a><span class="php-comment">     * @access protected
+</span></span><span id="2014" class="l"><a href="#2014">2014: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
+</span></span><span id="2015" class="l"><a href="#2015">2015: </a><span class="php-comment">     * each time
+</span></span><span id="2016" class="l"><a href="#2016">2016: </a><span class="php-comment">     * @return void
+</span></span><span id="2017" class="l"><a href="#2017">2017: </a><span class="php-comment">     */</span>
+</span><span id="2018" class="l"><a href="#2018">2018: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
+</span><span id="2019" class="l"><a href="#2019">2019: </a>    {
+</span><span id="2020" class="l"><a href="#2020">2020: </a>        <span class="php-var">$rest_auth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
+</span><span id="2021" class="l"><a href="#2021">2021: </a>        <span class="php-var">$rest_realm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
+</span><span id="2022" class="l"><a href="#2022">2022: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'basic'</span>)
+</span><span id="2023" class="l"><a href="#2023">2023: </a>        {
+</span><span id="2024" class="l"><a href="#2024">2024: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
+</span><span id="2025" class="l"><a href="#2025">2025: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span> . <span class="php-var">$rest_realm</span> . <span class="php-quote">'&quot;'</span>);
+</span><span id="2026" class="l"><a href="#2026">2026: </a>        }
+</span><span id="2027" class="l"><a href="#2027">2027: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'digest'</span>)
+</span><span id="2028" class="l"><a href="#2028">2028: </a>        {
+</span><span id="2029" class="l"><a href="#2029">2029: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
+</span><span id="2030" class="l"><a href="#2030">2030: </a>            <span class="php-keyword2">header</span>(
+</span><span id="2031" class="l"><a href="#2031">2031: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span> . <span class="php-var">$rest_realm</span>
+</span><span id="2032" class="l"><a href="#2032">2032: </a>                . <span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span> . <span class="php-var">$nonce</span>
+</span><span id="2033" class="l"><a href="#2033">2033: </a>                . <span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$rest_realm</span>) . <span class="php-quote">'&quot;'</span>);
+</span><span id="2034" class="l"><a href="#2034">2034: </a>        }
+</span><span id="2035" class="l"><a href="#2035">2035: </a>
+</span><span id="2036" class="l"><a href="#2036">2036: </a>        <span class="php-comment">// Display an error response</span>
+</span><span id="2037" class="l"><a href="#2037">2037: </a>        <span class="php-var">$this</span>-&gt;response([
+</span><span id="2038" class="l"><a href="#2038">2038: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="2039" class="l"><a href="#2039">2039: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unauthorized'</span>)
+</span><span id="2040" class="l"><a href="#2040">2040: </a>            ], self::HTTP_UNAUTHORIZED);
+</span><span id="2041" class="l"><a href="#2041">2041: </a>    }
+</span><span id="2042" class="l"><a href="#2042">2042: </a>
+</span><span id="2043" class="l"><a href="#2043">2043: </a>    <span class="php-comment">/**
+</span></span><span id="2044" class="l"><a href="#2044">2044: </a><span class="php-comment">     * Updates the log table with the total access time
+</span></span><span id="2045" class="l"><a href="#2045">2045: </a><span class="php-comment">     *
+</span></span><span id="2046" class="l"><a href="#2046">2046: </a><span class="php-comment">     * @access protected
+</span></span><span id="2047" class="l"><a href="#2047">2047: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="2048" class="l"><a href="#2048">2048: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="2049" class="l"><a href="#2049">2049: </a><span class="php-comment">     */</span>
+</span><span id="2050" class="l"><a href="#2050">2050: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
+</span><span id="2051" class="l"><a href="#2051">2051: </a>    {
+</span><span id="2052" class="l"><a href="#2052">2052: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
+</span><span id="2053" class="l"><a href="#2053">2053: </a>
+</span><span id="2054" class="l"><a href="#2054">2054: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
+</span><span id="2055" class="l"><a href="#2055">2055: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="2056" class="l"><a href="#2056">2056: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="2057" class="l"><a href="#2057">2057: </a>            ]);
+</span><span id="2058" class="l"><a href="#2058">2058: </a>    }
+</span><span id="2059" class="l"><a href="#2059">2059: </a>
+</span><span id="2060" class="l"><a href="#2060">2060: </a>    <span class="php-comment">/**
+</span></span><span id="2061" class="l"><a href="#2061">2061: </a><span class="php-comment">     * Updates the log table with HTTP response code
+</span></span><span id="2062" class="l"><a href="#2062">2062: </a><span class="php-comment">     *
+</span></span><span id="2063" class="l"><a href="#2063">2063: </a><span class="php-comment">     * @access protected
+</span></span><span id="2064" class="l"><a href="#2064">2064: </a><span class="php-comment">     * @author Justin Chen
+</span></span><span id="2065" class="l"><a href="#2065">2065: </a><span class="php-comment">     * @param $http_code int HTTP status code
+</span></span><span id="2066" class="l"><a href="#2066">2066: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="2067" class="l"><a href="#2067">2067: </a><span class="php-comment">     */</span>
+</span><span id="2068" class="l"><a href="#2068">2068: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
+</span><span id="2069" class="l"><a href="#2069">2069: </a>    {
+</span><span id="2070" class="l"><a href="#2070">2070: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
+</span><span id="2071" class="l"><a href="#2071">2071: </a>
+</span><span id="2072" class="l"><a href="#2072">2072: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
+</span><span id="2073" class="l"><a href="#2073">2073: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="2074" class="l"><a href="#2074">2074: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="2075" class="l"><a href="#2075">2075: </a>        ]);
+</span><span id="2076" class="l"><a href="#2076">2076: </a>    }
+</span><span id="2077" class="l"><a href="#2077">2077: </a>
+</span><span id="2078" class="l"><a href="#2078">2078: </a>    <span class="php-comment">/**
+</span></span><span id="2079" class="l"><a href="#2079">2079: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
+</span></span><span id="2080" class="l"><a href="#2080">2080: </a><span class="php-comment">     *
+</span></span><span id="2081" class="l"><a href="#2081">2081: </a><span class="php-comment">     * @access protected
+</span></span><span id="2082" class="l"><a href="#2082">2082: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
+</span></span><span id="2083" class="l"><a href="#2083">2083: </a><span class="php-comment">     */</span>
+</span><span id="2084" class="l"><a href="#2084">2084: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
+</span><span id="2085" class="l"><a href="#2085">2085: </a>    {
+</span><span id="2086" class="l"><a href="#2086">2086: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
+</span><span id="2087" class="l"><a href="#2087">2087: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="2088" class="l"><a href="#2088">2088: </a>        {
+</span><span id="2089" class="l"><a href="#2089">2089: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="2090" class="l"><a href="#2090">2090: </a>        }
+</span><span id="2091" class="l"><a href="#2091">2091: </a>
+</span><span id="2092" class="l"><a href="#2092">2092: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
+</span><span id="2093" class="l"><a href="#2093">2093: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
+</span><span id="2094" class="l"><a href="#2094">2094: </a>            <span class="php-quote">'/'</span>, [
+</span><span id="2095" class="l"><a href="#2095">2095: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
+</span><span id="2096" class="l"><a href="#2096">2096: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
+</span><span id="2097" class="l"><a href="#2097">2097: </a>        ]);
+</span><span id="2098" class="l"><a href="#2098">2098: </a>
+</span><span id="2099" class="l"><a href="#2099">2099: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
+</span><span id="2100" class="l"><a href="#2100">2100: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
+</span><span id="2101" class="l"><a href="#2101">2101: </a>
+</span><span id="2102" class="l"><a href="#2102">2102: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
+</span><span id="2103" class="l"><a href="#2103">2103: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="2104" class="l"><a href="#2104">2104: </a>            -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="2105" class="l"><a href="#2105">2105: </a>            -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
+</span><span id="2106" class="l"><a href="#2106">2106: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
+</span><span id="2107" class="l"><a href="#2107">2107: </a>            -&gt;num_rows() &gt; <span class="php-num">0</span>;
+</span><span id="2108" class="l"><a href="#2108">2108: </a>    }
+</span><span id="2109" class="l"><a href="#2109">2109: </a>
+</span><span id="2110" class="l"><a href="#2110">2110: </a>}
+</span><span id="2111" class="l"><a href="#2111">2111: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>

From 4b89df4242ae1f685d4d735db4d1dc8295959e02 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Sat, 25 Jul 2015 20:35:16 +0300
Subject: [PATCH 137/354] The Welcome page: Show the links to the REST server
 documentation and CodeIgniter userguide if the locally downloaded files are
 present.

---
 application/views/welcome_message.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php
index 33c29458..1870d556 100644
--- a/application/views/welcome_message.php
+++ b/application/views/welcome_message.php
@@ -74,6 +74,10 @@
 
         <h2><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/rest-server'); ?>">REST Server Tests</a></h2>
 
+        <?php if (file_exists(FCPATH.'documentation/index.html')) : ?>
+        <h2><a href="http://github.com/%3C?php%20echo%20base_url('http://github.com/documentation/index.html'); ?>" target="_blank">REST Server Documentation</a></h2>
+        <?php endif ?>
+
         <p>The page you are looking at is being generated dynamically by CodeIgniter.</p>
 
         <p>If you would like to edit this page you'll find it located at:</p>
@@ -82,11 +86,13 @@
         <p>The corresponding controller for this page is found at:</p>
         <code>application/controllers/Welcome.php</code>
 
-        <p>If you are exploring CodeIgniter for the very first time, you should start by reading the <a href="http://github.com/user_guide/">User Guide</a>.</p>
+        <?php if (file_exists(FCPATH.'user_guide/index.html')) : ?>
+        <p>If you are exploring CodeIgniter for the very first time, you should start by reading the <a href="http://github.com/%3C?php%20echo%20base_url('http://github.com/user_guide/index.html'); ?>" target="_blank">User Guide</a>.</p>
+        <?php endif ?>
     </div>
 
     <p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>' . CI_VERSION . '</strong>' : '' ?></p>
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>

From 1a7adc28ee8be1906937ef2538d634507ff9e60f Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 27 Jul 2015 23:42:46 +0300
Subject: [PATCH 138/354] Updated files to match CI 3.0.1rc

This is unlikely to change in the stable release
---
 application/config/routes.php       | 14 +++++-----
 application/controllers/Welcome.php | 40 ++++++++++++++---------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index a56d21f6..5cbeb064 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -11,7 +11,7 @@
 | and its corresponding controller class/method. The segments in a
 | URL normally follow this pattern:
 |
-|	example.com/class/method/id/
+| example.com/class/method/id/
 |
 | In some instances, however, you may want to remap this relationship
 | so that a different class/function is called than the one
@@ -19,7 +19,7 @@
 |
 | Please see the user guide for complete details:
 |
-|	http://codeigniter.com/user_guide/general/routing.html
+| http://codeigniter.com/user_guide/general/routing.html
 |
 | -------------------------------------------------------------------------
 | RESERVED ROUTES
@@ -27,18 +27,18 @@
 |
 | There are three reserved routes:
 |
-|	$route['default_controller'] = 'welcome';
+| $route['default_controller'] = 'welcome';
 |
 | This route indicates which controller class should be loaded if the
 | URI contains no data. In the above example, the "welcome" class
 | would be loaded.
 |
-|	$route['404_override'] = 'errors/page_missing';
+| $route['404_override'] = 'errors/page_missing';
 |
 | This route will tell the Router which controller/method to use if those
 | provided in the URL cannot be matched to a valid route.
 |
-|	$route['translate_uri_dashes'] = FALSE;
+| $route['translate_uri_dashes'] = FALSE;
 |
 | This is not exactly a route, but allows you to automatically route
 | controller and method names that contain dashes. '-' isn't a valid
@@ -46,8 +46,8 @@
 | When you set this option to TRUE, it will replace ALL dashes in the
 | controller and method URI segments.
 |
-| Examples:	my-controller/index	-> my_controller/index
-|		my-controller/my-method	-> my_controller/my_method
+| Examples: my-controller/index -> my_controller/index
+|   my-controller/my-method -> my_controller/my_method
 */
 $route['default_controller'] = 'welcome';
 $route['404_override'] = '';
diff --git a/application/controllers/Welcome.php b/application/controllers/Welcome.php
index aa64c8d4..d16a4dee 100644
--- a/application/controllers/Welcome.php
+++ b/application/controllers/Welcome.php
@@ -3,25 +3,25 @@
 
 class Welcome extends CI_Controller {
 
-    /**
-     * Index Page for this controller.
-     *
-     * Maps to the following URL
-     * http://example.com/index.php/welcome
-     *    - or -
-     * http://example.com/index.php/welcome/index
-     *    - or -
-     * Since this controller is set as the default controller in
-     * config/routes.php, it's displayed at http://example.com/
-     *
-     * So any other public methods not prefixed with an underscore will
-     * map to /index.php/welcome/<method_name>
-     * @see http://codeigniter.com/user_guide/general/urls.html
-     */
-    public function index()
-    {
-        $this->load->helper('url');
+	/**
+	 * Index Page for this controller.
+	 *
+	 * Maps to the following URL
+	 * 		http://example.com/index.php/welcome
+	 *	- or -
+	 * 		http://example.com/index.php/welcome/index
+	 *	- or -
+	 * Since this controller is set as the default controller in
+	 * config/routes.php, it's displayed at http://example.com/
+	 *
+	 * So any other public methods not prefixed with an underscore will
+	 * map to /index.php/welcome/<method_name>
+	 * @see http://codeigniter.com/user_guide/general/urls.html
+	 */
+	public function index()
+	{
+		$this->load->helper('url');
 
-        $this->load->view('welcome_message');
-    }
+		$this->load->view('welcome_message');
+	}
 }

From 1ca02cb908806f2a424be06d16313fdb228b3bac Mon Sep 17 00:00:00 2001
From: Louis Linehan <louis@greynoise.co.uk>
Date: Thu, 30 Jul 2015 18:47:11 +0100
Subject: [PATCH 139/354] Fix for issue #530 Field 'response_code' doesn't have
 a default value

---
 application/config/rest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/config/rest.php b/application/config/rest.php
index cf75d699..71704cde 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -352,7 +352,7 @@
 |       `time` INT(11) NOT NULL,
 |       `rtime` FLOAT DEFAULT NULL,
 |       `authorized` VARCHAR(1) NOT NULL,
-|       `response_code` SMALLINT(3) NOT NULL,
+|       `response_code` smallint(3) DEFAULT '0',
 |       PRIMARY KEY (`id`)
 |   ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 |

From aabce5e25db29fb13a02cca86d62d2f6c896ba1f Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Sun, 9 Aug 2015 03:36:05 +0300
Subject: [PATCH 140/354] A minor visual correction.

---
 application/views/rest_server.php     | 1 +
 application/views/welcome_message.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/application/views/rest_server.php b/application/views/rest_server.php
index b5e378db..2faded75 100644
--- a/application/views/rest_server.php
+++ b/application/views/rest_server.php
@@ -18,6 +18,7 @@
         margin: 40px;
         font: 16px/20px normal Helvetica, Arial, sans-serif;
         color: #4F5155;
+        word-wrap: break-word;
     }
 
     a {
diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php
index 1870d556..8c879443 100644
--- a/application/views/welcome_message.php
+++ b/application/views/welcome_message.php
@@ -16,6 +16,7 @@
         margin: 40px;
         font: 16px/20px normal Helvetica, Arial, sans-serif;
         color: #4F5155;
+        word-wrap: break-word;
     }
 
     a {

From ed523603d61833affb293ab664bffed13aaacbac Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 13 Aug 2015 19:07:01 +0300
Subject: [PATCH 141/354] Updated documentation

---
 documentation/source-class-REST_Controller.html |  4 ++--
 documentation/source-class-Welcome.html         | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/documentation/source-class-REST_Controller.html b/documentation/source-class-REST_Controller.html
index 5d6c6497..84d4170f 100644
--- a/documentation/source-class-REST_Controller.html
+++ b/documentation/source-class-REST_Controller.html
@@ -1072,7 +1072,7 @@ <h3>Classes</h3>
 </span><span id="978" class="l"><a href="#978"> 978: </a>                }
 </span><span id="979" class="l"><a href="#979"> 979: </a>            }
 </span><span id="980" class="l"><a href="#980"> 980: </a>
-</span><span id="981" class="l"><a href="#981"> 981: </a>            <span class="php-keyword1">return</span> <span class="php-var">$row</span>;
+</span><span id="981" class="l"><a href="#981"> 981: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
 </span><span id="982" class="l"><a href="#982"> 982: </a>        }
 </span><span id="983" class="l"><a href="#983"> 983: </a>
 </span><span id="984" class="l"><a href="#984"> 984: </a>        <span class="php-comment">// No key has been sent</span>
@@ -2209,7 +2209,7 @@ <h3>Classes</h3>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
+<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
 <script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Welcome.html b/documentation/source-class-Welcome.html
index 53bf7995..6a681eb1 100644
--- a/documentation/source-class-Welcome.html
+++ b/documentation/source-class-Welcome.html
@@ -101,10 +101,10 @@ <h3>Classes</h3>
 </span></span><span id="7" class="l"><a href="#7"> 7: </a><span class="php-comment">     * Index Page for this controller.
 </span></span><span id="8" class="l"><a href="#8"> 8: </a><span class="php-comment">     *
 </span></span><span id="9" class="l"><a href="#9"> 9: </a><span class="php-comment">     * Maps to the following URL
-</span></span><span id="10" class="l"><a href="#10">10: </a><span class="php-comment">     * http://example.com/index.php/welcome
-</span></span><span id="11" class="l"><a href="#11">11: </a><span class="php-comment">     *    - or -
-</span></span><span id="12" class="l"><a href="#12">12: </a><span class="php-comment">     * http://example.com/index.php/welcome/index
-</span></span><span id="13" class="l"><a href="#13">13: </a><span class="php-comment">     *    - or -
+</span></span><span id="10" class="l"><a href="#10">10: </a><span class="php-comment">     *      http://example.com/index.php/welcome
+</span></span><span id="11" class="l"><a href="#11">11: </a><span class="php-comment">     *  - or -
+</span></span><span id="12" class="l"><a href="#12">12: </a><span class="php-comment">     *      http://example.com/index.php/welcome/index
+</span></span><span id="13" class="l"><a href="#13">13: </a><span class="php-comment">     *  - or -
 </span></span><span id="14" class="l"><a href="#14">14: </a><span class="php-comment">     * Since this controller is set as the default controller in
 </span></span><span id="15" class="l"><a href="#15">15: </a><span class="php-comment">     * config/routes.php, it's displayed at http://example.com/
 </span></span><span id="16" class="l"><a href="#16">16: </a><span class="php-comment">     *
@@ -126,7 +126,7 @@ <h3>Classes</h3>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
+<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
 <script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>

From a6e46c8bf23f8303fb1c9d8672fb94a725e4c7e4 Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Sat, 29 Aug 2015 18:10:05 +0900
Subject: [PATCH 142/354] Fix _generate_key() method. See #535

---
 application/controllers/api/Key.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
index 1823c814..0fa67172 100644
--- a/application/controllers/api/Key.php
+++ b/application/controllers/api/Key.php
@@ -213,7 +213,7 @@ private function _generate_key()
         do
         {
             // Generate a random salt
-            $salt = $this->security->get_random_bytes(64);
+            $salt = base_convert(bin2hex($this->security->get_random_bytes(64)), 16, 36);
 
             // If an error occurred, then fall back to the previous method
             if ($salt === FALSE)

From f26a018802a44d01b806d7a8ba048edbf233829d Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Tue, 1 Sep 2015 21:14:14 +0900
Subject: [PATCH 143/354] Refactor REST_Controller::_parse_options()

---
 application/libraries/REST_Controller.php | 25 +----------------------
 1 file changed, 1 insertion(+), 24 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 2c50884f..33288a29 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1435,30 +1435,7 @@ protected function _parse_delete()
      */
     protected function _parse_query()
     {
-        // Declare a variable that will hold the REQUEST_URI
-        $request_uri = NULL;
-
-        // If using the commandline version
-        if (is_cli())
-        {
-            $args = $this->input->server('argv');
-            unset($args[0]);
-
-            // Combine the arguments using '/' as the delimiter
-            $request_uri = '/' . implode('/', $args) . '/';
-
-            // Set the following server variables (perhaps not required anymore?)
-            $_SERVER['REQUEST_URI'] = $request_uri;
-            $_SERVER['PATH_INFO'] = $request_uri;
-            $_SERVER['QUERY_STRING'] = $request_uri;
-        }
-        else
-        {
-            $request_uri = $this->input->server('REQUEST_URI');
-        }
-
-        // Parse the query parameters from the query string
-        parse_str(parse_url(http://github.com/$request_uri,%20PHP_URL_QUERY), $this->_query_args);
+        $this->_query_args = $this->input->get();
     }
 
     // INPUT FUNCTION --------------------------------------------------------------

From 23e8142d669a4211cebe45e0125f40d514b697bf Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@Chris-Book.local>
Date: Fri, 11 Sep 2015 17:54:53 -0500
Subject: [PATCH 144/354] changed back to time() it should not have been a PHP
 function, but a SQL function.  fixes #548

---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 2c50884f..403aa833 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1037,7 +1037,7 @@ protected function _log_request($authorized = FALSE)
                 'params' => $this->_args ? ($this->config->item('rest_logs_json_params') === TRUE ? json_encode($this->_args) : serialize($this->_args)) : NULL,
                 'api_key' => isset($this->rest->key) ? $this->rest->key : '',
                 'ip_address' => $this->input->ip_address(),
-                'time' => now(), // Used to be: function_exists('now') ? now() : time()
+                'time' => time(),
                 'authorized' => $authorized
             ]);
 

From f329f1e7e4309c4f52fb03c78c7bf9137016183b Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 12 Sep 2015 08:25:49 +0300
Subject: [PATCH 145/354] Added new changelog entires

---
 CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a482d6ee..dfdadc58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,19 @@
 Changelog:
 ===========
 
+### 2.7.2
+
+* Added $this->query() in which query parameters can now be obtained regardless of whether a GET request is sent or not
+* Added doc comments added to functions
+* Added HTTP status constants e.g. REST_Controller::HTTP_OK
+* Added new CSV formatting function
+* Fixed numerous bug fixes
+* Updated API calls limit can be based on API key, routed url or method name
+* Updated documentation
+* Updated examples (thanks @ivantcholakov and @lagaisse)
+* Updated many functions by re-writing (thanks @softwarespot)
+* Updated performance increase
+
 ### 2.7.0
 
 * Added Blacklist IP option

From d10a30903e43dd6ca237092d4d70b8ba16fc7376 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 12 Sep 2015 08:28:20 +0300
Subject: [PATCH 146/354] Renamed _CI variable

Now matches the same style as CodeIgniter
---
 application/libraries/Format.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 6615e2cf..0d3bf773 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -56,7 +56,7 @@ class Format {
      *
      * @var object
      */
-    private $_ci;
+    private $_CI;
 
     /**
      * Data to parse
@@ -83,10 +83,10 @@ class Format {
     public function __construct($data = NULL, $from_type = NULL)
     {
         // Get the CodeIgniter reference
-        $this->_ci = &get_instance();
+        $this->_CI = &get_instance();
 
         // Load the inflector helper
-        $this->_ci->load->helper('inflector');
+        $this->_CI->load->helper('inflector');
 
         // If the provided data is already formatted we should probably convert it to an array
         if ($from_type !== NULL)
@@ -283,20 +283,20 @@ public function to_html($data = NULL)
         }
 
         // Load the table library
-        $this->_ci->load->library('table');
+        $this->_CI->load->library('table');
 
-        $this->_ci->table->set_heading($headings);
+        $this->_CI->table->set_heading($headings);
 
         foreach ($data as $row)
         {
-            // Suppressing the "array to string conversion" notice.
-            // Keep the "evil" @ here.
-            $row = @ array_map('strval', $row);
+            // Suppressing the "array to string conversion" notice
+            // Keep the "evil" @ here
+            $row = @array_map('strval', $row);
 
-            $this->_ci->table->add_row($row);
+            $this->_CI->table->add_row($row);
         }
 
-        return $this->_ci->table->generate();
+        return $this->_CI->table->generate();
     }
 
     /**
@@ -405,7 +405,7 @@ public function to_json($data = NULL)
         }
 
         // Get the callback parameter (if set)
-        $callback = $this->_ci->input->get('callback');
+        $callback = $this->_CI->input->get('callback');
 
         if (empty($callback) === TRUE)
         {

From a89db04f326e78314e361411741aead0d04515a1 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 12 Sep 2015 08:34:07 +0300
Subject: [PATCH 147/354] Throw exceptions than exit

---
 application/libraries/REST_Controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 403aa833..221df752 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -381,13 +381,13 @@ public function __construct($config = 'rest')
         if (is_php('5.4') === FALSE)
         {
             // CodeIgniter 3 is recommended for v5.4 or above
-            exit('Using PHP v' . PHP_VERSION . ', though PHP v5.4 or greater is required');
+            throw new Exception('Using PHP v' . PHP_VERSION . ', though PHP v5.4 or greater is required');
         }
 
         // Check to see if this is CI 3.x
         if (explode('.', CI_VERSION, 2)[0] < 3)
         {
-            exit('REST Server requires CodeIgniter 3.x');
+            throw new Exception('REST Server requires CodeIgniter 3.x');
         }
 
         // Set the default value of global xss filtering. Same approach as CodeIgniter 3

From 5e2ae86ac6bc5a0daa1bb37fc88e643c419d420f Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 12 Sep 2015 08:36:22 +0300
Subject: [PATCH 148/354] Unified comments

---
 application/libraries/REST_Controller.php | 28 +++++++++++------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 403aa833..1df0ede7 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -150,8 +150,8 @@ abstract class REST_Controller extends CI_Controller {
     const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511;
 
     /**
-     * This defines the rest format.
-     * Must be overridden it in a controller so that it is set.
+     * This defines the rest format
+     * Must be overridden it in a controller so that it is set
      *
      * @var string|NULL
      */
@@ -269,7 +269,7 @@ abstract class REST_Controller extends CI_Controller {
     protected $_args = [];
 
     /**
-     * If the request is allowed based on the API key provided.
+     * If the request is allowed based on the API key provided
      *
      * @var bool
      */
@@ -323,7 +323,7 @@ abstract class REST_Controller extends CI_Controller {
      * Enable XSS flag
      * Determines whether the XSS filter is always active when
      * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered.
-     * Set automatically based on config setting.
+     * Set automatically based on config setting
      *
      * @var bool
      */
@@ -560,11 +560,11 @@ public function __destruct()
     /**
      * Requests are not made to methods directly, the request will be for
      * an "object". This simply maps the object and method to the correct
-     * Controller method.
+     * Controller method
      *
      * @access public
      * @param  string $object_called
-     * @param  array $arguments The arguments passed to the controller method.
+     * @param  array $arguments The arguments passed to the controller method
      */
     public function _remap($object_called, $arguments)
     {
@@ -588,7 +588,7 @@ public function _remap($object_called, $arguments)
         // Use keys for this method?
         $use_key = !(isset($this->methods[$controller_method]['key']) && $this->methods[$controller_method]['key'] === FALSE);
 
-        // They provided a key, but it wasn't valid, so get them out of here.
+        // They provided a key, but it wasn't valid, so get them out of here
         if ($this->config->item('rest_enable_keys') && $use_key && $this->_allow === FALSE)
         {
             if ($this->config->item('rest_enable_logging') && $log_method)
@@ -602,7 +602,7 @@ public function _remap($object_called, $arguments)
                 ], self::HTTP_FORBIDDEN);
         }
 
-        // Check to see if this key has access to the requested controller.
+        // Check to see if this key has access to the requested controller
         if ($this->config->item('rest_enable_keys') && $use_key && empty($this->rest->key) === FALSE && $this->_check_access() === FALSE)
         {
             if ($this->config->item('rest_enable_logging') && $log_method)
@@ -713,7 +713,7 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
                 $this->output->set_content_type($this->_supported_formats[$this->response->format], strtolower($this->config->item('charset')));
                 $output = $this->format->factory($data)->{'to_' . $this->response->format}();
 
-                // An array must be parsed as a string, so as not to cause an array to string error.
+                // An array must be parsed as a string, so as not to cause an array to string error
                 // Json is the most appropriate form for such a datatype
                 if ($this->response->format === 'array')
                 {
@@ -763,7 +763,7 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
      * Takes mixed data and optionally a status code, then creates the response
      * within the buffers of the Output class. The response is sent to the client
      * lately by the framework, after the current controller's method termination.
-     * All the hooks after the controller's method termination are executable.
+     * All the hooks after the controller's method termination are executable
      *
      * @access public
      * @param array|NULL $data Data to output to the user
@@ -904,7 +904,7 @@ protected function _detect_method()
 
         if (empty($method))
         {
-            // Get the request method as a lowercase string.
+            // Get the request method as a lowercase string
             $method = $this->input->method();
         }
 
@@ -948,7 +948,7 @@ protected function _detect_api_key()
 
             /*
              * If "is private key" is enabled, compare the ip address with the list
-             * of valid ip addresses stored in the database.
+             * of valid ip addresses stored in the database
              */
             if (empty($row->is_private_key) === FALSE)
             {
@@ -973,7 +973,7 @@ protected function _detect_api_key()
                 }
                 else
                 {
-                    // There should be at least one IP address for this private key.
+                    // There should be at least one IP address for this private key
                     return FALSE;
                 }
             }
@@ -1617,7 +1617,7 @@ public function query($key = NULL, $xss_clean = NULL)
 
     /**
      * Sanitizes data so that Cross Site Scripting Hacks can be
-     * prevented.
+     * prevented
      *
      * @access protected
      * @param  string $value Input data

From 6c3c26e46f66a84384a1aa0b1f151f007c428de8 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 12 Sep 2015 08:37:52 +0300
Subject: [PATCH 149/354] Changed case of color

---
 application/views/welcome_message.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php
index 8c879443..69acde90 100644
--- a/application/views/welcome_message.php
+++ b/application/views/welcome_message.php
@@ -12,7 +12,7 @@
     ::-moz-selection { background-color: #E13300; color: white; }
 
     body {
-        background-color: #fff;
+        background-color: #FFF;
         margin: 40px;
         font: 16px/20px normal Helvetica, Arial, sans-serif;
         color: #4F5155;

From 24a506ab1674ab783d5fb0d2984d0c636f16969c Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 12 Sep 2015 08:38:59 +0300
Subject: [PATCH 150/354] Re-wrote ajax to request to be modular

---
 application/views/rest_server.php | 74 ++++++++++++++++++++++++-------
 1 file changed, 57 insertions(+), 17 deletions(-)

diff --git a/application/views/rest_server.php b/application/views/rest_server.php
index 2faded75..264d1a3b 100644
--- a/application/views/rest_server.php
+++ b/application/views/rest_server.php
@@ -118,31 +118,71 @@
 <script src="https://code.jquery.com/jquery-1.11.3.js"></script>
 
 <script>
-    $(function() {
+    // Create an 'App' namespace
+    var App = App || {};
 
-        $('#ajax').on('click', function (event) {
+    // Basic rest module using an IIFE as a way of enclosing private variables
+    App.rest = (function ($, window) {
+        // Fields
 
-            event.preventDefault();
+        // Cache the jQuery selector
+        var $_ajax = null;
 
-            $.ajax({
-
-                // URL from the link that was clicked on.
-                url: $(this).attr('href')
-
-            }).done(function (data) {
-
-                // The 'data' parameter is an array of objects that can be looped over.
+        // Methods (private)
 
-                alert(JSON.stringify(data));
+        // Called on Ajax done
+        function ajaxDone(data) {
+            // The 'data' parameter is an array of objects that can be iterated over
+            window.alert(JSON.stringify(data, null, 2));
+        }
 
-            }).fail(function () {
-
-                alert('Oh no! A problem with the Ajax request!');
+        // Called on Ajax fail
+        function ajaxFail() {
+            window.alert('Oh no! A problem with the Ajax request!');
+        }
 
+        // On Ajax request
+        function ajaxEvent($this) {
+            $.ajax({
+                    // URL from the link that was 'clicked' on
+                    url: $this.attr('href')
+                })
+                .done(ajaxDone)
+                .fail(ajaxFail);
+        }
+
+        // Bind event(s)
+        function bind() {
+            // Namespace the 'click' event
+            $_ajax.on('click.app.rest.module', function (event) {
+                event.preventDefault();
+
+                // Pass this to the Ajax event function
+                ajaxEvent($(this));
             });
-        });
-
+        }
+
+        // Cache the DOM node(s)
+        function cacheDom() {
+            $_ajax = $('#ajax');
+        }
+
+        // Public API
+        return {
+            init: function () {
+                // Cache the DOM and bind event(s)
+                cacheDom();
+                bind();
+            }
+        };
+    })(jQuery, window);
+
+    // DOM ready event
+    $(function () {
+        // Initialise the App module
+        App.rest.init();
     });
+
 </script>
 
 </body>

From 6f070f8de6b398e08db90ae1176490e36d5089a4 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 14 Sep 2015 11:44:22 +0300
Subject: [PATCH 151/354] Fixes #555

---
 application/libraries/REST_Controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 82f49cec..431587b9 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1514,10 +1514,10 @@ public function head($key = NULL, $xss_clean = NULL)
     {
         if ($key === NULL)
         {
-            return $this->head_args;
+            return $this->_head_args;
         }
 
-        return isset($this->head_args[$key]) ? $this->_xss_clean($this->head_args[$key], $xss_clean) : NULL;
+        return isset($this->_head_args[$key]) ? $this->_xss_clean($this->_head_args[$key], $xss_clean) : NULL;
     }
 
     /**

From 44352b6b60614ea0fe89827436ebc53f41f06b57 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 14 Sep 2015 14:49:40 +0300
Subject: [PATCH 152/354] Removed .txt extension from LICENSE

This is kind of standard on GitHub
---
 LICENSE.txt => LICENSE | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename LICENSE.txt => LICENSE (100%)

diff --git a/LICENSE.txt b/LICENSE
similarity index 100%
rename from LICENSE.txt
rename to LICENSE

From e3af4bc19645674ef93eaa00ae8f24d5c2ead12d Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 14 Sep 2015 14:52:16 +0300
Subject: [PATCH 153/354] Swapped arguments around

---
 application/views/rest_server.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/rest_server.php b/application/views/rest_server.php
index 264d1a3b..af4771e2 100644
--- a/application/views/rest_server.php
+++ b/application/views/rest_server.php
@@ -122,7 +122,7 @@
     var App = App || {};
 
     // Basic rest module using an IIFE as a way of enclosing private variables
-    App.rest = (function ($, window) {
+    App.rest = (function (window, $) {
         // Fields
 
         // Cache the jQuery selector
@@ -175,7 +175,7 @@ function cacheDom() {
                 bind();
             }
         };
-    })(jQuery, window);
+    })(window, jQuery);
 
     // DOM ready event
     $(function () {

From 8187c2c1c1edb27e9e4c9e9e7ba56a3838615406 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 14 Sep 2015 14:57:02 +0300
Subject: [PATCH 154/354] Removed pointless nested ifs

---
 application/libraries/REST_Controller.php | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 82f49cec..f1b75550 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1349,13 +1349,10 @@ protected function _parse_put()
         {
             $this->request->body = $this->input->raw_input_stream;
         }
-        else
+        else if ($this->input->method() === 'put')
         {
-            // If no filetype is provided, then there are probably just arguments
-            if ($this->input->method() === 'put')
-            {
-                $this->_put_args = $this->input->input_stream();
-            }
+           // If no filetype is provided, then there are probably just arguments
+           $this->_put_args = $this->input->input_stream();
         }
     }
 
@@ -1402,13 +1399,10 @@ protected function _parse_patch()
         {
             $this->request->body = $this->input->raw_input_stream;
         }
-        else
+        else if ($this->input->method() === 'patch')
         {
             // If no filetype is provided, then there are probably just arguments
-            if ($this->input->method() === 'patch')
-            {
-                $this->_patch_args = $this->input->input_stream();
-            }
+            $this->_patch_args = $this->input->input_stream();
         }
     }
 

From d7b23bf62036ec9e298054cd53b81fb513200b20 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 17 Sep 2015 19:32:13 +0300
Subject: [PATCH 155/354] Moved insert id declaration

---
 application/libraries/REST_Controller.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index eacf54aa..88f37d37 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -212,13 +212,6 @@ abstract class REST_Controller extends CI_Controller {
      */
     protected $_post_args = [];
 
-    /**
-     * The insert_id of the log entry (if we have one)
-     *
-     * @var string
-     */
-    protected $_insert_id = '';
-
     /**
      * The arguments for the PUT request method
      *
@@ -268,6 +261,13 @@ abstract class REST_Controller extends CI_Controller {
      */
     protected $_args = [];
 
+    /**
+     * The insert_id of the log entry (if we have one)
+     *
+     * @var string
+     */
+    protected $_insert_id = '';
+
     /**
      * If the request is allowed based on the API key provided
      *

From bc8abe825092de56aa69b0f8dfc0ba61931c7e04 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 17 Sep 2015 19:34:18 +0300
Subject: [PATCH 156/354] Fixed language comment

---
 application/language/english/rest_controller_lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/language/english/rest_controller_lang.php b/application/language/english/rest_controller_lang.php
index 37305221..858c652f 100644
--- a/application/language/english/rest_controller_lang.php
+++ b/application/language/english/rest_controller_lang.php
@@ -1,8 +1,8 @@
 <?php
 
 /*
-* English language
-*/
+ * English language
+ */
 
 $lang['text_rest_invalid_api_key'] = 'Invalid API key %s'; // %s is the REST API key
 $lang['text_rest_invalid_credentials'] = 'Invalid credentials';

From 5f0b5d8e1b69f7efd94ca230308afe8e977ee54f Mon Sep 17 00:00:00 2001
From: ares242 <taurus.936@gmail.com>
Date: Thu, 17 Sep 2015 19:36:50 -0300
Subject: [PATCH 157/354] Session auth override

---
 application/libraries/REST_Controller.php | 32 +++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index eacf54aa..fa19579f 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1188,6 +1188,14 @@ protected function _auth_override_check()
                     return TRUE;
                 }
 
+                // Session auth override found, check session
+                if ($auth_override_class_method[$this->router->class]['*'] === 'session')
+                {
+                    $this->_check_php_session();
+
+                    return TRUE;
+                }
+
                 // Whitelist auth override found, check client's ip against config whitelist
                 if ($auth_override_class_method[$this->router->class]['*'] === 'whitelist')
                 {
@@ -1222,6 +1230,14 @@ protected function _auth_override_check()
                     return TRUE;
                 }
 
+                // Session auth override found, check session
+                if ($auth_override_class_method[$this->router->class][$this->router->method] === 'session')
+                {
+                    $this->_check_php_session();
+
+                    return TRUE;
+                }
+
                 // Whitelist auth override found, check client's ip against config whitelist
                 if ($auth_override_class_method[$this->router->class][$this->router->method] === 'whitelist')
                 {
@@ -1263,6 +1279,14 @@ protected function _auth_override_check()
                     return TRUE;
                 }
 
+                // Session auth override found, check session
+                if ($auth_override_class_method[$this->router->class]['*'][$this->request->method] === 'session')
+                {
+                    $this->_check_php_session();
+
+                    return TRUE;
+                }
+
                 // Whitelist auth override found, check client's ip against config whitelist
                 if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'whitelist')
                 {
@@ -1297,6 +1321,14 @@ protected function _auth_override_check()
                     return TRUE;
                 }
 
+                // Session auth override found, check session
+                if ($auth_override_class_method[$this->router->class][$this->router->method][$this->request->method] === 'session')
+                {
+                    $this->_check_php_session();
+
+                    return TRUE;
+                }
+
                 // Whitelist auth override found, check client's ip against config whitelist
                 if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'whitelist')
                 {

From bb39fb7ebf23dfe50ff286eb639037875cf7e775 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Fri, 18 Sep 2015 04:37:53 +0300
Subject: [PATCH 158/354] A minor language line correction.

---
 application/language/english/rest_controller_lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/language/english/rest_controller_lang.php b/application/language/english/rest_controller_lang.php
index 858c652f..1c665bdc 100644
--- a/application/language/english/rest_controller_lang.php
+++ b/application/language/english/rest_controller_lang.php
@@ -9,7 +9,7 @@
 $lang['text_rest_ip_denied'] = 'IP denied';
 $lang['text_rest_ip_unauthorized'] = 'IP unauthorized';
 $lang['text_rest_unauthorized'] = 'Unauthorized';
-$lang['text_rest_ajax_only'] = 'Only Ajax requests are only allowed';
+$lang['text_rest_ajax_only'] = 'Only AJAX requests are allowed';
 $lang['text_rest_api_key_unauthorized'] = 'This API key does not have access to the requested controller';
 $lang['text_rest_api_key_permissions'] = 'This API key does not have enough permissions';
 $lang['text_rest_api_key_time_limit'] = 'This API key has reached the time limit for this method';

From 1bc2301392e944a3838465fb75324af182ccfebd Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Fri, 18 Sep 2015 04:46:00 +0300
Subject: [PATCH 159/354] Adding Bulgarian language.

---
 application/language/bulgarian/index.html       | 11 +++++++++++
 .../language/bulgarian/rest_controller_lang.php | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 application/language/bulgarian/index.html
 create mode 100644 application/language/bulgarian/rest_controller_lang.php

diff --git a/application/language/bulgarian/index.html b/application/language/bulgarian/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/language/bulgarian/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/bulgarian/rest_controller_lang.php b/application/language/bulgarian/rest_controller_lang.php
new file mode 100644
index 00000000..6145307d
--- /dev/null
+++ b/application/language/bulgarian/rest_controller_lang.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * Bulgarian language
+ */
+
+$lang['text_rest_invalid_api_key'] = 'Невалиден API ключ %s';
+$lang['text_rest_invalid_credentials'] = 'Невалидни данни за достъп';
+$lang['text_rest_ip_denied'] = 'Отказан IP адрес';
+$lang['text_rest_ip_unauthorized'] = 'Неоторизиран IP адрес';
+$lang['text_rest_unauthorized'] = 'Неоторизиран достъп';
+$lang['text_rest_ajax_only'] = 'Само AJAX заявки са разрешени';
+$lang['text_rest_api_key_unauthorized'] = 'API ключът не е оторизиран зо достъп до заявения контролер';
+$lang['text_rest_api_key_permissions'] = 'API ключът няма достатъчно права';
+$lang['text_rest_api_key_time_limit'] = 'API ключът е изполван с превишаване на времевия лимит за този метод';
+$lang['text_rest_unknown_method'] = 'Неизвестен метод';
+$lang['text_rest_unsupported'] = 'Неподдържан протокол';

From ecec95f5ce81b657071123804b74cec3ca35385b Mon Sep 17 00:00:00 2001
From: ares242 <taurus.936@gmail.com>
Date: Fri, 18 Sep 2015 21:39:28 -0300
Subject: [PATCH 160/354] fixing session option class/method/http method

---
 application/libraries/REST_Controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index fa19579f..a71b687d 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1280,7 +1280,7 @@ protected function _auth_override_check()
                 }
 
                 // Session auth override found, check session
-                if ($auth_override_class_method[$this->router->class]['*'][$this->request->method] === 'session')
+                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'session')
                 {
                     $this->_check_php_session();
 
@@ -1322,7 +1322,7 @@ protected function _auth_override_check()
                 }
 
                 // Session auth override found, check session
-                if ($auth_override_class_method[$this->router->class][$this->router->method][$this->request->method] === 'session')
+                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'session')
                 {
                     $this->_check_php_session();
 

From 24bb84cadc0087cd0540a84cdc6ff167b3282a89 Mon Sep 17 00:00:00 2001
From: Rogerio Taques <rogerio.taques@rakuten.com>
Date: Mon, 28 Sep 2015 11:36:32 +0900
Subject: [PATCH 161/354] Added Brazilian Portuguese language support.

---
 application/language/portuguese/index.html      | 11 +++++++++++
 .../portuguese/rest_controller_lang.php         | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 application/language/portuguese/index.html
 create mode 100644 application/language/portuguese/rest_controller_lang.php

diff --git a/application/language/portuguese/index.html b/application/language/portuguese/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/language/portuguese/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/portuguese/rest_controller_lang.php b/application/language/portuguese/rest_controller_lang.php
new file mode 100644
index 00000000..04bbf6e3
--- /dev/null
+++ b/application/language/portuguese/rest_controller_lang.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * Brazilian portuguese language
+ */
+
+$lang['text_rest_invalid_api_key'] = 'Chave da API %s inválida'; // %s is the REST API key
+$lang['text_rest_invalid_credentials'] = 'Credenciais inválidas';
+$lang['text_rest_ip_denied'] = 'IP proibido';
+$lang['text_rest_ip_unauthorized'] = 'IP não autorizado';
+$lang['text_rest_unauthorized'] = 'Não autorizado';
+$lang['text_rest_ajax_only'] = 'Apenas chamadas AJAX são permitidas';
+$lang['text_rest_api_key_unauthorized'] = 'Esta chave da API não tem acesso ao controller solicitado';
+$lang['text_rest_api_key_permissions'] = 'Esta chave da API não tem permissões suficientes';
+$lang['text_rest_api_key_time_limit'] = 'Esta chave da API já atingiu o tempo limite para este método';
+$lang['text_rest_unknown_method'] = 'Método desconhecido';
+$lang['text_rest_unsupported'] = 'Sem suporte para este protocolo';

From 944a3f33a5f1af508676753419b487ce0a307cb9 Mon Sep 17 00:00:00 2001
From: Rogerio Taques <rogerio.taques@rakuten.com>
Date: Mon, 28 Sep 2015 15:58:50 +0900
Subject: [PATCH 162/354] Changed from language/portuguese to
 language/portuguese-brazilian to match with CI3 translations tree.

---
 .../language/{portuguese => portuguese-brazilian}/index.html      | 0
 .../{portuguese => portuguese-brazilian}/rest_controller_lang.php | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename application/language/{portuguese => portuguese-brazilian}/index.html (100%)
 rename application/language/{portuguese => portuguese-brazilian}/rest_controller_lang.php (100%)

diff --git a/application/language/portuguese/index.html b/application/language/portuguese-brazilian/index.html
similarity index 100%
rename from application/language/portuguese/index.html
rename to application/language/portuguese-brazilian/index.html
diff --git a/application/language/portuguese/rest_controller_lang.php b/application/language/portuguese-brazilian/rest_controller_lang.php
similarity index 100%
rename from application/language/portuguese/rest_controller_lang.php
rename to application/language/portuguese-brazilian/rest_controller_lang.php

From acefb27162da695550f1ebdf5f9ea9ee809b2d10 Mon Sep 17 00:00:00 2001
From: Chathu Vishwaijith <4evercreations@gmail.com>
Date: Sat, 24 Oct 2015 15:54:29 +0530
Subject: [PATCH 163/354] Add Licence badge

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index ccd236d9..59214003 100644
--- a/README.md
+++ b/README.md
@@ -194,3 +194,5 @@ as he is no longer using it.  As of 2013/11/20 further developement and support
 
 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.
+
+[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://raw.githubusercontent.com/chriskacerguis/codeigniter-restserver/master/LICENSE)

From 14ff0064253d55f705aa3b1d6311fdd9049e0b99 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Mon, 26 Oct 2015 19:39:25 +0200
Subject: [PATCH 164/354] Configurable supported formats, a PR about #573.

---
 application/config/rest.php               | 25 +++++++++++++-
 application/libraries/REST_Controller.php | 40 ++++++++++++++++++++++-
 2 files changed, 63 insertions(+), 2 deletions(-)

diff --git a/application/config/rest.php b/application/config/rest.php
index 71704cde..15af4ed7 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -14,7 +14,7 @@
 
 /*
 |--------------------------------------------------------------------------
-| REST Format
+| REST Output Format
 |--------------------------------------------------------------------------
 |
 | The default format of the response
@@ -31,6 +31,29 @@
 */
 $config['rest_default_format'] = 'json';
 
+/*
+|--------------------------------------------------------------------------
+| REST Supported Output Formats
+|--------------------------------------------------------------------------
+|
+| The following setting contains a list of the supported/allowed formats.
+| You may remove those formats that you don't want to use.
+| If the default format $config['rest_default_format'] is missing within
+| $config['rest_supported_formats'], it will be added silently during
+| REST_Controller initialization.
+|
+*/
+$config['rest_supported_formats'] = [
+    'json',
+    'array',
+    'csv',
+    'html',
+    'jsonp',
+    'php',
+    'serialized',
+    'xml',
+];
+
 /*
 |--------------------------------------------------------------------------
 | REST Status Field Name
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 42e37a8c..c528d5e5 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -406,6 +406,30 @@ public function __construct($config = 'rest')
         // At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)
         $this->load->library('format');
 
+        // Determine supported output formats from configiguration.
+        $supported_formats = $this->config->item('rest_supported_formats');
+
+        // Validate the configuration setting output formats
+        if (empty($supported_formats))
+        {
+            $supported_formats = [];
+        }
+
+        if (!is_array($supported_formats))
+        {
+            $supported_formats = [$supported_formats];
+        }
+
+        // Add silently the default output format if it is missing.
+        $default_format = $this->_get_default_output_format();
+        if (!in_array($default_format, $supported_formats))
+        {
+            $supported_formats[] = $default_format;
+        }
+
+        // Now update $this->_supported_formats
+        $this->_supported_formats = array_intersect_key($this->_supported_formats, array_flip($supported_formats));
+
         // Get the language
         $language = $this->config->item('rest_language');
         if ($language === NULL)
@@ -808,6 +832,20 @@ protected function _detect_input_format()
         return NULL;
     }
 
+    /**
+     * Gets the default format from the configuration. Fallbacks to 'json'.
+     * if the corresponding configuration option $config['rest_default_format']
+     * is missing or is empty.
+     *
+     * @access protected
+     * @return string The default supported input format
+     */
+    protected function _get_default_output_format()
+    {
+        $default_format = (string) $this->config->item('rest_default_format');
+        return $default_format === '' ? 'json' : $default_format;
+    }
+
     /**
      * Detect which format should be used to output the data
      *
@@ -876,7 +914,7 @@ protected function _detect_output_format()
         }
 
         // Obtain the default format from the configuration
-        return $this->config->item('rest_default_format');
+        return $this->_get_default_output_format();
     }
 
     /**

From 63de1c01459c555e5791fdf807b716d202ddc528 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 29 Oct 2015 21:20:30 +0200
Subject: [PATCH 165/354] Refactored JavaScript code

---
 application/views/rest_server.php | 61 +++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 20 deletions(-)

diff --git a/application/views/rest_server.php b/application/views/rest_server.php
index af4771e2..aab0b9d4 100644
--- a/application/views/rest_server.php
+++ b/application/views/rest_server.php
@@ -126,56 +126,77 @@
         // Fields
 
         // Cache the jQuery selector
-        var $_ajax = null;
+        var _$ajax = null;
 
         // Methods (private)
 
-        // Called on Ajax done
-        function ajaxDone(data) {
+        /**
+         * Called on Ajax done
+         *
+         * @return {undefined}
+         */
+        function _ajaxDone(data) {
             // The 'data' parameter is an array of objects that can be iterated over
-            window.alert(JSON.stringify(data, null, 2));
+            window.alert(window.JSON.stringify(data, null, 2));
         }
 
-        // Called on Ajax fail
-        function ajaxFail() {
+        /**
+         * Called on Ajax fail
+         *
+         * @return {undefined}
+         */
+        function _ajaxFail() {
             window.alert('Oh no! A problem with the Ajax request!');
         }
 
-        // On Ajax request
-        function ajaxEvent($this) {
+        /**
+         * On Ajax request
+         *
+         * @param {HTMLElement} $this Current element selected
+         * @return {undefined}
+         */
+        function _ajaxEvent($this) {
             $.ajax({
                     // URL from the link that was 'clicked' on
                     url: $this.attr('href')
                 })
-                .done(ajaxDone)
-                .fail(ajaxFail);
+                .done(_ajaxDone)
+                .fail(_ajaxFail);
         }
 
-        // Bind event(s)
-        function bind() {
+        /**
+         * Bind events
+         *
+         * @return {undefined}
+         */
+        function _bindEvents() {
             // Namespace the 'click' event
-            $_ajax.on('click.app.rest.module', function (event) {
+            _$ajax.on('click.app.rest.module', function (event) {
                 event.preventDefault();
 
                 // Pass this to the Ajax event function
-                ajaxEvent($(this));
+                _ajaxEvent($(this));
             });
         }
 
-        // Cache the DOM node(s)
-        function cacheDom() {
-            $_ajax = $('#ajax');
+        /**
+         * Cache the DOM node(s)
+         *
+         * @return {undefined}
+         */
+        function _cacheDom() {
+            _$ajax = $('#ajax');
         }
 
         // Public API
         return {
             init: function () {
                 // Cache the DOM and bind event(s)
-                cacheDom();
-                bind();
+                _cacheDom();
+                _bindEvents();
             }
         };
-    })(window, jQuery);
+    })(window, window.jQuery);
 
     // DOM ready event
     $(function () {

From 722a221e638a43aba0f1a10a940ab5cbd8af0049 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 29 Oct 2015 21:22:31 +0200
Subject: [PATCH 166/354] Fixed typo and styling

---
 application/libraries/REST_Controller.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index c528d5e5..a487c1ae 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -322,7 +322,7 @@ abstract class REST_Controller extends CI_Controller {
     /**
      * Enable XSS flag
      * Determines whether the XSS filter is always active when
-     * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered.
+     * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered
      * Set automatically based on config setting
      *
      * @var bool
@@ -406,7 +406,7 @@ public function __construct($config = 'rest')
         // At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)
         $this->load->library('format');
 
-        // Determine supported output formats from configiguration.
+        // Determine supported output formats from configuration
         $supported_formats = $this->config->item('rest_supported_formats');
 
         // Validate the configuration setting output formats
@@ -420,7 +420,7 @@ public function __construct($config = 'rest')
             $supported_formats = [$supported_formats];
         }
 
-        // Add silently the default output format if it is missing.
+        // Add silently the default output format if it is missing
         $default_format = $this->_get_default_output_format();
         if (!in_array($default_format, $supported_formats))
         {
@@ -833,9 +833,9 @@ protected function _detect_input_format()
     }
 
     /**
-     * Gets the default format from the configuration. Fallbacks to 'json'.
+     * Gets the default format from the configuration. Fallbacks to 'json'
      * if the corresponding configuration option $config['rest_default_format']
-     * is missing or is empty.
+     * is missing or is empty
      *
      * @access protected
      * @return string The default supported input format

From 0ee30d89c082f0c6c2fb184491a4c2a1a1ee43d7 Mon Sep 17 00:00:00 2001
From: ecowed <ed@ecow.co.uk>
Date: Wed, 2 Dec 2015 16:02:14 +0000
Subject: [PATCH 167/354] Update rest.php

Add the ability to use both authentication and API Keys
---
 application/config/rest.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/application/config/rest.php b/application/config/rest.php
index 15af4ed7..f86544a0 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -128,6 +128,17 @@
 */
 $config['auth_source'] = 'ldap';
 
+/*
+|--------------------------------------------------------------------------
+| Allow Authentication and API Keys
+|--------------------------------------------------------------------------
+|
+| Where you wish to have Basic, Digest or Session login, but also want to use API Keys (for limiting
+| requests etc), set to TRUE;
+|
+*/
+$config['allow_auth_and_keys'] = TRUE;
+
 /*
 |--------------------------------------------------------------------------
 | REST Login Class and Function

From bb3216c003650e1c435327dae69593817d1cfa4f Mon Sep 17 00:00:00 2001
From: ecowed <ed@ecow.co.uk>
Date: Wed, 2 Dec 2015 16:08:14 +0000
Subject: [PATCH 168/354] Update rest.php

Add to if statement on line 543 to allow both authentication and API Keys using a config item
---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index c528d5e5..32c094eb 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -540,7 +540,7 @@ public function __construct($config = 'rest')
         }
 
         // When there is no specific override for the current class/method, use the default auth value set in the config
-        if ($this->auth_override === FALSE && !($this->config->item('rest_enable_keys') && $this->_allow === TRUE))
+        if ($this->auth_override === FALSE && !($this->config->item('rest_enable_keys') && $this->_allow === TRUE) || ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE))
         {
             $rest_auth = strtolower($this->config->item('rest_auth'));
             switch ($rest_auth)

From 1db7161d0202ec2165e209f250f67afbd91f71f1 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Fri, 11 Dec 2015 19:10:08 +0200
Subject: [PATCH 169/354] PHP7 compatibility: Make the extended signature of
 the _remap() method to match to that in the CodeIgniter's user guide.

---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index c528d5e5..4857c761 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -590,7 +590,7 @@ public function __destruct()
      * @param  string $object_called
      * @param  array $arguments The arguments passed to the controller method
      */
-    public function _remap($object_called, $arguments)
+    public function _remap($object_called, $arguments = [])
     {
         // Should we answer if not over SSL?
         if ($this->config->item('force_https') && $this->request->ssl === FALSE)

From afd41c3ad06b18ea390c740365eebbde4d37a94e Mon Sep 17 00:00:00 2001
From: amtesistemas777 <amtesistemas777@hotmail.com>
Date: Wed, 16 Dec 2015 11:52:37 -0500
Subject: [PATCH 170/354] Create spanish

Spanish messages
---
 application/language/spanish | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 application/language/spanish

diff --git a/application/language/spanish b/application/language/spanish
new file mode 100644
index 00000000..962376c7
--- /dev/null
+++ b/application/language/spanish
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * Spanish language
+ */
+
+$lang['text_rest_invalid_api_key'] = 'API key %s No valida'; // %s is the REST API key
+$lang['text_rest_invalid_credentials'] = 'Credenciales Invalidas';
+$lang['text_rest_ip_denied'] = 'IP denegada';
+$lang['text_rest_ip_unauthorized'] = 'IP no autorizada';
+$lang['text_rest_unauthorized'] = 'Acceso no autorizado';
+$lang['text_rest_ajax_only'] = 'Solo peticiones ajax permitidas';
+$lang['text_rest_api_key_unauthorized'] = 'This API key does not have access to the requested controller';
+$lang['text_rest_api_key_permissions'] = 'This API key does not have enough permissions';
+$lang['text_rest_api_key_time_limit'] = 'This API key has reached the time limit for this method';
+$lang['text_rest_unknown_method'] = 'metodo desconocido';
+$lang['text_rest_unsupported'] = 'Protocolo no soportado';

From fc778e255d0beb415ce8462f54b7190450768cc1 Mon Sep 17 00:00:00 2001
From: Craine Runton <crunton@squaretwofinancial.com>
Date: Mon, 21 Dec 2015 15:42:10 -0700
Subject: [PATCH 171/354] Set the CORS configs in the rest.php config file

---
 application/config/rest.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/application/config/rest.php b/application/config/rest.php
index 15af4ed7..ff5a62ec 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -510,3 +510,19 @@
 |
 */
 $config['rest_language'] = 'english';
+
+/*
+|--------------------------------------------------------------------------
+| CORS Check
+|--------------------------------------------------------------------------
+|
+| Set to true to enable Cross-Origin Resource Sharing (CORS). Useful if you
+|  are hosting your API on a different domain from the appolication that 
+|  will access it through a browser. If true, set all the allowable domains
+|  within the array. 
+|
+| e.g. $config['allowed_origins'] = ['www.example.com', 'mobile.example.com']
+|
+*/
+$config['check_cors'] = false;
+$config['allowed_origins'] = [];

From e21dee0f61c9a97c30e707a27a68db8a09d2264c Mon Sep 17 00:00:00 2001
From: Craine Runton <crunton@squaretwofinancial.com>
Date: Mon, 21 Dec 2015 15:43:14 -0700
Subject: [PATCH 172/354] Create the _check_cors function to send the
 appropriate CORS headers

---
 application/libraries/REST_Controller.php | 25 +++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index c528d5e5..d159f4d8 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -2148,4 +2148,29 @@ protected function _check_access()
             ->num_rows() > 0;
     }
 
+    /**
+     * Check to see if presented user_id and API key match
+     *
+     * @access protected
+     * @return void
+     */
+    protected function _check_cors() 
+    {
+        // Store the HTTP Origin header, 
+        $origin = (isset($_SERVER['HTTP_ORIGIN']) ? $_SERVER['HTTP_ORIGIN'] : '');
+
+        // If the origin domain is in the allowed_origins list, then add the Access Control headers
+        if (in_array($origin, $this->config->item('allowed_origins'))) {
+            header('Access-Control-Allow-Origin: '.$origin);
+            header('Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method');
+            header('Access-Control-Allow-Methods: GET, POST, OPTIONS, PUT, PATCH, DELETE');
+        }
+
+        // If the request HTTP method is 'OPTIONS', kill the response and send it to the client
+        $method = $_SERVER['REQUEST_METHOD'];
+        if($method == "OPTIONS") {
+            die();
+        }
+    }
+
 }

From 3bddbb5f2aa4d4fa8598a3cacba36e04962d186e Mon Sep 17 00:00:00 2001
From: Craine Runton <crunton@squaretwofinancial.com>
Date: Mon, 21 Dec 2015 15:44:25 -0700
Subject: [PATCH 173/354] Call the _check_cors function during construction if
 the config is set to true

---
 application/libraries/REST_Controller.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index d159f4d8..1a385780 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -319,6 +319,13 @@ abstract class REST_Controller extends CI_Controller {
      */
     protected $_apiuser;
 
+    /**
+     * Whether or not to perform a CORS check and apply CORS headers to the request
+     *
+     * @var bool
+     */
+    protected $check_cors = NULL;
+
     /**
      * Enable XSS flag
      * Determines whether the XSS filter is always active when
@@ -457,6 +464,12 @@ public function __construct($config = 'rest')
         // How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS
         $this->request->method = $this->_detect_method();
 
+        // Check for CORS access request
+        $check_cors = $this->config->item('check_cors');
+        if ($check_cors === true) {
+          $this->_check_cors();
+        }
+
         // Create an argument container if it doesn't exist e.g. _get_args
         if (isset($this->{'_' . $this->request->method . '_args'}) === FALSE)
         {

From e7cfb45cddfd1da0485ea257d68af860bd7fbf37 Mon Sep 17 00:00:00 2001
From: Craine Runton <crunton@squaretwofinancial.com>
Date: Mon, 21 Dec 2015 15:56:05 -0700
Subject: [PATCH 174/354] Change config item name to make its purpose clearer

---
 application/config/rest.php               | 2 +-
 application/libraries/REST_Controller.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/config/rest.php b/application/config/rest.php
index ff5a62ec..ab808b63 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -525,4 +525,4 @@
 |
 */
 $config['check_cors'] = false;
-$config['allowed_origins'] = [];
+$config['allowed_cors_origins'] = [];
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 1a385780..2cfefaa8 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -2172,8 +2172,8 @@ protected function _check_cors()
         // Store the HTTP Origin header, 
         $origin = (isset($_SERVER['HTTP_ORIGIN']) ? $_SERVER['HTTP_ORIGIN'] : '');
 
-        // If the origin domain is in the allowed_origins list, then add the Access Control headers
-        if (in_array($origin, $this->config->item('allowed_origins'))) {
+        // If the origin domain is in the allowed_cors_origins list, then add the Access Control headers
+        if (in_array($origin, $this->config->item('allowed_cors_origins'))) {
             header('Access-Control-Allow-Origin: '.$origin);
             header('Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method');
             header('Access-Control-Allow-Methods: GET, POST, OPTIONS, PUT, PATCH, DELETE');

From 07cd8f9fe5de5d99fb0079c93130f31f9a9fcaa5 Mon Sep 17 00:00:00 2001
From: Craine Runton <crunton@squaretwofinancial.com>
Date: Mon, 21 Dec 2015 16:14:04 -0700
Subject: [PATCH 175/354] Separate the CORS config settings into their own
 blocks

---
 application/config/rest.php | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/application/config/rest.php b/application/config/rest.php
index ab808b63..e321d429 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -518,11 +518,22 @@
 |
 | Set to true to enable Cross-Origin Resource Sharing (CORS). Useful if you
 |  are hosting your API on a different domain from the appolication that 
-|  will access it through a browser. If true, set all the allowable domains
-|  within the array. 
+|  will access it through a browser. 
+|
+*/
+$config['check_cors'] = false;
+
+
+/*
+|--------------------------------------------------------------------------
+| CORS Allowable Domains
+|--------------------------------------------------------------------------
+|
+| Used if $config['check_cors'] is set to true and 
+|  $config['allow_any_cors_domain'] is set to false. Set all the allowable 
+|  domains within the array. 
 |
 | e.g. $config['allowed_origins'] = ['www.example.com', 'mobile.example.com']
 |
 */
-$config['check_cors'] = false;
 $config['allowed_cors_origins'] = [];

From 66d50d03c7b25f96743cd7c29e21e7b8c6efb9da Mon Sep 17 00:00:00 2001
From: Craine Runton <crunton@squaretwofinancial.com>
Date: Mon, 21 Dec 2015 16:14:32 -0700
Subject: [PATCH 176/354] Add a config to allow CORS from any source domain

---
 application/config/rest.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/application/config/rest.php b/application/config/rest.php
index e321d429..ff239f0f 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -523,6 +523,16 @@
 */
 $config['check_cors'] = false;
 
+/*
+|--------------------------------------------------------------------------
+| CORS Allow Any Domain
+|--------------------------------------------------------------------------
+|
+| Set to true to enable Cross-Origin Resource Sharing (CORS) from any
+|  source domain 
+|
+*/
+$config['allow_any_cors_domain'] = false;
 
 /*
 |--------------------------------------------------------------------------

From 5eb88d9a2167ad5b80f55dd6c3d080aba40ba8b0 Mon Sep 17 00:00:00 2001
From: Craine Runton <crunton@squaretwofinancial.com>
Date: Mon, 21 Dec 2015 16:15:30 -0700
Subject: [PATCH 177/354] Add a function to let the server use a wildcard in
 the Access-Control-Allow-Origin if the config item 'allow_any_cors_domain is
 set to true

---
 application/libraries/REST_Controller.php | 28 +++++++++++++++++------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 2cfefaa8..3ce058b9 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -2169,19 +2169,33 @@ protected function _check_access()
      */
     protected function _check_cors() 
     {
-        // Store the HTTP Origin header, 
-        $origin = (isset($_SERVER['HTTP_ORIGIN']) ? $_SERVER['HTTP_ORIGIN'] : '');
-
-        // If the origin domain is in the allowed_cors_origins list, then add the Access Control headers
-        if (in_array($origin, $this->config->item('allowed_cors_origins'))) {
-            header('Access-Control-Allow-Origin: '.$origin);
+        // If we want to allow any domain to access the API
+        if ($this->config->item('allow_any_cors_domain') === true)
+        {   
+            header('Access-Control-Allow-Origin: *');
             header('Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method');
             header('Access-Control-Allow-Methods: GET, POST, OPTIONS, PUT, PATCH, DELETE');
+        } 
+        // We're going to allow only certain domains access
+        else 
+        {        
+            // Store the HTTP Origin header
+            $origin = (isset($_SERVER['HTTP_ORIGIN']) ? $_SERVER['HTTP_ORIGIN'] : '');
+
+            // If the origin domain is in the allowed_cors_origins list, then add the Access Control headers
+            if (in_array($origin, $this->config->item('allowed_cors_origins')))
+            {
+                header('Access-Control-Allow-Origin: '.$origin);
+                header('Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method');
+                header('Access-Control-Allow-Methods: GET, POST, OPTIONS, PUT, PATCH, DELETE');
+            }
         }
 
         // If the request HTTP method is 'OPTIONS', kill the response and send it to the client
         $method = $_SERVER['REQUEST_METHOD'];
-        if($method == "OPTIONS") {
+
+        if ($method === 'OPTIONS')
+        {
             die();
         }
     }

From 595dffa5e2fdae3daf8e15b327f0bc6c40bca599 Mon Sep 17 00:00:00 2001
From: Craine Runton <craine.runton@gmail.com>
Date: Mon, 21 Dec 2015 21:00:16 -0700
Subject: [PATCH 178/354] Fix description and whitespace cleanup

---
 application/libraries/REST_Controller.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 3ce058b9..332eb593 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -2162,23 +2162,23 @@ protected function _check_access()
     }
 
     /**
-     * Check to see if presented user_id and API key match
+     * Checks allowed domains, and adds appropriate headers for HTTP access control (CORS)
      *
      * @access protected
      * @return void
      */
-    protected function _check_cors() 
+    protected function _check_cors()
     {
         // If we want to allow any domain to access the API
         if ($this->config->item('allow_any_cors_domain') === true)
-        {   
+        {
             header('Access-Control-Allow-Origin: *');
             header('Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method');
             header('Access-Control-Allow-Methods: GET, POST, OPTIONS, PUT, PATCH, DELETE');
-        } 
+        }
         // We're going to allow only certain domains access
-        else 
-        {        
+        else
+        {
             // Store the HTTP Origin header
             $origin = (isset($_SERVER['HTTP_ORIGIN']) ? $_SERVER['HTTP_ORIGIN'] : '');
 

From db979b16e3edf8aa5adbb48e569e80439f143e3b Mon Sep 17 00:00:00 2001
From: Craine Runton <craine.runton@gmail.com>
Date: Mon, 21 Dec 2015 21:02:02 -0700
Subject: [PATCH 179/354] Fix descriptions and whitespace cleanup

---
 application/config/rest.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/application/config/rest.php b/application/config/rest.php
index ff239f0f..626df5b8 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -517,8 +517,8 @@
 |--------------------------------------------------------------------------
 |
 | Set to true to enable Cross-Origin Resource Sharing (CORS). Useful if you
-|  are hosting your API on a different domain from the appolication that 
-|  will access it through a browser. 
+|  are hosting your API on a different domain from the appolication that
+|  will access it through a browser.
 |
 */
 $config['check_cors'] = false;
@@ -529,7 +529,7 @@
 |--------------------------------------------------------------------------
 |
 | Set to true to enable Cross-Origin Resource Sharing (CORS) from any
-|  source domain 
+|  source domain
 |
 */
 $config['allow_any_cors_domain'] = false;
@@ -539,11 +539,10 @@
 | CORS Allowable Domains
 |--------------------------------------------------------------------------
 |
-| Used if $config['check_cors'] is set to true and 
-|  $config['allow_any_cors_domain'] is set to false. Set all the allowable 
-|  domains within the array. 
+| Used if $config['check_cors'] is set to true and $config['allow_any_cors_domain']
+|  is set to false. Set all the allowable domains within the array.
 |
-| e.g. $config['allowed_origins'] = ['www.example.com', 'mobile.example.com']
+| e.g. $config['allowed_origins'] = ['www.example.com', 'spa.example.com']
 |
 */
 $config['allowed_cors_origins'] = [];

From a6b1f92f9cde8c323cb8425b465e634bf1412dd4 Mon Sep 17 00:00:00 2001
From: Craine Runton <craine.runton@gmail.com>
Date: Mon, 21 Dec 2015 22:04:02 -0700
Subject: [PATCH 180/354] Add allowable headers and methods config items, then
 call them to build the correct headers

---
 application/config/rest.php               | 35 +++++++++++++++++++++++
 application/libraries/REST_Controller.php | 14 +++++----
 2 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/application/config/rest.php b/application/config/rest.php
index 626df5b8..0c2267a7 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -523,6 +523,40 @@
 */
 $config['check_cors'] = false;
 
+/*
+|--------------------------------------------------------------------------
+| CORS Allowable Headers
+|--------------------------------------------------------------------------
+|
+| If using CORS checks, set the allowable headers here. Add any custom headers you may
+|  be using in tyou application to the array
+|
+*/
+$config['allowed_cors_headers'] = [
+  'Origin',
+  'X-Requested-With',
+  'Content-Type',
+  'Accept',
+  'Access-Control-Request-Method'
+];
+
+/*
+|--------------------------------------------------------------------------
+| CORS Allowable Methods
+|--------------------------------------------------------------------------
+|
+| If using CORS checks, you can set the methods you want to be allowed here.
+|
+*/
+$config['allowed_cors_methods'] = [
+  'GET',
+  'POST',
+  'OPTIONS',
+  'PUT',
+  'PATCH',
+  'DELETE'
+];
+
 /*
 |--------------------------------------------------------------------------
 | CORS Allow Any Domain
@@ -546,3 +580,4 @@
 |
 */
 $config['allowed_cors_origins'] = [];
+
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 332eb593..e3983d40 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -2169,12 +2169,16 @@ protected function _check_access()
      */
     protected function _check_cors()
     {
+        // Convert the config items into strings
+        $allowed_headers = implode(' ,', $this->config->item('allowed_cors_headers'));
+        $allowed_methods = implode(' ,', $this->config->item('allowed_cors_methods'));
+
         // If we want to allow any domain to access the API
         if ($this->config->item('allow_any_cors_domain') === true)
         {
             header('Access-Control-Allow-Origin: *');
-            header('Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method');
-            header('Access-Control-Allow-Methods: GET, POST, OPTIONS, PUT, PATCH, DELETE');
+            header('Access-Control-Allow-Headers: ' . $allowed_headers);
+            header('Access-Control-Allow-Methods: ' . $allowed_methods);
         }
         // We're going to allow only certain domains access
         else
@@ -2185,9 +2189,9 @@ protected function _check_cors()
             // If the origin domain is in the allowed_cors_origins list, then add the Access Control headers
             if (in_array($origin, $this->config->item('allowed_cors_origins')))
             {
-                header('Access-Control-Allow-Origin: '.$origin);
-                header('Access-Control-Allow-Headers: Origin, X-Requested-With, Content-Type, Accept, Access-Control-Request-Method');
-                header('Access-Control-Allow-Methods: GET, POST, OPTIONS, PUT, PATCH, DELETE');
+                header('Access-Control-Allow-Origin: ' . $origin);
+                header('Access-Control-Allow-Headers: ' . $allowed_headers);
+                header('Access-Control-Allow-Methods: ' . $allowed_methods);
             }
         }
 

From b70db372d5957d6af7cf5336c31a6aa97e9ffbca Mon Sep 17 00:00:00 2001
From: Craine Runton <craine.runton@gmail.com>
Date: Mon, 21 Dec 2015 22:09:12 -0700
Subject: [PATCH 181/354] Update config allowed_origins docblock to include
 protocol in example

---
 application/config/rest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/config/rest.php b/application/config/rest.php
index 0c2267a7..a16efde2 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -576,7 +576,7 @@
 | Used if $config['check_cors'] is set to true and $config['allow_any_cors_domain']
 |  is set to false. Set all the allowable domains within the array.
 |
-| e.g. $config['allowed_origins'] = ['www.example.com', 'spa.example.com']
+| e.g. $config['allowed_origins'] = ['http://www.example.com/', 'https://spa.example.com/']
 |
 */
 $config['allowed_cors_origins'] = [];

From 2e8217998b780563521611a2c933b48faa8904dc Mon Sep 17 00:00:00 2001
From: Mathieu Nayrolles <mathieu.nayrolles@gmail.com>
Date: Fri, 8 Jan 2016 17:12:01 -0500
Subject: [PATCH 182/354] Add french language support

I added support for the french language for codeigniter-restserver. The french version is a translation of the english one.
---
 application/language/french/index.html          | 11 +++++++++++
 .../language/french/rest_controller_lang.php    | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 application/language/french/index.html
 create mode 100644 application/language/french/rest_controller_lang.php

diff --git a/application/language/french/index.html b/application/language/french/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/language/french/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/french/rest_controller_lang.php b/application/language/french/rest_controller_lang.php
new file mode 100644
index 00000000..fb5727f5
--- /dev/null
+++ b/application/language/french/rest_controller_lang.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * French language
+ */
+
+$lang['text_rest_invalid_api_key'] = 'La clef d\'API %s est invalide'; // %s is the REST API key
+$lang['text_rest_invalid_credentials'] = 'Authentification invalide';
+$lang['text_rest_ip_denied'] = 'IP refusée';
+$lang['text_rest_ip_unauthorized'] = 'IP non-autorisée';
+$lang['text_rest_unauthorized'] = 'Non autorisé';
+$lang['text_rest_ajax_only'] = 'Seul les requêtes AJAX sont autorisées';
+$lang['text_rest_api_key_unauthorized'] = 'Cette clef d\'API n\'a pas accès au contrôleur demandé';
+$lang['text_rest_api_key_permissions'] = 'Cette clef d\'API n\'a pas les permissions requises';
+$lang['text_rest_api_key_time_limit'] = 'Cette clef d\'API a atteint sa limite de temps pour cette méthode';
+$lang['text_rest_unknown_method'] = 'Méthode inconnue';
+$lang['text_rest_unsupported'] = 'Protocole non-supporté';

From e65092c5628a7434cf2a2a1544f1c5bbb7d27f71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C4=81vis=20Mi=C4=8Dulis?=
 <DavisMiculis@users.noreply.github.com>
Date: Sun, 24 Jan 2016 15:13:34 +0200
Subject: [PATCH 183/354] Config file database structure missing field.

Added missing `user_id` field for `keys` database structure in rest config file.
---
 application/config/rest.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/config/rest.php b/application/config/rest.php
index 15af4ed7..2e644c9f 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -291,6 +291,7 @@
 | Default table schema:
 |   CREATE TABLE `keys` (
 |       `id` INT(11) NOT NULL AUTO_INCREMENT,
+|       `user_id` INT(11) NOT NULL,
 |       `key` VARCHAR(40) NOT NULL,
 |       `level` INT(2) NOT NULL,
 |       `ignore_limits` TINYINT(1) NOT NULL DEFAULT '0',

From 7ef3d345fa1a25790bb908c227f5cc2a1533e087 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 31 Jan 2016 00:01:29 +0200
Subject: [PATCH 184/354] Cached global functions

---
 application/views/rest_server.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/views/rest_server.php b/application/views/rest_server.php
index aab0b9d4..a6c3ce3f 100644
--- a/application/views/rest_server.php
+++ b/application/views/rest_server.php
@@ -124,6 +124,8 @@
     // Basic rest module using an IIFE as a way of enclosing private variables
     App.rest = (function (window, $) {
         // Fields
+        var _alert = window.alert;
+        var _JSON = window.JSON;
 
         // Cache the jQuery selector
         var _$ajax = null;
@@ -137,7 +139,7 @@
          */
         function _ajaxDone(data) {
             // The 'data' parameter is an array of objects that can be iterated over
-            window.alert(window.JSON.stringify(data, null, 2));
+            _alert(_JSON.stringify(data, null, 2));
         }
 
         /**
@@ -146,7 +148,7 @@ function _ajaxDone(data) {
          * @return {undefined}
          */
         function _ajaxFail() {
-            window.alert('Oh no! A problem with the Ajax request!');
+            _alert('Oh no! A problem with the Ajax request!');
         }
 
         /**
@@ -196,7 +198,7 @@ function _cacheDom() {
                 _bindEvents();
             }
         };
-    })(window, window.jQuery);
+    }(window, window.jQuery));
 
     // DOM ready event
     $(function () {

From 1afc0ce5d0c20205a0a33c0d0165a7952b5e6b38 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <kacerguis_christopher@bah.com>
Date: Sat, 30 Jan 2016 16:45:04 -0600
Subject: [PATCH 185/354] fixed bad pr with the spanish langauge setup

---
 application/language/spanish/index.html               | 11 +++++++++++
 .../{spanish => spanish/rest_controller_lang.php}     |  0
 2 files changed, 11 insertions(+)
 create mode 100644 application/language/spanish/index.html
 rename application/language/{spanish => spanish/rest_controller_lang.php} (100%)

diff --git a/application/language/spanish/index.html b/application/language/spanish/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/language/spanish/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/spanish b/application/language/spanish/rest_controller_lang.php
similarity index 100%
rename from application/language/spanish
rename to application/language/spanish/rest_controller_lang.php

From 3dc075bfee26d6a0855cf5e5472ecef22c164115 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 6 Feb 2016 10:52:48 +0200
Subject: [PATCH 186/354] Updated API before possible release

Related #609
---
 application/config/routes.php                 |    2 +-
 application/controllers/Welcome.php           |    2 +-
 application/libraries/Format.php              |   10 +-
 application/libraries/REST_Controller.php     |   44 +-
 application/views/rest_server.php             |   32 +-
 application/views/welcome_message.php         |    2 +-
 documentation/class-Example.html              |    1 +
 documentation/class-Key.html                  |    1 +
 documentation/class-REST_Controller.html      |  224 +-
 documentation/class-Welcome.html              |    8 +-
 documentation/source-class-Format.html        |   32 +-
 documentation/source-class-Key.html           |    2 +-
 .../source-class-REST_Controller.html         | 3383 +++++++++--------
 documentation/source-class-Welcome.html       |    4 +-
 14 files changed, 1919 insertions(+), 1828 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index 5cbeb064..f2d051f7 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -19,7 +19,7 @@
 |
 | Please see the user guide for complete details:
 |
-| http://codeigniter.com/user_guide/general/routing.html
+| https://codeigniter.com/user_guide/general/routing.html
 |
 | -------------------------------------------------------------------------
 | RESERVED ROUTES
diff --git a/application/controllers/Welcome.php b/application/controllers/Welcome.php
index d16a4dee..59818c7f 100644
--- a/application/controllers/Welcome.php
+++ b/application/controllers/Welcome.php
@@ -16,7 +16,7 @@ class Welcome extends CI_Controller {
 	 *
 	 * So any other public methods not prefixed with an underscore will
 	 * map to /index.php/welcome/<method_name>
-	 * @see http://codeigniter.com/user_guide/general/urls.html
+	 * @see https://codeigniter.com/user_guide/general/urls.html
 	 */
 	public function index()
 	{
diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 0d3bf773..4f058e25 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -91,13 +91,13 @@ public function __construct($data = NULL, $from_type = NULL)
         // If the provided data is already formatted we should probably convert it to an array
         if ($from_type !== NULL)
         {
-            if (method_exists($this, '_from_' . $from_type))
+            if (method_exists($this, '_from_'.$from_type))
             {
-                $data = call_user_func([$this, '_from_' . $from_type], $data);
+                $data = call_user_func([$this, '_from_'.$from_type], $data);
             }
             else
             {
-                throw new Exception('Format class does not support conversion from "' . $from_type . '".');
+                throw new Exception('Format class does not support conversion from "'.$from_type.'".');
             }
         }
 
@@ -416,12 +416,12 @@ public function to_json($data = NULL)
         elseif (preg_match('/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i', $callback))
         {
             // Return the data as encoded json with a callback
-            return $callback . '(' . json_encode($data) . ');';
+            return $callback.'('.json_encode($data).');';
         }
 
         // An invalid jsonp callback function provided.
         // Though I don't believe this should be hardcoded here
-        $data['warning'] = 'INVALID JSONP CALLBACK: ' . $callback;
+        $data['warning'] = 'INVALID JSONP CALLBACK: '.$callback;
 
         return json_encode($data);
     }
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index ea4bbcce..be69f2d5 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -381,7 +381,7 @@ public function __construct($config = 'rest')
         if (is_php('5.4') === FALSE)
         {
             // CodeIgniter 3 is recommended for v5.4 or above
-            throw new Exception('Using PHP v' . PHP_VERSION . ', though PHP v5.4 or greater is required');
+            throw new Exception('Using PHP v'.PHP_VERSION.', though PHP v5.4 or greater is required');
         }
 
         // Check to see if this is CI 3.x
@@ -458,9 +458,9 @@ public function __construct($config = 'rest')
         $this->request->method = $this->_detect_method();
 
         // Create an argument container if it doesn't exist e.g. _get_args
-        if (isset($this->{'_' . $this->request->method . '_args'}) === FALSE)
+        if (isset($this->{'_'.$this->request->method.'_args'}) === FALSE)
         {
-            $this->{'_' . $this->request->method . '_args'} = [];
+            $this->{'_'.$this->request->method.'_args'} = [];
         }
 
         // Set up the query parameters
@@ -482,7 +482,7 @@ public function __construct($config = 'rest')
         {
             $this->request->body = $this->format->factory($this->request->body, $this->request->format)->to_array();
             // Assign payload arguments to proper method container
-            $this->{'_' . $this->request->method . '_args'} = $this->request->body;
+            $this->{'_'.$this->request->method.'_args'} = $this->request->body;
         }
 
         // Merge both for one mega-args variable
@@ -494,7 +494,7 @@ public function __construct($config = 'rest')
             $this->_put_args,
             $this->_post_args,
             $this->_delete_args,
-            $this->{'_' . $this->request->method . '_args'}
+            $this->{'_'.$this->request->method.'_args'}
         );
 
         // Which format should the data be returned in?
@@ -602,9 +602,9 @@ public function _remap($object_called, $arguments = [])
         }
 
         // Remove the supported format from the function name e.g. index.json => index
-        $object_called = preg_replace('/^(.*)\.(?:' . implode('|', array_keys($this->_supported_formats)) . ')$/', '$1', $object_called);
+        $object_called = preg_replace('/^(.*)\.(?:'.implode('|', array_keys($this->_supported_formats)).')$/', '$1', $object_called);
 
-        $controller_method = $object_called . '_' . $this->request->method;
+        $controller_method = $object_called.'_'.$this->request->method;
 
         // Do we want to log this method (if allowed by config)?
         $log_method = !(isset($this->methods[$controller_method]['log']) && $this->methods[$controller_method]['log'] === FALSE);
@@ -855,7 +855,7 @@ protected function _get_default_output_format()
     protected function _detect_output_format()
     {
         // Concatenate formats to a regex pattern e.g. \.(csv|json|xml)
-        $pattern = '/\.(' . implode('|', array_keys($this->_supported_formats)) . ')($|\/)/';
+        $pattern = '/\.('.implode('|', array_keys($this->_supported_formats)).')($|\/)/';
         $matches = [];
 
         // Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2
@@ -1120,7 +1120,7 @@ protected function _check_limit($controller_method)
             {
                 $limited_uri = substr($limited_uri,0, -strlen($this->response->format) - 1);
             }
-            $limited_uri = 'uri:' . $limited_uri . ':' . $this->request->method; // It's good to differentiate GET from PUT
+            $limited_uri = 'uri:'.$limited_uri.':'.$this->request->method; // It's good to differentiate GET from PUT
             $limited_method_name = $controller_method;
             break;
         }
@@ -1722,11 +1722,11 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
         $ldapconn = ldap_connect($ldap['host'], $ldap['port']);
         if ($ldapconn)
         {
-            log_message('debug', 'Setting timeout to ' . $ldap['timeout'] . ' seconds');
+            log_message('debug', 'Setting timeout to '.$ldap['timeout'].' seconds');
 
             ldap_set_option($ldapconn, LDAP_OPT_NETWORK_TIMEOUT, $ldap['timeout']);
 
-            log_message('debug', 'LDAP Auth: Binding to ' . $ldap['host'] . ' with dn ' . $ldap['rdn']);
+            log_message('debug', 'LDAP Auth: Binding to '.$ldap['host'].' with dn '.$ldap['rdn']);
 
             // Binding to the ldap server
             $ldapbind = ldap_bind($ldapconn, $ldap['rdn'], $ldap['pass']);
@@ -1744,13 +1744,13 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
         // Search for user
         if (($res_id = ldap_search($ldapconn, $ldap['basedn'], "uid=$username")) === FALSE)
         {
-            log_message('error', 'LDAP Auth: User ' . $username . ' not found in search');
+            log_message('error', 'LDAP Auth: User '.$username.' not found in search');
             return FALSE;
         }
 
         if (ldap_count_entries($ldapconn, $res_id) !== 1)
         {
-            log_message('error', 'LDAP Auth: Failure, username ' . $username . 'found more than once');
+            log_message('error', 'LDAP Auth: Failure, username '.$username.'found more than once');
             return FALSE;
         }
 
@@ -1773,7 +1773,7 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
             return FALSE;
         }
 
-        log_message('debug', 'LDAP Auth: Success ' . $user_dn . ' authenticated successfully');
+        log_message('debug', 'LDAP Auth: Success '.$user_dn.' authenticated successfully');
 
         $this->_user_ldap_dn = $user_dn;
 
@@ -1843,7 +1843,7 @@ protected function _check_login($username = NULL, $password = FALSE)
         if (!$this->config->item('auth_source') && $rest_auth === 'digest')
         {
             // For digest we do not have a password passed as argument
-            return md5($username . ':' . $this->config->item('rest_realm') . ':' . (isset($valid_logins[$username]) ? $valid_logins[$username] : ''));
+            return md5($username.':'.$this->config->item('rest_realm').':'.(isset($valid_logins[$username]) ? $valid_logins[$username] : ''));
         }
 
         if ($password === FALSE)
@@ -1977,15 +1977,15 @@ protected function _prepare_digest_auth()
         preg_match_all('@(username|nonce|uri|nc|cnonce|qop|response)=[\'"]?([^\'",]+)@', $digest_string, $matches);
         $digest = (empty($matches[1]) || empty($matches[2])) ? [] : array_combine($matches[1], $matches[2]);
 
-        // For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config
+        // For digest authentication the library function should return already stored md5(username:restrealm:password) for that username see rest.php::auth_library_function config
         $username = $this->_check_login($digest['username'], TRUE);
         if (array_key_exists('username', $digest) === FALSE || $username === FALSE)
         {
             $this->_force_login($unique_id);
         }
 
-        $md5 = md5(strtoupper($this->request->method) . ':' . $digest['uri']);
-        $valid_response = md5($username . ':' . $digest['nonce'] . ':' . $digest['nc'] . ':' . $digest['cnonce'] . ':' . $digest['qop'] . ':' . $md5);
+        $md5 = md5(strtoupper($this->request->method).':'.$digest['uri']);
+        $valid_response = md5($username.':'.$digest['nonce'].':'.$digest['nc'].':'.$digest['cnonce'].':'.$digest['qop'].':'.$md5);
 
         // Check if the string don't compare (case-insensitive)
         if (strcasecmp($digest['response'], $valid_response) !== 0)
@@ -2063,15 +2063,15 @@ protected function _force_login($nonce = '')
         if (strtolower($rest_auth) === 'basic')
         {
             // See http://tools.ietf.org/html/rfc2617#page-5
-            header('WWW-Authenticate: Basic realm="' . $rest_realm . '"');
+            header('WWW-Authenticate: Basic realm="'.$rest_realm.'"');
         }
         elseif (strtolower($rest_auth) === 'digest')
         {
             // See http://tools.ietf.org/html/rfc2617#page-18
             header(
-                'WWW-Authenticate: Digest realm="' . $rest_realm
-                . '", qop="auth", nonce="' . $nonce
-                . '", opaque="' . md5($rest_realm) . '"');
+                'WWW-Authenticate: Digest realm="'.$rest_realm
+                .'", qop="auth", nonce="'.$nonce
+                .'", opaque="' . md5($rest_realm).'"');
         }
 
         // Display an error response
diff --git a/application/views/rest_server.php b/application/views/rest_server.php
index a6c3ce3f..5212e6da 100644
--- a/application/views/rest_server.php
+++ b/application/views/rest_server.php
@@ -112,17 +112,17 @@
 
     </div>
 
-    <p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>' . CI_VERSION . '</strong>' : '' ?></p>
+    <p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>'.CI_VERSION.'</strong>' : '' ?></p>
 </div>
 
-<script src="https://code.jquery.com/jquery-1.11.3.js"></script>
+<script src="https://code.jquery.com/jquery-1.12.0.js"></script>
 
 <script>
     // Create an 'App' namespace
     var App = App || {};
 
     // Basic rest module using an IIFE as a way of enclosing private variables
-    App.rest = (function (window, $) {
+    App.rest = (function restModule(window) {
         // Fields
         var _alert = window.alert;
         var _JSON = window.JSON;
@@ -130,6 +130,9 @@
         // Cache the jQuery selector
         var _$ajax = null;
 
+        // Cache the jQuery object
+        var $ = null;
+
         // Methods (private)
 
         /**
@@ -154,13 +157,13 @@ function _ajaxFail() {
         /**
          * On Ajax request
          *
-         * @param {HTMLElement} $this Current element selected
+         * @param {jQuery} $element Current element selected
          * @return {undefined}
          */
-        function _ajaxEvent($this) {
+        function _ajaxEvent($element) {
             $.ajax({
                     // URL from the link that was 'clicked' on
-                    url: $this.attr('href')
+                    url: $element.attr('href')
                 })
                 .done(_ajaxDone)
                 .fail(_ajaxFail);
@@ -192,20 +195,27 @@ function _cacheDom() {
 
         // Public API
         return {
-            init: function () {
+            /**
+             * Initialise the following module
+             *
+             * @param {object} jQuery Reference to jQuery
+             * @return {undefined}
+             */
+            init: function init(jQuery) {
+                $ = jQuery;
+
                 // Cache the DOM and bind event(s)
                 _cacheDom();
                 _bindEvents();
             }
         };
-    }(window, window.jQuery));
+    }(window));
 
     // DOM ready event
-    $(function () {
+    $(function domReady($) {
         // Initialise the App module
-        App.rest.init();
+        App.rest.init($);
     });
-
 </script>
 
 </body>
diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php
index 69acde90..7a407656 100644
--- a/application/views/welcome_message.php
+++ b/application/views/welcome_message.php
@@ -92,7 +92,7 @@
         <?php endif ?>
     </div>
 
-    <p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>' . CI_VERSION . '</strong>' : '' ?></p>
+    <p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>'.CI_VERSION.'</strong>' : '' ?></p>
 </div>
 
 </body>
diff --git a/documentation/class-Example.html b/documentation/class-Example.html
index e8af6477..18482b73 100644
--- a/documentation/class-Example.html
+++ b/documentation/class-Example.html
@@ -294,6 +294,7 @@ <h4>Overrides</h4>
 			<a href="http://github.com/class-REST_Controller.html#__detect_method">_detect_method()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_output_format">_detect_output_format()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__force_login">_force_login()</a>, 
+			<a href="http://github.com/class-REST_Controller.html#__get_default_output_format">_get_default_output_format()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__log_access_time">_log_access_time()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__log_request">_log_request()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__log_response_code">_log_response_code()</a>, 
diff --git a/documentation/class-Key.html b/documentation/class-Key.html
index 540d7d3e..957df227 100644
--- a/documentation/class-Key.html
+++ b/documentation/class-Key.html
@@ -317,6 +317,7 @@ <h1>Class Key</h1>
 			<a href="http://github.com/class-REST_Controller.html#__detect_method">_detect_method()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_output_format">_detect_output_format()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__force_login">_force_login()</a>, 
+			<a href="http://github.com/class-REST_Controller.html#__get_default_output_format">_get_default_output_format()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__log_access_time">_log_access_time()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__log_request">_log_request()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__log_response_code">_log_response_code()</a>, 
diff --git a/documentation/class-REST_Controller.html b/documentation/class-REST_Controller.html
index fc94cfdb..34c4d2aa 100644
--- a/documentation/class-REST_Controller.html
+++ b/documentation/class-REST_Controller.html
@@ -137,7 +137,7 @@ <h4>Direct known subclasses</h4>
 				3.0.0<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-2110" title="Go to source code">libraries/REST_Controller.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-2151" title="Go to source code">libraries/REST_Controller.php</a>
 		<br>
 	</div>
 
@@ -187,7 +187,7 @@ <h4>Direct known subclasses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___construct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#365-539" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#365-563" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
 
 		<div class="description short">
 			<p>Constructor for the REST API</p>
@@ -223,7 +223,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___destruct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#541-558" title="Go to source code">__destruct</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#565-582" title="Go to source code">__destruct</a>( )</code>
 
 		<div class="description short">
 			<p>Deconstructor</p>
@@ -257,18 +257,18 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__remap">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#560-677" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#584-701" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var> = []</span> )</code>
 
 		<div class="description short">
 			<p>Requests are not made to methods directly, the request will be for
 an "object". This simply maps the object and method to the correct
-Controller method.</p>
+Controller method</p>
 		</div>
 
 		<div class="description detailed hidden">
 			<p>Requests are not made to methods directly, the request will be for
 an "object". This simply maps the object and method to the correct
-Controller method.</p>
+Controller method</p>
 
 
 				<h4>Parameters</h4>
@@ -276,7 +276,7 @@ <h4>Parameters</h4>
 					<dt><var>$object_called</var></dt>
 					<dd></dd>
 					<dt><var>$arguments</var></dt>
-					<dd>The arguments passed to the controller method.</dd>
+					<dd>The arguments passed to the controller method</dd>
 				</dl></div>
 
 
@@ -298,7 +298,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#679-760" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#703-784" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Takes mixed data and optionally a status code, then creates the response</p>
@@ -338,20 +338,20 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_set_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#762-775" title="Go to source code">set_response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#786-799" title="Go to source code">set_response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Takes mixed data and optionally a status code, then creates the response
 within the buffers of the Output class. The response is sent to the client
 lately by the framework, after the current controller's method termination.
-All the hooks after the controller's method termination are executable.</p>
+All the hooks after the controller's method termination are executable</p>
 		</div>
 
 		<div class="description detailed hidden">
 			<p>Takes mixed data and optionally a status code, then creates the response
 within the buffers of the Output class. The response is sent to the client
 lately by the framework, after the current controller's method termination.
-All the hooks after the controller's method termination are executable.</p>
+All the hooks after the controller's method termination are executable</p>
 
 
 				<h4>Parameters</h4>
@@ -381,7 +381,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_input_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#777-809" title="Go to source code">_detect_input_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#801-833" title="Go to source code">_detect_input_format</a>( )</code>
 
 		<div class="description short">
 			<p>Get the input format e.g. json or xml</p>
@@ -400,6 +400,44 @@ <h4>Returns</h4>
 
 
 
+		</div>
+		</div></td>
+	</tr>
+	<tr data-order="_get_default_output_format" id="__get_default_output_format">
+
+		<td class="attributes"><code>
+			 protected 
+
+			string
+			
+			</code>
+		</td>
+
+		<td class="name"><div>
+		<a class="anchor" href="#__get_default_output_format">#</a>
+		<code><a href="http://github.com/source-class-REST_Controller.html#835-847" title="Go to source code">_get_default_output_format</a>( )</code>
+
+		<div class="description short">
+			<p>Gets the default format from the configuration. Fallbacks to 'json'
+if the corresponding configuration option $config['rest_default_format']
+is missing or is empty</p>
+		</div>
+
+		<div class="description detailed hidden">
+			<p>Gets the default format from the configuration. Fallbacks to 'json'
+if the corresponding configuration option $config['rest_default_format']
+is missing or is empty</p>
+
+
+
+				<h4>Returns</h4>
+				<div class="list">
+					string<br>The default supported input format
+				</div>
+
+
+
+
 		</div>
 		</div></td>
 	</tr>
@@ -415,7 +453,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_output_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#811-880" title="Go to source code">_detect_output_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#849-918" title="Go to source code">_detect_output_format</a>( )</code>
 
 		<div class="description short">
 			<p>Detect which format should be used to output the data</p>
@@ -449,7 +487,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_method">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#882-912" title="Go to source code">_detect_method</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#920-950" title="Go to source code">_detect_method</a>( )</code>
 
 		<div class="description short">
 			<p>Get the HTTP request string e.g. get or post</p>
@@ -483,7 +521,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_api_key">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#914-986" title="Go to source code">_detect_api_key</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#952-1024" title="Go to source code">_detect_api_key</a>( )</code>
 
 		<div class="description short">
 			<p>See if the user has provided an API key</p>
@@ -517,7 +555,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_lang">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#988-1020" title="Go to source code">_detect_lang</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1026-1058" title="Go to source code">_detect_lang</a>( )</code>
 
 		<div class="description short">
 			<p>Preferred return language</p>
@@ -551,7 +589,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_request">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1022-1048" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1060-1086" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Add the request to the log table</p>
@@ -590,7 +628,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_limit">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1050-1150" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1088-1188" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
 
 		<div class="description short">
 			<p>Check if the requests to a controller method exceed a limit</p>
@@ -629,7 +667,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__auth_override_check">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1152-1310" title="Go to source code">_auth_override_check</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1190-1380" title="Go to source code">_auth_override_check</a>( )</code>
 
 		<div class="description short">
 			<p>Check if there is a specific auth type set for the current class/method/HTTP-method being called</p>
@@ -663,7 +701,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1312-1322" title="Go to source code">_parse_get</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1382-1392" title="Go to source code">_parse_get</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the GET request arguments</p>
@@ -693,7 +731,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1324-1338" title="Go to source code">_parse_post</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1394-1408" title="Go to source code">_parse_post</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the POST request arguments</p>
@@ -723,7 +761,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1340-1360" title="Go to source code">_parse_put</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1410-1427" title="Go to source code">_parse_put</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PUT request arguments</p>
@@ -753,7 +791,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1362-1375" title="Go to source code">_parse_head</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1429-1442" title="Go to source code">_parse_head</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the HEAD request arguments</p>
@@ -783,7 +821,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1377-1390" title="Go to source code">_parse_options</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1444-1457" title="Go to source code">_parse_options</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the OPTIONS request arguments</p>
@@ -813,7 +851,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1392-1413" title="Go to source code">_parse_patch</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1459-1477" title="Go to source code">_parse_patch</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PATCH request arguments</p>
@@ -843,7 +881,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1415-1428" title="Go to source code">_parse_delete</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1479-1492" title="Go to source code">_parse_delete</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the DELETE request arguments</p>
@@ -873,7 +911,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1430-1462" title="Go to source code">_parse_query</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1494-1503" title="Go to source code">_parse_query</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the query parameters</p>
@@ -903,7 +941,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1466-1483" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1507-1524" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a GET request</p>
@@ -945,7 +983,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1485-1502" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1526-1543" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a OPTIONS request</p>
@@ -987,7 +1025,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1504-1521" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1545-1562" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a HEAD request</p>
@@ -1029,7 +1067,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1523-1540" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1564-1581" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a POST request</p>
@@ -1071,7 +1109,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1542-1559" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1583-1600" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PUT request</p>
@@ -1113,7 +1151,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1561-1578" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1602-1619" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a DELETE request</p>
@@ -1155,7 +1193,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1580-1597" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1621-1638" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PATCH request</p>
@@ -1197,7 +1235,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1599-1616" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1640-1657" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from the query parameters</p>
@@ -1239,16 +1277,16 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__xss_clean">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1618-1632" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1659-1673" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
 
 		<div class="description short">
 			<p>Sanitizes data so that Cross Site Scripting Hacks can be
-prevented.</p>
+prevented</p>
 		</div>
 
 		<div class="description detailed hidden">
 			<p>Sanitizes data so that Cross Site Scripting Hacks can be
-prevented.</p>
+prevented</p>
 
 
 				<h4>Parameters</h4>
@@ -1282,7 +1320,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_validation_errors">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1634-1645" title="Go to source code">validation_errors</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1675-1686" title="Go to source code">validation_errors</a>( )</code>
 
 		<div class="description short">
 			<p>Retrieve the validation errors</p>
@@ -1316,7 +1354,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_ldap_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1649-1742" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1690-1783" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform LDAP Authentication</p>
@@ -1357,7 +1395,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_library_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1744-1781" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1785-1822" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform Library Authentication - Override this function to change the way the library is called</p>
@@ -1398,7 +1436,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1783-1838" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1824-1879" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Check if the user is logged in</p>
@@ -1439,7 +1477,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_php_session">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1840-1860" title="Go to source code">_check_php_session</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1881-1901" title="Go to source code">_check_php_session</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the user is logged in with a PHP session key</p>
@@ -1469,7 +1507,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_basic_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1862-1901" title="Go to source code">_prepare_basic_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1903-1942" title="Go to source code">_prepare_basic_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for basic authentication</p>
@@ -1499,7 +1537,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_digest_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1903-1958" title="Go to source code">_prepare_digest_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1944-1999" title="Go to source code">_prepare_digest_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for digest authentication</p>
@@ -1529,7 +1567,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_blacklist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1960-1980" title="Go to source code">_check_blacklist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2001-2021" title="Go to source code">_check_blacklist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response</p>
@@ -1559,7 +1597,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_whitelist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1982-2008" title="Go to source code">_check_whitelist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2023-2049" title="Go to source code">_check_whitelist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response</p>
@@ -1589,7 +1627,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__force_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2010-2041" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2051-2082" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
 
 		<div class="description short">
 			<p>Force logging in by setting the WWW-Authenticate header</p>
@@ -1625,7 +1663,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_access_time">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2043-2058" title="Go to source code">_log_access_time</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2084-2099" title="Go to source code">_log_access_time</a>( )</code>
 
 		<div class="description short">
 			<p>Updates the log table with the total access time</p>
@@ -1663,7 +1701,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_response_code">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2060-2076" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2101-2117" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
 
 		<div class="description short">
 			<p>Updates the log table with HTTP response code</p>
@@ -1706,7 +1744,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_access">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2078-2108" title="Go to source code">_check_access</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2119-2149" title="Go to source code">_check_access</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the API key has access to the controller and methods</p>
@@ -3204,13 +3242,13 @@ <h4>Returns</h4>
 				<a href="http://github.com/source-class-REST_Controller.html#152-158" title="Go to source code"><var>$rest_format</var></a>
 
 			<div class="description short">
-				<p>This defines the rest format.
-Must be overridden it in a controller so that it is set.</p>
+				<p>This defines the rest format
+Must be overridden it in a controller so that it is set</p>
 			</div>
 
 			<div class="description detailed hidden">
-				<p>This defines the rest format.
-Must be overridden it in a controller so that it is set.</p>
+				<p>This defines the rest format
+Must be overridden it in a controller so that it is set</p>
 
 			</div>
 		</td>
@@ -3408,31 +3446,6 @@ <h4>Returns</h4>
 			</div>
 		</td>
 	</tr>
-	<tr data-order="_insert_id" id="$_insert_id">
-		<td class="attributes"><code>
-			protected  
-			string
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#215-220" title="Go to source code"><var>$_insert_id</var></a>
-
-			<div class="description short">
-				<p>The insert_id of the log entry (if we have one)</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The insert_id of the log entry (if we have one)</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_insert_id" class="anchor">#</a>
-				<code><span class="php-quote">''</span></code>
-			</div>
-		</td>
-	</tr>
 	<tr data-order="_put_args" id="$_put_args">
 		<td class="attributes"><code>
 			protected  
@@ -3440,7 +3453,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#222-227" title="Go to source code"><var>$_put_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#215-220" title="Go to source code"><var>$_put_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the PUT request method</p>
@@ -3465,7 +3478,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#229-234" title="Go to source code"><var>$_delete_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#222-227" title="Go to source code"><var>$_delete_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the DELETE request method</p>
@@ -3490,7 +3503,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#236-241" title="Go to source code"><var>$_patch_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#229-234" title="Go to source code"><var>$_patch_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the PATCH request method</p>
@@ -3515,7 +3528,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#243-248" title="Go to source code"><var>$_head_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#236-241" title="Go to source code"><var>$_head_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the HEAD request method</p>
@@ -3540,7 +3553,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#250-255" title="Go to source code"><var>$_options_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#243-248" title="Go to source code"><var>$_options_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the OPTIONS request method</p>
@@ -3565,7 +3578,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#257-262" title="Go to source code"><var>$_query_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#250-255" title="Go to source code"><var>$_query_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the query parameters</p>
@@ -3590,7 +3603,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#264-269" title="Go to source code"><var>$_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#257-262" title="Go to source code"><var>$_args</var></a>
 
 			<div class="description short">
 				<p>The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined</p>
@@ -3608,6 +3621,31 @@ <h4>Returns</h4>
 			</div>
 		</td>
 	</tr>
+	<tr data-order="_insert_id" id="$_insert_id">
+		<td class="attributes"><code>
+			protected  
+			string
+		</code></td>
+
+		<td class="name">
+				<a href="http://github.com/source-class-REST_Controller.html#264-269" title="Go to source code"><var>$_insert_id</var></a>
+
+			<div class="description short">
+				<p>The insert_id of the log entry (if we have one)</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The insert_id of the log entry (if we have one)</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#$_insert_id" class="anchor">#</a>
+				<code><span class="php-quote">''</span></code>
+			</div>
+		</td>
+	</tr>
 	<tr data-order="_allow" id="$_allow">
 		<td class="attributes"><code>
 			protected  
@@ -3618,11 +3656,11 @@ <h4>Returns</h4>
 				<a href="http://github.com/source-class-REST_Controller.html#271-276" title="Go to source code"><var>$_allow</var></a>
 
 			<div class="description short">
-				<p>If the request is allowed based on the API key provided.</p>
+				<p>If the request is allowed based on the API key provided</p>
 			</div>
 
 			<div class="description detailed hidden">
-				<p>If the request is allowed based on the API key provided.</p>
+				<p>If the request is allowed based on the API key provided</p>
 
 			</div>
 		</td>
@@ -3779,15 +3817,15 @@ <h4>Returns</h4>
 			<div class="description short">
 				<p>Enable XSS flag
 Determines whether the XSS filter is always active when
-GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered.
-Set automatically based on config setting.</p>
+GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered
+Set automatically based on config setting</p>
 			</div>
 
 			<div class="description detailed hidden">
 				<p>Enable XSS flag
 Determines whether the XSS filter is always active when
-GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered.
-Set automatically based on config setting.</p>
+GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered
+Set automatically based on config setting</p>
 
 			</div>
 		</td>
diff --git a/documentation/class-Welcome.html b/documentation/class-Welcome.html
index 2ba710ee..cb9f0f28 100644
--- a/documentation/class-Welcome.html
+++ b/documentation/class-Welcome.html
@@ -149,9 +149,9 @@ <h1>Class Welcome</h1>
 		<div class="description detailed hidden">
 			<p>Index Page for this controller.</p>
 
-<p>Maps to the following URL
-http://example.com/index.php/welcome - or -
-http://example.com/index.php/welcome/index - or -
+<p>Maps to the following URL http://example.com/index.php/welcome
+- or - http://example.com/index.php/welcome/index
+- or -
 Since this controller is set as the default controller in
 config/routes.php, it's displayed at http://example.com/</p>
 
@@ -164,7 +164,7 @@ <h1>Class Welcome</h1>
 
 				<h4>See</h4>
 				<div class="list">
-						http://codeigniter.com/user_guide/general/urls.html<br>
+						https://codeigniter.com/user_guide/general/urls.html<br>
 				</div>
 
 
diff --git a/documentation/source-class-Format.html b/documentation/source-class-Format.html
index 050cbd84..d1b5353d 100644
--- a/documentation/source-class-Format.html
+++ b/documentation/source-class-Format.html
@@ -150,7 +150,7 @@ <h3>Classes</h3>
 </span></span><span id="56" class="l"><a href="#56"> 56: </a><span class="php-comment">     *
 </span></span><span id="57" class="l"><a href="#57"> 57: </a><span class="php-comment">     * @var object
 </span></span><span id="58" class="l"><a href="#58"> 58: </a><span class="php-comment">     */</span>
-</span><span id="59" class="l"><a href="#59"> 59: </a>    <span class="php-keyword1">private</span> <span class="php-var">$_ci</span>;
+</span><span id="59" class="l"><a href="#59"> 59: </a>    <span class="php-keyword1">private</span> <span class="php-var">$_CI</span>;
 </span><span id="60" class="l"><a href="#60"> 60: </a>
 </span><span id="61" class="l"><a href="#61"> 61: </a>    <span class="php-comment">/**
 </span></span><span id="62" class="l"><a href="#62"> 62: </a><span class="php-comment">     * Data to parse
@@ -177,21 +177,21 @@ <h3>Classes</h3>
 </span><span id="83" class="l"><a href="#83"> 83: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$from_type</span> = <span class="php-keyword1">NULL</span>)
 </span><span id="84" class="l"><a href="#84"> 84: </a>    {
 </span><span id="85" class="l"><a href="#85"> 85: </a>        <span class="php-comment">// Get the CodeIgniter reference</span>
-</span><span id="86" class="l"><a href="#86"> 86: </a>        <span class="php-var">$this</span>-&gt;_ci = &amp;get_instance();
+</span><span id="86" class="l"><a href="#86"> 86: </a>        <span class="php-var">$this</span>-&gt;_CI = &amp;get_instance();
 </span><span id="87" class="l"><a href="#87"> 87: </a>
 </span><span id="88" class="l"><a href="#88"> 88: </a>        <span class="php-comment">// Load the inflector helper</span>
-</span><span id="89" class="l"><a href="#89"> 89: </a>        <span class="php-var">$this</span>-&gt;_ci-&gt;load-&gt;helper(<span class="php-quote">'inflector'</span>);
+</span><span id="89" class="l"><a href="#89"> 89: </a>        <span class="php-var">$this</span>-&gt;_CI-&gt;load-&gt;helper(<span class="php-quote">'inflector'</span>);
 </span><span id="90" class="l"><a href="#90"> 90: </a>
 </span><span id="91" class="l"><a href="#91"> 91: </a>        <span class="php-comment">// If the provided data is already formatted we should probably convert it to an array</span>
 </span><span id="92" class="l"><a href="#92"> 92: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$from_type</span> !== <span class="php-keyword1">NULL</span>)
 </span><span id="93" class="l"><a href="#93"> 93: </a>        {
-</span><span id="94" class="l"><a href="#94"> 94: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span> . <span class="php-var">$from_type</span>))
+</span><span id="94" class="l"><a href="#94"> 94: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span>.<span class="php-var">$from_type</span>))
 </span><span id="95" class="l"><a href="#95"> 95: </a>            {
-</span><span id="96" class="l"><a href="#96"> 96: </a>                <span class="php-var">$data</span> = <span class="php-keyword2">call_user_func</span>([<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span> . <span class="php-var">$from_type</span>], <span class="php-var">$data</span>);
+</span><span id="96" class="l"><a href="#96"> 96: </a>                <span class="php-var">$data</span> = <span class="php-keyword2">call_user_func</span>([<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span>.<span class="php-var">$from_type</span>], <span class="php-var">$data</span>);
 </span><span id="97" class="l"><a href="#97"> 97: </a>            }
 </span><span id="98" class="l"><a href="#98"> 98: </a>            <span class="php-keyword1">else</span>
 </span><span id="99" class="l"><a href="#99"> 99: </a>            {
-</span><span id="100" class="l"><a href="#100">100: </a>                <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'Format class does not support conversion from &quot;'</span> . <span class="php-var">$from_type</span> . <span class="php-quote">'&quot;.'</span>);
+</span><span id="100" class="l"><a href="#100">100: </a>                <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'Format class does not support conversion from &quot;'</span>.<span class="php-var">$from_type</span>.<span class="php-quote">'&quot;.'</span>);
 </span><span id="101" class="l"><a href="#101">101: </a>            }
 </span><span id="102" class="l"><a href="#102">102: </a>        }
 </span><span id="103" class="l"><a href="#103">103: </a>
@@ -377,20 +377,20 @@ <h3>Classes</h3>
 </span><span id="283" class="l"><a href="#283">283: </a>        }
 </span><span id="284" class="l"><a href="#284">284: </a>
 </span><span id="285" class="l"><a href="#285">285: </a>        <span class="php-comment">// Load the table library</span>
-</span><span id="286" class="l"><a href="#286">286: </a>        <span class="php-var">$this</span>-&gt;_ci-&gt;load-&gt;library(<span class="php-quote">'table'</span>);
+</span><span id="286" class="l"><a href="#286">286: </a>        <span class="php-var">$this</span>-&gt;_CI-&gt;load-&gt;library(<span class="php-quote">'table'</span>);
 </span><span id="287" class="l"><a href="#287">287: </a>
-</span><span id="288" class="l"><a href="#288">288: </a>        <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;set_heading(<span class="php-var">$headings</span>);
+</span><span id="288" class="l"><a href="#288">288: </a>        <span class="php-var">$this</span>-&gt;_CI-&gt;table-&gt;set_heading(<span class="php-var">$headings</span>);
 </span><span id="289" class="l"><a href="#289">289: </a>
 </span><span id="290" class="l"><a href="#290">290: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$row</span>)
 </span><span id="291" class="l"><a href="#291">291: </a>        {
-</span><span id="292" class="l"><a href="#292">292: </a>            <span class="php-comment">// Suppressing the &quot;array to string conversion&quot; notice.</span>
-</span><span id="293" class="l"><a href="#293">293: </a>            <span class="php-comment">// Keep the &quot;evil&quot; @ here.</span>
-</span><span id="294" class="l"><a href="#294">294: </a>            <span class="php-var">$row</span> = @ <span class="php-keyword2">array_map</span>(<span class="php-quote">'strval'</span>, <span class="php-var">$row</span>);
+</span><span id="292" class="l"><a href="#292">292: </a>            <span class="php-comment">// Suppressing the &quot;array to string conversion&quot; notice</span>
+</span><span id="293" class="l"><a href="#293">293: </a>            <span class="php-comment">// Keep the &quot;evil&quot; @ here</span>
+</span><span id="294" class="l"><a href="#294">294: </a>            <span class="php-var">$row</span> = @<span class="php-keyword2">array_map</span>(<span class="php-quote">'strval'</span>, <span class="php-var">$row</span>);
 </span><span id="295" class="l"><a href="#295">295: </a>
-</span><span id="296" class="l"><a href="#296">296: </a>            <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;add_row(<span class="php-var">$row</span>);
+</span><span id="296" class="l"><a href="#296">296: </a>            <span class="php-var">$this</span>-&gt;_CI-&gt;table-&gt;add_row(<span class="php-var">$row</span>);
 </span><span id="297" class="l"><a href="#297">297: </a>        }
 </span><span id="298" class="l"><a href="#298">298: </a>
-</span><span id="299" class="l"><a href="#299">299: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;generate();
+</span><span id="299" class="l"><a href="#299">299: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_CI-&gt;table-&gt;generate();
 </span><span id="300" class="l"><a href="#300">300: </a>    }
 </span><span id="301" class="l"><a href="#301">301: </a>
 </span><span id="302" class="l"><a href="#302">302: </a>    <span class="php-comment">/**
@@ -499,7 +499,7 @@ <h3>Classes</h3>
 </span><span id="405" class="l"><a href="#405">405: </a>        }
 </span><span id="406" class="l"><a href="#406">406: </a>
 </span><span id="407" class="l"><a href="#407">407: </a>        <span class="php-comment">// Get the callback parameter (if set)</span>
-</span><span id="408" class="l"><a href="#408">408: </a>        <span class="php-var">$callback</span> = <span class="php-var">$this</span>-&gt;_ci-&gt;input-&gt;get(<span class="php-quote">'callback'</span>);
+</span><span id="408" class="l"><a href="#408">408: </a>        <span class="php-var">$callback</span> = <span class="php-var">$this</span>-&gt;_CI-&gt;input-&gt;get(<span class="php-quote">'callback'</span>);
 </span><span id="409" class="l"><a href="#409">409: </a>
 </span><span id="410" class="l"><a href="#410">410: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$callback</span>) === <span class="php-keyword1">TRUE</span>)
 </span><span id="411" class="l"><a href="#411">411: </a>        {
@@ -510,12 +510,12 @@ <h3>Classes</h3>
 </span><span id="416" class="l"><a href="#416">416: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">preg_match</span>(<span class="php-quote">'/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i'</span>, <span class="php-var">$callback</span>))
 </span><span id="417" class="l"><a href="#417">417: </a>        {
 </span><span id="418" class="l"><a href="#418">418: </a>            <span class="php-comment">// Return the data as encoded json with a callback</span>
-</span><span id="419" class="l"><a href="#419">419: </a>            <span class="php-keyword1">return</span> <span class="php-var">$callback</span> . <span class="php-quote">'('</span> . <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>) . <span class="php-quote">');'</span>;
+</span><span id="419" class="l"><a href="#419">419: </a>            <span class="php-keyword1">return</span> <span class="php-var">$callback</span>.<span class="php-quote">'('</span>.<span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>).<span class="php-quote">');'</span>;
 </span><span id="420" class="l"><a href="#420">420: </a>        }
 </span><span id="421" class="l"><a href="#421">421: </a>
 </span><span id="422" class="l"><a href="#422">422: </a>        <span class="php-comment">// An invalid jsonp callback function provided.</span>
 </span><span id="423" class="l"><a href="#423">423: </a>        <span class="php-comment">// Though I don't believe this should be hardcoded here</span>
-</span><span id="424" class="l"><a href="#424">424: </a>        <span class="php-var">$data</span>[<span class="php-quote">'warning'</span>] = <span class="php-quote">'INVALID JSONP CALLBACK: '</span> . <span class="php-var">$callback</span>;
+</span><span id="424" class="l"><a href="#424">424: </a>        <span class="php-var">$data</span>[<span class="php-quote">'warning'</span>] = <span class="php-quote">'INVALID JSONP CALLBACK: '</span>.<span class="php-var">$callback</span>;
 </span><span id="425" class="l"><a href="#425">425: </a>
 </span><span id="426" class="l"><a href="#426">426: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
 </span><span id="427" class="l"><a href="#427">427: </a>    }
diff --git a/documentation/source-class-Key.html b/documentation/source-class-Key.html
index 0d0e86e9..c6a5c28a 100644
--- a/documentation/source-class-Key.html
+++ b/documentation/source-class-Key.html
@@ -307,7 +307,7 @@ <h3>Classes</h3>
 </span><span id="213" class="l"><a href="#213">213: </a>        <span class="php-keyword1">do</span>
 </span><span id="214" class="l"><a href="#214">214: </a>        {
 </span><span id="215" class="l"><a href="#215">215: </a>            <span class="php-comment">// Generate a random salt</span>
-</span><span id="216" class="l"><a href="#216">216: </a>            <span class="php-var">$salt</span> = <span class="php-var">$this</span>-&gt;security-&gt;get_random_bytes(<span class="php-num">64</span>);
+</span><span id="216" class="l"><a href="#216">216: </a>            <span class="php-var">$salt</span> = <span class="php-keyword2">base_convert</span>(<span class="php-keyword2">bin2hex</span>(<span class="php-var">$this</span>-&gt;security-&gt;get_random_bytes(<span class="php-num">64</span>)), <span class="php-num">16</span>, <span class="php-num">36</span>);
 </span><span id="217" class="l"><a href="#217">217: </a>
 </span><span id="218" class="l"><a href="#218">218: </a>            <span class="php-comment">// If an error occurred, then fall back to the previous method</span>
 </span><span id="219" class="l"><a href="#219">219: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$salt</span> === <span class="php-keyword1">FALSE</span>)
diff --git a/documentation/source-class-REST_Controller.html b/documentation/source-class-REST_Controller.html
index 84d4170f..d049c3bc 100644
--- a/documentation/source-class-REST_Controller.html
+++ b/documentation/source-class-REST_Controller.html
@@ -244,8 +244,8 @@ <h3>Classes</h3>
 </span><span id="150" class="l"><a href="#150"> 150: </a>    <span class="php-keyword1">const</span> HTTP_NETWORK_AUTHENTICATION_REQUIRED = <span class="php-num">511</span>;
 </span><span id="151" class="l"><a href="#151"> 151: </a>
 </span><span id="152" class="l"><a href="#152"> 152: </a>    <span class="php-comment">/**
-</span></span><span id="153" class="l"><a href="#153"> 153: </a><span class="php-comment">     * This defines the rest format.
-</span></span><span id="154" class="l"><a href="#154"> 154: </a><span class="php-comment">     * Must be overridden it in a controller so that it is set.
+</span></span><span id="153" class="l"><a href="#153"> 153: </a><span class="php-comment">     * This defines the rest format
+</span></span><span id="154" class="l"><a href="#154"> 154: </a><span class="php-comment">     * Must be overridden it in a controller so that it is set
 </span></span><span id="155" class="l"><a href="#155"> 155: </a><span class="php-comment">     *
 </span></span><span id="156" class="l"><a href="#156"> 156: </a><span class="php-comment">     * @var string|NULL
 </span></span><span id="157" class="l"><a href="#157"> 157: </a><span class="php-comment">     */</span>
@@ -307,63 +307,63 @@ <h3>Classes</h3>
 </span><span id="213" class="l"><a href="#213"> 213: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_post_args</span> = [];
 </span><span id="214" class="l"><a href="#214"> 214: </a>
 </span><span id="215" class="l"><a href="#215"> 215: </a>    <span class="php-comment">/**
-</span></span><span id="216" class="l"><a href="#216"> 216: </a><span class="php-comment">     * The insert_id of the log entry (if we have one)
+</span></span><span id="216" class="l"><a href="#216"> 216: </a><span class="php-comment">     * The arguments for the PUT request method
 </span></span><span id="217" class="l"><a href="#217"> 217: </a><span class="php-comment">     *
-</span></span><span id="218" class="l"><a href="#218"> 218: </a><span class="php-comment">     * @var string
+</span></span><span id="218" class="l"><a href="#218"> 218: </a><span class="php-comment">     * @var array
 </span></span><span id="219" class="l"><a href="#219"> 219: </a><span class="php-comment">     */</span>
-</span><span id="220" class="l"><a href="#220"> 220: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_insert_id</span> = <span class="php-quote">''</span>;
+</span><span id="220" class="l"><a href="#220"> 220: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_put_args</span> = [];
 </span><span id="221" class="l"><a href="#221"> 221: </a>
 </span><span id="222" class="l"><a href="#222"> 222: </a>    <span class="php-comment">/**
-</span></span><span id="223" class="l"><a href="#223"> 223: </a><span class="php-comment">     * The arguments for the PUT request method
+</span></span><span id="223" class="l"><a href="#223"> 223: </a><span class="php-comment">     * The arguments for the DELETE request method
 </span></span><span id="224" class="l"><a href="#224"> 224: </a><span class="php-comment">     *
 </span></span><span id="225" class="l"><a href="#225"> 225: </a><span class="php-comment">     * @var array
 </span></span><span id="226" class="l"><a href="#226"> 226: </a><span class="php-comment">     */</span>
-</span><span id="227" class="l"><a href="#227"> 227: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_put_args</span> = [];
+</span><span id="227" class="l"><a href="#227"> 227: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_delete_args</span> = [];
 </span><span id="228" class="l"><a href="#228"> 228: </a>
 </span><span id="229" class="l"><a href="#229"> 229: </a>    <span class="php-comment">/**
-</span></span><span id="230" class="l"><a href="#230"> 230: </a><span class="php-comment">     * The arguments for the DELETE request method
+</span></span><span id="230" class="l"><a href="#230"> 230: </a><span class="php-comment">     * The arguments for the PATCH request method
 </span></span><span id="231" class="l"><a href="#231"> 231: </a><span class="php-comment">     *
 </span></span><span id="232" class="l"><a href="#232"> 232: </a><span class="php-comment">     * @var array
 </span></span><span id="233" class="l"><a href="#233"> 233: </a><span class="php-comment">     */</span>
-</span><span id="234" class="l"><a href="#234"> 234: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_delete_args</span> = [];
+</span><span id="234" class="l"><a href="#234"> 234: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_patch_args</span> = [];
 </span><span id="235" class="l"><a href="#235"> 235: </a>
 </span><span id="236" class="l"><a href="#236"> 236: </a>    <span class="php-comment">/**
-</span></span><span id="237" class="l"><a href="#237"> 237: </a><span class="php-comment">     * The arguments for the PATCH request method
+</span></span><span id="237" class="l"><a href="#237"> 237: </a><span class="php-comment">     * The arguments for the HEAD request method
 </span></span><span id="238" class="l"><a href="#238"> 238: </a><span class="php-comment">     *
 </span></span><span id="239" class="l"><a href="#239"> 239: </a><span class="php-comment">     * @var array
 </span></span><span id="240" class="l"><a href="#240"> 240: </a><span class="php-comment">     */</span>
-</span><span id="241" class="l"><a href="#241"> 241: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_patch_args</span> = [];
+</span><span id="241" class="l"><a href="#241"> 241: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_head_args</span> = [];
 </span><span id="242" class="l"><a href="#242"> 242: </a>
 </span><span id="243" class="l"><a href="#243"> 243: </a>    <span class="php-comment">/**
-</span></span><span id="244" class="l"><a href="#244"> 244: </a><span class="php-comment">     * The arguments for the HEAD request method
+</span></span><span id="244" class="l"><a href="#244"> 244: </a><span class="php-comment">     * The arguments for the OPTIONS request method
 </span></span><span id="245" class="l"><a href="#245"> 245: </a><span class="php-comment">     *
 </span></span><span id="246" class="l"><a href="#246"> 246: </a><span class="php-comment">     * @var array
 </span></span><span id="247" class="l"><a href="#247"> 247: </a><span class="php-comment">     */</span>
-</span><span id="248" class="l"><a href="#248"> 248: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_head_args</span> = [];
+</span><span id="248" class="l"><a href="#248"> 248: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_options_args</span> = [];
 </span><span id="249" class="l"><a href="#249"> 249: </a>
 </span><span id="250" class="l"><a href="#250"> 250: </a>    <span class="php-comment">/**
-</span></span><span id="251" class="l"><a href="#251"> 251: </a><span class="php-comment">     * The arguments for the OPTIONS request method
+</span></span><span id="251" class="l"><a href="#251"> 251: </a><span class="php-comment">     * The arguments for the query parameters
 </span></span><span id="252" class="l"><a href="#252"> 252: </a><span class="php-comment">     *
 </span></span><span id="253" class="l"><a href="#253"> 253: </a><span class="php-comment">     * @var array
 </span></span><span id="254" class="l"><a href="#254"> 254: </a><span class="php-comment">     */</span>
-</span><span id="255" class="l"><a href="#255"> 255: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_options_args</span> = [];
+</span><span id="255" class="l"><a href="#255"> 255: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_query_args</span> = [];
 </span><span id="256" class="l"><a href="#256"> 256: </a>
 </span><span id="257" class="l"><a href="#257"> 257: </a>    <span class="php-comment">/**
-</span></span><span id="258" class="l"><a href="#258"> 258: </a><span class="php-comment">     * The arguments for the query parameters
+</span></span><span id="258" class="l"><a href="#258"> 258: </a><span class="php-comment">     * The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined
 </span></span><span id="259" class="l"><a href="#259"> 259: </a><span class="php-comment">     *
 </span></span><span id="260" class="l"><a href="#260"> 260: </a><span class="php-comment">     * @var array
 </span></span><span id="261" class="l"><a href="#261"> 261: </a><span class="php-comment">     */</span>
-</span><span id="262" class="l"><a href="#262"> 262: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_query_args</span> = [];
+</span><span id="262" class="l"><a href="#262"> 262: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_args</span> = [];
 </span><span id="263" class="l"><a href="#263"> 263: </a>
 </span><span id="264" class="l"><a href="#264"> 264: </a>    <span class="php-comment">/**
-</span></span><span id="265" class="l"><a href="#265"> 265: </a><span class="php-comment">     * The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined
+</span></span><span id="265" class="l"><a href="#265"> 265: </a><span class="php-comment">     * The insert_id of the log entry (if we have one)
 </span></span><span id="266" class="l"><a href="#266"> 266: </a><span class="php-comment">     *
-</span></span><span id="267" class="l"><a href="#267"> 267: </a><span class="php-comment">     * @var array
+</span></span><span id="267" class="l"><a href="#267"> 267: </a><span class="php-comment">     * @var string
 </span></span><span id="268" class="l"><a href="#268"> 268: </a><span class="php-comment">     */</span>
-</span><span id="269" class="l"><a href="#269"> 269: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_args</span> = [];
+</span><span id="269" class="l"><a href="#269"> 269: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_insert_id</span> = <span class="php-quote">''</span>;
 </span><span id="270" class="l"><a href="#270"> 270: </a>
 </span><span id="271" class="l"><a href="#271"> 271: </a>    <span class="php-comment">/**
-</span></span><span id="272" class="l"><a href="#272"> 272: </a><span class="php-comment">     * If the request is allowed based on the API key provided.
+</span></span><span id="272" class="l"><a href="#272"> 272: </a><span class="php-comment">     * If the request is allowed based on the API key provided
 </span></span><span id="273" class="l"><a href="#273"> 273: </a><span class="php-comment">     *
 </span></span><span id="274" class="l"><a href="#274"> 274: </a><span class="php-comment">     * @var bool
 </span></span><span id="275" class="l"><a href="#275"> 275: </a><span class="php-comment">     */</span>
@@ -416,8 +416,8 @@ <h3>Classes</h3>
 </span><span id="322" class="l"><a href="#322"> 322: </a>    <span class="php-comment">/**
 </span></span><span id="323" class="l"><a href="#323"> 323: </a><span class="php-comment">     * Enable XSS flag
 </span></span><span id="324" class="l"><a href="#324"> 324: </a><span class="php-comment">     * Determines whether the XSS filter is always active when
-</span></span><span id="325" class="l"><a href="#325"> 325: </a><span class="php-comment">     * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered.
-</span></span><span id="326" class="l"><a href="#326"> 326: </a><span class="php-comment">     * Set automatically based on config setting.
+</span></span><span id="325" class="l"><a href="#325"> 325: </a><span class="php-comment">     * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered
+</span></span><span id="326" class="l"><a href="#326"> 326: </a><span class="php-comment">     * Set automatically based on config setting
 </span></span><span id="327" class="l"><a href="#327"> 327: </a><span class="php-comment">     *
 </span></span><span id="328" class="l"><a href="#328"> 328: </a><span class="php-comment">     * @var bool
 </span></span><span id="329" class="l"><a href="#329"> 329: </a><span class="php-comment">     */</span>
@@ -475,13 +475,13 @@ <h3>Classes</h3>
 </span><span id="381" class="l"><a href="#381"> 381: </a>        <span class="php-keyword1">if</span> (is_php(<span class="php-quote">'5.4'</span>) === <span class="php-keyword1">FALSE</span>)
 </span><span id="382" class="l"><a href="#382"> 382: </a>        {
 </span><span id="383" class="l"><a href="#383"> 383: </a>            <span class="php-comment">// CodeIgniter 3 is recommended for v5.4 or above</span>
-</span><span id="384" class="l"><a href="#384"> 384: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'Using PHP v'</span> . PHP_VERSION . <span class="php-quote">', though PHP v5.4 or greater is required'</span>);
+</span><span id="384" class="l"><a href="#384"> 384: </a>            <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'Using PHP v'</span>.PHP_VERSION.<span class="php-quote">', though PHP v5.4 or greater is required'</span>);
 </span><span id="385" class="l"><a href="#385"> 385: </a>        }
 </span><span id="386" class="l"><a href="#386"> 386: </a>
 </span><span id="387" class="l"><a href="#387"> 387: </a>        <span class="php-comment">// Check to see if this is CI 3.x</span>
 </span><span id="388" class="l"><a href="#388"> 388: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">explode</span>(<span class="php-quote">'.'</span>, CI_VERSION, <span class="php-num">2</span>)[<span class="php-num">0</span>] &lt; <span class="php-num">3</span>)
 </span><span id="389" class="l"><a href="#389"> 389: </a>        {
-</span><span id="390" class="l"><a href="#390"> 390: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
+</span><span id="390" class="l"><a href="#390"> 390: </a>            <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
 </span><span id="391" class="l"><a href="#391"> 391: </a>        }
 </span><span id="392" class="l"><a href="#392"> 392: </a>
 </span><span id="393" class="l"><a href="#393"> 393: </a>        <span class="php-comment">// Set the default value of global xss filtering. Same approach as CodeIgniter 3</span>
@@ -500,1507 +500,1507 @@ <h3>Classes</h3>
 </span><span id="406" class="l"><a href="#406"> 406: </a>        <span class="php-comment">// At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)</span>
 </span><span id="407" class="l"><a href="#407"> 407: </a>        <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-quote">'format'</span>);
 </span><span id="408" class="l"><a href="#408"> 408: </a>
-</span><span id="409" class="l"><a href="#409"> 409: </a>        <span class="php-comment">// Get the language</span>
-</span><span id="410" class="l"><a href="#410"> 410: </a>        <span class="php-var">$language</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_language'</span>);
-</span><span id="411" class="l"><a href="#411"> 411: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$language</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="412" class="l"><a href="#412"> 412: </a>        {
-</span><span id="413" class="l"><a href="#413"> 413: </a>            <span class="php-var">$language</span> = <span class="php-quote">'english'</span>;
-</span><span id="414" class="l"><a href="#414"> 414: </a>        }
-</span><span id="415" class="l"><a href="#415"> 415: </a>
-</span><span id="416" class="l"><a href="#416"> 416: </a>        <span class="php-comment">// Load the language file</span>
-</span><span id="417" class="l"><a href="#417"> 417: </a>        <span class="php-var">$this</span>-&gt;lang-&gt;load(<span class="php-quote">'rest_controller'</span>, <span class="php-var">$language</span>);
-</span><span id="418" class="l"><a href="#418"> 418: </a>
-</span><span id="419" class="l"><a href="#419"> 419: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
-</span><span id="420" class="l"><a href="#420"> 420: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
-</span><span id="421" class="l"><a href="#421"> 421: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
-</span><span id="422" class="l"><a href="#422"> 422: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
-</span><span id="423" class="l"><a href="#423"> 423: </a>
-</span><span id="424" class="l"><a href="#424"> 424: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
-</span><span id="425" class="l"><a href="#425"> 425: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="409" class="l"><a href="#409"> 409: </a>        <span class="php-comment">// Determine supported output formats from configuration</span>
+</span><span id="410" class="l"><a href="#410"> 410: </a>        <span class="php-var">$supported_formats</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_supported_formats'</span>);
+</span><span id="411" class="l"><a href="#411"> 411: </a>
+</span><span id="412" class="l"><a href="#412"> 412: </a>        <span class="php-comment">// Validate the configuration setting output formats</span>
+</span><span id="413" class="l"><a href="#413"> 413: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$supported_formats</span>))
+</span><span id="414" class="l"><a href="#414"> 414: </a>        {
+</span><span id="415" class="l"><a href="#415"> 415: </a>            <span class="php-var">$supported_formats</span> = [];
+</span><span id="416" class="l"><a href="#416"> 416: </a>        }
+</span><span id="417" class="l"><a href="#417"> 417: </a>
+</span><span id="418" class="l"><a href="#418"> 418: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword2">is_array</span>(<span class="php-var">$supported_formats</span>))
+</span><span id="419" class="l"><a href="#419"> 419: </a>        {
+</span><span id="420" class="l"><a href="#420"> 420: </a>            <span class="php-var">$supported_formats</span> = [<span class="php-var">$supported_formats</span>];
+</span><span id="421" class="l"><a href="#421"> 421: </a>        }
+</span><span id="422" class="l"><a href="#422"> 422: </a>
+</span><span id="423" class="l"><a href="#423"> 423: </a>        <span class="php-comment">// Add silently the default output format if it is missing</span>
+</span><span id="424" class="l"><a href="#424"> 424: </a>        <span class="php-var">$default_format</span> = <span class="php-var">$this</span>-&gt;_get_default_output_format();
+</span><span id="425" class="l"><a href="#425"> 425: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword2">in_array</span>(<span class="php-var">$default_format</span>, <span class="php-var">$supported_formats</span>))
 </span><span id="426" class="l"><a href="#426"> 426: </a>        {
-</span><span id="427" class="l"><a href="#427"> 427: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
+</span><span id="427" class="l"><a href="#427"> 427: </a>            <span class="php-var">$supported_formats</span>[] = <span class="php-var">$default_format</span>;
 </span><span id="428" class="l"><a href="#428"> 428: </a>        }
 </span><span id="429" class="l"><a href="#429"> 429: </a>
-</span><span id="430" class="l"><a href="#430"> 430: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
-</span><span id="431" class="l"><a href="#431"> 431: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
+</span><span id="430" class="l"><a href="#430"> 430: </a>        <span class="php-comment">// Now update $this-&gt;_supported_formats</span>
+</span><span id="431" class="l"><a href="#431"> 431: </a>        <span class="php-var">$this</span>-&gt;_supported_formats = <span class="php-keyword2">array_intersect_key</span>(<span class="php-var">$this</span>-&gt;_supported_formats, <span class="php-keyword2">array_flip</span>(<span class="php-var">$supported_formats</span>));
 </span><span id="432" class="l"><a href="#432"> 432: </a>
-</span><span id="433" class="l"><a href="#433"> 433: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
-</span><span id="434" class="l"><a href="#434"> 434: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
-</span><span id="435" class="l"><a href="#435"> 435: </a>
-</span><span id="436" class="l"><a href="#436"> 436: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
-</span><span id="437" class="l"><a href="#437"> 437: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
-</span><span id="438" class="l"><a href="#438"> 438: </a>        {
-</span><span id="439" class="l"><a href="#439"> 439: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = [];
-</span><span id="440" class="l"><a href="#440"> 440: </a>        }
-</span><span id="441" class="l"><a href="#441"> 441: </a>
-</span><span id="442" class="l"><a href="#442"> 442: </a>        <span class="php-comment">// Set up the query parameters</span>
-</span><span id="443" class="l"><a href="#443"> 443: </a>        <span class="php-var">$this</span>-&gt;_parse_query();
-</span><span id="444" class="l"><a href="#444"> 444: </a>
-</span><span id="445" class="l"><a href="#445"> 445: </a>        <span class="php-comment">// Set up the GET variables</span>
-</span><span id="446" class="l"><a href="#446"> 446: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
+</span><span id="433" class="l"><a href="#433"> 433: </a>        <span class="php-comment">// Get the language</span>
+</span><span id="434" class="l"><a href="#434"> 434: </a>        <span class="php-var">$language</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_language'</span>);
+</span><span id="435" class="l"><a href="#435"> 435: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$language</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="436" class="l"><a href="#436"> 436: </a>        {
+</span><span id="437" class="l"><a href="#437"> 437: </a>            <span class="php-var">$language</span> = <span class="php-quote">'english'</span>;
+</span><span id="438" class="l"><a href="#438"> 438: </a>        }
+</span><span id="439" class="l"><a href="#439"> 439: </a>
+</span><span id="440" class="l"><a href="#440"> 440: </a>        <span class="php-comment">// Load the language file</span>
+</span><span id="441" class="l"><a href="#441"> 441: </a>        <span class="php-var">$this</span>-&gt;lang-&gt;load(<span class="php-quote">'rest_controller'</span>, <span class="php-var">$language</span>);
+</span><span id="442" class="l"><a href="#442"> 442: </a>
+</span><span id="443" class="l"><a href="#443"> 443: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
+</span><span id="444" class="l"><a href="#444"> 444: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
+</span><span id="445" class="l"><a href="#445"> 445: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
+</span><span id="446" class="l"><a href="#446"> 446: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
 </span><span id="447" class="l"><a href="#447"> 447: </a>
-</span><span id="448" class="l"><a href="#448"> 448: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
-</span><span id="449" class="l"><a href="#449"> 449: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
-</span><span id="450" class="l"><a href="#450"> 450: </a>
-</span><span id="451" class="l"><a href="#451"> 451: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
-</span><span id="452" class="l"><a href="#452"> 452: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
+</span><span id="448" class="l"><a href="#448"> 448: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
+</span><span id="449" class="l"><a href="#449"> 449: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="450" class="l"><a href="#450"> 450: </a>        {
+</span><span id="451" class="l"><a href="#451"> 451: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
+</span><span id="452" class="l"><a href="#452"> 452: </a>        }
 </span><span id="453" class="l"><a href="#453"> 453: </a>
-</span><span id="454" class="l"><a href="#454"> 454: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
-</span><span id="455" class="l"><a href="#455"> 455: </a>
-</span><span id="456" class="l"><a href="#456"> 456: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
-</span><span id="457" class="l"><a href="#457"> 457: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
-</span><span id="458" class="l"><a href="#458"> 458: </a>        {
-</span><span id="459" class="l"><a href="#459"> 459: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
-</span><span id="460" class="l"><a href="#460"> 460: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
-</span><span id="461" class="l"><a href="#461"> 461: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
-</span><span id="462" class="l"><a href="#462"> 462: </a>        }
-</span><span id="463" class="l"><a href="#463"> 463: </a>
-</span><span id="464" class="l"><a href="#464"> 464: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
-</span><span id="465" class="l"><a href="#465"> 465: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
-</span><span id="466" class="l"><a href="#466"> 466: </a>            <span class="php-var">$this</span>-&gt;_get_args,
-</span><span id="467" class="l"><a href="#467"> 467: </a>            <span class="php-var">$this</span>-&gt;_options_args,
-</span><span id="468" class="l"><a href="#468"> 468: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
-</span><span id="469" class="l"><a href="#469"> 469: </a>            <span class="php-var">$this</span>-&gt;_head_args,
-</span><span id="470" class="l"><a href="#470"> 470: </a>            <span class="php-var">$this</span>-&gt;_put_args,
-</span><span id="471" class="l"><a href="#471"> 471: </a>            <span class="php-var">$this</span>-&gt;_post_args,
-</span><span id="472" class="l"><a href="#472"> 472: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
-</span><span id="473" class="l"><a href="#473"> 473: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}
-</span><span id="474" class="l"><a href="#474"> 474: </a>        );
-</span><span id="475" class="l"><a href="#475"> 475: </a>
-</span><span id="476" class="l"><a href="#476"> 476: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
-</span><span id="477" class="l"><a href="#477"> 477: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
-</span><span id="478" class="l"><a href="#478"> 478: </a>
-</span><span id="479" class="l"><a href="#479"> 479: </a>        <span class="php-comment">// Which language should the data be returned in?</span>
-</span><span id="480" class="l"><a href="#480"> 480: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
-</span><span id="481" class="l"><a href="#481"> 481: </a>
-</span><span id="482" class="l"><a href="#482"> 482: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
-</span><span id="483" class="l"><a href="#483"> 483: </a>        <span class="php-var">$this</span>-&gt;early_checks();
-</span><span id="484" class="l"><a href="#484"> 484: </a>
-</span><span id="485" class="l"><a href="#485"> 485: </a>        <span class="php-comment">// Load DB if its enabled</span>
-</span><span id="486" class="l"><a href="#486"> 486: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
-</span><span id="487" class="l"><a href="#487"> 487: </a>        {
-</span><span id="488" class="l"><a href="#488"> 488: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
-</span><span id="489" class="l"><a href="#489"> 489: </a>        }
-</span><span id="490" class="l"><a href="#490"> 490: </a>
-</span><span id="491" class="l"><a href="#491"> 491: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
-</span><span id="492" class="l"><a href="#492"> 492: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
-</span><span id="493" class="l"><a href="#493"> 493: </a>        {
-</span><span id="494" class="l"><a href="#494"> 494: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
-</span><span id="495" class="l"><a href="#495"> 495: </a>        }
-</span><span id="496" class="l"><a href="#496"> 496: </a>
-</span><span id="497" class="l"><a href="#497"> 497: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
-</span><span id="498" class="l"><a href="#498"> 498: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
-</span><span id="499" class="l"><a href="#499"> 499: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
-</span><span id="500" class="l"><a href="#500"> 500: </a>
-</span><span id="501" class="l"><a href="#501"> 501: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
-</span><span id="502" class="l"><a href="#502"> 502: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
-</span><span id="503" class="l"><a href="#503"> 503: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
-</span><span id="504" class="l"><a href="#504"> 504: </a>        {
-</span><span id="505" class="l"><a href="#505"> 505: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
-</span><span id="506" class="l"><a href="#506"> 506: </a>        }
-</span><span id="507" class="l"><a href="#507"> 507: </a>
-</span><span id="508" class="l"><a href="#508"> 508: </a>        <span class="php-comment">// Only allow ajax requests</span>
-</span><span id="509" class="l"><a href="#509"> 509: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
-</span><span id="510" class="l"><a href="#510"> 510: </a>        {
-</span><span id="511" class="l"><a href="#511"> 511: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="512" class="l"><a href="#512"> 512: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="513" class="l"><a href="#513"> 513: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="514" class="l"><a href="#514"> 514: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ajax_only'</span>)
-</span><span id="515" class="l"><a href="#515"> 515: </a>                ], self::HTTP_NOT_ACCEPTABLE);
-</span><span id="516" class="l"><a href="#516"> 516: </a>        }
-</span><span id="517" class="l"><a href="#517"> 517: </a>
-</span><span id="518" class="l"><a href="#518"> 518: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
-</span><span id="519" class="l"><a href="#519"> 519: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; !(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
-</span><span id="520" class="l"><a href="#520"> 520: </a>        {
-</span><span id="521" class="l"><a href="#521"> 521: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="522" class="l"><a href="#522"> 522: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
-</span><span id="523" class="l"><a href="#523"> 523: </a>            {
-</span><span id="524" class="l"><a href="#524"> 524: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
-</span><span id="525" class="l"><a href="#525"> 525: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="526" class="l"><a href="#526"> 526: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="527" class="l"><a href="#527"> 527: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
-</span><span id="528" class="l"><a href="#528"> 528: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="529" class="l"><a href="#529"> 529: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="530" class="l"><a href="#530"> 530: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
-</span><span id="531" class="l"><a href="#531"> 531: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="532" class="l"><a href="#532"> 532: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="533" class="l"><a href="#533"> 533: </a>            }
-</span><span id="534" class="l"><a href="#534"> 534: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="535" class="l"><a href="#535"> 535: </a>            {
-</span><span id="536" class="l"><a href="#536"> 536: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="537" class="l"><a href="#537"> 537: </a>            }
-</span><span id="538" class="l"><a href="#538"> 538: </a>        }
-</span><span id="539" class="l"><a href="#539"> 539: </a>    }
-</span><span id="540" class="l"><a href="#540"> 540: </a>
-</span><span id="541" class="l"><a href="#541"> 541: </a>    <span class="php-comment">/**
-</span></span><span id="542" class="l"><a href="#542"> 542: </a><span class="php-comment">     * Deconstructor
-</span></span><span id="543" class="l"><a href="#543"> 543: </a><span class="php-comment">     *
-</span></span><span id="544" class="l"><a href="#544"> 544: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="545" class="l"><a href="#545"> 545: </a><span class="php-comment">     * @access public
-</span></span><span id="546" class="l"><a href="#546"> 546: </a><span class="php-comment">     * @return void
-</span></span><span id="547" class="l"><a href="#547"> 547: </a><span class="php-comment">     */</span>
-</span><span id="548" class="l"><a href="#548"> 548: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
-</span><span id="549" class="l"><a href="#549"> 549: </a>    {
-</span><span id="550" class="l"><a href="#550"> 550: </a>        <span class="php-comment">// Get the current timestamp</span>
-</span><span id="551" class="l"><a href="#551"> 551: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="552" class="l"><a href="#552"> 552: </a>
-</span><span id="553" class="l"><a href="#553"> 553: </a>        <span class="php-comment">// Log the loading time to the log table</span>
-</span><span id="554" class="l"><a href="#554"> 554: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="555" class="l"><a href="#555"> 555: </a>        {
-</span><span id="556" class="l"><a href="#556"> 556: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
-</span><span id="557" class="l"><a href="#557"> 557: </a>        }
-</span><span id="558" class="l"><a href="#558"> 558: </a>    }
-</span><span id="559" class="l"><a href="#559"> 559: </a>
-</span><span id="560" class="l"><a href="#560"> 560: </a>    <span class="php-comment">/**
-</span></span><span id="561" class="l"><a href="#561"> 561: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
-</span></span><span id="562" class="l"><a href="#562"> 562: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
-</span></span><span id="563" class="l"><a href="#563"> 563: </a><span class="php-comment">     * Controller method.
-</span></span><span id="564" class="l"><a href="#564"> 564: </a><span class="php-comment">     *
-</span></span><span id="565" class="l"><a href="#565"> 565: </a><span class="php-comment">     * @access public
-</span></span><span id="566" class="l"><a href="#566"> 566: </a><span class="php-comment">     * @param  string $object_called
-</span></span><span id="567" class="l"><a href="#567"> 567: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method.
-</span></span><span id="568" class="l"><a href="#568"> 568: </a><span class="php-comment">     */</span>
-</span><span id="569" class="l"><a href="#569"> 569: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span>)
-</span><span id="570" class="l"><a href="#570"> 570: </a>    {
-</span><span id="571" class="l"><a href="#571"> 571: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
-</span><span id="572" class="l"><a href="#572"> 572: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
-</span><span id="573" class="l"><a href="#573"> 573: </a>        {
-</span><span id="574" class="l"><a href="#574"> 574: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="575" class="l"><a href="#575"> 575: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="576" class="l"><a href="#576"> 576: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unsupported'</span>)
-</span><span id="577" class="l"><a href="#577"> 577: </a>                ], self::HTTP_FORBIDDEN);
-</span><span id="578" class="l"><a href="#578"> 578: </a>        }
-</span><span id="579" class="l"><a href="#579"> 579: </a>
-</span><span id="580" class="l"><a href="#580"> 580: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
-</span><span id="581" class="l"><a href="#581"> 581: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
-</span><span id="582" class="l"><a href="#582"> 582: </a>
-</span><span id="583" class="l"><a href="#583"> 583: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span> . <span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method;
-</span><span id="584" class="l"><a href="#584"> 584: </a>
-</span><span id="585" class="l"><a href="#585"> 585: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
-</span><span id="586" class="l"><a href="#586"> 586: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] === <span class="php-keyword1">FALSE</span>);
-</span><span id="587" class="l"><a href="#587"> 587: </a>
-</span><span id="588" class="l"><a href="#588"> 588: </a>        <span class="php-comment">// Use keys for this method?</span>
-</span><span id="589" class="l"><a href="#589"> 589: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] === <span class="php-keyword1">FALSE</span>);
-</span><span id="590" class="l"><a href="#590"> 590: </a>
-</span><span id="591" class="l"><a href="#591"> 591: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here.</span>
-</span><span id="592" class="l"><a href="#592"> 592: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
-</span><span id="593" class="l"><a href="#593"> 593: </a>        {
-</span><span id="594" class="l"><a href="#594"> 594: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="595" class="l"><a href="#595"> 595: </a>            {
-</span><span id="596" class="l"><a href="#596"> 596: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="597" class="l"><a href="#597"> 597: </a>            }
-</span><span id="598" class="l"><a href="#598"> 598: </a>
-</span><span id="599" class="l"><a href="#599"> 599: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="600" class="l"><a href="#600"> 600: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="601" class="l"><a href="#601"> 601: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-keyword2">sprintf</span>(<span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_invalid_api_key'</span>), <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="602" class="l"><a href="#602"> 602: </a>                ], self::HTTP_FORBIDDEN);
-</span><span id="603" class="l"><a href="#603"> 603: </a>        }
-</span><span id="604" class="l"><a href="#604"> 604: </a>
-</span><span id="605" class="l"><a href="#605"> 605: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller.</span>
-</span><span id="606" class="l"><a href="#606"> 606: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
-</span><span id="607" class="l"><a href="#607"> 607: </a>        {
-</span><span id="608" class="l"><a href="#608"> 608: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="609" class="l"><a href="#609"> 609: </a>            {
-</span><span id="610" class="l"><a href="#610"> 610: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="611" class="l"><a href="#611"> 611: </a>            }
-</span><span id="612" class="l"><a href="#612"> 612: </a>
-</span><span id="613" class="l"><a href="#613"> 613: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="614" class="l"><a href="#614"> 614: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="615" class="l"><a href="#615"> 615: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_unauthorized'</span>)
-</span><span id="616" class="l"><a href="#616"> 616: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="617" class="l"><a href="#617"> 617: </a>        }
-</span><span id="618" class="l"><a href="#618"> 618: </a>
-</span><span id="619" class="l"><a href="#619"> 619: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
-</span><span id="620" class="l"><a href="#620"> 620: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="621" class="l"><a href="#621"> 621: </a>        {
-</span><span id="622" class="l"><a href="#622"> 622: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="623" class="l"><a href="#623"> 623: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="624" class="l"><a href="#624"> 624: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unknown_method'</span>)
-</span><span id="625" class="l"><a href="#625"> 625: </a>                ], self::HTTP_NOT_FOUND);
-</span><span id="626" class="l"><a href="#626"> 626: </a>        }
-</span><span id="627" class="l"><a href="#627"> 627: </a>
-</span><span id="628" class="l"><a href="#628"> 628: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
-</span><span id="629" class="l"><a href="#629"> 629: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="630" class="l"><a href="#630"> 630: </a>        {
-</span><span id="631" class="l"><a href="#631"> 631: </a>            <span class="php-comment">// Check the limit</span>
-</span><span id="632" class="l"><a href="#632"> 632: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="454" class="l"><a href="#454"> 454: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
+</span><span id="455" class="l"><a href="#455"> 455: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
+</span><span id="456" class="l"><a href="#456"> 456: </a>
+</span><span id="457" class="l"><a href="#457"> 457: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
+</span><span id="458" class="l"><a href="#458"> 458: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
+</span><span id="459" class="l"><a href="#459"> 459: </a>
+</span><span id="460" class="l"><a href="#460"> 460: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
+</span><span id="461" class="l"><a href="#461"> 461: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
+</span><span id="462" class="l"><a href="#462"> 462: </a>        {
+</span><span id="463" class="l"><a href="#463"> 463: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>} = [];
+</span><span id="464" class="l"><a href="#464"> 464: </a>        }
+</span><span id="465" class="l"><a href="#465"> 465: </a>
+</span><span id="466" class="l"><a href="#466"> 466: </a>        <span class="php-comment">// Set up the query parameters</span>
+</span><span id="467" class="l"><a href="#467"> 467: </a>        <span class="php-var">$this</span>-&gt;_parse_query();
+</span><span id="468" class="l"><a href="#468"> 468: </a>
+</span><span id="469" class="l"><a href="#469"> 469: </a>        <span class="php-comment">// Set up the GET variables</span>
+</span><span id="470" class="l"><a href="#470"> 470: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
+</span><span id="471" class="l"><a href="#471"> 471: </a>
+</span><span id="472" class="l"><a href="#472"> 472: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
+</span><span id="473" class="l"><a href="#473"> 473: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
+</span><span id="474" class="l"><a href="#474"> 474: </a>
+</span><span id="475" class="l"><a href="#475"> 475: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
+</span><span id="476" class="l"><a href="#476"> 476: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
+</span><span id="477" class="l"><a href="#477"> 477: </a>
+</span><span id="478" class="l"><a href="#478"> 478: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
+</span><span id="479" class="l"><a href="#479"> 479: </a>
+</span><span id="480" class="l"><a href="#480"> 480: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
+</span><span id="481" class="l"><a href="#481"> 481: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
+</span><span id="482" class="l"><a href="#482"> 482: </a>        {
+</span><span id="483" class="l"><a href="#483"> 483: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
+</span><span id="484" class="l"><a href="#484"> 484: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
+</span><span id="485" class="l"><a href="#485"> 485: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
+</span><span id="486" class="l"><a href="#486"> 486: </a>        }
+</span><span id="487" class="l"><a href="#487"> 487: </a>
+</span><span id="488" class="l"><a href="#488"> 488: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
+</span><span id="489" class="l"><a href="#489"> 489: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
+</span><span id="490" class="l"><a href="#490"> 490: </a>            <span class="php-var">$this</span>-&gt;_get_args,
+</span><span id="491" class="l"><a href="#491"> 491: </a>            <span class="php-var">$this</span>-&gt;_options_args,
+</span><span id="492" class="l"><a href="#492"> 492: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
+</span><span id="493" class="l"><a href="#493"> 493: </a>            <span class="php-var">$this</span>-&gt;_head_args,
+</span><span id="494" class="l"><a href="#494"> 494: </a>            <span class="php-var">$this</span>-&gt;_put_args,
+</span><span id="495" class="l"><a href="#495"> 495: </a>            <span class="php-var">$this</span>-&gt;_post_args,
+</span><span id="496" class="l"><a href="#496"> 496: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
+</span><span id="497" class="l"><a href="#497"> 497: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>}
+</span><span id="498" class="l"><a href="#498"> 498: </a>        );
+</span><span id="499" class="l"><a href="#499"> 499: </a>
+</span><span id="500" class="l"><a href="#500"> 500: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
+</span><span id="501" class="l"><a href="#501"> 501: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
+</span><span id="502" class="l"><a href="#502"> 502: </a>
+</span><span id="503" class="l"><a href="#503"> 503: </a>        <span class="php-comment">// Which language should the data be returned in?</span>
+</span><span id="504" class="l"><a href="#504"> 504: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
+</span><span id="505" class="l"><a href="#505"> 505: </a>
+</span><span id="506" class="l"><a href="#506"> 506: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
+</span><span id="507" class="l"><a href="#507"> 507: </a>        <span class="php-var">$this</span>-&gt;early_checks();
+</span><span id="508" class="l"><a href="#508"> 508: </a>
+</span><span id="509" class="l"><a href="#509"> 509: </a>        <span class="php-comment">// Load DB if its enabled</span>
+</span><span id="510" class="l"><a href="#510"> 510: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
+</span><span id="511" class="l"><a href="#511"> 511: </a>        {
+</span><span id="512" class="l"><a href="#512"> 512: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
+</span><span id="513" class="l"><a href="#513"> 513: </a>        }
+</span><span id="514" class="l"><a href="#514"> 514: </a>
+</span><span id="515" class="l"><a href="#515"> 515: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
+</span><span id="516" class="l"><a href="#516"> 516: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
+</span><span id="517" class="l"><a href="#517"> 517: </a>        {
+</span><span id="518" class="l"><a href="#518"> 518: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
+</span><span id="519" class="l"><a href="#519"> 519: </a>        }
+</span><span id="520" class="l"><a href="#520"> 520: </a>
+</span><span id="521" class="l"><a href="#521"> 521: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
+</span><span id="522" class="l"><a href="#522"> 522: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
+</span><span id="523" class="l"><a href="#523"> 523: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
+</span><span id="524" class="l"><a href="#524"> 524: </a>
+</span><span id="525" class="l"><a href="#525"> 525: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
+</span><span id="526" class="l"><a href="#526"> 526: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
+</span><span id="527" class="l"><a href="#527"> 527: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
+</span><span id="528" class="l"><a href="#528"> 528: </a>        {
+</span><span id="529" class="l"><a href="#529"> 529: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
+</span><span id="530" class="l"><a href="#530"> 530: </a>        }
+</span><span id="531" class="l"><a href="#531"> 531: </a>
+</span><span id="532" class="l"><a href="#532"> 532: </a>        <span class="php-comment">// Only allow ajax requests</span>
+</span><span id="533" class="l"><a href="#533"> 533: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
+</span><span id="534" class="l"><a href="#534"> 534: </a>        {
+</span><span id="535" class="l"><a href="#535"> 535: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="536" class="l"><a href="#536"> 536: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="537" class="l"><a href="#537"> 537: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="538" class="l"><a href="#538"> 538: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ajax_only'</span>)
+</span><span id="539" class="l"><a href="#539"> 539: </a>                ], self::HTTP_NOT_ACCEPTABLE);
+</span><span id="540" class="l"><a href="#540"> 540: </a>        }
+</span><span id="541" class="l"><a href="#541"> 541: </a>
+</span><span id="542" class="l"><a href="#542"> 542: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
+</span><span id="543" class="l"><a href="#543"> 543: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; !(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>) || (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'allow_auth_and_keys'</span>) === <span class="php-keyword1">TRUE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
+</span><span id="544" class="l"><a href="#544"> 544: </a>        {
+</span><span id="545" class="l"><a href="#545"> 545: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="546" class="l"><a href="#546"> 546: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
+</span><span id="547" class="l"><a href="#547"> 547: </a>            {
+</span><span id="548" class="l"><a href="#548"> 548: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
+</span><span id="549" class="l"><a href="#549"> 549: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="550" class="l"><a href="#550"> 550: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="551" class="l"><a href="#551"> 551: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
+</span><span id="552" class="l"><a href="#552"> 552: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="553" class="l"><a href="#553"> 553: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="554" class="l"><a href="#554"> 554: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
+</span><span id="555" class="l"><a href="#555"> 555: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="556" class="l"><a href="#556"> 556: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="557" class="l"><a href="#557"> 557: </a>            }
+</span><span id="558" class="l"><a href="#558"> 558: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="559" class="l"><a href="#559"> 559: </a>            {
+</span><span id="560" class="l"><a href="#560"> 560: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="561" class="l"><a href="#561"> 561: </a>            }
+</span><span id="562" class="l"><a href="#562"> 562: </a>        }
+</span><span id="563" class="l"><a href="#563"> 563: </a>    }
+</span><span id="564" class="l"><a href="#564"> 564: </a>
+</span><span id="565" class="l"><a href="#565"> 565: </a>    <span class="php-comment">/**
+</span></span><span id="566" class="l"><a href="#566"> 566: </a><span class="php-comment">     * Deconstructor
+</span></span><span id="567" class="l"><a href="#567"> 567: </a><span class="php-comment">     *
+</span></span><span id="568" class="l"><a href="#568"> 568: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="569" class="l"><a href="#569"> 569: </a><span class="php-comment">     * @access public
+</span></span><span id="570" class="l"><a href="#570"> 570: </a><span class="php-comment">     * @return void
+</span></span><span id="571" class="l"><a href="#571"> 571: </a><span class="php-comment">     */</span>
+</span><span id="572" class="l"><a href="#572"> 572: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
+</span><span id="573" class="l"><a href="#573"> 573: </a>    {
+</span><span id="574" class="l"><a href="#574"> 574: </a>        <span class="php-comment">// Get the current timestamp</span>
+</span><span id="575" class="l"><a href="#575"> 575: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="576" class="l"><a href="#576"> 576: </a>
+</span><span id="577" class="l"><a href="#577"> 577: </a>        <span class="php-comment">// Log the loading time to the log table</span>
+</span><span id="578" class="l"><a href="#578"> 578: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="579" class="l"><a href="#579"> 579: </a>        {
+</span><span id="580" class="l"><a href="#580"> 580: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
+</span><span id="581" class="l"><a href="#581"> 581: </a>        }
+</span><span id="582" class="l"><a href="#582"> 582: </a>    }
+</span><span id="583" class="l"><a href="#583"> 583: </a>
+</span><span id="584" class="l"><a href="#584"> 584: </a>    <span class="php-comment">/**
+</span></span><span id="585" class="l"><a href="#585"> 585: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
+</span></span><span id="586" class="l"><a href="#586"> 586: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
+</span></span><span id="587" class="l"><a href="#587"> 587: </a><span class="php-comment">     * Controller method
+</span></span><span id="588" class="l"><a href="#588"> 588: </a><span class="php-comment">     *
+</span></span><span id="589" class="l"><a href="#589"> 589: </a><span class="php-comment">     * @access public
+</span></span><span id="590" class="l"><a href="#590"> 590: </a><span class="php-comment">     * @param  string $object_called
+</span></span><span id="591" class="l"><a href="#591"> 591: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method
+</span></span><span id="592" class="l"><a href="#592"> 592: </a><span class="php-comment">     */</span>
+</span><span id="593" class="l"><a href="#593"> 593: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span> = [])
+</span><span id="594" class="l"><a href="#594"> 594: </a>    {
+</span><span id="595" class="l"><a href="#595"> 595: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
+</span><span id="596" class="l"><a href="#596"> 596: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
+</span><span id="597" class="l"><a href="#597"> 597: </a>        {
+</span><span id="598" class="l"><a href="#598"> 598: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="599" class="l"><a href="#599"> 599: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="600" class="l"><a href="#600"> 600: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unsupported'</span>)
+</span><span id="601" class="l"><a href="#601"> 601: </a>                ], self::HTTP_FORBIDDEN);
+</span><span id="602" class="l"><a href="#602"> 602: </a>        }
+</span><span id="603" class="l"><a href="#603"> 603: </a>
+</span><span id="604" class="l"><a href="#604"> 604: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
+</span><span id="605" class="l"><a href="#605"> 605: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span>.<span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)).<span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
+</span><span id="606" class="l"><a href="#606"> 606: </a>
+</span><span id="607" class="l"><a href="#607"> 607: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span>.<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method;
+</span><span id="608" class="l"><a href="#608"> 608: </a>
+</span><span id="609" class="l"><a href="#609"> 609: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
+</span><span id="610" class="l"><a href="#610"> 610: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] === <span class="php-keyword1">FALSE</span>);
+</span><span id="611" class="l"><a href="#611"> 611: </a>
+</span><span id="612" class="l"><a href="#612"> 612: </a>        <span class="php-comment">// Use keys for this method?</span>
+</span><span id="613" class="l"><a href="#613"> 613: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] === <span class="php-keyword1">FALSE</span>);
+</span><span id="614" class="l"><a href="#614"> 614: </a>
+</span><span id="615" class="l"><a href="#615"> 615: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here</span>
+</span><span id="616" class="l"><a href="#616"> 616: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
+</span><span id="617" class="l"><a href="#617"> 617: </a>        {
+</span><span id="618" class="l"><a href="#618"> 618: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="619" class="l"><a href="#619"> 619: </a>            {
+</span><span id="620" class="l"><a href="#620"> 620: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="621" class="l"><a href="#621"> 621: </a>            }
+</span><span id="622" class="l"><a href="#622"> 622: </a>
+</span><span id="623" class="l"><a href="#623"> 623: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="624" class="l"><a href="#624"> 624: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="625" class="l"><a href="#625"> 625: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-keyword2">sprintf</span>(<span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_invalid_api_key'</span>), <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="626" class="l"><a href="#626"> 626: </a>                ], self::HTTP_FORBIDDEN);
+</span><span id="627" class="l"><a href="#627"> 627: </a>        }
+</span><span id="628" class="l"><a href="#628"> 628: </a>
+</span><span id="629" class="l"><a href="#629"> 629: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller</span>
+</span><span id="630" class="l"><a href="#630"> 630: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
+</span><span id="631" class="l"><a href="#631"> 631: </a>        {
+</span><span id="632" class="l"><a href="#632"> 632: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
 </span><span id="633" class="l"><a href="#633"> 633: </a>            {
-</span><span id="634" class="l"><a href="#634"> 634: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_time_limit'</span>)];
-</span><span id="635" class="l"><a href="#635"> 635: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
-</span><span id="636" class="l"><a href="#636"> 636: </a>            }
-</span><span id="637" class="l"><a href="#637"> 637: </a>
-</span><span id="638" class="l"><a href="#638"> 638: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
-</span><span id="639" class="l"><a href="#639"> 639: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
-</span><span id="640" class="l"><a href="#640"> 640: </a>
-</span><span id="641" class="l"><a href="#641"> 641: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
-</span><span id="642" class="l"><a href="#642"> 642: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
-</span><span id="643" class="l"><a href="#643"> 643: </a>
-</span><span id="644" class="l"><a href="#644"> 644: </a>            <span class="php-comment">// IM TELLIN!</span>
-</span><span id="645" class="l"><a href="#645"> 645: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="646" class="l"><a href="#646"> 646: </a>            {
-</span><span id="647" class="l"><a href="#647"> 647: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
-</span><span id="648" class="l"><a href="#648"> 648: </a>            }
-</span><span id="649" class="l"><a href="#649"> 649: </a>
-</span><span id="650" class="l"><a href="#650"> 650: </a>            <span class="php-comment">// They don't have good enough perms</span>
-</span><span id="651" class="l"><a href="#651"> 651: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_permissions'</span>)];
-</span><span id="652" class="l"><a href="#652"> 652: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
-</span><span id="653" class="l"><a href="#653"> 653: </a>        }
-</span><span id="654" class="l"><a href="#654"> 654: </a>
-</span><span id="655" class="l"><a href="#655"> 655: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
-</span><span id="656" class="l"><a href="#656"> 656: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="657" class="l"><a href="#657"> 657: </a>        {
-</span><span id="658" class="l"><a href="#658"> 658: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
-</span><span id="659" class="l"><a href="#659"> 659: </a>        }
-</span><span id="660" class="l"><a href="#660"> 660: </a>
-</span><span id="661" class="l"><a href="#661"> 661: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
-</span><span id="662" class="l"><a href="#662"> 662: </a>        <span class="php-keyword1">try</span>
-</span><span id="663" class="l"><a href="#663"> 663: </a>        {
-</span><span id="664" class="l"><a href="#664"> 664: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
-</span><span id="665" class="l"><a href="#665"> 665: </a>        }
-</span><span id="666" class="l"><a href="#666"> 666: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
-</span><span id="667" class="l"><a href="#667"> 667: </a>        {
-</span><span id="668" class="l"><a href="#668"> 668: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
-</span><span id="669" class="l"><a href="#669"> 669: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="670" class="l"><a href="#670"> 670: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="671" class="l"><a href="#671"> 671: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
-</span><span id="672" class="l"><a href="#672"> 672: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
-</span><span id="673" class="l"><a href="#673"> 673: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
-</span><span id="674" class="l"><a href="#674"> 674: </a>                    ]
-</span><span id="675" class="l"><a href="#675"> 675: </a>                ], self::HTTP_INTERNAL_SERVER_ERROR);
-</span><span id="676" class="l"><a href="#676"> 676: </a>        }
-</span><span id="677" class="l"><a href="#677"> 677: </a>    }
+</span><span id="634" class="l"><a href="#634"> 634: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="635" class="l"><a href="#635"> 635: </a>            }
+</span><span id="636" class="l"><a href="#636"> 636: </a>
+</span><span id="637" class="l"><a href="#637"> 637: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="638" class="l"><a href="#638"> 638: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="639" class="l"><a href="#639"> 639: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_unauthorized'</span>)
+</span><span id="640" class="l"><a href="#640"> 640: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="641" class="l"><a href="#641"> 641: </a>        }
+</span><span id="642" class="l"><a href="#642"> 642: </a>
+</span><span id="643" class="l"><a href="#643"> 643: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
+</span><span id="644" class="l"><a href="#644"> 644: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="645" class="l"><a href="#645"> 645: </a>        {
+</span><span id="646" class="l"><a href="#646"> 646: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="647" class="l"><a href="#647"> 647: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="648" class="l"><a href="#648"> 648: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unknown_method'</span>)
+</span><span id="649" class="l"><a href="#649"> 649: </a>                ], self::HTTP_NOT_FOUND);
+</span><span id="650" class="l"><a href="#650"> 650: </a>        }
+</span><span id="651" class="l"><a href="#651"> 651: </a>
+</span><span id="652" class="l"><a href="#652"> 652: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
+</span><span id="653" class="l"><a href="#653"> 653: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="654" class="l"><a href="#654"> 654: </a>        {
+</span><span id="655" class="l"><a href="#655"> 655: </a>            <span class="php-comment">// Check the limit</span>
+</span><span id="656" class="l"><a href="#656"> 656: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="657" class="l"><a href="#657"> 657: </a>            {
+</span><span id="658" class="l"><a href="#658"> 658: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_time_limit'</span>)];
+</span><span id="659" class="l"><a href="#659"> 659: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
+</span><span id="660" class="l"><a href="#660"> 660: </a>            }
+</span><span id="661" class="l"><a href="#661"> 661: </a>
+</span><span id="662" class="l"><a href="#662"> 662: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
+</span><span id="663" class="l"><a href="#663"> 663: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
+</span><span id="664" class="l"><a href="#664"> 664: </a>
+</span><span id="665" class="l"><a href="#665"> 665: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
+</span><span id="666" class="l"><a href="#666"> 666: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
+</span><span id="667" class="l"><a href="#667"> 667: </a>
+</span><span id="668" class="l"><a href="#668"> 668: </a>            <span class="php-comment">// IM TELLIN!</span>
+</span><span id="669" class="l"><a href="#669"> 669: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="670" class="l"><a href="#670"> 670: </a>            {
+</span><span id="671" class="l"><a href="#671"> 671: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
+</span><span id="672" class="l"><a href="#672"> 672: </a>            }
+</span><span id="673" class="l"><a href="#673"> 673: </a>
+</span><span id="674" class="l"><a href="#674"> 674: </a>            <span class="php-comment">// They don't have good enough perms</span>
+</span><span id="675" class="l"><a href="#675"> 675: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_permissions'</span>)];
+</span><span id="676" class="l"><a href="#676"> 676: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
+</span><span id="677" class="l"><a href="#677"> 677: </a>        }
 </span><span id="678" class="l"><a href="#678"> 678: </a>
-</span><span id="679" class="l"><a href="#679"> 679: </a>    <span class="php-comment">/**
-</span></span><span id="680" class="l"><a href="#680"> 680: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
-</span></span><span id="681" class="l"><a href="#681"> 681: </a><span class="php-comment">     *
-</span></span><span id="682" class="l"><a href="#682"> 682: </a><span class="php-comment">     * @access public
-</span></span><span id="683" class="l"><a href="#683"> 683: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
-</span></span><span id="684" class="l"><a href="#684"> 684: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
-</span></span><span id="685" class="l"><a href="#685"> 685: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
-</span></span><span id="686" class="l"><a href="#686"> 686: </a><span class="php-comment">     * running the script; otherwise, exit
-</span></span><span id="687" class="l"><a href="#687"> 687: </a><span class="php-comment">     */</span>
-</span><span id="688" class="l"><a href="#688"> 688: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="689" class="l"><a href="#689"> 689: </a>    {
-</span><span id="690" class="l"><a href="#690"> 690: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
-</span><span id="691" class="l"><a href="#691"> 691: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="692" class="l"><a href="#692"> 692: </a>        {
-</span><span id="693" class="l"><a href="#693"> 693: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
-</span><span id="694" class="l"><a href="#694"> 694: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
-</span><span id="695" class="l"><a href="#695"> 695: </a>        }
-</span><span id="696" class="l"><a href="#696"> 696: </a>
-</span><span id="697" class="l"><a href="#697"> 697: </a>        <span class="php-comment">// Set the output as NULL by default</span>
-</span><span id="698" class="l"><a href="#698"> 698: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="699" class="l"><a href="#699"> 699: </a>
-</span><span id="700" class="l"><a href="#700"> 700: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
-</span><span id="701" class="l"><a href="#701"> 701: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="702" class="l"><a href="#702"> 702: </a>        {
-</span><span id="703" class="l"><a href="#703"> 703: </a>            <span class="php-var">$http_code</span> = self::HTTP_NOT_FOUND;
-</span><span id="704" class="l"><a href="#704"> 704: </a>        }
-</span><span id="705" class="l"><a href="#705"> 705: </a>
-</span><span id="706" class="l"><a href="#706"> 706: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
-</span><span id="707" class="l"><a href="#707"> 707: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="708" class="l"><a href="#708"> 708: </a>        {
-</span><span id="709" class="l"><a href="#709"> 709: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
-</span><span id="710" class="l"><a href="#710"> 710: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
-</span><span id="711" class="l"><a href="#711"> 711: </a>            {
-</span><span id="712" class="l"><a href="#712"> 712: </a>                <span class="php-comment">// Set the format header</span>
-</span><span id="713" class="l"><a href="#713"> 713: </a>                <span class="php-var">$this</span>-&gt;output-&gt;set_content_type(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format], <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
-</span><span id="714" class="l"><a href="#714"> 714: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
-</span><span id="715" class="l"><a href="#715"> 715: </a>
-</span><span id="716" class="l"><a href="#716"> 716: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error.</span>
-</span><span id="717" class="l"><a href="#717"> 717: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
-</span><span id="718" class="l"><a href="#718"> 718: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
-</span><span id="719" class="l"><a href="#719"> 719: </a>                {
-</span><span id="720" class="l"><a href="#720"> 720: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="721" class="l"><a href="#721"> 721: </a>                }
-</span><span id="722" class="l"><a href="#722"> 722: </a>            }
-</span><span id="723" class="l"><a href="#723"> 723: </a>            <span class="php-keyword1">else</span>
-</span><span id="724" class="l"><a href="#724"> 724: </a>            {
-</span><span id="725" class="l"><a href="#725"> 725: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
-</span><span id="726" class="l"><a href="#726"> 726: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
-</span><span id="727" class="l"><a href="#727"> 727: </a>                {
-</span><span id="728" class="l"><a href="#728"> 728: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="729" class="l"><a href="#729"> 729: </a>                }
-</span><span id="730" class="l"><a href="#730"> 730: </a>
-</span><span id="731" class="l"><a href="#731"> 731: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
-</span><span id="732" class="l"><a href="#732"> 732: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
-</span><span id="733" class="l"><a href="#733"> 733: </a>            }
-</span><span id="734" class="l"><a href="#734"> 734: </a>        }
-</span><span id="735" class="l"><a href="#735"> 735: </a>
-</span><span id="736" class="l"><a href="#736"> 736: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
-</span><span id="737" class="l"><a href="#737"> 737: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
-</span><span id="738" class="l"><a href="#738"> 738: </a>        <span class="php-comment">// correct HTTP status code</span>
-</span><span id="739" class="l"><a href="#739"> 739: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = self::HTTP_OK;
-</span><span id="740" class="l"><a href="#740"> 740: </a>
-</span><span id="741" class="l"><a href="#741"> 741: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_status_header(<span class="php-var">$http_code</span>);
-</span><span id="742" class="l"><a href="#742"> 742: </a>
-</span><span id="743" class="l"><a href="#743"> 743: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
-</span><span id="744" class="l"><a href="#744"> 744: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="745" class="l"><a href="#745"> 745: </a>        {
-</span><span id="746" class="l"><a href="#746"> 746: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
-</span><span id="747" class="l"><a href="#747"> 747: </a>        }
-</span><span id="748" class="l"><a href="#748"> 748: </a>
-</span><span id="749" class="l"><a href="#749"> 749: </a>        <span class="php-comment">// Output the data</span>
-</span><span id="750" class="l"><a href="#750"> 750: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_output(<span class="php-var">$output</span>);
-</span><span id="751" class="l"><a href="#751"> 751: </a>
-</span><span id="752" class="l"><a href="#752"> 752: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="753" class="l"><a href="#753"> 753: </a>        {
-</span><span id="754" class="l"><a href="#754"> 754: </a>            <span class="php-comment">// Display the data and exit execution</span>
-</span><span id="755" class="l"><a href="#755"> 755: </a>            <span class="php-var">$this</span>-&gt;output-&gt;_display();
-</span><span id="756" class="l"><a href="#756"> 756: </a>            <span class="php-keyword1">exit</span>;
-</span><span id="757" class="l"><a href="#757"> 757: </a>        }
-</span><span id="758" class="l"><a href="#758"> 758: </a>
-</span><span id="759" class="l"><a href="#759"> 759: </a>        <span class="php-comment">// Otherwise dump the output automatically</span>
-</span><span id="760" class="l"><a href="#760"> 760: </a>    }
-</span><span id="761" class="l"><a href="#761"> 761: </a>
-</span><span id="762" class="l"><a href="#762"> 762: </a>    <span class="php-comment">/**
-</span></span><span id="763" class="l"><a href="#763"> 763: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
-</span></span><span id="764" class="l"><a href="#764"> 764: </a><span class="php-comment">     * within the buffers of the Output class. The response is sent to the client
-</span></span><span id="765" class="l"><a href="#765"> 765: </a><span class="php-comment">     * lately by the framework, after the current controller's method termination.
-</span></span><span id="766" class="l"><a href="#766"> 766: </a><span class="php-comment">     * All the hooks after the controller's method termination are executable.
-</span></span><span id="767" class="l"><a href="#767"> 767: </a><span class="php-comment">     *
-</span></span><span id="768" class="l"><a href="#768"> 768: </a><span class="php-comment">     * @access public
-</span></span><span id="769" class="l"><a href="#769"> 769: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
-</span></span><span id="770" class="l"><a href="#770"> 770: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
-</span></span><span id="771" class="l"><a href="#771"> 771: </a><span class="php-comment">     */</span>
-</span><span id="772" class="l"><a href="#772"> 772: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> set_response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="773" class="l"><a href="#773"> 773: </a>    {
-</span><span id="774" class="l"><a href="#774"> 774: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$data</span>, <span class="php-var">$http_code</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="775" class="l"><a href="#775"> 775: </a>    }
-</span><span id="776" class="l"><a href="#776"> 776: </a>
-</span><span id="777" class="l"><a href="#777"> 777: </a>    <span class="php-comment">/**
-</span></span><span id="778" class="l"><a href="#778"> 778: </a><span class="php-comment">     * Get the input format e.g. json or xml
-</span></span><span id="779" class="l"><a href="#779"> 779: </a><span class="php-comment">     *
-</span></span><span id="780" class="l"><a href="#780"> 780: </a><span class="php-comment">     * @access protected
-</span></span><span id="781" class="l"><a href="#781"> 781: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
-</span></span><span id="782" class="l"><a href="#782"> 782: </a><span class="php-comment">     */</span>
-</span><span id="783" class="l"><a href="#783"> 783: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
-</span><span id="784" class="l"><a href="#784"> 784: </a>    {
-</span><span id="785" class="l"><a href="#785"> 785: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
-</span><span id="786" class="l"><a href="#786"> 786: </a>        <span class="php-var">$content_type</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
-</span><span id="787" class="l"><a href="#787"> 787: </a>
-</span><span id="788" class="l"><a href="#788"> 788: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$content_type</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="789" class="l"><a href="#789"> 789: </a>        {
-</span><span id="790" class="l"><a href="#790"> 790: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="791" class="l"><a href="#791"> 791: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
-</span><span id="792" class="l"><a href="#792"> 792: </a>            {
-</span><span id="793" class="l"><a href="#793"> 793: </a>                <span class="php-comment">// $key = format e.g. csv</span>
-</span><span id="794" class="l"><a href="#794"> 794: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
-</span><span id="795" class="l"><a href="#795"> 795: </a>
-</span><span id="796" class="l"><a href="#796"> 796: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
-</span><span id="797" class="l"><a href="#797"> 797: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
-</span><span id="798" class="l"><a href="#798"> 798: </a>                <span class="php-var">$content_type</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$content_type</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$content_type</span>)) : <span class="php-var">$content_type</span>);
-</span><span id="799" class="l"><a href="#799"> 799: </a>
-</span><span id="800" class="l"><a href="#800"> 800: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
-</span><span id="801" class="l"><a href="#801"> 801: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$content_type</span> === <span class="php-var">$value</span>)
-</span><span id="802" class="l"><a href="#802"> 802: </a>                {
-</span><span id="803" class="l"><a href="#803"> 803: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
-</span><span id="804" class="l"><a href="#804"> 804: </a>                }
-</span><span id="805" class="l"><a href="#805"> 805: </a>            }
-</span><span id="806" class="l"><a href="#806"> 806: </a>        }
-</span><span id="807" class="l"><a href="#807"> 807: </a>
-</span><span id="808" class="l"><a href="#808"> 808: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="809" class="l"><a href="#809"> 809: </a>    }
-</span><span id="810" class="l"><a href="#810"> 810: </a>
-</span><span id="811" class="l"><a href="#811"> 811: </a>    <span class="php-comment">/**
-</span></span><span id="812" class="l"><a href="#812"> 812: </a><span class="php-comment">     * Detect which format should be used to output the data
-</span></span><span id="813" class="l"><a href="#813"> 813: </a><span class="php-comment">     *
-</span></span><span id="814" class="l"><a href="#814"> 814: </a><span class="php-comment">     * @access protected
-</span></span><span id="815" class="l"><a href="#815"> 815: </a><span class="php-comment">     * @return mixed|NULL|string Output format
-</span></span><span id="816" class="l"><a href="#816"> 816: </a><span class="php-comment">     */</span>
-</span><span id="817" class="l"><a href="#817"> 817: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
-</span><span id="818" class="l"><a href="#818"> 818: </a>    {
-</span><span id="819" class="l"><a href="#819"> 819: </a>        <span class="php-comment">// Concatenate formats to a regex pattern e.g. \.(csv|json|xml)</span>
-</span><span id="820" class="l"><a href="#820"> 820: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')($|\/)/'</span>;
-</span><span id="821" class="l"><a href="#821"> 821: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="822" class="l"><a href="#822"> 822: </a>
-</span><span id="823" class="l"><a href="#823"> 823: </a>        <span class="php-comment">// Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2</span>
-</span><span id="824" class="l"><a href="#824"> 824: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
-</span><span id="825" class="l"><a href="#825"> 825: </a>        {
-</span><span id="826" class="l"><a href="#826"> 826: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
-</span><span id="827" class="l"><a href="#827"> 827: </a>        }
-</span><span id="828" class="l"><a href="#828"> 828: </a>
-</span><span id="829" class="l"><a href="#829"> 829: </a>        <span class="php-comment">// Get the format parameter named as 'format'</span>
-</span><span id="830" class="l"><a href="#830"> 830: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]))
-</span><span id="831" class="l"><a href="#831"> 831: </a>        {
-</span><span id="832" class="l"><a href="#832"> 832: </a>            <span class="php-var">$format</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]);
-</span><span id="833" class="l"><a href="#833"> 833: </a>
-</span><span id="834" class="l"><a href="#834"> 834: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]) === <span class="php-keyword1">TRUE</span>)
-</span><span id="835" class="l"><a href="#835"> 835: </a>            {
-</span><span id="836" class="l"><a href="#836"> 836: </a>                <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="837" class="l"><a href="#837"> 837: </a>            }
-</span><span id="838" class="l"><a href="#838"> 838: </a>        }
-</span><span id="839" class="l"><a href="#839"> 839: </a>
-</span><span id="840" class="l"><a href="#840"> 840: </a>        <span class="php-comment">// Get the HTTP_ACCEPT server variable</span>
-</span><span id="841" class="l"><a href="#841"> 841: </a>        <span class="php-var">$http_accept</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>);
-</span><span id="842" class="l"><a href="#842"> 842: </a>
-</span><span id="843" class="l"><a href="#843"> 843: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT server variable</span>
-</span><span id="844" class="l"><a href="#844"> 844: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$http_accept</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="845" class="l"><a href="#845"> 845: </a>        {
-</span><span id="846" class="l"><a href="#846"> 846: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="847" class="l"><a href="#847"> 847: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
-</span><span id="848" class="l"><a href="#848"> 848: </a>            {
-</span><span id="849" class="l"><a href="#849"> 849: </a>                <span class="php-comment">// Has this format been requested?</span>
-</span><span id="850" class="l"><a href="#850"> 850: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="851" class="l"><a href="#851"> 851: </a>                {
-</span><span id="852" class="l"><a href="#852"> 852: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
-</span><span id="853" class="l"><a href="#853"> 853: </a>                    {
-</span><span id="854" class="l"><a href="#854"> 854: </a>                        <span class="php-comment">// If not HTML or XML assume it's correct</span>
-</span><span id="855" class="l"><a href="#855"> 855: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="856" class="l"><a href="#856"> 856: </a>                    }
-</span><span id="857" class="l"><a href="#857"> 857: </a>                    <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="858" class="l"><a href="#858"> 858: </a>                    {
-</span><span id="859" class="l"><a href="#859"> 859: </a>                        <span class="php-comment">// HTML or XML have shown up as a match</span>
-</span><span id="860" class="l"><a href="#860"> 860: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
-</span><span id="861" class="l"><a href="#861"> 861: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="862" class="l"><a href="#862"> 862: </a>                    }
-</span><span id="863" class="l"><a href="#863"> 863: </a>                    <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="864" class="l"><a href="#864"> 864: </a>                    {
-</span><span id="865" class="l"><a href="#865"> 865: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
-</span><span id="866" class="l"><a href="#866"> 866: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="867" class="l"><a href="#867"> 867: </a>                    }
-</span><span id="868" class="l"><a href="#868"> 868: </a>                }
-</span><span id="869" class="l"><a href="#869"> 869: </a>            }
-</span><span id="870" class="l"><a href="#870"> 870: </a>        }
+</span><span id="679" class="l"><a href="#679"> 679: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
+</span><span id="680" class="l"><a href="#680"> 680: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="681" class="l"><a href="#681"> 681: </a>        {
+</span><span id="682" class="l"><a href="#682"> 682: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
+</span><span id="683" class="l"><a href="#683"> 683: </a>        }
+</span><span id="684" class="l"><a href="#684"> 684: </a>
+</span><span id="685" class="l"><a href="#685"> 685: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
+</span><span id="686" class="l"><a href="#686"> 686: </a>        <span class="php-keyword1">try</span>
+</span><span id="687" class="l"><a href="#687"> 687: </a>        {
+</span><span id="688" class="l"><a href="#688"> 688: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
+</span><span id="689" class="l"><a href="#689"> 689: </a>        }
+</span><span id="690" class="l"><a href="#690"> 690: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
+</span><span id="691" class="l"><a href="#691"> 691: </a>        {
+</span><span id="692" class="l"><a href="#692"> 692: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
+</span><span id="693" class="l"><a href="#693"> 693: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="694" class="l"><a href="#694"> 694: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="695" class="l"><a href="#695"> 695: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
+</span><span id="696" class="l"><a href="#696"> 696: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
+</span><span id="697" class="l"><a href="#697"> 697: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
+</span><span id="698" class="l"><a href="#698"> 698: </a>                    ]
+</span><span id="699" class="l"><a href="#699"> 699: </a>                ], self::HTTP_INTERNAL_SERVER_ERROR);
+</span><span id="700" class="l"><a href="#700"> 700: </a>        }
+</span><span id="701" class="l"><a href="#701"> 701: </a>    }
+</span><span id="702" class="l"><a href="#702"> 702: </a>
+</span><span id="703" class="l"><a href="#703"> 703: </a>    <span class="php-comment">/**
+</span></span><span id="704" class="l"><a href="#704"> 704: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
+</span></span><span id="705" class="l"><a href="#705"> 705: </a><span class="php-comment">     *
+</span></span><span id="706" class="l"><a href="#706"> 706: </a><span class="php-comment">     * @access public
+</span></span><span id="707" class="l"><a href="#707"> 707: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
+</span></span><span id="708" class="l"><a href="#708"> 708: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
+</span></span><span id="709" class="l"><a href="#709"> 709: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
+</span></span><span id="710" class="l"><a href="#710"> 710: </a><span class="php-comment">     * running the script; otherwise, exit
+</span></span><span id="711" class="l"><a href="#711"> 711: </a><span class="php-comment">     */</span>
+</span><span id="712" class="l"><a href="#712"> 712: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="713" class="l"><a href="#713"> 713: </a>    {
+</span><span id="714" class="l"><a href="#714"> 714: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
+</span><span id="715" class="l"><a href="#715"> 715: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="716" class="l"><a href="#716"> 716: </a>        {
+</span><span id="717" class="l"><a href="#717"> 717: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
+</span><span id="718" class="l"><a href="#718"> 718: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
+</span><span id="719" class="l"><a href="#719"> 719: </a>        }
+</span><span id="720" class="l"><a href="#720"> 720: </a>
+</span><span id="721" class="l"><a href="#721"> 721: </a>        <span class="php-comment">// Set the output as NULL by default</span>
+</span><span id="722" class="l"><a href="#722"> 722: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="723" class="l"><a href="#723"> 723: </a>
+</span><span id="724" class="l"><a href="#724"> 724: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
+</span><span id="725" class="l"><a href="#725"> 725: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="726" class="l"><a href="#726"> 726: </a>        {
+</span><span id="727" class="l"><a href="#727"> 727: </a>            <span class="php-var">$http_code</span> = self::HTTP_NOT_FOUND;
+</span><span id="728" class="l"><a href="#728"> 728: </a>        }
+</span><span id="729" class="l"><a href="#729"> 729: </a>
+</span><span id="730" class="l"><a href="#730"> 730: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
+</span><span id="731" class="l"><a href="#731"> 731: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="732" class="l"><a href="#732"> 732: </a>        {
+</span><span id="733" class="l"><a href="#733"> 733: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
+</span><span id="734" class="l"><a href="#734"> 734: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
+</span><span id="735" class="l"><a href="#735"> 735: </a>            {
+</span><span id="736" class="l"><a href="#736"> 736: </a>                <span class="php-comment">// Set the format header</span>
+</span><span id="737" class="l"><a href="#737"> 737: </a>                <span class="php-var">$this</span>-&gt;output-&gt;set_content_type(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format], <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
+</span><span id="738" class="l"><a href="#738"> 738: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
+</span><span id="739" class="l"><a href="#739"> 739: </a>
+</span><span id="740" class="l"><a href="#740"> 740: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error</span>
+</span><span id="741" class="l"><a href="#741"> 741: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
+</span><span id="742" class="l"><a href="#742"> 742: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
+</span><span id="743" class="l"><a href="#743"> 743: </a>                {
+</span><span id="744" class="l"><a href="#744"> 744: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="745" class="l"><a href="#745"> 745: </a>                }
+</span><span id="746" class="l"><a href="#746"> 746: </a>            }
+</span><span id="747" class="l"><a href="#747"> 747: </a>            <span class="php-keyword1">else</span>
+</span><span id="748" class="l"><a href="#748"> 748: </a>            {
+</span><span id="749" class="l"><a href="#749"> 749: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
+</span><span id="750" class="l"><a href="#750"> 750: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
+</span><span id="751" class="l"><a href="#751"> 751: </a>                {
+</span><span id="752" class="l"><a href="#752"> 752: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="753" class="l"><a href="#753"> 753: </a>                }
+</span><span id="754" class="l"><a href="#754"> 754: </a>
+</span><span id="755" class="l"><a href="#755"> 755: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
+</span><span id="756" class="l"><a href="#756"> 756: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
+</span><span id="757" class="l"><a href="#757"> 757: </a>            }
+</span><span id="758" class="l"><a href="#758"> 758: </a>        }
+</span><span id="759" class="l"><a href="#759"> 759: </a>
+</span><span id="760" class="l"><a href="#760"> 760: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
+</span><span id="761" class="l"><a href="#761"> 761: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
+</span><span id="762" class="l"><a href="#762"> 762: </a>        <span class="php-comment">// correct HTTP status code</span>
+</span><span id="763" class="l"><a href="#763"> 763: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = self::HTTP_OK;
+</span><span id="764" class="l"><a href="#764"> 764: </a>
+</span><span id="765" class="l"><a href="#765"> 765: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_status_header(<span class="php-var">$http_code</span>);
+</span><span id="766" class="l"><a href="#766"> 766: </a>
+</span><span id="767" class="l"><a href="#767"> 767: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
+</span><span id="768" class="l"><a href="#768"> 768: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="769" class="l"><a href="#769"> 769: </a>        {
+</span><span id="770" class="l"><a href="#770"> 770: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
+</span><span id="771" class="l"><a href="#771"> 771: </a>        }
+</span><span id="772" class="l"><a href="#772"> 772: </a>
+</span><span id="773" class="l"><a href="#773"> 773: </a>        <span class="php-comment">// Output the data</span>
+</span><span id="774" class="l"><a href="#774"> 774: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_output(<span class="php-var">$output</span>);
+</span><span id="775" class="l"><a href="#775"> 775: </a>
+</span><span id="776" class="l"><a href="#776"> 776: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="777" class="l"><a href="#777"> 777: </a>        {
+</span><span id="778" class="l"><a href="#778"> 778: </a>            <span class="php-comment">// Display the data and exit execution</span>
+</span><span id="779" class="l"><a href="#779"> 779: </a>            <span class="php-var">$this</span>-&gt;output-&gt;_display();
+</span><span id="780" class="l"><a href="#780"> 780: </a>            <span class="php-keyword1">exit</span>;
+</span><span id="781" class="l"><a href="#781"> 781: </a>        }
+</span><span id="782" class="l"><a href="#782"> 782: </a>
+</span><span id="783" class="l"><a href="#783"> 783: </a>        <span class="php-comment">// Otherwise dump the output automatically</span>
+</span><span id="784" class="l"><a href="#784"> 784: </a>    }
+</span><span id="785" class="l"><a href="#785"> 785: </a>
+</span><span id="786" class="l"><a href="#786"> 786: </a>    <span class="php-comment">/**
+</span></span><span id="787" class="l"><a href="#787"> 787: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
+</span></span><span id="788" class="l"><a href="#788"> 788: </a><span class="php-comment">     * within the buffers of the Output class. The response is sent to the client
+</span></span><span id="789" class="l"><a href="#789"> 789: </a><span class="php-comment">     * lately by the framework, after the current controller's method termination.
+</span></span><span id="790" class="l"><a href="#790"> 790: </a><span class="php-comment">     * All the hooks after the controller's method termination are executable
+</span></span><span id="791" class="l"><a href="#791"> 791: </a><span class="php-comment">     *
+</span></span><span id="792" class="l"><a href="#792"> 792: </a><span class="php-comment">     * @access public
+</span></span><span id="793" class="l"><a href="#793"> 793: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
+</span></span><span id="794" class="l"><a href="#794"> 794: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
+</span></span><span id="795" class="l"><a href="#795"> 795: </a><span class="php-comment">     */</span>
+</span><span id="796" class="l"><a href="#796"> 796: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> set_response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="797" class="l"><a href="#797"> 797: </a>    {
+</span><span id="798" class="l"><a href="#798"> 798: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$data</span>, <span class="php-var">$http_code</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="799" class="l"><a href="#799"> 799: </a>    }
+</span><span id="800" class="l"><a href="#800"> 800: </a>
+</span><span id="801" class="l"><a href="#801"> 801: </a>    <span class="php-comment">/**
+</span></span><span id="802" class="l"><a href="#802"> 802: </a><span class="php-comment">     * Get the input format e.g. json or xml
+</span></span><span id="803" class="l"><a href="#803"> 803: </a><span class="php-comment">     *
+</span></span><span id="804" class="l"><a href="#804"> 804: </a><span class="php-comment">     * @access protected
+</span></span><span id="805" class="l"><a href="#805"> 805: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
+</span></span><span id="806" class="l"><a href="#806"> 806: </a><span class="php-comment">     */</span>
+</span><span id="807" class="l"><a href="#807"> 807: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
+</span><span id="808" class="l"><a href="#808"> 808: </a>    {
+</span><span id="809" class="l"><a href="#809"> 809: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
+</span><span id="810" class="l"><a href="#810"> 810: </a>        <span class="php-var">$content_type</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
+</span><span id="811" class="l"><a href="#811"> 811: </a>
+</span><span id="812" class="l"><a href="#812"> 812: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$content_type</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="813" class="l"><a href="#813"> 813: </a>        {
+</span><span id="814" class="l"><a href="#814"> 814: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="815" class="l"><a href="#815"> 815: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
+</span><span id="816" class="l"><a href="#816"> 816: </a>            {
+</span><span id="817" class="l"><a href="#817"> 817: </a>                <span class="php-comment">// $key = format e.g. csv</span>
+</span><span id="818" class="l"><a href="#818"> 818: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
+</span><span id="819" class="l"><a href="#819"> 819: </a>
+</span><span id="820" class="l"><a href="#820"> 820: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
+</span><span id="821" class="l"><a href="#821"> 821: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
+</span><span id="822" class="l"><a href="#822"> 822: </a>                <span class="php-var">$content_type</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$content_type</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$content_type</span>)) : <span class="php-var">$content_type</span>);
+</span><span id="823" class="l"><a href="#823"> 823: </a>
+</span><span id="824" class="l"><a href="#824"> 824: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
+</span><span id="825" class="l"><a href="#825"> 825: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$content_type</span> === <span class="php-var">$value</span>)
+</span><span id="826" class="l"><a href="#826"> 826: </a>                {
+</span><span id="827" class="l"><a href="#827"> 827: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
+</span><span id="828" class="l"><a href="#828"> 828: </a>                }
+</span><span id="829" class="l"><a href="#829"> 829: </a>            }
+</span><span id="830" class="l"><a href="#830"> 830: </a>        }
+</span><span id="831" class="l"><a href="#831"> 831: </a>
+</span><span id="832" class="l"><a href="#832"> 832: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="833" class="l"><a href="#833"> 833: </a>    }
+</span><span id="834" class="l"><a href="#834"> 834: </a>
+</span><span id="835" class="l"><a href="#835"> 835: </a>    <span class="php-comment">/**
+</span></span><span id="836" class="l"><a href="#836"> 836: </a><span class="php-comment">     * Gets the default format from the configuration. Fallbacks to 'json'
+</span></span><span id="837" class="l"><a href="#837"> 837: </a><span class="php-comment">     * if the corresponding configuration option $config['rest_default_format']
+</span></span><span id="838" class="l"><a href="#838"> 838: </a><span class="php-comment">     * is missing or is empty
+</span></span><span id="839" class="l"><a href="#839"> 839: </a><span class="php-comment">     *
+</span></span><span id="840" class="l"><a href="#840"> 840: </a><span class="php-comment">     * @access protected
+</span></span><span id="841" class="l"><a href="#841"> 841: </a><span class="php-comment">     * @return string The default supported input format
+</span></span><span id="842" class="l"><a href="#842"> 842: </a><span class="php-comment">     */</span>
+</span><span id="843" class="l"><a href="#843"> 843: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _get_default_output_format()
+</span><span id="844" class="l"><a href="#844"> 844: </a>    {
+</span><span id="845" class="l"><a href="#845"> 845: </a>        <span class="php-var">$default_format</span> = (string) <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
+</span><span id="846" class="l"><a href="#846"> 846: </a>        <span class="php-keyword1">return</span> <span class="php-var">$default_format</span> === <span class="php-quote">''</span> ? <span class="php-quote">'json'</span> : <span class="php-var">$default_format</span>;
+</span><span id="847" class="l"><a href="#847"> 847: </a>    }
+</span><span id="848" class="l"><a href="#848"> 848: </a>
+</span><span id="849" class="l"><a href="#849"> 849: </a>    <span class="php-comment">/**
+</span></span><span id="850" class="l"><a href="#850"> 850: </a><span class="php-comment">     * Detect which format should be used to output the data
+</span></span><span id="851" class="l"><a href="#851"> 851: </a><span class="php-comment">     *
+</span></span><span id="852" class="l"><a href="#852"> 852: </a><span class="php-comment">     * @access protected
+</span></span><span id="853" class="l"><a href="#853"> 853: </a><span class="php-comment">     * @return mixed|NULL|string Output format
+</span></span><span id="854" class="l"><a href="#854"> 854: </a><span class="php-comment">     */</span>
+</span><span id="855" class="l"><a href="#855"> 855: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
+</span><span id="856" class="l"><a href="#856"> 856: </a>    {
+</span><span id="857" class="l"><a href="#857"> 857: </a>        <span class="php-comment">// Concatenate formats to a regex pattern e.g. \.(csv|json|xml)</span>
+</span><span id="858" class="l"><a href="#858"> 858: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span>.<span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)).<span class="php-quote">')($|\/)/'</span>;
+</span><span id="859" class="l"><a href="#859"> 859: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="860" class="l"><a href="#860"> 860: </a>
+</span><span id="861" class="l"><a href="#861"> 861: </a>        <span class="php-comment">// Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2</span>
+</span><span id="862" class="l"><a href="#862"> 862: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
+</span><span id="863" class="l"><a href="#863"> 863: </a>        {
+</span><span id="864" class="l"><a href="#864"> 864: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
+</span><span id="865" class="l"><a href="#865"> 865: </a>        }
+</span><span id="866" class="l"><a href="#866"> 866: </a>
+</span><span id="867" class="l"><a href="#867"> 867: </a>        <span class="php-comment">// Get the format parameter named as 'format'</span>
+</span><span id="868" class="l"><a href="#868"> 868: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]))
+</span><span id="869" class="l"><a href="#869"> 869: </a>        {
+</span><span id="870" class="l"><a href="#870"> 870: </a>            <span class="php-var">$format</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]);
 </span><span id="871" class="l"><a href="#871"> 871: </a>
-</span><span id="872" class="l"><a href="#872"> 872: </a>        <span class="php-comment">// Check if the controller has a default format</span>
-</span><span id="873" class="l"><a href="#873"> 873: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
-</span><span id="874" class="l"><a href="#874"> 874: </a>        {
-</span><span id="875" class="l"><a href="#875"> 875: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
+</span><span id="872" class="l"><a href="#872"> 872: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]) === <span class="php-keyword1">TRUE</span>)
+</span><span id="873" class="l"><a href="#873"> 873: </a>            {
+</span><span id="874" class="l"><a href="#874"> 874: </a>                <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="875" class="l"><a href="#875"> 875: </a>            }
 </span><span id="876" class="l"><a href="#876"> 876: </a>        }
 </span><span id="877" class="l"><a href="#877"> 877: </a>
-</span><span id="878" class="l"><a href="#878"> 878: </a>        <span class="php-comment">// Obtain the default format from the configuration</span>
-</span><span id="879" class="l"><a href="#879"> 879: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
-</span><span id="880" class="l"><a href="#880"> 880: </a>    }
-</span><span id="881" class="l"><a href="#881"> 881: </a>
-</span><span id="882" class="l"><a href="#882"> 882: </a>    <span class="php-comment">/**
-</span></span><span id="883" class="l"><a href="#883"> 883: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
-</span></span><span id="884" class="l"><a href="#884"> 884: </a><span class="php-comment">     *
-</span></span><span id="885" class="l"><a href="#885"> 885: </a><span class="php-comment">     * @access protected
-</span></span><span id="886" class="l"><a href="#886"> 886: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
-</span></span><span id="887" class="l"><a href="#887"> 887: </a><span class="php-comment">     */</span>
-</span><span id="888" class="l"><a href="#888"> 888: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
-</span><span id="889" class="l"><a href="#889"> 889: </a>    {
-</span><span id="890" class="l"><a href="#890"> 890: </a>        <span class="php-comment">// Declare a variable to store the method</span>
-</span><span id="891" class="l"><a href="#891"> 891: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="892" class="l"><a href="#892"> 892: </a>
-</span><span id="893" class="l"><a href="#893"> 893: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
-</span><span id="894" class="l"><a href="#894"> 894: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="895" class="l"><a href="#895"> 895: </a>        {
-</span><span id="896" class="l"><a href="#896"> 896: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
-</span><span id="897" class="l"><a href="#897"> 897: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="898" class="l"><a href="#898"> 898: </a>            {
-</span><span id="899" class="l"><a href="#899"> 899: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
-</span><span id="900" class="l"><a href="#900"> 900: </a>            }
-</span><span id="901" class="l"><a href="#901"> 901: </a>
-</span><span id="902" class="l"><a href="#902"> 902: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
-</span><span id="903" class="l"><a href="#903"> 903: </a>        }
-</span><span id="904" class="l"><a href="#904"> 904: </a>
-</span><span id="905" class="l"><a href="#905"> 905: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
-</span><span id="906" class="l"><a href="#906"> 906: </a>        {
-</span><span id="907" class="l"><a href="#907"> 907: </a>            <span class="php-comment">// Get the request method as a lowercase string.</span>
-</span><span id="908" class="l"><a href="#908"> 908: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
-</span><span id="909" class="l"><a href="#909"> 909: </a>        }
-</span><span id="910" class="l"><a href="#910"> 910: </a>
-</span><span id="911" class="l"><a href="#911"> 911: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
-</span><span id="912" class="l"><a href="#912"> 912: </a>    }
-</span><span id="913" class="l"><a href="#913"> 913: </a>
-</span><span id="914" class="l"><a href="#914"> 914: </a>    <span class="php-comment">/**
-</span></span><span id="915" class="l"><a href="#915"> 915: </a><span class="php-comment">     * See if the user has provided an API key
-</span></span><span id="916" class="l"><a href="#916"> 916: </a><span class="php-comment">     *
-</span></span><span id="917" class="l"><a href="#917"> 917: </a><span class="php-comment">     * @access protected
-</span></span><span id="918" class="l"><a href="#918"> 918: </a><span class="php-comment">     * @return bool
-</span></span><span id="919" class="l"><a href="#919"> 919: </a><span class="php-comment">     */</span>
-</span><span id="920" class="l"><a href="#920"> 920: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
-</span><span id="921" class="l"><a href="#921"> 921: </a>    {
-</span><span id="922" class="l"><a href="#922"> 922: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
-</span><span id="923" class="l"><a href="#923"> 923: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
-</span><span id="924" class="l"><a href="#924"> 924: </a>
-</span><span id="925" class="l"><a href="#925"> 925: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
-</span><span id="926" class="l"><a href="#926"> 926: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
-</span><span id="927" class="l"><a href="#927"> 927: </a>
-</span><span id="928" class="l"><a href="#928"> 928: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="929" class="l"><a href="#929"> 929: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
-</span><span id="930" class="l"><a href="#930"> 930: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
-</span><span id="931" class="l"><a href="#931"> 931: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
-</span><span id="932" class="l"><a href="#932"> 932: </a>
-</span><span id="933" class="l"><a href="#933"> 933: </a>        <span class="php-comment">// Find the key from server or arguments</span>
-</span><span id="934" class="l"><a href="#934"> 934: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
-</span><span id="935" class="l"><a href="#935"> 935: </a>        {
-</span><span id="936" class="l"><a href="#936"> 936: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
-</span><span id="937" class="l"><a href="#937"> 937: </a>            {
-</span><span id="938" class="l"><a href="#938"> 938: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="939" class="l"><a href="#939"> 939: </a>            }
-</span><span id="940" class="l"><a href="#940"> 940: </a>
-</span><span id="941" class="l"><a href="#941"> 941: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
+</span><span id="878" class="l"><a href="#878"> 878: </a>        <span class="php-comment">// Get the HTTP_ACCEPT server variable</span>
+</span><span id="879" class="l"><a href="#879"> 879: </a>        <span class="php-var">$http_accept</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>);
+</span><span id="880" class="l"><a href="#880"> 880: </a>
+</span><span id="881" class="l"><a href="#881"> 881: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT server variable</span>
+</span><span id="882" class="l"><a href="#882"> 882: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$http_accept</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="883" class="l"><a href="#883"> 883: </a>        {
+</span><span id="884" class="l"><a href="#884"> 884: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="885" class="l"><a href="#885"> 885: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
+</span><span id="886" class="l"><a href="#886"> 886: </a>            {
+</span><span id="887" class="l"><a href="#887"> 887: </a>                <span class="php-comment">// Has this format been requested?</span>
+</span><span id="888" class="l"><a href="#888"> 888: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="889" class="l"><a href="#889"> 889: </a>                {
+</span><span id="890" class="l"><a href="#890"> 890: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
+</span><span id="891" class="l"><a href="#891"> 891: </a>                    {
+</span><span id="892" class="l"><a href="#892"> 892: </a>                        <span class="php-comment">// If not HTML or XML assume it's correct</span>
+</span><span id="893" class="l"><a href="#893"> 893: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="894" class="l"><a href="#894"> 894: </a>                    }
+</span><span id="895" class="l"><a href="#895"> 895: </a>                    <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="896" class="l"><a href="#896"> 896: </a>                    {
+</span><span id="897" class="l"><a href="#897"> 897: </a>                        <span class="php-comment">// HTML or XML have shown up as a match</span>
+</span><span id="898" class="l"><a href="#898"> 898: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
+</span><span id="899" class="l"><a href="#899"> 899: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="900" class="l"><a href="#900"> 900: </a>                    }
+</span><span id="901" class="l"><a href="#901"> 901: </a>                    <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="902" class="l"><a href="#902"> 902: </a>                    {
+</span><span id="903" class="l"><a href="#903"> 903: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
+</span><span id="904" class="l"><a href="#904"> 904: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="905" class="l"><a href="#905"> 905: </a>                    }
+</span><span id="906" class="l"><a href="#906"> 906: </a>                }
+</span><span id="907" class="l"><a href="#907"> 907: </a>            }
+</span><span id="908" class="l"><a href="#908"> 908: </a>        }
+</span><span id="909" class="l"><a href="#909"> 909: </a>
+</span><span id="910" class="l"><a href="#910"> 910: </a>        <span class="php-comment">// Check if the controller has a default format</span>
+</span><span id="911" class="l"><a href="#911"> 911: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
+</span><span id="912" class="l"><a href="#912"> 912: </a>        {
+</span><span id="913" class="l"><a href="#913"> 913: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
+</span><span id="914" class="l"><a href="#914"> 914: </a>        }
+</span><span id="915" class="l"><a href="#915"> 915: </a>
+</span><span id="916" class="l"><a href="#916"> 916: </a>        <span class="php-comment">// Obtain the default format from the configuration</span>
+</span><span id="917" class="l"><a href="#917"> 917: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_default_output_format();
+</span><span id="918" class="l"><a href="#918"> 918: </a>    }
+</span><span id="919" class="l"><a href="#919"> 919: </a>
+</span><span id="920" class="l"><a href="#920"> 920: </a>    <span class="php-comment">/**
+</span></span><span id="921" class="l"><a href="#921"> 921: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
+</span></span><span id="922" class="l"><a href="#922"> 922: </a><span class="php-comment">     *
+</span></span><span id="923" class="l"><a href="#923"> 923: </a><span class="php-comment">     * @access protected
+</span></span><span id="924" class="l"><a href="#924"> 924: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
+</span></span><span id="925" class="l"><a href="#925"> 925: </a><span class="php-comment">     */</span>
+</span><span id="926" class="l"><a href="#926"> 926: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
+</span><span id="927" class="l"><a href="#927"> 927: </a>    {
+</span><span id="928" class="l"><a href="#928"> 928: </a>        <span class="php-comment">// Declare a variable to store the method</span>
+</span><span id="929" class="l"><a href="#929"> 929: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="930" class="l"><a href="#930"> 930: </a>
+</span><span id="931" class="l"><a href="#931"> 931: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
+</span><span id="932" class="l"><a href="#932"> 932: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="933" class="l"><a href="#933"> 933: </a>        {
+</span><span id="934" class="l"><a href="#934"> 934: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
+</span><span id="935" class="l"><a href="#935"> 935: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="936" class="l"><a href="#936"> 936: </a>            {
+</span><span id="937" class="l"><a href="#937"> 937: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
+</span><span id="938" class="l"><a href="#938"> 938: </a>            }
+</span><span id="939" class="l"><a href="#939"> 939: </a>
+</span><span id="940" class="l"><a href="#940"> 940: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
+</span><span id="941" class="l"><a href="#941"> 941: </a>        }
 </span><span id="942" class="l"><a href="#942"> 942: </a>
-</span><span id="943" class="l"><a href="#943"> 943: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
-</span><span id="944" class="l"><a href="#944"> 944: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
-</span><span id="945" class="l"><a href="#945"> 945: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
-</span><span id="946" class="l"><a href="#946"> 946: </a>
-</span><span id="947" class="l"><a href="#947"> 947: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
+</span><span id="943" class="l"><a href="#943"> 943: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
+</span><span id="944" class="l"><a href="#944"> 944: </a>        {
+</span><span id="945" class="l"><a href="#945"> 945: </a>            <span class="php-comment">// Get the request method as a lowercase string</span>
+</span><span id="946" class="l"><a href="#946"> 946: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
+</span><span id="947" class="l"><a href="#947"> 947: </a>        }
 </span><span id="948" class="l"><a href="#948"> 948: </a>
-</span><span id="949" class="l"><a href="#949"> 949: </a>            <span class="php-comment">/*
-</span></span><span id="950" class="l"><a href="#950"> 950: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
-</span></span><span id="951" class="l"><a href="#951"> 951: </a><span class="php-comment">             * of valid ip addresses stored in the database.
-</span></span><span id="952" class="l"><a href="#952"> 952: </a><span class="php-comment">             */</span>
-</span><span id="953" class="l"><a href="#953"> 953: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
-</span><span id="954" class="l"><a href="#954"> 954: </a>            {
-</span><span id="955" class="l"><a href="#955"> 955: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
-</span><span id="956" class="l"><a href="#956"> 956: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
-</span><span id="957" class="l"><a href="#957"> 957: </a>                {
-</span><span id="958" class="l"><a href="#958"> 958: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
-</span><span id="959" class="l"><a href="#959"> 959: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
-</span><span id="960" class="l"><a href="#960"> 960: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
-</span><span id="961" class="l"><a href="#961"> 961: </a>
-</span><span id="962" class="l"><a href="#962"> 962: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
-</span><span id="963" class="l"><a href="#963"> 963: </a>                    {
-</span><span id="964" class="l"><a href="#964"> 964: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() === <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
-</span><span id="965" class="l"><a href="#965"> 965: </a>                        {
-</span><span id="966" class="l"><a href="#966"> 966: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
-</span><span id="967" class="l"><a href="#967"> 967: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
-</span><span id="968" class="l"><a href="#968"> 968: </a>                            <span class="php-keyword1">break</span>;
-</span><span id="969" class="l"><a href="#969"> 969: </a>                        }
-</span><span id="970" class="l"><a href="#970"> 970: </a>                    }
-</span><span id="971" class="l"><a href="#971"> 971: </a>
-</span><span id="972" class="l"><a href="#972"> 972: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
-</span><span id="973" class="l"><a href="#973"> 973: </a>                }
-</span><span id="974" class="l"><a href="#974"> 974: </a>                <span class="php-keyword1">else</span>
-</span><span id="975" class="l"><a href="#975"> 975: </a>                {
-</span><span id="976" class="l"><a href="#976"> 976: </a>                    <span class="php-comment">// There should be at least one IP address for this private key.</span>
-</span><span id="977" class="l"><a href="#977"> 977: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="978" class="l"><a href="#978"> 978: </a>                }
-</span><span id="979" class="l"><a href="#979"> 979: </a>            }
+</span><span id="949" class="l"><a href="#949"> 949: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
+</span><span id="950" class="l"><a href="#950"> 950: </a>    }
+</span><span id="951" class="l"><a href="#951"> 951: </a>
+</span><span id="952" class="l"><a href="#952"> 952: </a>    <span class="php-comment">/**
+</span></span><span id="953" class="l"><a href="#953"> 953: </a><span class="php-comment">     * See if the user has provided an API key
+</span></span><span id="954" class="l"><a href="#954"> 954: </a><span class="php-comment">     *
+</span></span><span id="955" class="l"><a href="#955"> 955: </a><span class="php-comment">     * @access protected
+</span></span><span id="956" class="l"><a href="#956"> 956: </a><span class="php-comment">     * @return bool
+</span></span><span id="957" class="l"><a href="#957"> 957: </a><span class="php-comment">     */</span>
+</span><span id="958" class="l"><a href="#958"> 958: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
+</span><span id="959" class="l"><a href="#959"> 959: </a>    {
+</span><span id="960" class="l"><a href="#960"> 960: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
+</span><span id="961" class="l"><a href="#961"> 961: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
+</span><span id="962" class="l"><a href="#962"> 962: </a>
+</span><span id="963" class="l"><a href="#963"> 963: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
+</span><span id="964" class="l"><a href="#964"> 964: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
+</span><span id="965" class="l"><a href="#965"> 965: </a>
+</span><span id="966" class="l"><a href="#966"> 966: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="967" class="l"><a href="#967"> 967: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
+</span><span id="968" class="l"><a href="#968"> 968: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
+</span><span id="969" class="l"><a href="#969"> 969: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
+</span><span id="970" class="l"><a href="#970"> 970: </a>
+</span><span id="971" class="l"><a href="#971"> 971: </a>        <span class="php-comment">// Find the key from server or arguments</span>
+</span><span id="972" class="l"><a href="#972"> 972: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
+</span><span id="973" class="l"><a href="#973"> 973: </a>        {
+</span><span id="974" class="l"><a href="#974"> 974: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
+</span><span id="975" class="l"><a href="#975"> 975: </a>            {
+</span><span id="976" class="l"><a href="#976"> 976: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="977" class="l"><a href="#977"> 977: </a>            }
+</span><span id="978" class="l"><a href="#978"> 978: </a>
+</span><span id="979" class="l"><a href="#979"> 979: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
 </span><span id="980" class="l"><a href="#980"> 980: </a>
-</span><span id="981" class="l"><a href="#981"> 981: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="982" class="l"><a href="#982"> 982: </a>        }
-</span><span id="983" class="l"><a href="#983"> 983: </a>
-</span><span id="984" class="l"><a href="#984"> 984: </a>        <span class="php-comment">// No key has been sent</span>
-</span><span id="985" class="l"><a href="#985"> 985: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="986" class="l"><a href="#986"> 986: </a>    }
-</span><span id="987" class="l"><a href="#987"> 987: </a>
-</span><span id="988" class="l"><a href="#988"> 988: </a>    <span class="php-comment">/**
-</span></span><span id="989" class="l"><a href="#989"> 989: </a><span class="php-comment">     * Preferred return language
-</span></span><span id="990" class="l"><a href="#990"> 990: </a><span class="php-comment">     *
-</span></span><span id="991" class="l"><a href="#991"> 991: </a><span class="php-comment">     * @access protected
-</span></span><span id="992" class="l"><a href="#992"> 992: </a><span class="php-comment">     * @return string|NULL The language code
-</span></span><span id="993" class="l"><a href="#993"> 993: </a><span class="php-comment">     */</span>
-</span><span id="994" class="l"><a href="#994"> 994: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
-</span><span id="995" class="l"><a href="#995"> 995: </a>    {
-</span><span id="996" class="l"><a href="#996"> 996: </a>        <span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>);
-</span><span id="997" class="l"><a href="#997"> 997: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$lang</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="998" class="l"><a href="#998"> 998: </a>        {
-</span><span id="999" class="l"><a href="#999"> 999: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="1000" class="l"><a href="#1000">1000: </a>        }
-</span><span id="1001" class="l"><a href="#1001">1001: </a>
-</span><span id="1002" class="l"><a href="#1002">1002: </a>        <span class="php-comment">// It appears more than one language has been sent using a comma delimiter</span>
-</span><span id="1003" class="l"><a href="#1003">1003: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="1004" class="l"><a href="#1004">1004: </a>        {
-</span><span id="1005" class="l"><a href="#1005">1005: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
-</span><span id="1006" class="l"><a href="#1006">1006: </a>
-</span><span id="1007" class="l"><a href="#1007">1007: </a>            <span class="php-var">$return_langs</span> = [];
-</span><span id="1008" class="l"><a href="#1008">1008: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
-</span><span id="1009" class="l"><a href="#1009">1009: </a>            {
-</span><span id="1010" class="l"><a href="#1010">1010: </a>                <span class="php-comment">// Remove weight and trim leading and trailing whitespace</span>
-</span><span id="1011" class="l"><a href="#1011">1011: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
-</span><span id="1012" class="l"><a href="#1012">1012: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
-</span><span id="1013" class="l"><a href="#1013">1013: </a>            }
-</span><span id="1014" class="l"><a href="#1014">1014: </a>
-</span><span id="1015" class="l"><a href="#1015">1015: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
-</span><span id="1016" class="l"><a href="#1016">1016: </a>        }
-</span><span id="1017" class="l"><a href="#1017">1017: </a>
-</span><span id="1018" class="l"><a href="#1018">1018: </a>        <span class="php-comment">// Otherwise simply return as a string</span>
-</span><span id="1019" class="l"><a href="#1019">1019: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
-</span><span id="1020" class="l"><a href="#1020">1020: </a>    }
+</span><span id="981" class="l"><a href="#981"> 981: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
+</span><span id="982" class="l"><a href="#982"> 982: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
+</span><span id="983" class="l"><a href="#983"> 983: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
+</span><span id="984" class="l"><a href="#984"> 984: </a>
+</span><span id="985" class="l"><a href="#985"> 985: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
+</span><span id="986" class="l"><a href="#986"> 986: </a>
+</span><span id="987" class="l"><a href="#987"> 987: </a>            <span class="php-comment">/*
+</span></span><span id="988" class="l"><a href="#988"> 988: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
+</span></span><span id="989" class="l"><a href="#989"> 989: </a><span class="php-comment">             * of valid ip addresses stored in the database
+</span></span><span id="990" class="l"><a href="#990"> 990: </a><span class="php-comment">             */</span>
+</span><span id="991" class="l"><a href="#991"> 991: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
+</span><span id="992" class="l"><a href="#992"> 992: </a>            {
+</span><span id="993" class="l"><a href="#993"> 993: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
+</span><span id="994" class="l"><a href="#994"> 994: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
+</span><span id="995" class="l"><a href="#995"> 995: </a>                {
+</span><span id="996" class="l"><a href="#996"> 996: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
+</span><span id="997" class="l"><a href="#997"> 997: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
+</span><span id="998" class="l"><a href="#998"> 998: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
+</span><span id="999" class="l"><a href="#999"> 999: </a>
+</span><span id="1000" class="l"><a href="#1000">1000: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
+</span><span id="1001" class="l"><a href="#1001">1001: </a>                    {
+</span><span id="1002" class="l"><a href="#1002">1002: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() === <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
+</span><span id="1003" class="l"><a href="#1003">1003: </a>                        {
+</span><span id="1004" class="l"><a href="#1004">1004: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
+</span><span id="1005" class="l"><a href="#1005">1005: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
+</span><span id="1006" class="l"><a href="#1006">1006: </a>                            <span class="php-keyword1">break</span>;
+</span><span id="1007" class="l"><a href="#1007">1007: </a>                        }
+</span><span id="1008" class="l"><a href="#1008">1008: </a>                    }
+</span><span id="1009" class="l"><a href="#1009">1009: </a>
+</span><span id="1010" class="l"><a href="#1010">1010: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
+</span><span id="1011" class="l"><a href="#1011">1011: </a>                }
+</span><span id="1012" class="l"><a href="#1012">1012: </a>                <span class="php-keyword1">else</span>
+</span><span id="1013" class="l"><a href="#1013">1013: </a>                {
+</span><span id="1014" class="l"><a href="#1014">1014: </a>                    <span class="php-comment">// There should be at least one IP address for this private key</span>
+</span><span id="1015" class="l"><a href="#1015">1015: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1016" class="l"><a href="#1016">1016: </a>                }
+</span><span id="1017" class="l"><a href="#1017">1017: </a>            }
+</span><span id="1018" class="l"><a href="#1018">1018: </a>
+</span><span id="1019" class="l"><a href="#1019">1019: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1020" class="l"><a href="#1020">1020: </a>        }
 </span><span id="1021" class="l"><a href="#1021">1021: </a>
-</span><span id="1022" class="l"><a href="#1022">1022: </a>    <span class="php-comment">/**
-</span></span><span id="1023" class="l"><a href="#1023">1023: </a><span class="php-comment">     * Add the request to the log table
-</span></span><span id="1024" class="l"><a href="#1024">1024: </a><span class="php-comment">     *
-</span></span><span id="1025" class="l"><a href="#1025">1025: </a><span class="php-comment">     * @access protected
-</span></span><span id="1026" class="l"><a href="#1026">1026: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
-</span></span><span id="1027" class="l"><a href="#1027">1027: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
-</span></span><span id="1028" class="l"><a href="#1028">1028: </a><span class="php-comment">     */</span>
-</span><span id="1029" class="l"><a href="#1029">1029: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1030" class="l"><a href="#1030">1030: </a>    {
-</span><span id="1031" class="l"><a href="#1031">1031: </a>        <span class="php-comment">// Insert the request into the log table</span>
-</span><span id="1032" class="l"><a href="#1032">1032: </a>        <span class="php-var">$is_inserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1033" class="l"><a href="#1033">1033: </a>            -&gt;insert(
-</span><span id="1034" class="l"><a href="#1034">1034: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
-</span><span id="1035" class="l"><a href="#1035">1035: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
-</span><span id="1036" class="l"><a href="#1036">1036: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
-</span><span id="1037" class="l"><a href="#1037">1037: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
-</span><span id="1038" class="l"><a href="#1038">1038: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="1039" class="l"><a href="#1039">1039: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
-</span><span id="1040" class="l"><a href="#1040">1040: </a>                <span class="php-quote">'time'</span> =&gt; now(), <span class="php-comment">// Used to be: function_exists('now') ? now() : time()</span>
-</span><span id="1041" class="l"><a href="#1041">1041: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
-</span><span id="1042" class="l"><a href="#1042">1042: </a>            ]);
-</span><span id="1043" class="l"><a href="#1043">1043: </a>
-</span><span id="1044" class="l"><a href="#1044">1044: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
-</span><span id="1045" class="l"><a href="#1045">1045: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
-</span><span id="1046" class="l"><a href="#1046">1046: </a>
-</span><span id="1047" class="l"><a href="#1047">1047: </a>        <span class="php-keyword1">return</span> <span class="php-var">$is_inserted</span>;
-</span><span id="1048" class="l"><a href="#1048">1048: </a>    }
-</span><span id="1049" class="l"><a href="#1049">1049: </a>
-</span><span id="1050" class="l"><a href="#1050">1050: </a>    <span class="php-comment">/**
-</span></span><span id="1051" class="l"><a href="#1051">1051: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
-</span></span><span id="1052" class="l"><a href="#1052">1052: </a><span class="php-comment">     *
-</span></span><span id="1053" class="l"><a href="#1053">1053: </a><span class="php-comment">     * @access protected
-</span></span><span id="1054" class="l"><a href="#1054">1054: </a><span class="php-comment">     * @param  string $controller_method The method being called
-</span></span><span id="1055" class="l"><a href="#1055">1055: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
-</span></span><span id="1056" class="l"><a href="#1056">1056: </a><span class="php-comment">     */</span>
-</span><span id="1057" class="l"><a href="#1057">1057: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
-</span><span id="1058" class="l"><a href="#1058">1058: </a>    {
-</span><span id="1059" class="l"><a href="#1059">1059: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
-</span><span id="1060" class="l"><a href="#1060">1060: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1061" class="l"><a href="#1061">1061: </a>        {
-</span><span id="1062" class="l"><a href="#1062">1062: </a>            <span class="php-comment">// Everything is fine</span>
-</span><span id="1063" class="l"><a href="#1063">1063: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1064" class="l"><a href="#1064">1064: </a>        }
-</span><span id="1065" class="l"><a href="#1065">1065: </a>
-</span><span id="1066" class="l"><a href="#1066">1066: </a>        <span class="php-keyword1">switch</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_method'</span>))
-</span><span id="1067" class="l"><a href="#1067">1067: </a>        {
-</span><span id="1068" class="l"><a href="#1068">1068: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'API_KEY'</span>:
-</span><span id="1069" class="l"><a href="#1069">1069: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'api-key:'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>);
-</span><span id="1070" class="l"><a href="#1070">1070: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>;
-</span><span id="1071" class="l"><a href="#1071">1071: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1072" class="l"><a href="#1072">1072: </a>
-</span><span id="1073" class="l"><a href="#1073">1073: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'METHOD_NAME'</span>:
-</span><span id="1074" class="l"><a href="#1074">1074: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'method-name:'</span> . <span class="php-var">$controller_method</span>;
-</span><span id="1075" class="l"><a href="#1075">1075: </a>            <span class="php-var">$limited_method_name</span> =  <span class="php-var">$controller_method</span>;
-</span><span id="1076" class="l"><a href="#1076">1076: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1077" class="l"><a href="#1077">1077: </a>
-</span><span id="1078" class="l"><a href="#1078">1078: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'ROUTED_URL'</span>:
-</span><span id="1079" class="l"><a href="#1079">1079: </a>          <span class="php-keyword1">default</span>:
-</span><span id="1080" class="l"><a href="#1080">1080: </a>            <span class="php-var">$limited_uri</span> = <span class="php-var">$this</span>-&gt;uri-&gt;ruri_string();
-</span><span id="1081" class="l"><a href="#1081">1081: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$limited_uri</span>), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
-</span><span id="1082" class="l"><a href="#1082">1082: </a>            {
-</span><span id="1083" class="l"><a href="#1083">1083: </a>                <span class="php-var">$limited_uri</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$limited_uri</span>,<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format) - <span class="php-num">1</span>);
-</span><span id="1084" class="l"><a href="#1084">1084: </a>            }
-</span><span id="1085" class="l"><a href="#1085">1085: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'uri:'</span> . <span class="php-var">$limited_uri</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method; <span class="php-comment">// It's good to differentiate GET from PUT</span>
-</span><span id="1086" class="l"><a href="#1086">1086: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-var">$controller_method</span>;
-</span><span id="1087" class="l"><a href="#1087">1087: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1088" class="l"><a href="#1088">1088: </a>        }
-</span><span id="1089" class="l"><a href="#1089">1089: </a>
-</span><span id="1090" class="l"><a href="#1090">1090: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span> )
-</span><span id="1091" class="l"><a href="#1091">1091: </a>        {
-</span><span id="1092" class="l"><a href="#1092">1092: </a>            <span class="php-comment">// Everything is fine</span>
-</span><span id="1093" class="l"><a href="#1093">1093: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1094" class="l"><a href="#1094">1094: </a>        }
-</span><span id="1095" class="l"><a href="#1095">1095: </a>
-</span><span id="1096" class="l"><a href="#1096">1096: </a>        <span class="php-comment">// How many times can you get to this method in a defined time_limit (default: 1 hour)?</span>
-</span><span id="1097" class="l"><a href="#1097">1097: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>];
-</span><span id="1098" class="l"><a href="#1098">1098: </a>
-</span><span id="1099" class="l"><a href="#1099">1099: </a>        <span class="php-var">$time_limit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>] : <span class="php-num">3600</span>); <span class="php-comment">// 3600 = 60 * 60</span>
-</span><span id="1100" class="l"><a href="#1100">1100: </a>
-</span><span id="1101" class="l"><a href="#1101">1101: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
-</span><span id="1102" class="l"><a href="#1102">1102: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1103" class="l"><a href="#1103">1103: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1104" class="l"><a href="#1104">1104: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1105" class="l"><a href="#1105">1105: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
-</span><span id="1106" class="l"><a href="#1106">1106: </a>            -&gt;row();
-</span><span id="1107" class="l"><a href="#1107">1107: </a>
-</span><span id="1108" class="l"><a href="#1108">1108: </a>        <span class="php-comment">// No calls have been made for this key</span>
-</span><span id="1109" class="l"><a href="#1109">1109: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1110" class="l"><a href="#1110">1110: </a>        {
-</span><span id="1111" class="l"><a href="#1111">1111: </a>            <span class="php-comment">// Create a new row for the following key</span>
-</span><span id="1112" class="l"><a href="#1112">1112: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
-</span><span id="1113" class="l"><a href="#1113">1113: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$limited_uri</span>,
-</span><span id="1114" class="l"><a href="#1114">1114: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="1115" class="l"><a href="#1115">1115: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
-</span><span id="1116" class="l"><a href="#1116">1116: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
-</span><span id="1117" class="l"><a href="#1117">1117: </a>            ]);
-</span><span id="1118" class="l"><a href="#1118">1118: </a>        }
-</span><span id="1119" class="l"><a href="#1119">1119: </a>
-</span><span id="1120" class="l"><a href="#1120">1120: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
-</span><span id="1121" class="l"><a href="#1121">1121: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$time_limit</span>))
-</span><span id="1122" class="l"><a href="#1122">1122: </a>        {
-</span><span id="1123" class="l"><a href="#1123">1123: </a>            <span class="php-comment">// Reset the started period and count</span>
-</span><span id="1124" class="l"><a href="#1124">1124: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1125" class="l"><a href="#1125">1125: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1126" class="l"><a href="#1126">1126: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
-</span><span id="1127" class="l"><a href="#1127">1127: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
-</span><span id="1128" class="l"><a href="#1128">1128: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
-</span><span id="1129" class="l"><a href="#1129">1129: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1130" class="l"><a href="#1130">1130: </a>        }
-</span><span id="1131" class="l"><a href="#1131">1131: </a>
-</span><span id="1132" class="l"><a href="#1132">1132: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
-</span><span id="1133" class="l"><a href="#1133">1133: </a>        <span class="php-keyword1">else</span>
-</span><span id="1134" class="l"><a href="#1134">1134: </a>        {
-</span><span id="1135" class="l"><a href="#1135">1135: </a>            <span class="php-comment">// The limit has been exceeded</span>
-</span><span id="1136" class="l"><a href="#1136">1136: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
-</span><span id="1137" class="l"><a href="#1137">1137: </a>            {
-</span><span id="1138" class="l"><a href="#1138">1138: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1139" class="l"><a href="#1139">1139: </a>            }
-</span><span id="1140" class="l"><a href="#1140">1140: </a>
-</span><span id="1141" class="l"><a href="#1141">1141: </a>            <span class="php-comment">// Increase the count by one</span>
-</span><span id="1142" class="l"><a href="#1142">1142: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1143" class="l"><a href="#1143">1143: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1144" class="l"><a href="#1144">1144: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1145" class="l"><a href="#1145">1145: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
-</span><span id="1146" class="l"><a href="#1146">1146: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1147" class="l"><a href="#1147">1147: </a>        }
-</span><span id="1148" class="l"><a href="#1148">1148: </a>
-</span><span id="1149" class="l"><a href="#1149">1149: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1150" class="l"><a href="#1150">1150: </a>    }
-</span><span id="1151" class="l"><a href="#1151">1151: </a>
-</span><span id="1152" class="l"><a href="#1152">1152: </a>    <span class="php-comment">/**
-</span></span><span id="1153" class="l"><a href="#1153">1153: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method/HTTP-method being called
-</span></span><span id="1154" class="l"><a href="#1154">1154: </a><span class="php-comment">     *
-</span></span><span id="1155" class="l"><a href="#1155">1155: </a><span class="php-comment">     * @access protected
-</span></span><span id="1156" class="l"><a href="#1156">1156: </a><span class="php-comment">     * @return bool
-</span></span><span id="1157" class="l"><a href="#1157">1157: </a><span class="php-comment">     */</span>
-</span><span id="1158" class="l"><a href="#1158">1158: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
-</span><span id="1159" class="l"><a href="#1159">1159: </a>    {
-</span><span id="1160" class="l"><a href="#1160">1160: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
-</span><span id="1161" class="l"><a href="#1161">1161: </a>        <span class="php-var">$auth_override_class_method</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
-</span><span id="1162" class="l"><a href="#1162">1162: </a>
-</span><span id="1163" class="l"><a href="#1163">1163: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
-</span><span id="1164" class="l"><a href="#1164">1164: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>))
-</span><span id="1165" class="l"><a href="#1165">1165: </a>        {
-</span><span id="1166" class="l"><a href="#1166">1166: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="1167" class="l"><a href="#1167">1167: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>])) <span class="php-comment">// Check for class overrides</span>
-</span><span id="1168" class="l"><a href="#1168">1168: </a>            {
-</span><span id="1169" class="l"><a href="#1169">1169: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1170" class="l"><a href="#1170">1170: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'none'</span>)
-</span><span id="1171" class="l"><a href="#1171">1171: </a>                {
-</span><span id="1172" class="l"><a href="#1172">1172: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1173" class="l"><a href="#1173">1173: </a>                }
-</span><span id="1174" class="l"><a href="#1174">1174: </a>
-</span><span id="1175" class="l"><a href="#1175">1175: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1176" class="l"><a href="#1176">1176: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'basic'</span>)
-</span><span id="1177" class="l"><a href="#1177">1177: </a>                {
-</span><span id="1178" class="l"><a href="#1178">1178: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1179" class="l"><a href="#1179">1179: </a>
-</span><span id="1180" class="l"><a href="#1180">1180: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1181" class="l"><a href="#1181">1181: </a>                }
-</span><span id="1182" class="l"><a href="#1182">1182: </a>
-</span><span id="1183" class="l"><a href="#1183">1183: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1184" class="l"><a href="#1184">1184: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'digest'</span>)
-</span><span id="1185" class="l"><a href="#1185">1185: </a>                {
-</span><span id="1186" class="l"><a href="#1186">1186: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1187" class="l"><a href="#1187">1187: </a>
-</span><span id="1188" class="l"><a href="#1188">1188: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1189" class="l"><a href="#1189">1189: </a>                }
-</span><span id="1190" class="l"><a href="#1190">1190: </a>
-</span><span id="1191" class="l"><a href="#1191">1191: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1192" class="l"><a href="#1192">1192: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1193" class="l"><a href="#1193">1193: </a>                {
-</span><span id="1194" class="l"><a href="#1194">1194: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1195" class="l"><a href="#1195">1195: </a>
-</span><span id="1196" class="l"><a href="#1196">1196: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1197" class="l"><a href="#1197">1197: </a>                }
-</span><span id="1198" class="l"><a href="#1198">1198: </a>            }
-</span><span id="1199" class="l"><a href="#1199">1199: </a>
-</span><span id="1200" class="l"><a href="#1200">1200: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
-</span><span id="1201" class="l"><a href="#1201">1201: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
-</span><span id="1202" class="l"><a href="#1202">1202: </a>            {
-</span><span id="1203" class="l"><a href="#1203">1203: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1204" class="l"><a href="#1204">1204: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'none'</span>)
-</span><span id="1205" class="l"><a href="#1205">1205: </a>                {
-</span><span id="1206" class="l"><a href="#1206">1206: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1207" class="l"><a href="#1207">1207: </a>                }
-</span><span id="1208" class="l"><a href="#1208">1208: </a>
-</span><span id="1209" class="l"><a href="#1209">1209: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1210" class="l"><a href="#1210">1210: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'basic'</span>)
-</span><span id="1211" class="l"><a href="#1211">1211: </a>                {
-</span><span id="1212" class="l"><a href="#1212">1212: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1213" class="l"><a href="#1213">1213: </a>
-</span><span id="1214" class="l"><a href="#1214">1214: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1215" class="l"><a href="#1215">1215: </a>                }
-</span><span id="1216" class="l"><a href="#1216">1216: </a>
-</span><span id="1217" class="l"><a href="#1217">1217: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1218" class="l"><a href="#1218">1218: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'digest'</span>)
-</span><span id="1219" class="l"><a href="#1219">1219: </a>                {
-</span><span id="1220" class="l"><a href="#1220">1220: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1221" class="l"><a href="#1221">1221: </a>
-</span><span id="1222" class="l"><a href="#1222">1222: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1223" class="l"><a href="#1223">1223: </a>                }
-</span><span id="1224" class="l"><a href="#1224">1224: </a>
-</span><span id="1225" class="l"><a href="#1225">1225: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1226" class="l"><a href="#1226">1226: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1227" class="l"><a href="#1227">1227: </a>                {
-</span><span id="1228" class="l"><a href="#1228">1228: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1229" class="l"><a href="#1229">1229: </a>
-</span><span id="1230" class="l"><a href="#1230">1230: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1231" class="l"><a href="#1231">1231: </a>                }
-</span><span id="1232" class="l"><a href="#1232">1232: </a>            }
-</span><span id="1233" class="l"><a href="#1233">1233: </a>        }
-</span><span id="1234" class="l"><a href="#1234">1234: </a>
-</span><span id="1235" class="l"><a href="#1235">1235: </a>        <span class="php-comment">// Assign the class/method/HTTP-method auth type override array from the config</span>
-</span><span id="1236" class="l"><a href="#1236">1236: </a>        <span class="php-var">$auth_override_class_method_http</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method_http'</span>);
-</span><span id="1237" class="l"><a href="#1237">1237: </a>
-</span><span id="1238" class="l"><a href="#1238">1238: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
-</span><span id="1239" class="l"><a href="#1239">1239: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>))
-</span><span id="1240" class="l"><a href="#1240">1240: </a>        {
-</span><span id="1241" class="l"><a href="#1241">1241: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="1242" class="l"><a href="#1242">1242: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method]))
-</span><span id="1243" class="l"><a href="#1243">1243: </a>            {
-</span><span id="1244" class="l"><a href="#1244">1244: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1245" class="l"><a href="#1245">1245: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
-</span><span id="1246" class="l"><a href="#1246">1246: </a>                {
-</span><span id="1247" class="l"><a href="#1247">1247: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1248" class="l"><a href="#1248">1248: </a>                }
-</span><span id="1249" class="l"><a href="#1249">1249: </a>
-</span><span id="1250" class="l"><a href="#1250">1250: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1251" class="l"><a href="#1251">1251: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
-</span><span id="1252" class="l"><a href="#1252">1252: </a>                {
-</span><span id="1253" class="l"><a href="#1253">1253: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1022" class="l"><a href="#1022">1022: </a>        <span class="php-comment">// No key has been sent</span>
+</span><span id="1023" class="l"><a href="#1023">1023: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1024" class="l"><a href="#1024">1024: </a>    }
+</span><span id="1025" class="l"><a href="#1025">1025: </a>
+</span><span id="1026" class="l"><a href="#1026">1026: </a>    <span class="php-comment">/**
+</span></span><span id="1027" class="l"><a href="#1027">1027: </a><span class="php-comment">     * Preferred return language
+</span></span><span id="1028" class="l"><a href="#1028">1028: </a><span class="php-comment">     *
+</span></span><span id="1029" class="l"><a href="#1029">1029: </a><span class="php-comment">     * @access protected
+</span></span><span id="1030" class="l"><a href="#1030">1030: </a><span class="php-comment">     * @return string|NULL The language code
+</span></span><span id="1031" class="l"><a href="#1031">1031: </a><span class="php-comment">     */</span>
+</span><span id="1032" class="l"><a href="#1032">1032: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
+</span><span id="1033" class="l"><a href="#1033">1033: </a>    {
+</span><span id="1034" class="l"><a href="#1034">1034: </a>        <span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>);
+</span><span id="1035" class="l"><a href="#1035">1035: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$lang</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1036" class="l"><a href="#1036">1036: </a>        {
+</span><span id="1037" class="l"><a href="#1037">1037: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="1038" class="l"><a href="#1038">1038: </a>        }
+</span><span id="1039" class="l"><a href="#1039">1039: </a>
+</span><span id="1040" class="l"><a href="#1040">1040: </a>        <span class="php-comment">// It appears more than one language has been sent using a comma delimiter</span>
+</span><span id="1041" class="l"><a href="#1041">1041: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="1042" class="l"><a href="#1042">1042: </a>        {
+</span><span id="1043" class="l"><a href="#1043">1043: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
+</span><span id="1044" class="l"><a href="#1044">1044: </a>
+</span><span id="1045" class="l"><a href="#1045">1045: </a>            <span class="php-var">$return_langs</span> = [];
+</span><span id="1046" class="l"><a href="#1046">1046: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
+</span><span id="1047" class="l"><a href="#1047">1047: </a>            {
+</span><span id="1048" class="l"><a href="#1048">1048: </a>                <span class="php-comment">// Remove weight and trim leading and trailing whitespace</span>
+</span><span id="1049" class="l"><a href="#1049">1049: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
+</span><span id="1050" class="l"><a href="#1050">1050: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
+</span><span id="1051" class="l"><a href="#1051">1051: </a>            }
+</span><span id="1052" class="l"><a href="#1052">1052: </a>
+</span><span id="1053" class="l"><a href="#1053">1053: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
+</span><span id="1054" class="l"><a href="#1054">1054: </a>        }
+</span><span id="1055" class="l"><a href="#1055">1055: </a>
+</span><span id="1056" class="l"><a href="#1056">1056: </a>        <span class="php-comment">// Otherwise simply return as a string</span>
+</span><span id="1057" class="l"><a href="#1057">1057: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
+</span><span id="1058" class="l"><a href="#1058">1058: </a>    }
+</span><span id="1059" class="l"><a href="#1059">1059: </a>
+</span><span id="1060" class="l"><a href="#1060">1060: </a>    <span class="php-comment">/**
+</span></span><span id="1061" class="l"><a href="#1061">1061: </a><span class="php-comment">     * Add the request to the log table
+</span></span><span id="1062" class="l"><a href="#1062">1062: </a><span class="php-comment">     *
+</span></span><span id="1063" class="l"><a href="#1063">1063: </a><span class="php-comment">     * @access protected
+</span></span><span id="1064" class="l"><a href="#1064">1064: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
+</span></span><span id="1065" class="l"><a href="#1065">1065: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
+</span></span><span id="1066" class="l"><a href="#1066">1066: </a><span class="php-comment">     */</span>
+</span><span id="1067" class="l"><a href="#1067">1067: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="1068" class="l"><a href="#1068">1068: </a>    {
+</span><span id="1069" class="l"><a href="#1069">1069: </a>        <span class="php-comment">// Insert the request into the log table</span>
+</span><span id="1070" class="l"><a href="#1070">1070: </a>        <span class="php-var">$is_inserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1071" class="l"><a href="#1071">1071: </a>            -&gt;insert(
+</span><span id="1072" class="l"><a href="#1072">1072: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
+</span><span id="1073" class="l"><a href="#1073">1073: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
+</span><span id="1074" class="l"><a href="#1074">1074: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
+</span><span id="1075" class="l"><a href="#1075">1075: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
+</span><span id="1076" class="l"><a href="#1076">1076: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="1077" class="l"><a href="#1077">1077: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
+</span><span id="1078" class="l"><a href="#1078">1078: </a>                <span class="php-quote">'time'</span> =&gt; <span class="php-keyword2">time</span>(),
+</span><span id="1079" class="l"><a href="#1079">1079: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
+</span><span id="1080" class="l"><a href="#1080">1080: </a>            ]);
+</span><span id="1081" class="l"><a href="#1081">1081: </a>
+</span><span id="1082" class="l"><a href="#1082">1082: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
+</span><span id="1083" class="l"><a href="#1083">1083: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
+</span><span id="1084" class="l"><a href="#1084">1084: </a>
+</span><span id="1085" class="l"><a href="#1085">1085: </a>        <span class="php-keyword1">return</span> <span class="php-var">$is_inserted</span>;
+</span><span id="1086" class="l"><a href="#1086">1086: </a>    }
+</span><span id="1087" class="l"><a href="#1087">1087: </a>
+</span><span id="1088" class="l"><a href="#1088">1088: </a>    <span class="php-comment">/**
+</span></span><span id="1089" class="l"><a href="#1089">1089: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
+</span></span><span id="1090" class="l"><a href="#1090">1090: </a><span class="php-comment">     *
+</span></span><span id="1091" class="l"><a href="#1091">1091: </a><span class="php-comment">     * @access protected
+</span></span><span id="1092" class="l"><a href="#1092">1092: </a><span class="php-comment">     * @param  string $controller_method The method being called
+</span></span><span id="1093" class="l"><a href="#1093">1093: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
+</span></span><span id="1094" class="l"><a href="#1094">1094: </a><span class="php-comment">     */</span>
+</span><span id="1095" class="l"><a href="#1095">1095: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
+</span><span id="1096" class="l"><a href="#1096">1096: </a>    {
+</span><span id="1097" class="l"><a href="#1097">1097: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
+</span><span id="1098" class="l"><a href="#1098">1098: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1099" class="l"><a href="#1099">1099: </a>        {
+</span><span id="1100" class="l"><a href="#1100">1100: </a>            <span class="php-comment">// Everything is fine</span>
+</span><span id="1101" class="l"><a href="#1101">1101: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1102" class="l"><a href="#1102">1102: </a>        }
+</span><span id="1103" class="l"><a href="#1103">1103: </a>
+</span><span id="1104" class="l"><a href="#1104">1104: </a>        <span class="php-keyword1">switch</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_method'</span>))
+</span><span id="1105" class="l"><a href="#1105">1105: </a>        {
+</span><span id="1106" class="l"><a href="#1106">1106: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'API_KEY'</span>:
+</span><span id="1107" class="l"><a href="#1107">1107: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'api-key:'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>);
+</span><span id="1108" class="l"><a href="#1108">1108: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>;
+</span><span id="1109" class="l"><a href="#1109">1109: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1110" class="l"><a href="#1110">1110: </a>
+</span><span id="1111" class="l"><a href="#1111">1111: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'METHOD_NAME'</span>:
+</span><span id="1112" class="l"><a href="#1112">1112: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'method-name:'</span> . <span class="php-var">$controller_method</span>;
+</span><span id="1113" class="l"><a href="#1113">1113: </a>            <span class="php-var">$limited_method_name</span> =  <span class="php-var">$controller_method</span>;
+</span><span id="1114" class="l"><a href="#1114">1114: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1115" class="l"><a href="#1115">1115: </a>
+</span><span id="1116" class="l"><a href="#1116">1116: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'ROUTED_URL'</span>:
+</span><span id="1117" class="l"><a href="#1117">1117: </a>          <span class="php-keyword1">default</span>:
+</span><span id="1118" class="l"><a href="#1118">1118: </a>            <span class="php-var">$limited_uri</span> = <span class="php-var">$this</span>-&gt;uri-&gt;ruri_string();
+</span><span id="1119" class="l"><a href="#1119">1119: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$limited_uri</span>), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
+</span><span id="1120" class="l"><a href="#1120">1120: </a>            {
+</span><span id="1121" class="l"><a href="#1121">1121: </a>                <span class="php-var">$limited_uri</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$limited_uri</span>,<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format) - <span class="php-num">1</span>);
+</span><span id="1122" class="l"><a href="#1122">1122: </a>            }
+</span><span id="1123" class="l"><a href="#1123">1123: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'uri:'</span>.<span class="php-var">$limited_uri</span>.<span class="php-quote">':'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method; <span class="php-comment">// It's good to differentiate GET from PUT</span>
+</span><span id="1124" class="l"><a href="#1124">1124: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-var">$controller_method</span>;
+</span><span id="1125" class="l"><a href="#1125">1125: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1126" class="l"><a href="#1126">1126: </a>        }
+</span><span id="1127" class="l"><a href="#1127">1127: </a>
+</span><span id="1128" class="l"><a href="#1128">1128: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span> )
+</span><span id="1129" class="l"><a href="#1129">1129: </a>        {
+</span><span id="1130" class="l"><a href="#1130">1130: </a>            <span class="php-comment">// Everything is fine</span>
+</span><span id="1131" class="l"><a href="#1131">1131: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1132" class="l"><a href="#1132">1132: </a>        }
+</span><span id="1133" class="l"><a href="#1133">1133: </a>
+</span><span id="1134" class="l"><a href="#1134">1134: </a>        <span class="php-comment">// How many times can you get to this method in a defined time_limit (default: 1 hour)?</span>
+</span><span id="1135" class="l"><a href="#1135">1135: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>];
+</span><span id="1136" class="l"><a href="#1136">1136: </a>
+</span><span id="1137" class="l"><a href="#1137">1137: </a>        <span class="php-var">$time_limit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>] : <span class="php-num">3600</span>); <span class="php-comment">// 3600 = 60 * 60</span>
+</span><span id="1138" class="l"><a href="#1138">1138: </a>
+</span><span id="1139" class="l"><a href="#1139">1139: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
+</span><span id="1140" class="l"><a href="#1140">1140: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1141" class="l"><a href="#1141">1141: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1142" class="l"><a href="#1142">1142: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1143" class="l"><a href="#1143">1143: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
+</span><span id="1144" class="l"><a href="#1144">1144: </a>            -&gt;row();
+</span><span id="1145" class="l"><a href="#1145">1145: </a>
+</span><span id="1146" class="l"><a href="#1146">1146: </a>        <span class="php-comment">// No calls have been made for this key</span>
+</span><span id="1147" class="l"><a href="#1147">1147: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1148" class="l"><a href="#1148">1148: </a>        {
+</span><span id="1149" class="l"><a href="#1149">1149: </a>            <span class="php-comment">// Create a new row for the following key</span>
+</span><span id="1150" class="l"><a href="#1150">1150: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
+</span><span id="1151" class="l"><a href="#1151">1151: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$limited_uri</span>,
+</span><span id="1152" class="l"><a href="#1152">1152: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="1153" class="l"><a href="#1153">1153: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
+</span><span id="1154" class="l"><a href="#1154">1154: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
+</span><span id="1155" class="l"><a href="#1155">1155: </a>            ]);
+</span><span id="1156" class="l"><a href="#1156">1156: </a>        }
+</span><span id="1157" class="l"><a href="#1157">1157: </a>
+</span><span id="1158" class="l"><a href="#1158">1158: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
+</span><span id="1159" class="l"><a href="#1159">1159: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$time_limit</span>))
+</span><span id="1160" class="l"><a href="#1160">1160: </a>        {
+</span><span id="1161" class="l"><a href="#1161">1161: </a>            <span class="php-comment">// Reset the started period and count</span>
+</span><span id="1162" class="l"><a href="#1162">1162: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1163" class="l"><a href="#1163">1163: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1164" class="l"><a href="#1164">1164: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
+</span><span id="1165" class="l"><a href="#1165">1165: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
+</span><span id="1166" class="l"><a href="#1166">1166: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
+</span><span id="1167" class="l"><a href="#1167">1167: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1168" class="l"><a href="#1168">1168: </a>        }
+</span><span id="1169" class="l"><a href="#1169">1169: </a>
+</span><span id="1170" class="l"><a href="#1170">1170: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
+</span><span id="1171" class="l"><a href="#1171">1171: </a>        <span class="php-keyword1">else</span>
+</span><span id="1172" class="l"><a href="#1172">1172: </a>        {
+</span><span id="1173" class="l"><a href="#1173">1173: </a>            <span class="php-comment">// The limit has been exceeded</span>
+</span><span id="1174" class="l"><a href="#1174">1174: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
+</span><span id="1175" class="l"><a href="#1175">1175: </a>            {
+</span><span id="1176" class="l"><a href="#1176">1176: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1177" class="l"><a href="#1177">1177: </a>            }
+</span><span id="1178" class="l"><a href="#1178">1178: </a>
+</span><span id="1179" class="l"><a href="#1179">1179: </a>            <span class="php-comment">// Increase the count by one</span>
+</span><span id="1180" class="l"><a href="#1180">1180: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1181" class="l"><a href="#1181">1181: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1182" class="l"><a href="#1182">1182: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1183" class="l"><a href="#1183">1183: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
+</span><span id="1184" class="l"><a href="#1184">1184: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1185" class="l"><a href="#1185">1185: </a>        }
+</span><span id="1186" class="l"><a href="#1186">1186: </a>
+</span><span id="1187" class="l"><a href="#1187">1187: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1188" class="l"><a href="#1188">1188: </a>    }
+</span><span id="1189" class="l"><a href="#1189">1189: </a>
+</span><span id="1190" class="l"><a href="#1190">1190: </a>    <span class="php-comment">/**
+</span></span><span id="1191" class="l"><a href="#1191">1191: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method/HTTP-method being called
+</span></span><span id="1192" class="l"><a href="#1192">1192: </a><span class="php-comment">     *
+</span></span><span id="1193" class="l"><a href="#1193">1193: </a><span class="php-comment">     * @access protected
+</span></span><span id="1194" class="l"><a href="#1194">1194: </a><span class="php-comment">     * @return bool
+</span></span><span id="1195" class="l"><a href="#1195">1195: </a><span class="php-comment">     */</span>
+</span><span id="1196" class="l"><a href="#1196">1196: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
+</span><span id="1197" class="l"><a href="#1197">1197: </a>    {
+</span><span id="1198" class="l"><a href="#1198">1198: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
+</span><span id="1199" class="l"><a href="#1199">1199: </a>        <span class="php-var">$auth_override_class_method</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
+</span><span id="1200" class="l"><a href="#1200">1200: </a>
+</span><span id="1201" class="l"><a href="#1201">1201: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
+</span><span id="1202" class="l"><a href="#1202">1202: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>))
+</span><span id="1203" class="l"><a href="#1203">1203: </a>        {
+</span><span id="1204" class="l"><a href="#1204">1204: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
+</span><span id="1205" class="l"><a href="#1205">1205: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>])) <span class="php-comment">// Check for class overrides</span>
+</span><span id="1206" class="l"><a href="#1206">1206: </a>            {
+</span><span id="1207" class="l"><a href="#1207">1207: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1208" class="l"><a href="#1208">1208: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'none'</span>)
+</span><span id="1209" class="l"><a href="#1209">1209: </a>                {
+</span><span id="1210" class="l"><a href="#1210">1210: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1211" class="l"><a href="#1211">1211: </a>                }
+</span><span id="1212" class="l"><a href="#1212">1212: </a>
+</span><span id="1213" class="l"><a href="#1213">1213: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1214" class="l"><a href="#1214">1214: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'basic'</span>)
+</span><span id="1215" class="l"><a href="#1215">1215: </a>                {
+</span><span id="1216" class="l"><a href="#1216">1216: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1217" class="l"><a href="#1217">1217: </a>
+</span><span id="1218" class="l"><a href="#1218">1218: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1219" class="l"><a href="#1219">1219: </a>                }
+</span><span id="1220" class="l"><a href="#1220">1220: </a>
+</span><span id="1221" class="l"><a href="#1221">1221: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1222" class="l"><a href="#1222">1222: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'digest'</span>)
+</span><span id="1223" class="l"><a href="#1223">1223: </a>                {
+</span><span id="1224" class="l"><a href="#1224">1224: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1225" class="l"><a href="#1225">1225: </a>
+</span><span id="1226" class="l"><a href="#1226">1226: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1227" class="l"><a href="#1227">1227: </a>                }
+</span><span id="1228" class="l"><a href="#1228">1228: </a>
+</span><span id="1229" class="l"><a href="#1229">1229: </a>                <span class="php-comment">// Session auth override found, check session</span>
+</span><span id="1230" class="l"><a href="#1230">1230: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'session'</span>)
+</span><span id="1231" class="l"><a href="#1231">1231: </a>                {
+</span><span id="1232" class="l"><a href="#1232">1232: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="1233" class="l"><a href="#1233">1233: </a>
+</span><span id="1234" class="l"><a href="#1234">1234: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1235" class="l"><a href="#1235">1235: </a>                }
+</span><span id="1236" class="l"><a href="#1236">1236: </a>
+</span><span id="1237" class="l"><a href="#1237">1237: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1238" class="l"><a href="#1238">1238: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1239" class="l"><a href="#1239">1239: </a>                {
+</span><span id="1240" class="l"><a href="#1240">1240: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1241" class="l"><a href="#1241">1241: </a>
+</span><span id="1242" class="l"><a href="#1242">1242: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1243" class="l"><a href="#1243">1243: </a>                }
+</span><span id="1244" class="l"><a href="#1244">1244: </a>            }
+</span><span id="1245" class="l"><a href="#1245">1245: </a>
+</span><span id="1246" class="l"><a href="#1246">1246: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
+</span><span id="1247" class="l"><a href="#1247">1247: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
+</span><span id="1248" class="l"><a href="#1248">1248: </a>            {
+</span><span id="1249" class="l"><a href="#1249">1249: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1250" class="l"><a href="#1250">1250: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'none'</span>)
+</span><span id="1251" class="l"><a href="#1251">1251: </a>                {
+</span><span id="1252" class="l"><a href="#1252">1252: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1253" class="l"><a href="#1253">1253: </a>                }
 </span><span id="1254" class="l"><a href="#1254">1254: </a>
-</span><span id="1255" class="l"><a href="#1255">1255: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1256" class="l"><a href="#1256">1256: </a>                }
-</span><span id="1257" class="l"><a href="#1257">1257: </a>
-</span><span id="1258" class="l"><a href="#1258">1258: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1259" class="l"><a href="#1259">1259: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
-</span><span id="1260" class="l"><a href="#1260">1260: </a>                {
-</span><span id="1261" class="l"><a href="#1261">1261: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1255" class="l"><a href="#1255">1255: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1256" class="l"><a href="#1256">1256: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'basic'</span>)
+</span><span id="1257" class="l"><a href="#1257">1257: </a>                {
+</span><span id="1258" class="l"><a href="#1258">1258: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1259" class="l"><a href="#1259">1259: </a>
+</span><span id="1260" class="l"><a href="#1260">1260: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1261" class="l"><a href="#1261">1261: </a>                }
 </span><span id="1262" class="l"><a href="#1262">1262: </a>
-</span><span id="1263" class="l"><a href="#1263">1263: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1264" class="l"><a href="#1264">1264: </a>                }
-</span><span id="1265" class="l"><a href="#1265">1265: </a>
-</span><span id="1266" class="l"><a href="#1266">1266: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1267" class="l"><a href="#1267">1267: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1268" class="l"><a href="#1268">1268: </a>                {
-</span><span id="1269" class="l"><a href="#1269">1269: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1263" class="l"><a href="#1263">1263: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1264" class="l"><a href="#1264">1264: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'digest'</span>)
+</span><span id="1265" class="l"><a href="#1265">1265: </a>                {
+</span><span id="1266" class="l"><a href="#1266">1266: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1267" class="l"><a href="#1267">1267: </a>
+</span><span id="1268" class="l"><a href="#1268">1268: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1269" class="l"><a href="#1269">1269: </a>                }
 </span><span id="1270" class="l"><a href="#1270">1270: </a>
-</span><span id="1271" class="l"><a href="#1271">1271: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1272" class="l"><a href="#1272">1272: </a>                }
-</span><span id="1273" class="l"><a href="#1273">1273: </a>            }
-</span><span id="1274" class="l"><a href="#1274">1274: </a>
-</span><span id="1275" class="l"><a href="#1275">1275: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method/HTTP-method being called</span>
-</span><span id="1276" class="l"><a href="#1276">1276: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method]))
-</span><span id="1277" class="l"><a href="#1277">1277: </a>            {
-</span><span id="1278" class="l"><a href="#1278">1278: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1279" class="l"><a href="#1279">1279: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
-</span><span id="1280" class="l"><a href="#1280">1280: </a>                {
-</span><span id="1281" class="l"><a href="#1281">1281: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1282" class="l"><a href="#1282">1282: </a>                }
+</span><span id="1271" class="l"><a href="#1271">1271: </a>                <span class="php-comment">// Session auth override found, check session</span>
+</span><span id="1272" class="l"><a href="#1272">1272: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'session'</span>)
+</span><span id="1273" class="l"><a href="#1273">1273: </a>                {
+</span><span id="1274" class="l"><a href="#1274">1274: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="1275" class="l"><a href="#1275">1275: </a>
+</span><span id="1276" class="l"><a href="#1276">1276: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1277" class="l"><a href="#1277">1277: </a>                }
+</span><span id="1278" class="l"><a href="#1278">1278: </a>
+</span><span id="1279" class="l"><a href="#1279">1279: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1280" class="l"><a href="#1280">1280: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1281" class="l"><a href="#1281">1281: </a>                {
+</span><span id="1282" class="l"><a href="#1282">1282: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
 </span><span id="1283" class="l"><a href="#1283">1283: </a>
-</span><span id="1284" class="l"><a href="#1284">1284: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1285" class="l"><a href="#1285">1285: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
-</span><span id="1286" class="l"><a href="#1286">1286: </a>                {
-</span><span id="1287" class="l"><a href="#1287">1287: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1284" class="l"><a href="#1284">1284: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1285" class="l"><a href="#1285">1285: </a>                }
+</span><span id="1286" class="l"><a href="#1286">1286: </a>            }
+</span><span id="1287" class="l"><a href="#1287">1287: </a>        }
 </span><span id="1288" class="l"><a href="#1288">1288: </a>
-</span><span id="1289" class="l"><a href="#1289">1289: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1290" class="l"><a href="#1290">1290: </a>                }
+</span><span id="1289" class="l"><a href="#1289">1289: </a>        <span class="php-comment">// Assign the class/method/HTTP-method auth type override array from the config</span>
+</span><span id="1290" class="l"><a href="#1290">1290: </a>        <span class="php-var">$auth_override_class_method_http</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method_http'</span>);
 </span><span id="1291" class="l"><a href="#1291">1291: </a>
-</span><span id="1292" class="l"><a href="#1292">1292: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1293" class="l"><a href="#1293">1293: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
-</span><span id="1294" class="l"><a href="#1294">1294: </a>                {
-</span><span id="1295" class="l"><a href="#1295">1295: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1296" class="l"><a href="#1296">1296: </a>
-</span><span id="1297" class="l"><a href="#1297">1297: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1298" class="l"><a href="#1298">1298: </a>                }
-</span><span id="1299" class="l"><a href="#1299">1299: </a>
-</span><span id="1300" class="l"><a href="#1300">1300: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1301" class="l"><a href="#1301">1301: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1302" class="l"><a href="#1302">1302: </a>                {
-</span><span id="1303" class="l"><a href="#1303">1303: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1304" class="l"><a href="#1304">1304: </a>
-</span><span id="1305" class="l"><a href="#1305">1305: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1306" class="l"><a href="#1306">1306: </a>                }
-</span><span id="1307" class="l"><a href="#1307">1307: </a>            }
-</span><span id="1308" class="l"><a href="#1308">1308: </a>        }
-</span><span id="1309" class="l"><a href="#1309">1309: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1310" class="l"><a href="#1310">1310: </a>    }
+</span><span id="1292" class="l"><a href="#1292">1292: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
+</span><span id="1293" class="l"><a href="#1293">1293: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>))
+</span><span id="1294" class="l"><a href="#1294">1294: </a>        {
+</span><span id="1295" class="l"><a href="#1295">1295: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
+</span><span id="1296" class="l"><a href="#1296">1296: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method]))
+</span><span id="1297" class="l"><a href="#1297">1297: </a>            {
+</span><span id="1298" class="l"><a href="#1298">1298: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1299" class="l"><a href="#1299">1299: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
+</span><span id="1300" class="l"><a href="#1300">1300: </a>                {
+</span><span id="1301" class="l"><a href="#1301">1301: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1302" class="l"><a href="#1302">1302: </a>                }
+</span><span id="1303" class="l"><a href="#1303">1303: </a>
+</span><span id="1304" class="l"><a href="#1304">1304: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1305" class="l"><a href="#1305">1305: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
+</span><span id="1306" class="l"><a href="#1306">1306: </a>                {
+</span><span id="1307" class="l"><a href="#1307">1307: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1308" class="l"><a href="#1308">1308: </a>
+</span><span id="1309" class="l"><a href="#1309">1309: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1310" class="l"><a href="#1310">1310: </a>                }
 </span><span id="1311" class="l"><a href="#1311">1311: </a>
-</span><span id="1312" class="l"><a href="#1312">1312: </a>    <span class="php-comment">/**
-</span></span><span id="1313" class="l"><a href="#1313">1313: </a><span class="php-comment">     * Parse the GET request arguments
-</span></span><span id="1314" class="l"><a href="#1314">1314: </a><span class="php-comment">     *
-</span></span><span id="1315" class="l"><a href="#1315">1315: </a><span class="php-comment">     * @access protected
-</span></span><span id="1316" class="l"><a href="#1316">1316: </a><span class="php-comment">     * @return void
-</span></span><span id="1317" class="l"><a href="#1317">1317: </a><span class="php-comment">     */</span>
-</span><span id="1318" class="l"><a href="#1318">1318: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
-</span><span id="1319" class="l"><a href="#1319">1319: </a>    {
-</span><span id="1320" class="l"><a href="#1320">1320: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
-</span><span id="1321" class="l"><a href="#1321">1321: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
-</span><span id="1322" class="l"><a href="#1322">1322: </a>    }
-</span><span id="1323" class="l"><a href="#1323">1323: </a>
-</span><span id="1324" class="l"><a href="#1324">1324: </a>    <span class="php-comment">/**
-</span></span><span id="1325" class="l"><a href="#1325">1325: </a><span class="php-comment">     * Parse the POST request arguments
-</span></span><span id="1326" class="l"><a href="#1326">1326: </a><span class="php-comment">     *
-</span></span><span id="1327" class="l"><a href="#1327">1327: </a><span class="php-comment">     * @access protected
-</span></span><span id="1328" class="l"><a href="#1328">1328: </a><span class="php-comment">     * @return void
-</span></span><span id="1329" class="l"><a href="#1329">1329: </a><span class="php-comment">     */</span>
-</span><span id="1330" class="l"><a href="#1330">1330: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
-</span><span id="1331" class="l"><a href="#1331">1331: </a>    {
-</span><span id="1332" class="l"><a href="#1332">1332: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
-</span><span id="1333" class="l"><a href="#1333">1333: </a>
-</span><span id="1334" class="l"><a href="#1334">1334: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1335" class="l"><a href="#1335">1335: </a>        {
-</span><span id="1336" class="l"><a href="#1336">1336: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1337" class="l"><a href="#1337">1337: </a>        }
-</span><span id="1338" class="l"><a href="#1338">1338: </a>    }
-</span><span id="1339" class="l"><a href="#1339">1339: </a>
-</span><span id="1340" class="l"><a href="#1340">1340: </a>    <span class="php-comment">/**
-</span></span><span id="1341" class="l"><a href="#1341">1341: </a><span class="php-comment">     * Parse the PUT request arguments
-</span></span><span id="1342" class="l"><a href="#1342">1342: </a><span class="php-comment">     *
-</span></span><span id="1343" class="l"><a href="#1343">1343: </a><span class="php-comment">     * @access protected
-</span></span><span id="1344" class="l"><a href="#1344">1344: </a><span class="php-comment">     * @return void
-</span></span><span id="1345" class="l"><a href="#1345">1345: </a><span class="php-comment">     */</span>
-</span><span id="1346" class="l"><a href="#1346">1346: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
-</span><span id="1347" class="l"><a href="#1347">1347: </a>    {
-</span><span id="1348" class="l"><a href="#1348">1348: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1349" class="l"><a href="#1349">1349: </a>        {
-</span><span id="1350" class="l"><a href="#1350">1350: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1351" class="l"><a href="#1351">1351: </a>        }
-</span><span id="1352" class="l"><a href="#1352">1352: </a>        <span class="php-keyword1">else</span>
-</span><span id="1353" class="l"><a href="#1353">1353: </a>        {
-</span><span id="1354" class="l"><a href="#1354">1354: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1355" class="l"><a href="#1355">1355: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
-</span><span id="1356" class="l"><a href="#1356">1356: </a>            {
-</span><span id="1357" class="l"><a href="#1357">1357: </a>                <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1358" class="l"><a href="#1358">1358: </a>            }
-</span><span id="1359" class="l"><a href="#1359">1359: </a>        }
-</span><span id="1360" class="l"><a href="#1360">1360: </a>    }
+</span><span id="1312" class="l"><a href="#1312">1312: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1313" class="l"><a href="#1313">1313: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
+</span><span id="1314" class="l"><a href="#1314">1314: </a>                {
+</span><span id="1315" class="l"><a href="#1315">1315: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1316" class="l"><a href="#1316">1316: </a>
+</span><span id="1317" class="l"><a href="#1317">1317: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1318" class="l"><a href="#1318">1318: </a>                }
+</span><span id="1319" class="l"><a href="#1319">1319: </a>
+</span><span id="1320" class="l"><a href="#1320">1320: </a>                <span class="php-comment">// Session auth override found, check session</span>
+</span><span id="1321" class="l"><a href="#1321">1321: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'session'</span>)
+</span><span id="1322" class="l"><a href="#1322">1322: </a>                {
+</span><span id="1323" class="l"><a href="#1323">1323: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="1324" class="l"><a href="#1324">1324: </a>
+</span><span id="1325" class="l"><a href="#1325">1325: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1326" class="l"><a href="#1326">1326: </a>                }
+</span><span id="1327" class="l"><a href="#1327">1327: </a>
+</span><span id="1328" class="l"><a href="#1328">1328: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1329" class="l"><a href="#1329">1329: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1330" class="l"><a href="#1330">1330: </a>                {
+</span><span id="1331" class="l"><a href="#1331">1331: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1332" class="l"><a href="#1332">1332: </a>
+</span><span id="1333" class="l"><a href="#1333">1333: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1334" class="l"><a href="#1334">1334: </a>                }
+</span><span id="1335" class="l"><a href="#1335">1335: </a>            }
+</span><span id="1336" class="l"><a href="#1336">1336: </a>
+</span><span id="1337" class="l"><a href="#1337">1337: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method/HTTP-method being called</span>
+</span><span id="1338" class="l"><a href="#1338">1338: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method]))
+</span><span id="1339" class="l"><a href="#1339">1339: </a>            {
+</span><span id="1340" class="l"><a href="#1340">1340: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1341" class="l"><a href="#1341">1341: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
+</span><span id="1342" class="l"><a href="#1342">1342: </a>                {
+</span><span id="1343" class="l"><a href="#1343">1343: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1344" class="l"><a href="#1344">1344: </a>                }
+</span><span id="1345" class="l"><a href="#1345">1345: </a>
+</span><span id="1346" class="l"><a href="#1346">1346: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1347" class="l"><a href="#1347">1347: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
+</span><span id="1348" class="l"><a href="#1348">1348: </a>                {
+</span><span id="1349" class="l"><a href="#1349">1349: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1350" class="l"><a href="#1350">1350: </a>
+</span><span id="1351" class="l"><a href="#1351">1351: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1352" class="l"><a href="#1352">1352: </a>                }
+</span><span id="1353" class="l"><a href="#1353">1353: </a>
+</span><span id="1354" class="l"><a href="#1354">1354: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1355" class="l"><a href="#1355">1355: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
+</span><span id="1356" class="l"><a href="#1356">1356: </a>                {
+</span><span id="1357" class="l"><a href="#1357">1357: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1358" class="l"><a href="#1358">1358: </a>
+</span><span id="1359" class="l"><a href="#1359">1359: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1360" class="l"><a href="#1360">1360: </a>                }
 </span><span id="1361" class="l"><a href="#1361">1361: </a>
-</span><span id="1362" class="l"><a href="#1362">1362: </a>    <span class="php-comment">/**
-</span></span><span id="1363" class="l"><a href="#1363">1363: </a><span class="php-comment">     * Parse the HEAD request arguments
-</span></span><span id="1364" class="l"><a href="#1364">1364: </a><span class="php-comment">     *
-</span></span><span id="1365" class="l"><a href="#1365">1365: </a><span class="php-comment">     * @access protected
-</span></span><span id="1366" class="l"><a href="#1366">1366: </a><span class="php-comment">     * @return void
-</span></span><span id="1367" class="l"><a href="#1367">1367: </a><span class="php-comment">     */</span>
-</span><span id="1368" class="l"><a href="#1368">1368: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
-</span><span id="1369" class="l"><a href="#1369">1369: </a>    {
-</span><span id="1370" class="l"><a href="#1370">1370: </a>        <span class="php-comment">// Parse the HEAD variables</span>
-</span><span id="1371" class="l"><a href="#1371">1371: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
-</span><span id="1372" class="l"><a href="#1372">1372: </a>
-</span><span id="1373" class="l"><a href="#1373">1373: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
-</span><span id="1374" class="l"><a href="#1374">1374: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
-</span><span id="1375" class="l"><a href="#1375">1375: </a>    }
-</span><span id="1376" class="l"><a href="#1376">1376: </a>
-</span><span id="1377" class="l"><a href="#1377">1377: </a>    <span class="php-comment">/**
-</span></span><span id="1378" class="l"><a href="#1378">1378: </a><span class="php-comment">     * Parse the OPTIONS request arguments
-</span></span><span id="1379" class="l"><a href="#1379">1379: </a><span class="php-comment">     *
-</span></span><span id="1380" class="l"><a href="#1380">1380: </a><span class="php-comment">     * @access protected
-</span></span><span id="1381" class="l"><a href="#1381">1381: </a><span class="php-comment">     * @return void
-</span></span><span id="1382" class="l"><a href="#1382">1382: </a><span class="php-comment">     */</span>
-</span><span id="1383" class="l"><a href="#1383">1383: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
-</span><span id="1384" class="l"><a href="#1384">1384: </a>    {
-</span><span id="1385" class="l"><a href="#1385">1385: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
-</span><span id="1386" class="l"><a href="#1386">1386: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
-</span><span id="1387" class="l"><a href="#1387">1387: </a>
-</span><span id="1388" class="l"><a href="#1388">1388: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
-</span><span id="1389" class="l"><a href="#1389">1389: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
-</span><span id="1390" class="l"><a href="#1390">1390: </a>    }
-</span><span id="1391" class="l"><a href="#1391">1391: </a>
-</span><span id="1392" class="l"><a href="#1392">1392: </a>    <span class="php-comment">/**
-</span></span><span id="1393" class="l"><a href="#1393">1393: </a><span class="php-comment">     * Parse the PATCH request arguments
-</span></span><span id="1394" class="l"><a href="#1394">1394: </a><span class="php-comment">     *
-</span></span><span id="1395" class="l"><a href="#1395">1395: </a><span class="php-comment">     * @access protected
-</span></span><span id="1396" class="l"><a href="#1396">1396: </a><span class="php-comment">     * @return void
-</span></span><span id="1397" class="l"><a href="#1397">1397: </a><span class="php-comment">     */</span>
-</span><span id="1398" class="l"><a href="#1398">1398: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
-</span><span id="1399" class="l"><a href="#1399">1399: </a>    {
-</span><span id="1400" class="l"><a href="#1400">1400: </a>        <span class="php-comment">// It might be a HTTP body</span>
-</span><span id="1401" class="l"><a href="#1401">1401: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1402" class="l"><a href="#1402">1402: </a>        {
-</span><span id="1403" class="l"><a href="#1403">1403: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1404" class="l"><a href="#1404">1404: </a>        }
-</span><span id="1405" class="l"><a href="#1405">1405: </a>        <span class="php-keyword1">else</span>
-</span><span id="1406" class="l"><a href="#1406">1406: </a>        {
-</span><span id="1407" class="l"><a href="#1407">1407: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1408" class="l"><a href="#1408">1408: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
-</span><span id="1409" class="l"><a href="#1409">1409: </a>            {
-</span><span id="1410" class="l"><a href="#1410">1410: </a>                <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1411" class="l"><a href="#1411">1411: </a>            }
-</span><span id="1412" class="l"><a href="#1412">1412: </a>        }
-</span><span id="1413" class="l"><a href="#1413">1413: </a>    }
-</span><span id="1414" class="l"><a href="#1414">1414: </a>
-</span><span id="1415" class="l"><a href="#1415">1415: </a>    <span class="php-comment">/**
-</span></span><span id="1416" class="l"><a href="#1416">1416: </a><span class="php-comment">     * Parse the DELETE request arguments
-</span></span><span id="1417" class="l"><a href="#1417">1417: </a><span class="php-comment">     *
-</span></span><span id="1418" class="l"><a href="#1418">1418: </a><span class="php-comment">     * @access protected
-</span></span><span id="1419" class="l"><a href="#1419">1419: </a><span class="php-comment">     * @return void
-</span></span><span id="1420" class="l"><a href="#1420">1420: </a><span class="php-comment">     */</span>
-</span><span id="1421" class="l"><a href="#1421">1421: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
-</span><span id="1422" class="l"><a href="#1422">1422: </a>    {
-</span><span id="1423" class="l"><a href="#1423">1423: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
-</span><span id="1424" class="l"><a href="#1424">1424: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
-</span><span id="1425" class="l"><a href="#1425">1425: </a>        {
-</span><span id="1426" class="l"><a href="#1426">1426: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1427" class="l"><a href="#1427">1427: </a>        }
-</span><span id="1428" class="l"><a href="#1428">1428: </a>    }
-</span><span id="1429" class="l"><a href="#1429">1429: </a>
-</span><span id="1430" class="l"><a href="#1430">1430: </a>    <span class="php-comment">/**
-</span></span><span id="1431" class="l"><a href="#1431">1431: </a><span class="php-comment">     * Parse the query parameters
-</span></span><span id="1432" class="l"><a href="#1432">1432: </a><span class="php-comment">     *
-</span></span><span id="1433" class="l"><a href="#1433">1433: </a><span class="php-comment">     * @access protected
-</span></span><span id="1434" class="l"><a href="#1434">1434: </a><span class="php-comment">     * @return void
-</span></span><span id="1435" class="l"><a href="#1435">1435: </a><span class="php-comment">     */</span>
-</span><span id="1436" class="l"><a href="#1436">1436: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
-</span><span id="1437" class="l"><a href="#1437">1437: </a>    {
-</span><span id="1438" class="l"><a href="#1438">1438: </a>        <span class="php-comment">// Declare a variable that will hold the REQUEST_URI</span>
-</span><span id="1439" class="l"><a href="#1439">1439: </a>        <span class="php-var">$request_uri</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1440" class="l"><a href="#1440">1440: </a>
-</span><span id="1441" class="l"><a href="#1441">1441: </a>        <span class="php-comment">// If using the commandline version</span>
-</span><span id="1442" class="l"><a href="#1442">1442: </a>        <span class="php-keyword1">if</span> (is_cli())
-</span><span id="1443" class="l"><a href="#1443">1443: </a>        {
-</span><span id="1444" class="l"><a href="#1444">1444: </a>            <span class="php-var">$args</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'argv'</span>);
-</span><span id="1445" class="l"><a href="#1445">1445: </a>            <span class="php-keyword1">unset</span>(<span class="php-var">$args</span>[<span class="php-num">0</span>]);
-</span><span id="1446" class="l"><a href="#1446">1446: </a>
-</span><span id="1447" class="l"><a href="#1447">1447: </a>            <span class="php-comment">// Combine the arguments using '/' as the delimiter</span>
-</span><span id="1448" class="l"><a href="#1448">1448: </a>            <span class="php-var">$request_uri</span> = <span class="php-quote">'/'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'/'</span>, <span class="php-var">$args</span>) . <span class="php-quote">'/'</span>;
-</span><span id="1449" class="l"><a href="#1449">1449: </a>
-</span><span id="1450" class="l"><a href="#1450">1450: </a>            <span class="php-comment">// Set the following server variables (perhaps not required anymore?)</span>
-</span><span id="1451" class="l"><a href="#1451">1451: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1452" class="l"><a href="#1452">1452: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'PATH_INFO'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1453" class="l"><a href="#1453">1453: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'QUERY_STRING'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1454" class="l"><a href="#1454">1454: </a>        }
-</span><span id="1455" class="l"><a href="#1455">1455: </a>        <span class="php-keyword1">else</span>
-</span><span id="1456" class="l"><a href="#1456">1456: </a>        {
-</span><span id="1457" class="l"><a href="#1457">1457: </a>            <span class="php-var">$request_uri</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>);
-</span><span id="1458" class="l"><a href="#1458">1458: </a>        }
-</span><span id="1459" class="l"><a href="#1459">1459: </a>
-</span><span id="1460" class="l"><a href="#1460">1460: </a>        <span class="php-comment">// Parse the query parameters from the query string</span>
-</span><span id="1461" class="l"><a href="#1461">1461: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$request_uri</span>, PHP_URL_QUERY), <span class="php-var">$this</span>-&gt;_query_args);
-</span><span id="1462" class="l"><a href="#1462">1462: </a>    }
-</span><span id="1463" class="l"><a href="#1463">1463: </a>
-</span><span id="1464" class="l"><a href="#1464">1464: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
-</span><span id="1465" class="l"><a href="#1465">1465: </a>
-</span><span id="1466" class="l"><a href="#1466">1466: </a>    <span class="php-comment">/**
-</span></span><span id="1467" class="l"><a href="#1467">1467: </a><span class="php-comment">     * Retrieve a value from a GET request
-</span></span><span id="1468" class="l"><a href="#1468">1468: </a><span class="php-comment">     *
-</span></span><span id="1469" class="l"><a href="#1469">1469: </a><span class="php-comment">     * @access public
-</span></span><span id="1470" class="l"><a href="#1470">1470: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
-</span></span><span id="1471" class="l"><a href="#1471">1471: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1472" class="l"><a href="#1472">1472: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1473" class="l"><a href="#1473">1473: </a><span class="php-comment">     * @return array|string|NULL Value from the GET request; otherwise, NULL
-</span></span><span id="1474" class="l"><a href="#1474">1474: </a><span class="php-comment">     */</span>
-</span><span id="1475" class="l"><a href="#1475">1475: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1476" class="l"><a href="#1476">1476: </a>    {
-</span><span id="1477" class="l"><a href="#1477">1477: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1478" class="l"><a href="#1478">1478: </a>        {
-</span><span id="1479" class="l"><a href="#1479">1479: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
-</span><span id="1480" class="l"><a href="#1480">1480: </a>        }
-</span><span id="1481" class="l"><a href="#1481">1481: </a>
-</span><span id="1482" class="l"><a href="#1482">1482: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1483" class="l"><a href="#1483">1483: </a>    }
-</span><span id="1484" class="l"><a href="#1484">1484: </a>
-</span><span id="1485" class="l"><a href="#1485">1485: </a>    <span class="php-comment">/**
-</span></span><span id="1486" class="l"><a href="#1486">1486: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
-</span></span><span id="1487" class="l"><a href="#1487">1487: </a><span class="php-comment">     *
-</span></span><span id="1488" class="l"><a href="#1488">1488: </a><span class="php-comment">     * @access public
-</span></span><span id="1489" class="l"><a href="#1489">1489: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
-</span></span><span id="1490" class="l"><a href="#1490">1490: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1491" class="l"><a href="#1491">1491: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1492" class="l"><a href="#1492">1492: </a><span class="php-comment">     * @return array|string|NULL Value from the OPTIONS request; otherwise, NULL
-</span></span><span id="1493" class="l"><a href="#1493">1493: </a><span class="php-comment">     */</span>
-</span><span id="1494" class="l"><a href="#1494">1494: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1495" class="l"><a href="#1495">1495: </a>    {
-</span><span id="1496" class="l"><a href="#1496">1496: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1497" class="l"><a href="#1497">1497: </a>        {
-</span><span id="1498" class="l"><a href="#1498">1498: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
-</span><span id="1499" class="l"><a href="#1499">1499: </a>        }
-</span><span id="1500" class="l"><a href="#1500">1500: </a>
-</span><span id="1501" class="l"><a href="#1501">1501: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1502" class="l"><a href="#1502">1502: </a>    }
-</span><span id="1503" class="l"><a href="#1503">1503: </a>
-</span><span id="1504" class="l"><a href="#1504">1504: </a>    <span class="php-comment">/**
-</span></span><span id="1505" class="l"><a href="#1505">1505: </a><span class="php-comment">     * Retrieve a value from a HEAD request
-</span></span><span id="1506" class="l"><a href="#1506">1506: </a><span class="php-comment">     *
-</span></span><span id="1507" class="l"><a href="#1507">1507: </a><span class="php-comment">     * @access public
-</span></span><span id="1508" class="l"><a href="#1508">1508: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
-</span></span><span id="1509" class="l"><a href="#1509">1509: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1510" class="l"><a href="#1510">1510: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1511" class="l"><a href="#1511">1511: </a><span class="php-comment">     * @return array|string|NULL Value from the HEAD request; otherwise, NULL
-</span></span><span id="1512" class="l"><a href="#1512">1512: </a><span class="php-comment">     */</span>
-</span><span id="1513" class="l"><a href="#1513">1513: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1514" class="l"><a href="#1514">1514: </a>    {
-</span><span id="1515" class="l"><a href="#1515">1515: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1516" class="l"><a href="#1516">1516: </a>        {
-</span><span id="1517" class="l"><a href="#1517">1517: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;head_args;
-</span><span id="1518" class="l"><a href="#1518">1518: </a>        }
-</span><span id="1519" class="l"><a href="#1519">1519: </a>
-</span><span id="1520" class="l"><a href="#1520">1520: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1521" class="l"><a href="#1521">1521: </a>    }
+</span><span id="1362" class="l"><a href="#1362">1362: </a>                <span class="php-comment">// Session auth override found, check session</span>
+</span><span id="1363" class="l"><a href="#1363">1363: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'session'</span>)
+</span><span id="1364" class="l"><a href="#1364">1364: </a>                {
+</span><span id="1365" class="l"><a href="#1365">1365: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="1366" class="l"><a href="#1366">1366: </a>
+</span><span id="1367" class="l"><a href="#1367">1367: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1368" class="l"><a href="#1368">1368: </a>                }
+</span><span id="1369" class="l"><a href="#1369">1369: </a>
+</span><span id="1370" class="l"><a href="#1370">1370: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1371" class="l"><a href="#1371">1371: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1372" class="l"><a href="#1372">1372: </a>                {
+</span><span id="1373" class="l"><a href="#1373">1373: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1374" class="l"><a href="#1374">1374: </a>
+</span><span id="1375" class="l"><a href="#1375">1375: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1376" class="l"><a href="#1376">1376: </a>                }
+</span><span id="1377" class="l"><a href="#1377">1377: </a>            }
+</span><span id="1378" class="l"><a href="#1378">1378: </a>        }
+</span><span id="1379" class="l"><a href="#1379">1379: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1380" class="l"><a href="#1380">1380: </a>    }
+</span><span id="1381" class="l"><a href="#1381">1381: </a>
+</span><span id="1382" class="l"><a href="#1382">1382: </a>    <span class="php-comment">/**
+</span></span><span id="1383" class="l"><a href="#1383">1383: </a><span class="php-comment">     * Parse the GET request arguments
+</span></span><span id="1384" class="l"><a href="#1384">1384: </a><span class="php-comment">     *
+</span></span><span id="1385" class="l"><a href="#1385">1385: </a><span class="php-comment">     * @access protected
+</span></span><span id="1386" class="l"><a href="#1386">1386: </a><span class="php-comment">     * @return void
+</span></span><span id="1387" class="l"><a href="#1387">1387: </a><span class="php-comment">     */</span>
+</span><span id="1388" class="l"><a href="#1388">1388: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
+</span><span id="1389" class="l"><a href="#1389">1389: </a>    {
+</span><span id="1390" class="l"><a href="#1390">1390: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
+</span><span id="1391" class="l"><a href="#1391">1391: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
+</span><span id="1392" class="l"><a href="#1392">1392: </a>    }
+</span><span id="1393" class="l"><a href="#1393">1393: </a>
+</span><span id="1394" class="l"><a href="#1394">1394: </a>    <span class="php-comment">/**
+</span></span><span id="1395" class="l"><a href="#1395">1395: </a><span class="php-comment">     * Parse the POST request arguments
+</span></span><span id="1396" class="l"><a href="#1396">1396: </a><span class="php-comment">     *
+</span></span><span id="1397" class="l"><a href="#1397">1397: </a><span class="php-comment">     * @access protected
+</span></span><span id="1398" class="l"><a href="#1398">1398: </a><span class="php-comment">     * @return void
+</span></span><span id="1399" class="l"><a href="#1399">1399: </a><span class="php-comment">     */</span>
+</span><span id="1400" class="l"><a href="#1400">1400: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
+</span><span id="1401" class="l"><a href="#1401">1401: </a>    {
+</span><span id="1402" class="l"><a href="#1402">1402: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
+</span><span id="1403" class="l"><a href="#1403">1403: </a>
+</span><span id="1404" class="l"><a href="#1404">1404: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1405" class="l"><a href="#1405">1405: </a>        {
+</span><span id="1406" class="l"><a href="#1406">1406: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1407" class="l"><a href="#1407">1407: </a>        }
+</span><span id="1408" class="l"><a href="#1408">1408: </a>    }
+</span><span id="1409" class="l"><a href="#1409">1409: </a>
+</span><span id="1410" class="l"><a href="#1410">1410: </a>    <span class="php-comment">/**
+</span></span><span id="1411" class="l"><a href="#1411">1411: </a><span class="php-comment">     * Parse the PUT request arguments
+</span></span><span id="1412" class="l"><a href="#1412">1412: </a><span class="php-comment">     *
+</span></span><span id="1413" class="l"><a href="#1413">1413: </a><span class="php-comment">     * @access protected
+</span></span><span id="1414" class="l"><a href="#1414">1414: </a><span class="php-comment">     * @return void
+</span></span><span id="1415" class="l"><a href="#1415">1415: </a><span class="php-comment">     */</span>
+</span><span id="1416" class="l"><a href="#1416">1416: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
+</span><span id="1417" class="l"><a href="#1417">1417: </a>    {
+</span><span id="1418" class="l"><a href="#1418">1418: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1419" class="l"><a href="#1419">1419: </a>        {
+</span><span id="1420" class="l"><a href="#1420">1420: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1421" class="l"><a href="#1421">1421: </a>        }
+</span><span id="1422" class="l"><a href="#1422">1422: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
+</span><span id="1423" class="l"><a href="#1423">1423: </a>        {
+</span><span id="1424" class="l"><a href="#1424">1424: </a>           <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1425" class="l"><a href="#1425">1425: </a>           <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1426" class="l"><a href="#1426">1426: </a>        }
+</span><span id="1427" class="l"><a href="#1427">1427: </a>    }
+</span><span id="1428" class="l"><a href="#1428">1428: </a>
+</span><span id="1429" class="l"><a href="#1429">1429: </a>    <span class="php-comment">/**
+</span></span><span id="1430" class="l"><a href="#1430">1430: </a><span class="php-comment">     * Parse the HEAD request arguments
+</span></span><span id="1431" class="l"><a href="#1431">1431: </a><span class="php-comment">     *
+</span></span><span id="1432" class="l"><a href="#1432">1432: </a><span class="php-comment">     * @access protected
+</span></span><span id="1433" class="l"><a href="#1433">1433: </a><span class="php-comment">     * @return void
+</span></span><span id="1434" class="l"><a href="#1434">1434: </a><span class="php-comment">     */</span>
+</span><span id="1435" class="l"><a href="#1435">1435: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
+</span><span id="1436" class="l"><a href="#1436">1436: </a>    {
+</span><span id="1437" class="l"><a href="#1437">1437: </a>        <span class="php-comment">// Parse the HEAD variables</span>
+</span><span id="1438" class="l"><a href="#1438">1438: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
+</span><span id="1439" class="l"><a href="#1439">1439: </a>
+</span><span id="1440" class="l"><a href="#1440">1440: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
+</span><span id="1441" class="l"><a href="#1441">1441: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
+</span><span id="1442" class="l"><a href="#1442">1442: </a>    }
+</span><span id="1443" class="l"><a href="#1443">1443: </a>
+</span><span id="1444" class="l"><a href="#1444">1444: </a>    <span class="php-comment">/**
+</span></span><span id="1445" class="l"><a href="#1445">1445: </a><span class="php-comment">     * Parse the OPTIONS request arguments
+</span></span><span id="1446" class="l"><a href="#1446">1446: </a><span class="php-comment">     *
+</span></span><span id="1447" class="l"><a href="#1447">1447: </a><span class="php-comment">     * @access protected
+</span></span><span id="1448" class="l"><a href="#1448">1448: </a><span class="php-comment">     * @return void
+</span></span><span id="1449" class="l"><a href="#1449">1449: </a><span class="php-comment">     */</span>
+</span><span id="1450" class="l"><a href="#1450">1450: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
+</span><span id="1451" class="l"><a href="#1451">1451: </a>    {
+</span><span id="1452" class="l"><a href="#1452">1452: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
+</span><span id="1453" class="l"><a href="#1453">1453: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
+</span><span id="1454" class="l"><a href="#1454">1454: </a>
+</span><span id="1455" class="l"><a href="#1455">1455: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
+</span><span id="1456" class="l"><a href="#1456">1456: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
+</span><span id="1457" class="l"><a href="#1457">1457: </a>    }
+</span><span id="1458" class="l"><a href="#1458">1458: </a>
+</span><span id="1459" class="l"><a href="#1459">1459: </a>    <span class="php-comment">/**
+</span></span><span id="1460" class="l"><a href="#1460">1460: </a><span class="php-comment">     * Parse the PATCH request arguments
+</span></span><span id="1461" class="l"><a href="#1461">1461: </a><span class="php-comment">     *
+</span></span><span id="1462" class="l"><a href="#1462">1462: </a><span class="php-comment">     * @access protected
+</span></span><span id="1463" class="l"><a href="#1463">1463: </a><span class="php-comment">     * @return void
+</span></span><span id="1464" class="l"><a href="#1464">1464: </a><span class="php-comment">     */</span>
+</span><span id="1465" class="l"><a href="#1465">1465: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
+</span><span id="1466" class="l"><a href="#1466">1466: </a>    {
+</span><span id="1467" class="l"><a href="#1467">1467: </a>        <span class="php-comment">// It might be a HTTP body</span>
+</span><span id="1468" class="l"><a href="#1468">1468: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1469" class="l"><a href="#1469">1469: </a>        {
+</span><span id="1470" class="l"><a href="#1470">1470: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1471" class="l"><a href="#1471">1471: </a>        }
+</span><span id="1472" class="l"><a href="#1472">1472: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
+</span><span id="1473" class="l"><a href="#1473">1473: </a>        {
+</span><span id="1474" class="l"><a href="#1474">1474: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1475" class="l"><a href="#1475">1475: </a>            <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1476" class="l"><a href="#1476">1476: </a>        }
+</span><span id="1477" class="l"><a href="#1477">1477: </a>    }
+</span><span id="1478" class="l"><a href="#1478">1478: </a>
+</span><span id="1479" class="l"><a href="#1479">1479: </a>    <span class="php-comment">/**
+</span></span><span id="1480" class="l"><a href="#1480">1480: </a><span class="php-comment">     * Parse the DELETE request arguments
+</span></span><span id="1481" class="l"><a href="#1481">1481: </a><span class="php-comment">     *
+</span></span><span id="1482" class="l"><a href="#1482">1482: </a><span class="php-comment">     * @access protected
+</span></span><span id="1483" class="l"><a href="#1483">1483: </a><span class="php-comment">     * @return void
+</span></span><span id="1484" class="l"><a href="#1484">1484: </a><span class="php-comment">     */</span>
+</span><span id="1485" class="l"><a href="#1485">1485: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
+</span><span id="1486" class="l"><a href="#1486">1486: </a>    {
+</span><span id="1487" class="l"><a href="#1487">1487: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
+</span><span id="1488" class="l"><a href="#1488">1488: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
+</span><span id="1489" class="l"><a href="#1489">1489: </a>        {
+</span><span id="1490" class="l"><a href="#1490">1490: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1491" class="l"><a href="#1491">1491: </a>        }
+</span><span id="1492" class="l"><a href="#1492">1492: </a>    }
+</span><span id="1493" class="l"><a href="#1493">1493: </a>
+</span><span id="1494" class="l"><a href="#1494">1494: </a>    <span class="php-comment">/**
+</span></span><span id="1495" class="l"><a href="#1495">1495: </a><span class="php-comment">     * Parse the query parameters
+</span></span><span id="1496" class="l"><a href="#1496">1496: </a><span class="php-comment">     *
+</span></span><span id="1497" class="l"><a href="#1497">1497: </a><span class="php-comment">     * @access protected
+</span></span><span id="1498" class="l"><a href="#1498">1498: </a><span class="php-comment">     * @return void
+</span></span><span id="1499" class="l"><a href="#1499">1499: </a><span class="php-comment">     */</span>
+</span><span id="1500" class="l"><a href="#1500">1500: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
+</span><span id="1501" class="l"><a href="#1501">1501: </a>    {
+</span><span id="1502" class="l"><a href="#1502">1502: </a>        <span class="php-var">$this</span>-&gt;_query_args = <span class="php-var">$this</span>-&gt;input-&gt;get();
+</span><span id="1503" class="l"><a href="#1503">1503: </a>    }
+</span><span id="1504" class="l"><a href="#1504">1504: </a>
+</span><span id="1505" class="l"><a href="#1505">1505: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
+</span><span id="1506" class="l"><a href="#1506">1506: </a>
+</span><span id="1507" class="l"><a href="#1507">1507: </a>    <span class="php-comment">/**
+</span></span><span id="1508" class="l"><a href="#1508">1508: </a><span class="php-comment">     * Retrieve a value from a GET request
+</span></span><span id="1509" class="l"><a href="#1509">1509: </a><span class="php-comment">     *
+</span></span><span id="1510" class="l"><a href="#1510">1510: </a><span class="php-comment">     * @access public
+</span></span><span id="1511" class="l"><a href="#1511">1511: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
+</span></span><span id="1512" class="l"><a href="#1512">1512: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1513" class="l"><a href="#1513">1513: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1514" class="l"><a href="#1514">1514: </a><span class="php-comment">     * @return array|string|NULL Value from the GET request; otherwise, NULL
+</span></span><span id="1515" class="l"><a href="#1515">1515: </a><span class="php-comment">     */</span>
+</span><span id="1516" class="l"><a href="#1516">1516: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1517" class="l"><a href="#1517">1517: </a>    {
+</span><span id="1518" class="l"><a href="#1518">1518: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1519" class="l"><a href="#1519">1519: </a>        {
+</span><span id="1520" class="l"><a href="#1520">1520: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
+</span><span id="1521" class="l"><a href="#1521">1521: </a>        }
 </span><span id="1522" class="l"><a href="#1522">1522: </a>
-</span><span id="1523" class="l"><a href="#1523">1523: </a>    <span class="php-comment">/**
-</span></span><span id="1524" class="l"><a href="#1524">1524: </a><span class="php-comment">     * Retrieve a value from a POST request
-</span></span><span id="1525" class="l"><a href="#1525">1525: </a><span class="php-comment">     *
-</span></span><span id="1526" class="l"><a href="#1526">1526: </a><span class="php-comment">     * @access public
-</span></span><span id="1527" class="l"><a href="#1527">1527: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
-</span></span><span id="1528" class="l"><a href="#1528">1528: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1529" class="l"><a href="#1529">1529: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1530" class="l"><a href="#1530">1530: </a><span class="php-comment">     * @return array|string|NULL Value from the POST request; otherwise, NULL
-</span></span><span id="1531" class="l"><a href="#1531">1531: </a><span class="php-comment">     */</span>
-</span><span id="1532" class="l"><a href="#1532">1532: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1533" class="l"><a href="#1533">1533: </a>    {
-</span><span id="1534" class="l"><a href="#1534">1534: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1535" class="l"><a href="#1535">1535: </a>        {
-</span><span id="1536" class="l"><a href="#1536">1536: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
-</span><span id="1537" class="l"><a href="#1537">1537: </a>        }
-</span><span id="1538" class="l"><a href="#1538">1538: </a>
-</span><span id="1539" class="l"><a href="#1539">1539: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1540" class="l"><a href="#1540">1540: </a>    }
+</span><span id="1523" class="l"><a href="#1523">1523: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1524" class="l"><a href="#1524">1524: </a>    }
+</span><span id="1525" class="l"><a href="#1525">1525: </a>
+</span><span id="1526" class="l"><a href="#1526">1526: </a>    <span class="php-comment">/**
+</span></span><span id="1527" class="l"><a href="#1527">1527: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
+</span></span><span id="1528" class="l"><a href="#1528">1528: </a><span class="php-comment">     *
+</span></span><span id="1529" class="l"><a href="#1529">1529: </a><span class="php-comment">     * @access public
+</span></span><span id="1530" class="l"><a href="#1530">1530: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
+</span></span><span id="1531" class="l"><a href="#1531">1531: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1532" class="l"><a href="#1532">1532: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1533" class="l"><a href="#1533">1533: </a><span class="php-comment">     * @return array|string|NULL Value from the OPTIONS request; otherwise, NULL
+</span></span><span id="1534" class="l"><a href="#1534">1534: </a><span class="php-comment">     */</span>
+</span><span id="1535" class="l"><a href="#1535">1535: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1536" class="l"><a href="#1536">1536: </a>    {
+</span><span id="1537" class="l"><a href="#1537">1537: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1538" class="l"><a href="#1538">1538: </a>        {
+</span><span id="1539" class="l"><a href="#1539">1539: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
+</span><span id="1540" class="l"><a href="#1540">1540: </a>        }
 </span><span id="1541" class="l"><a href="#1541">1541: </a>
-</span><span id="1542" class="l"><a href="#1542">1542: </a>    <span class="php-comment">/**
-</span></span><span id="1543" class="l"><a href="#1543">1543: </a><span class="php-comment">     * Retrieve a value from a PUT request
-</span></span><span id="1544" class="l"><a href="#1544">1544: </a><span class="php-comment">     *
-</span></span><span id="1545" class="l"><a href="#1545">1545: </a><span class="php-comment">     * @access public
-</span></span><span id="1546" class="l"><a href="#1546">1546: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
-</span></span><span id="1547" class="l"><a href="#1547">1547: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1548" class="l"><a href="#1548">1548: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1549" class="l"><a href="#1549">1549: </a><span class="php-comment">     * @return array|string|NULL Value from the PUT request; otherwise, NULL
-</span></span><span id="1550" class="l"><a href="#1550">1550: </a><span class="php-comment">     */</span>
-</span><span id="1551" class="l"><a href="#1551">1551: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1552" class="l"><a href="#1552">1552: </a>    {
-</span><span id="1553" class="l"><a href="#1553">1553: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1554" class="l"><a href="#1554">1554: </a>        {
-</span><span id="1555" class="l"><a href="#1555">1555: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
-</span><span id="1556" class="l"><a href="#1556">1556: </a>        }
-</span><span id="1557" class="l"><a href="#1557">1557: </a>
-</span><span id="1558" class="l"><a href="#1558">1558: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1559" class="l"><a href="#1559">1559: </a>    }
+</span><span id="1542" class="l"><a href="#1542">1542: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1543" class="l"><a href="#1543">1543: </a>    }
+</span><span id="1544" class="l"><a href="#1544">1544: </a>
+</span><span id="1545" class="l"><a href="#1545">1545: </a>    <span class="php-comment">/**
+</span></span><span id="1546" class="l"><a href="#1546">1546: </a><span class="php-comment">     * Retrieve a value from a HEAD request
+</span></span><span id="1547" class="l"><a href="#1547">1547: </a><span class="php-comment">     *
+</span></span><span id="1548" class="l"><a href="#1548">1548: </a><span class="php-comment">     * @access public
+</span></span><span id="1549" class="l"><a href="#1549">1549: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
+</span></span><span id="1550" class="l"><a href="#1550">1550: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1551" class="l"><a href="#1551">1551: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1552" class="l"><a href="#1552">1552: </a><span class="php-comment">     * @return array|string|NULL Value from the HEAD request; otherwise, NULL
+</span></span><span id="1553" class="l"><a href="#1553">1553: </a><span class="php-comment">     */</span>
+</span><span id="1554" class="l"><a href="#1554">1554: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1555" class="l"><a href="#1555">1555: </a>    {
+</span><span id="1556" class="l"><a href="#1556">1556: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1557" class="l"><a href="#1557">1557: </a>        {
+</span><span id="1558" class="l"><a href="#1558">1558: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_head_args;
+</span><span id="1559" class="l"><a href="#1559">1559: </a>        }
 </span><span id="1560" class="l"><a href="#1560">1560: </a>
-</span><span id="1561" class="l"><a href="#1561">1561: </a>    <span class="php-comment">/**
-</span></span><span id="1562" class="l"><a href="#1562">1562: </a><span class="php-comment">     * Retrieve a value from a DELETE request
-</span></span><span id="1563" class="l"><a href="#1563">1563: </a><span class="php-comment">     *
-</span></span><span id="1564" class="l"><a href="#1564">1564: </a><span class="php-comment">     * @access public
-</span></span><span id="1565" class="l"><a href="#1565">1565: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
-</span></span><span id="1566" class="l"><a href="#1566">1566: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1567" class="l"><a href="#1567">1567: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1568" class="l"><a href="#1568">1568: </a><span class="php-comment">     * @return array|string|NULL Value from the DELETE request; otherwise, NULL
-</span></span><span id="1569" class="l"><a href="#1569">1569: </a><span class="php-comment">     */</span>
-</span><span id="1570" class="l"><a href="#1570">1570: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1571" class="l"><a href="#1571">1571: </a>    {
-</span><span id="1572" class="l"><a href="#1572">1572: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1573" class="l"><a href="#1573">1573: </a>        {
-</span><span id="1574" class="l"><a href="#1574">1574: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
-</span><span id="1575" class="l"><a href="#1575">1575: </a>        }
-</span><span id="1576" class="l"><a href="#1576">1576: </a>
-</span><span id="1577" class="l"><a href="#1577">1577: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1578" class="l"><a href="#1578">1578: </a>    }
+</span><span id="1561" class="l"><a href="#1561">1561: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_head_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1562" class="l"><a href="#1562">1562: </a>    }
+</span><span id="1563" class="l"><a href="#1563">1563: </a>
+</span><span id="1564" class="l"><a href="#1564">1564: </a>    <span class="php-comment">/**
+</span></span><span id="1565" class="l"><a href="#1565">1565: </a><span class="php-comment">     * Retrieve a value from a POST request
+</span></span><span id="1566" class="l"><a href="#1566">1566: </a><span class="php-comment">     *
+</span></span><span id="1567" class="l"><a href="#1567">1567: </a><span class="php-comment">     * @access public
+</span></span><span id="1568" class="l"><a href="#1568">1568: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
+</span></span><span id="1569" class="l"><a href="#1569">1569: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1570" class="l"><a href="#1570">1570: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1571" class="l"><a href="#1571">1571: </a><span class="php-comment">     * @return array|string|NULL Value from the POST request; otherwise, NULL
+</span></span><span id="1572" class="l"><a href="#1572">1572: </a><span class="php-comment">     */</span>
+</span><span id="1573" class="l"><a href="#1573">1573: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1574" class="l"><a href="#1574">1574: </a>    {
+</span><span id="1575" class="l"><a href="#1575">1575: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1576" class="l"><a href="#1576">1576: </a>        {
+</span><span id="1577" class="l"><a href="#1577">1577: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
+</span><span id="1578" class="l"><a href="#1578">1578: </a>        }
 </span><span id="1579" class="l"><a href="#1579">1579: </a>
-</span><span id="1580" class="l"><a href="#1580">1580: </a>    <span class="php-comment">/**
-</span></span><span id="1581" class="l"><a href="#1581">1581: </a><span class="php-comment">     * Retrieve a value from a PATCH request
-</span></span><span id="1582" class="l"><a href="#1582">1582: </a><span class="php-comment">     *
-</span></span><span id="1583" class="l"><a href="#1583">1583: </a><span class="php-comment">     * @access public
-</span></span><span id="1584" class="l"><a href="#1584">1584: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
-</span></span><span id="1585" class="l"><a href="#1585">1585: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1586" class="l"><a href="#1586">1586: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1587" class="l"><a href="#1587">1587: </a><span class="php-comment">     * @return array|string|NULL Value from the PATCH request; otherwise, NULL
-</span></span><span id="1588" class="l"><a href="#1588">1588: </a><span class="php-comment">     */</span>
-</span><span id="1589" class="l"><a href="#1589">1589: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1590" class="l"><a href="#1590">1590: </a>    {
-</span><span id="1591" class="l"><a href="#1591">1591: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1592" class="l"><a href="#1592">1592: </a>        {
-</span><span id="1593" class="l"><a href="#1593">1593: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
-</span><span id="1594" class="l"><a href="#1594">1594: </a>        }
-</span><span id="1595" class="l"><a href="#1595">1595: </a>
-</span><span id="1596" class="l"><a href="#1596">1596: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1597" class="l"><a href="#1597">1597: </a>    }
+</span><span id="1580" class="l"><a href="#1580">1580: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1581" class="l"><a href="#1581">1581: </a>    }
+</span><span id="1582" class="l"><a href="#1582">1582: </a>
+</span><span id="1583" class="l"><a href="#1583">1583: </a>    <span class="php-comment">/**
+</span></span><span id="1584" class="l"><a href="#1584">1584: </a><span class="php-comment">     * Retrieve a value from a PUT request
+</span></span><span id="1585" class="l"><a href="#1585">1585: </a><span class="php-comment">     *
+</span></span><span id="1586" class="l"><a href="#1586">1586: </a><span class="php-comment">     * @access public
+</span></span><span id="1587" class="l"><a href="#1587">1587: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
+</span></span><span id="1588" class="l"><a href="#1588">1588: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1589" class="l"><a href="#1589">1589: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1590" class="l"><a href="#1590">1590: </a><span class="php-comment">     * @return array|string|NULL Value from the PUT request; otherwise, NULL
+</span></span><span id="1591" class="l"><a href="#1591">1591: </a><span class="php-comment">     */</span>
+</span><span id="1592" class="l"><a href="#1592">1592: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1593" class="l"><a href="#1593">1593: </a>    {
+</span><span id="1594" class="l"><a href="#1594">1594: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1595" class="l"><a href="#1595">1595: </a>        {
+</span><span id="1596" class="l"><a href="#1596">1596: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
+</span><span id="1597" class="l"><a href="#1597">1597: </a>        }
 </span><span id="1598" class="l"><a href="#1598">1598: </a>
-</span><span id="1599" class="l"><a href="#1599">1599: </a>    <span class="php-comment">/**
-</span></span><span id="1600" class="l"><a href="#1600">1600: </a><span class="php-comment">     * Retrieve a value from the query parameters
-</span></span><span id="1601" class="l"><a href="#1601">1601: </a><span class="php-comment">     *
-</span></span><span id="1602" class="l"><a href="#1602">1602: </a><span class="php-comment">     * @access public
-</span></span><span id="1603" class="l"><a href="#1603">1603: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
-</span></span><span id="1604" class="l"><a href="#1604">1604: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1605" class="l"><a href="#1605">1605: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1606" class="l"><a href="#1606">1606: </a><span class="php-comment">     * @return array|string|NULL Value from the query parameters; otherwise, NULL
-</span></span><span id="1607" class="l"><a href="#1607">1607: </a><span class="php-comment">     */</span>
-</span><span id="1608" class="l"><a href="#1608">1608: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1609" class="l"><a href="#1609">1609: </a>    {
-</span><span id="1610" class="l"><a href="#1610">1610: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1611" class="l"><a href="#1611">1611: </a>        {
-</span><span id="1612" class="l"><a href="#1612">1612: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
-</span><span id="1613" class="l"><a href="#1613">1613: </a>        }
-</span><span id="1614" class="l"><a href="#1614">1614: </a>
-</span><span id="1615" class="l"><a href="#1615">1615: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1616" class="l"><a href="#1616">1616: </a>    }
+</span><span id="1599" class="l"><a href="#1599">1599: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1600" class="l"><a href="#1600">1600: </a>    }
+</span><span id="1601" class="l"><a href="#1601">1601: </a>
+</span><span id="1602" class="l"><a href="#1602">1602: </a>    <span class="php-comment">/**
+</span></span><span id="1603" class="l"><a href="#1603">1603: </a><span class="php-comment">     * Retrieve a value from a DELETE request
+</span></span><span id="1604" class="l"><a href="#1604">1604: </a><span class="php-comment">     *
+</span></span><span id="1605" class="l"><a href="#1605">1605: </a><span class="php-comment">     * @access public
+</span></span><span id="1606" class="l"><a href="#1606">1606: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
+</span></span><span id="1607" class="l"><a href="#1607">1607: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1608" class="l"><a href="#1608">1608: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1609" class="l"><a href="#1609">1609: </a><span class="php-comment">     * @return array|string|NULL Value from the DELETE request; otherwise, NULL
+</span></span><span id="1610" class="l"><a href="#1610">1610: </a><span class="php-comment">     */</span>
+</span><span id="1611" class="l"><a href="#1611">1611: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1612" class="l"><a href="#1612">1612: </a>    {
+</span><span id="1613" class="l"><a href="#1613">1613: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1614" class="l"><a href="#1614">1614: </a>        {
+</span><span id="1615" class="l"><a href="#1615">1615: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
+</span><span id="1616" class="l"><a href="#1616">1616: </a>        }
 </span><span id="1617" class="l"><a href="#1617">1617: </a>
-</span><span id="1618" class="l"><a href="#1618">1618: </a>    <span class="php-comment">/**
-</span></span><span id="1619" class="l"><a href="#1619">1619: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
-</span></span><span id="1620" class="l"><a href="#1620">1620: </a><span class="php-comment">     * prevented.
-</span></span><span id="1621" class="l"><a href="#1621">1621: </a><span class="php-comment">     *
-</span></span><span id="1622" class="l"><a href="#1622">1622: </a><span class="php-comment">     * @access protected
-</span></span><span id="1623" class="l"><a href="#1623">1623: </a><span class="php-comment">     * @param  string $value Input data
-</span></span><span id="1624" class="l"><a href="#1624">1624: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
-</span></span><span id="1625" class="l"><a href="#1625">1625: </a><span class="php-comment">     * @return string
-</span></span><span id="1626" class="l"><a href="#1626">1626: </a><span class="php-comment">     */</span>
-</span><span id="1627" class="l"><a href="#1627">1627: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
-</span><span id="1628" class="l"><a href="#1628">1628: </a>    {
-</span><span id="1629" class="l"><a href="#1629">1629: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) || <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
-</span><span id="1630" class="l"><a href="#1630">1630: </a>
-</span><span id="1631" class="l"><a href="#1631">1631: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
-</span><span id="1632" class="l"><a href="#1632">1632: </a>    }
-</span><span id="1633" class="l"><a href="#1633">1633: </a>
-</span><span id="1634" class="l"><a href="#1634">1634: </a>    <span class="php-comment">/**
-</span></span><span id="1635" class="l"><a href="#1635">1635: </a><span class="php-comment">     * Retrieve the validation errors
-</span></span><span id="1636" class="l"><a href="#1636">1636: </a><span class="php-comment">     *
-</span></span><span id="1637" class="l"><a href="#1637">1637: </a><span class="php-comment">     * @access public
-</span></span><span id="1638" class="l"><a href="#1638">1638: </a><span class="php-comment">     * @return array
-</span></span><span id="1639" class="l"><a href="#1639">1639: </a><span class="php-comment">     */</span>
-</span><span id="1640" class="l"><a href="#1640">1640: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
-</span><span id="1641" class="l"><a href="#1641">1641: </a>    {
-</span><span id="1642" class="l"><a href="#1642">1642: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
-</span><span id="1643" class="l"><a href="#1643">1643: </a>
-</span><span id="1644" class="l"><a href="#1644">1644: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
-</span><span id="1645" class="l"><a href="#1645">1645: </a>    }
-</span><span id="1646" class="l"><a href="#1646">1646: </a>
-</span><span id="1647" class="l"><a href="#1647">1647: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
-</span><span id="1648" class="l"><a href="#1648">1648: </a>
-</span><span id="1649" class="l"><a href="#1649">1649: </a>    <span class="php-comment">/**
-</span></span><span id="1650" class="l"><a href="#1650">1650: </a><span class="php-comment">     * Perform LDAP Authentication
-</span></span><span id="1651" class="l"><a href="#1651">1651: </a><span class="php-comment">     *
-</span></span><span id="1652" class="l"><a href="#1652">1652: </a><span class="php-comment">     * @access protected
-</span></span><span id="1653" class="l"><a href="#1653">1653: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1654" class="l"><a href="#1654">1654: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1655" class="l"><a href="#1655">1655: </a><span class="php-comment">     * @return bool
-</span></span><span id="1656" class="l"><a href="#1656">1656: </a><span class="php-comment">     */</span>
-</span><span id="1657" class="l"><a href="#1657">1657: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1658" class="l"><a href="#1658">1658: </a>    {
-</span><span id="1659" class="l"><a href="#1659">1659: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1660" class="l"><a href="#1660">1660: </a>        {
-</span><span id="1661" class="l"><a href="#1661">1661: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
-</span><span id="1662" class="l"><a href="#1662">1662: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1663" class="l"><a href="#1663">1663: </a>        }
-</span><span id="1664" class="l"><a href="#1664">1664: </a>
-</span><span id="1665" class="l"><a href="#1665">1665: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading configuration'</span>);
-</span><span id="1666" class="l"><a href="#1666">1666: </a>
-</span><span id="1667" class="l"><a href="#1667">1667: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="1668" class="l"><a href="#1668">1668: </a>
-</span><span id="1669" class="l"><a href="#1669">1669: </a>        <span class="php-var">$ldap</span> = [
-</span><span id="1670" class="l"><a href="#1670">1670: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1671" class="l"><a href="#1671">1671: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1672" class="l"><a href="#1672">1672: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1673" class="l"><a href="#1673">1673: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1674" class="l"><a href="#1674">1674: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1675" class="l"><a href="#1675">1675: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1676" class="l"><a href="#1676">1676: </a>        ];
-</span><span id="1677" class="l"><a href="#1677">1677: </a>
-</span><span id="1678" class="l"><a href="#1678">1678: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
-</span><span id="1679" class="l"><a href="#1679">1679: </a>
-</span><span id="1680" class="l"><a href="#1680">1680: </a>        <span class="php-comment">// Connect to the ldap server</span>
-</span><span id="1681" class="l"><a href="#1681">1681: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
-</span><span id="1682" class="l"><a href="#1682">1682: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
-</span><span id="1683" class="l"><a href="#1683">1683: </a>        {
-</span><span id="1684" class="l"><a href="#1684">1684: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>] . <span class="php-quote">' seconds'</span>);
-</span><span id="1685" class="l"><a href="#1685">1685: </a>
-</span><span id="1686" class="l"><a href="#1686">1686: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
+</span><span id="1618" class="l"><a href="#1618">1618: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1619" class="l"><a href="#1619">1619: </a>    }
+</span><span id="1620" class="l"><a href="#1620">1620: </a>
+</span><span id="1621" class="l"><a href="#1621">1621: </a>    <span class="php-comment">/**
+</span></span><span id="1622" class="l"><a href="#1622">1622: </a><span class="php-comment">     * Retrieve a value from a PATCH request
+</span></span><span id="1623" class="l"><a href="#1623">1623: </a><span class="php-comment">     *
+</span></span><span id="1624" class="l"><a href="#1624">1624: </a><span class="php-comment">     * @access public
+</span></span><span id="1625" class="l"><a href="#1625">1625: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
+</span></span><span id="1626" class="l"><a href="#1626">1626: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1627" class="l"><a href="#1627">1627: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1628" class="l"><a href="#1628">1628: </a><span class="php-comment">     * @return array|string|NULL Value from the PATCH request; otherwise, NULL
+</span></span><span id="1629" class="l"><a href="#1629">1629: </a><span class="php-comment">     */</span>
+</span><span id="1630" class="l"><a href="#1630">1630: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1631" class="l"><a href="#1631">1631: </a>    {
+</span><span id="1632" class="l"><a href="#1632">1632: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1633" class="l"><a href="#1633">1633: </a>        {
+</span><span id="1634" class="l"><a href="#1634">1634: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
+</span><span id="1635" class="l"><a href="#1635">1635: </a>        }
+</span><span id="1636" class="l"><a href="#1636">1636: </a>
+</span><span id="1637" class="l"><a href="#1637">1637: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1638" class="l"><a href="#1638">1638: </a>    }
+</span><span id="1639" class="l"><a href="#1639">1639: </a>
+</span><span id="1640" class="l"><a href="#1640">1640: </a>    <span class="php-comment">/**
+</span></span><span id="1641" class="l"><a href="#1641">1641: </a><span class="php-comment">     * Retrieve a value from the query parameters
+</span></span><span id="1642" class="l"><a href="#1642">1642: </a><span class="php-comment">     *
+</span></span><span id="1643" class="l"><a href="#1643">1643: </a><span class="php-comment">     * @access public
+</span></span><span id="1644" class="l"><a href="#1644">1644: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
+</span></span><span id="1645" class="l"><a href="#1645">1645: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1646" class="l"><a href="#1646">1646: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1647" class="l"><a href="#1647">1647: </a><span class="php-comment">     * @return array|string|NULL Value from the query parameters; otherwise, NULL
+</span></span><span id="1648" class="l"><a href="#1648">1648: </a><span class="php-comment">     */</span>
+</span><span id="1649" class="l"><a href="#1649">1649: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1650" class="l"><a href="#1650">1650: </a>    {
+</span><span id="1651" class="l"><a href="#1651">1651: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1652" class="l"><a href="#1652">1652: </a>        {
+</span><span id="1653" class="l"><a href="#1653">1653: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
+</span><span id="1654" class="l"><a href="#1654">1654: </a>        }
+</span><span id="1655" class="l"><a href="#1655">1655: </a>
+</span><span id="1656" class="l"><a href="#1656">1656: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1657" class="l"><a href="#1657">1657: </a>    }
+</span><span id="1658" class="l"><a href="#1658">1658: </a>
+</span><span id="1659" class="l"><a href="#1659">1659: </a>    <span class="php-comment">/**
+</span></span><span id="1660" class="l"><a href="#1660">1660: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
+</span></span><span id="1661" class="l"><a href="#1661">1661: </a><span class="php-comment">     * prevented
+</span></span><span id="1662" class="l"><a href="#1662">1662: </a><span class="php-comment">     *
+</span></span><span id="1663" class="l"><a href="#1663">1663: </a><span class="php-comment">     * @access protected
+</span></span><span id="1664" class="l"><a href="#1664">1664: </a><span class="php-comment">     * @param  string $value Input data
+</span></span><span id="1665" class="l"><a href="#1665">1665: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
+</span></span><span id="1666" class="l"><a href="#1666">1666: </a><span class="php-comment">     * @return string
+</span></span><span id="1667" class="l"><a href="#1667">1667: </a><span class="php-comment">     */</span>
+</span><span id="1668" class="l"><a href="#1668">1668: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
+</span><span id="1669" class="l"><a href="#1669">1669: </a>    {
+</span><span id="1670" class="l"><a href="#1670">1670: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) || <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
+</span><span id="1671" class="l"><a href="#1671">1671: </a>
+</span><span id="1672" class="l"><a href="#1672">1672: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
+</span><span id="1673" class="l"><a href="#1673">1673: </a>    }
+</span><span id="1674" class="l"><a href="#1674">1674: </a>
+</span><span id="1675" class="l"><a href="#1675">1675: </a>    <span class="php-comment">/**
+</span></span><span id="1676" class="l"><a href="#1676">1676: </a><span class="php-comment">     * Retrieve the validation errors
+</span></span><span id="1677" class="l"><a href="#1677">1677: </a><span class="php-comment">     *
+</span></span><span id="1678" class="l"><a href="#1678">1678: </a><span class="php-comment">     * @access public
+</span></span><span id="1679" class="l"><a href="#1679">1679: </a><span class="php-comment">     * @return array
+</span></span><span id="1680" class="l"><a href="#1680">1680: </a><span class="php-comment">     */</span>
+</span><span id="1681" class="l"><a href="#1681">1681: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
+</span><span id="1682" class="l"><a href="#1682">1682: </a>    {
+</span><span id="1683" class="l"><a href="#1683">1683: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
+</span><span id="1684" class="l"><a href="#1684">1684: </a>
+</span><span id="1685" class="l"><a href="#1685">1685: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
+</span><span id="1686" class="l"><a href="#1686">1686: </a>    }
 </span><span id="1687" class="l"><a href="#1687">1687: </a>
-</span><span id="1688" class="l"><a href="#1688">1688: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>] . <span class="php-quote">' with dn '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
+</span><span id="1688" class="l"><a href="#1688">1688: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
 </span><span id="1689" class="l"><a href="#1689">1689: </a>
-</span><span id="1690" class="l"><a href="#1690">1690: </a>            <span class="php-comment">// Binding to the ldap server</span>
-</span><span id="1691" class="l"><a href="#1691">1691: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
-</span><span id="1692" class="l"><a href="#1692">1692: </a>
-</span><span id="1693" class="l"><a href="#1693">1693: </a>            <span class="php-comment">// Verify the binding</span>
-</span><span id="1694" class="l"><a href="#1694">1694: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1695" class="l"><a href="#1695">1695: </a>            {
-</span><span id="1696" class="l"><a href="#1696">1696: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind was unsuccessful'</span>);
-</span><span id="1697" class="l"><a href="#1697">1697: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1698" class="l"><a href="#1698">1698: </a>            }
-</span><span id="1699" class="l"><a href="#1699">1699: </a>
-</span><span id="1700" class="l"><a href="#1700">1700: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
-</span><span id="1701" class="l"><a href="#1701">1701: </a>        }
-</span><span id="1702" class="l"><a href="#1702">1702: </a>
-</span><span id="1703" class="l"><a href="#1703">1703: </a>        <span class="php-comment">// Search for user</span>
-</span><span id="1704" class="l"><a href="#1704">1704: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1705" class="l"><a href="#1705">1705: </a>        {
-</span><span id="1706" class="l"><a href="#1706">1706: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span> . <span class="php-var">$username</span> . <span class="php-quote">' not found in search'</span>);
-</span><span id="1707" class="l"><a href="#1707">1707: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1708" class="l"><a href="#1708">1708: </a>        }
+</span><span id="1690" class="l"><a href="#1690">1690: </a>    <span class="php-comment">/**
+</span></span><span id="1691" class="l"><a href="#1691">1691: </a><span class="php-comment">     * Perform LDAP Authentication
+</span></span><span id="1692" class="l"><a href="#1692">1692: </a><span class="php-comment">     *
+</span></span><span id="1693" class="l"><a href="#1693">1693: </a><span class="php-comment">     * @access protected
+</span></span><span id="1694" class="l"><a href="#1694">1694: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1695" class="l"><a href="#1695">1695: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1696" class="l"><a href="#1696">1696: </a><span class="php-comment">     * @return bool
+</span></span><span id="1697" class="l"><a href="#1697">1697: </a><span class="php-comment">     */</span>
+</span><span id="1698" class="l"><a href="#1698">1698: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1699" class="l"><a href="#1699">1699: </a>    {
+</span><span id="1700" class="l"><a href="#1700">1700: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1701" class="l"><a href="#1701">1701: </a>        {
+</span><span id="1702" class="l"><a href="#1702">1702: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
+</span><span id="1703" class="l"><a href="#1703">1703: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1704" class="l"><a href="#1704">1704: </a>        }
+</span><span id="1705" class="l"><a href="#1705">1705: </a>
+</span><span id="1706" class="l"><a href="#1706">1706: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading configuration'</span>);
+</span><span id="1707" class="l"><a href="#1707">1707: </a>
+</span><span id="1708" class="l"><a href="#1708">1708: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
 </span><span id="1709" class="l"><a href="#1709">1709: </a>
-</span><span id="1710" class="l"><a href="#1710">1710: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
-</span><span id="1711" class="l"><a href="#1711">1711: </a>        {
-</span><span id="1712" class="l"><a href="#1712">1712: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username '</span> . <span class="php-var">$username</span> . <span class="php-quote">'found more than once'</span>);
-</span><span id="1713" class="l"><a href="#1713">1713: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1714" class="l"><a href="#1714">1714: </a>        }
-</span><span id="1715" class="l"><a href="#1715">1715: </a>
-</span><span id="1716" class="l"><a href="#1716">1716: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1717" class="l"><a href="#1717">1717: </a>        {
-</span><span id="1718" class="l"><a href="#1718">1718: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, entry of search result could not be fetched'</span>);
-</span><span id="1719" class="l"><a href="#1719">1719: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1720" class="l"><a href="#1720">1720: </a>        }
-</span><span id="1721" class="l"><a href="#1721">1721: </a>
-</span><span id="1722" class="l"><a href="#1722">1722: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1723" class="l"><a href="#1723">1723: </a>        {
-</span><span id="1724" class="l"><a href="#1724">1724: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, user-dn could not be fetched'</span>);
-</span><span id="1725" class="l"><a href="#1725">1725: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1726" class="l"><a href="#1726">1726: </a>        }
-</span><span id="1727" class="l"><a href="#1727">1727: </a>
-</span><span id="1728" class="l"><a href="#1728">1728: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
-</span><span id="1729" class="l"><a href="#1729">1729: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1730" class="l"><a href="#1730">1730: </a>        {
-</span><span id="1731" class="l"><a href="#1731">1731: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
-</span><span id="1732" class="l"><a href="#1732">1732: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1733" class="l"><a href="#1733">1733: </a>        }
-</span><span id="1734" class="l"><a href="#1734">1734: </a>
-</span><span id="1735" class="l"><a href="#1735">1735: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span> . <span class="php-var">$user_dn</span> . <span class="php-quote">' authenticated successfully'</span>);
-</span><span id="1736" class="l"><a href="#1736">1736: </a>
-</span><span id="1737" class="l"><a href="#1737">1737: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
-</span><span id="1738" class="l"><a href="#1738">1738: </a>
-</span><span id="1739" class="l"><a href="#1739">1739: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
+</span><span id="1710" class="l"><a href="#1710">1710: </a>        <span class="php-var">$ldap</span> = [
+</span><span id="1711" class="l"><a href="#1711">1711: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1712" class="l"><a href="#1712">1712: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1713" class="l"><a href="#1713">1713: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1714" class="l"><a href="#1714">1714: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1715" class="l"><a href="#1715">1715: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1716" class="l"><a href="#1716">1716: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1717" class="l"><a href="#1717">1717: </a>        ];
+</span><span id="1718" class="l"><a href="#1718">1718: </a>
+</span><span id="1719" class="l"><a href="#1719">1719: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
+</span><span id="1720" class="l"><a href="#1720">1720: </a>
+</span><span id="1721" class="l"><a href="#1721">1721: </a>        <span class="php-comment">// Connect to the ldap server</span>
+</span><span id="1722" class="l"><a href="#1722">1722: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
+</span><span id="1723" class="l"><a href="#1723">1723: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
+</span><span id="1724" class="l"><a href="#1724">1724: </a>        {
+</span><span id="1725" class="l"><a href="#1725">1725: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span>.<span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>].<span class="php-quote">' seconds'</span>);
+</span><span id="1726" class="l"><a href="#1726">1726: </a>
+</span><span id="1727" class="l"><a href="#1727">1727: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
+</span><span id="1728" class="l"><a href="#1728">1728: </a>
+</span><span id="1729" class="l"><a href="#1729">1729: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span>.<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>].<span class="php-quote">' with dn '</span>.<span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
+</span><span id="1730" class="l"><a href="#1730">1730: </a>
+</span><span id="1731" class="l"><a href="#1731">1731: </a>            <span class="php-comment">// Binding to the ldap server</span>
+</span><span id="1732" class="l"><a href="#1732">1732: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
+</span><span id="1733" class="l"><a href="#1733">1733: </a>
+</span><span id="1734" class="l"><a href="#1734">1734: </a>            <span class="php-comment">// Verify the binding</span>
+</span><span id="1735" class="l"><a href="#1735">1735: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1736" class="l"><a href="#1736">1736: </a>            {
+</span><span id="1737" class="l"><a href="#1737">1737: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind was unsuccessful'</span>);
+</span><span id="1738" class="l"><a href="#1738">1738: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1739" class="l"><a href="#1739">1739: </a>            }
 </span><span id="1740" class="l"><a href="#1740">1740: </a>
-</span><span id="1741" class="l"><a href="#1741">1741: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1742" class="l"><a href="#1742">1742: </a>    }
+</span><span id="1741" class="l"><a href="#1741">1741: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
+</span><span id="1742" class="l"><a href="#1742">1742: </a>        }
 </span><span id="1743" class="l"><a href="#1743">1743: </a>
-</span><span id="1744" class="l"><a href="#1744">1744: </a>    <span class="php-comment">/**
-</span></span><span id="1745" class="l"><a href="#1745">1745: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
-</span></span><span id="1746" class="l"><a href="#1746">1746: </a><span class="php-comment">     *
-</span></span><span id="1747" class="l"><a href="#1747">1747: </a><span class="php-comment">     * @access protected
-</span></span><span id="1748" class="l"><a href="#1748">1748: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1749" class="l"><a href="#1749">1749: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1750" class="l"><a href="#1750">1750: </a><span class="php-comment">     * @return bool
-</span></span><span id="1751" class="l"><a href="#1751">1751: </a><span class="php-comment">     */</span>
-</span><span id="1752" class="l"><a href="#1752">1752: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1753" class="l"><a href="#1753">1753: </a>    {
-</span><span id="1754" class="l"><a href="#1754">1754: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1755" class="l"><a href="#1755">1755: </a>        {
-</span><span id="1756" class="l"><a href="#1756">1756: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: Failure, empty username'</span>);
-</span><span id="1757" class="l"><a href="#1757">1757: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1758" class="l"><a href="#1758">1758: </a>        }
-</span><span id="1759" class="l"><a href="#1759">1759: </a>
-</span><span id="1760" class="l"><a href="#1760">1760: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
-</span><span id="1761" class="l"><a href="#1761">1761: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
+</span><span id="1744" class="l"><a href="#1744">1744: </a>        <span class="php-comment">// Search for user</span>
+</span><span id="1745" class="l"><a href="#1745">1745: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1746" class="l"><a href="#1746">1746: </a>        {
+</span><span id="1747" class="l"><a href="#1747">1747: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span>.<span class="php-var">$username</span>.<span class="php-quote">' not found in search'</span>);
+</span><span id="1748" class="l"><a href="#1748">1748: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1749" class="l"><a href="#1749">1749: </a>        }
+</span><span id="1750" class="l"><a href="#1750">1750: </a>
+</span><span id="1751" class="l"><a href="#1751">1751: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
+</span><span id="1752" class="l"><a href="#1752">1752: </a>        {
+</span><span id="1753" class="l"><a href="#1753">1753: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username '</span>.<span class="php-var">$username</span>.<span class="php-quote">'found more than once'</span>);
+</span><span id="1754" class="l"><a href="#1754">1754: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1755" class="l"><a href="#1755">1755: </a>        }
+</span><span id="1756" class="l"><a href="#1756">1756: </a>
+</span><span id="1757" class="l"><a href="#1757">1757: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1758" class="l"><a href="#1758">1758: </a>        {
+</span><span id="1759" class="l"><a href="#1759">1759: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, entry of search result could not be fetched'</span>);
+</span><span id="1760" class="l"><a href="#1760">1760: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1761" class="l"><a href="#1761">1761: </a>        }
 </span><span id="1762" class="l"><a href="#1762">1762: </a>
-</span><span id="1763" class="l"><a href="#1763">1763: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
+</span><span id="1763" class="l"><a href="#1763">1763: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) === <span class="php-keyword1">FALSE</span>)
 </span><span id="1764" class="l"><a href="#1764">1764: </a>        {
-</span><span id="1765" class="l"><a href="#1765">1765: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_class'</span>);
+</span><span id="1765" class="l"><a href="#1765">1765: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, user-dn could not be fetched'</span>);
 </span><span id="1766" class="l"><a href="#1766">1766: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
 </span><span id="1767" class="l"><a href="#1767">1767: </a>        }
 </span><span id="1768" class="l"><a href="#1768">1768: </a>
-</span><span id="1769" class="l"><a href="#1769">1769: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
-</span><span id="1770" class="l"><a href="#1770">1770: </a>        {
-</span><span id="1771" class="l"><a href="#1771">1771: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_function'</span>);
-</span><span id="1772" class="l"><a href="#1772">1772: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1773" class="l"><a href="#1773">1773: </a>        }
-</span><span id="1774" class="l"><a href="#1774">1774: </a>
-</span><span id="1775" class="l"><a href="#1775">1775: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1776" class="l"><a href="#1776">1776: </a>        {
-</span><span id="1777" class="l"><a href="#1777">1777: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
-</span><span id="1778" class="l"><a href="#1778">1778: </a>        }
+</span><span id="1769" class="l"><a href="#1769">1769: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
+</span><span id="1770" class="l"><a href="#1770">1770: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1771" class="l"><a href="#1771">1771: </a>        {
+</span><span id="1772" class="l"><a href="#1772">1772: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
+</span><span id="1773" class="l"><a href="#1773">1773: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1774" class="l"><a href="#1774">1774: </a>        }
+</span><span id="1775" class="l"><a href="#1775">1775: </a>
+</span><span id="1776" class="l"><a href="#1776">1776: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span>.<span class="php-var">$user_dn</span>.<span class="php-quote">' authenticated successfully'</span>);
+</span><span id="1777" class="l"><a href="#1777">1777: </a>
+</span><span id="1778" class="l"><a href="#1778">1778: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
 </span><span id="1779" class="l"><a href="#1779">1779: </a>
-</span><span id="1780" class="l"><a href="#1780">1780: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1781" class="l"><a href="#1781">1781: </a>    }
-</span><span id="1782" class="l"><a href="#1782">1782: </a>
-</span><span id="1783" class="l"><a href="#1783">1783: </a>    <span class="php-comment">/**
-</span></span><span id="1784" class="l"><a href="#1784">1784: </a><span class="php-comment">     * Check if the user is logged in
-</span></span><span id="1785" class="l"><a href="#1785">1785: </a><span class="php-comment">     *
-</span></span><span id="1786" class="l"><a href="#1786">1786: </a><span class="php-comment">     * @access protected
-</span></span><span id="1787" class="l"><a href="#1787">1787: </a><span class="php-comment">     * @param  string $username The user's name
-</span></span><span id="1788" class="l"><a href="#1788">1788: </a><span class="php-comment">     * @param  bool|string $password The user's password
-</span></span><span id="1789" class="l"><a href="#1789">1789: </a><span class="php-comment">     * @return bool
-</span></span><span id="1790" class="l"><a href="#1790">1790: </a><span class="php-comment">     */</span>
-</span><span id="1791" class="l"><a href="#1791">1791: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1792" class="l"><a href="#1792">1792: </a>    {
-</span><span id="1793" class="l"><a href="#1793">1793: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1794" class="l"><a href="#1794">1794: </a>        {
-</span><span id="1795" class="l"><a href="#1795">1795: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1796" class="l"><a href="#1796">1796: </a>        }
-</span><span id="1797" class="l"><a href="#1797">1797: </a>
-</span><span id="1798" class="l"><a href="#1798">1798: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
-</span><span id="1799" class="l"><a href="#1799">1799: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="1800" class="l"><a href="#1800">1800: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
-</span><span id="1801" class="l"><a href="#1801">1801: </a>
-</span><span id="1802" class="l"><a href="#1802">1802: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
-</span><span id="1803" class="l"><a href="#1803">1803: </a>        {
-</span><span id="1804" class="l"><a href="#1804">1804: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
-</span><span id="1805" class="l"><a href="#1805">1805: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>) . <span class="php-quote">':'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
-</span><span id="1806" class="l"><a href="#1806">1806: </a>        }
-</span><span id="1807" class="l"><a href="#1807">1807: </a>
-</span><span id="1808" class="l"><a href="#1808">1808: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1809" class="l"><a href="#1809">1809: </a>        {
-</span><span id="1810" class="l"><a href="#1810">1810: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1811" class="l"><a href="#1811">1811: </a>        }
-</span><span id="1812" class="l"><a href="#1812">1812: </a>
-</span><span id="1813" class="l"><a href="#1813">1813: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
-</span><span id="1814" class="l"><a href="#1814">1814: </a>        {
-</span><span id="1815" class="l"><a href="#1815">1815: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
-</span><span id="1816" class="l"><a href="#1816">1816: </a>
-</span><span id="1817" class="l"><a href="#1817">1817: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1818" class="l"><a href="#1818">1818: </a>        }
-</span><span id="1819" class="l"><a href="#1819">1819: </a>
-</span><span id="1820" class="l"><a href="#1820">1820: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
-</span><span id="1821" class="l"><a href="#1821">1821: </a>        {
-</span><span id="1822" class="l"><a href="#1822">1822: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1780" class="l"><a href="#1780">1780: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
+</span><span id="1781" class="l"><a href="#1781">1781: </a>
+</span><span id="1782" class="l"><a href="#1782">1782: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1783" class="l"><a href="#1783">1783: </a>    }
+</span><span id="1784" class="l"><a href="#1784">1784: </a>
+</span><span id="1785" class="l"><a href="#1785">1785: </a>    <span class="php-comment">/**
+</span></span><span id="1786" class="l"><a href="#1786">1786: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
+</span></span><span id="1787" class="l"><a href="#1787">1787: </a><span class="php-comment">     *
+</span></span><span id="1788" class="l"><a href="#1788">1788: </a><span class="php-comment">     * @access protected
+</span></span><span id="1789" class="l"><a href="#1789">1789: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1790" class="l"><a href="#1790">1790: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1791" class="l"><a href="#1791">1791: </a><span class="php-comment">     * @return bool
+</span></span><span id="1792" class="l"><a href="#1792">1792: </a><span class="php-comment">     */</span>
+</span><span id="1793" class="l"><a href="#1793">1793: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1794" class="l"><a href="#1794">1794: </a>    {
+</span><span id="1795" class="l"><a href="#1795">1795: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1796" class="l"><a href="#1796">1796: </a>        {
+</span><span id="1797" class="l"><a href="#1797">1797: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: Failure, empty username'</span>);
+</span><span id="1798" class="l"><a href="#1798">1798: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1799" class="l"><a href="#1799">1799: </a>        }
+</span><span id="1800" class="l"><a href="#1800">1800: </a>
+</span><span id="1801" class="l"><a href="#1801">1801: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
+</span><span id="1802" class="l"><a href="#1802">1802: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
+</span><span id="1803" class="l"><a href="#1803">1803: </a>
+</span><span id="1804" class="l"><a href="#1804">1804: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
+</span><span id="1805" class="l"><a href="#1805">1805: </a>        {
+</span><span id="1806" class="l"><a href="#1806">1806: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_class'</span>);
+</span><span id="1807" class="l"><a href="#1807">1807: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1808" class="l"><a href="#1808">1808: </a>        }
+</span><span id="1809" class="l"><a href="#1809">1809: </a>
+</span><span id="1810" class="l"><a href="#1810">1810: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
+</span><span id="1811" class="l"><a href="#1811">1811: </a>        {
+</span><span id="1812" class="l"><a href="#1812">1812: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_function'</span>);
+</span><span id="1813" class="l"><a href="#1813">1813: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1814" class="l"><a href="#1814">1814: </a>        }
+</span><span id="1815" class="l"><a href="#1815">1815: </a>
+</span><span id="1816" class="l"><a href="#1816">1816: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1817" class="l"><a href="#1817">1817: </a>        {
+</span><span id="1818" class="l"><a href="#1818">1818: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
+</span><span id="1819" class="l"><a href="#1819">1819: </a>        }
+</span><span id="1820" class="l"><a href="#1820">1820: </a>
+</span><span id="1821" class="l"><a href="#1821">1821: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1822" class="l"><a href="#1822">1822: </a>    }
 </span><span id="1823" class="l"><a href="#1823">1823: </a>
-</span><span id="1824" class="l"><a href="#1824">1824: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1825" class="l"><a href="#1825">1825: </a>        }
-</span><span id="1826" class="l"><a href="#1826">1826: </a>
-</span><span id="1827" class="l"><a href="#1827">1827: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1828" class="l"><a href="#1828">1828: </a>        {
-</span><span id="1829" class="l"><a href="#1829">1829: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1830" class="l"><a href="#1830">1830: </a>        }
-</span><span id="1831" class="l"><a href="#1831">1831: </a>
-</span><span id="1832" class="l"><a href="#1832">1832: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
-</span><span id="1833" class="l"><a href="#1833">1833: </a>        {
-</span><span id="1834" class="l"><a href="#1834">1834: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1835" class="l"><a href="#1835">1835: </a>        }
-</span><span id="1836" class="l"><a href="#1836">1836: </a>
-</span><span id="1837" class="l"><a href="#1837">1837: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1838" class="l"><a href="#1838">1838: </a>    }
-</span><span id="1839" class="l"><a href="#1839">1839: </a>
-</span><span id="1840" class="l"><a href="#1840">1840: </a>    <span class="php-comment">/**
-</span></span><span id="1841" class="l"><a href="#1841">1841: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
-</span></span><span id="1842" class="l"><a href="#1842">1842: </a><span class="php-comment">     *
-</span></span><span id="1843" class="l"><a href="#1843">1843: </a><span class="php-comment">     * @access protected
-</span></span><span id="1844" class="l"><a href="#1844">1844: </a><span class="php-comment">     * @return void
-</span></span><span id="1845" class="l"><a href="#1845">1845: </a><span class="php-comment">     */</span>
-</span><span id="1846" class="l"><a href="#1846">1846: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
-</span><span id="1847" class="l"><a href="#1847">1847: </a>    {
-</span><span id="1848" class="l"><a href="#1848">1848: </a>        <span class="php-comment">// Get the auth_source config item</span>
-</span><span id="1849" class="l"><a href="#1849">1849: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
-</span><span id="1850" class="l"><a href="#1850">1850: </a>
-</span><span id="1851" class="l"><a href="#1851">1851: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
-</span><span id="1852" class="l"><a href="#1852">1852: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
-</span><span id="1853" class="l"><a href="#1853">1853: </a>        {
-</span><span id="1854" class="l"><a href="#1854">1854: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1855" class="l"><a href="#1855">1855: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1856" class="l"><a href="#1856">1856: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1857" class="l"><a href="#1857">1857: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unauthorized'</span>)
-</span><span id="1858" class="l"><a href="#1858">1858: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="1824" class="l"><a href="#1824">1824: </a>    <span class="php-comment">/**
+</span></span><span id="1825" class="l"><a href="#1825">1825: </a><span class="php-comment">     * Check if the user is logged in
+</span></span><span id="1826" class="l"><a href="#1826">1826: </a><span class="php-comment">     *
+</span></span><span id="1827" class="l"><a href="#1827">1827: </a><span class="php-comment">     * @access protected
+</span></span><span id="1828" class="l"><a href="#1828">1828: </a><span class="php-comment">     * @param  string $username The user's name
+</span></span><span id="1829" class="l"><a href="#1829">1829: </a><span class="php-comment">     * @param  bool|string $password The user's password
+</span></span><span id="1830" class="l"><a href="#1830">1830: </a><span class="php-comment">     * @return bool
+</span></span><span id="1831" class="l"><a href="#1831">1831: </a><span class="php-comment">     */</span>
+</span><span id="1832" class="l"><a href="#1832">1832: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="1833" class="l"><a href="#1833">1833: </a>    {
+</span><span id="1834" class="l"><a href="#1834">1834: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1835" class="l"><a href="#1835">1835: </a>        {
+</span><span id="1836" class="l"><a href="#1836">1836: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1837" class="l"><a href="#1837">1837: </a>        }
+</span><span id="1838" class="l"><a href="#1838">1838: </a>
+</span><span id="1839" class="l"><a href="#1839">1839: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
+</span><span id="1840" class="l"><a href="#1840">1840: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="1841" class="l"><a href="#1841">1841: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
+</span><span id="1842" class="l"><a href="#1842">1842: </a>
+</span><span id="1843" class="l"><a href="#1843">1843: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
+</span><span id="1844" class="l"><a href="#1844">1844: </a>        {
+</span><span id="1845" class="l"><a href="#1845">1845: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
+</span><span id="1846" class="l"><a href="#1846">1846: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span>.<span class="php-quote">':'</span>.<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>).<span class="php-quote">':'</span>.(<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
+</span><span id="1847" class="l"><a href="#1847">1847: </a>        }
+</span><span id="1848" class="l"><a href="#1848">1848: </a>
+</span><span id="1849" class="l"><a href="#1849">1849: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1850" class="l"><a href="#1850">1850: </a>        {
+</span><span id="1851" class="l"><a href="#1851">1851: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1852" class="l"><a href="#1852">1852: </a>        }
+</span><span id="1853" class="l"><a href="#1853">1853: </a>
+</span><span id="1854" class="l"><a href="#1854">1854: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
+</span><span id="1855" class="l"><a href="#1855">1855: </a>        {
+</span><span id="1856" class="l"><a href="#1856">1856: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1857" class="l"><a href="#1857">1857: </a>
+</span><span id="1858" class="l"><a href="#1858">1858: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
 </span><span id="1859" class="l"><a href="#1859">1859: </a>        }
-</span><span id="1860" class="l"><a href="#1860">1860: </a>    }
-</span><span id="1861" class="l"><a href="#1861">1861: </a>
-</span><span id="1862" class="l"><a href="#1862">1862: </a>    <span class="php-comment">/**
-</span></span><span id="1863" class="l"><a href="#1863">1863: </a><span class="php-comment">     * Prepares for basic authentication
-</span></span><span id="1864" class="l"><a href="#1864">1864: </a><span class="php-comment">     *
-</span></span><span id="1865" class="l"><a href="#1865">1865: </a><span class="php-comment">     * @access protected
-</span></span><span id="1866" class="l"><a href="#1866">1866: </a><span class="php-comment">     * @return void
-</span></span><span id="1867" class="l"><a href="#1867">1867: </a><span class="php-comment">     */</span>
-</span><span id="1868" class="l"><a href="#1868">1868: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
-</span><span id="1869" class="l"><a href="#1869">1869: </a>    {
-</span><span id="1870" class="l"><a href="#1870">1870: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1871" class="l"><a href="#1871">1871: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
-</span><span id="1872" class="l"><a href="#1872">1872: </a>        {
-</span><span id="1873" class="l"><a href="#1873">1873: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1874" class="l"><a href="#1874">1874: </a>        }
-</span><span id="1875" class="l"><a href="#1875">1875: </a>
-</span><span id="1876" class="l"><a href="#1876">1876: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
-</span><span id="1877" class="l"><a href="#1877">1877: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
-</span><span id="1878" class="l"><a href="#1878">1878: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
-</span><span id="1879" class="l"><a href="#1879">1879: </a>
-</span><span id="1880" class="l"><a href="#1880">1880: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1881" class="l"><a href="#1881">1881: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1882" class="l"><a href="#1882">1882: </a>        {
-</span><span id="1883" class="l"><a href="#1883">1883: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
-</span><span id="1884" class="l"><a href="#1884">1884: </a>        }
-</span><span id="1885" class="l"><a href="#1885">1885: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1886" class="l"><a href="#1886">1886: </a>        {
-</span><span id="1887" class="l"><a href="#1887">1887: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
-</span><span id="1888" class="l"><a href="#1888">1888: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
-</span><span id="1889" class="l"><a href="#1889">1889: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
-</span><span id="1890" class="l"><a href="#1890">1890: </a>            {
-</span><span id="1891" class="l"><a href="#1891">1891: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
-</span><span id="1892" class="l"><a href="#1892">1892: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
-</span><span id="1893" class="l"><a href="#1893">1893: </a>            }
-</span><span id="1894" class="l"><a href="#1894">1894: </a>        }
-</span><span id="1895" class="l"><a href="#1895">1895: </a>
-</span><span id="1896" class="l"><a href="#1896">1896: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
-</span><span id="1897" class="l"><a href="#1897">1897: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1898" class="l"><a href="#1898">1898: </a>        {
-</span><span id="1899" class="l"><a href="#1899">1899: </a>            <span class="php-var">$this</span>-&gt;_force_login();
+</span><span id="1860" class="l"><a href="#1860">1860: </a>
+</span><span id="1861" class="l"><a href="#1861">1861: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
+</span><span id="1862" class="l"><a href="#1862">1862: </a>        {
+</span><span id="1863" class="l"><a href="#1863">1863: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1864" class="l"><a href="#1864">1864: </a>
+</span><span id="1865" class="l"><a href="#1865">1865: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1866" class="l"><a href="#1866">1866: </a>        }
+</span><span id="1867" class="l"><a href="#1867">1867: </a>
+</span><span id="1868" class="l"><a href="#1868">1868: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1869" class="l"><a href="#1869">1869: </a>        {
+</span><span id="1870" class="l"><a href="#1870">1870: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1871" class="l"><a href="#1871">1871: </a>        }
+</span><span id="1872" class="l"><a href="#1872">1872: </a>
+</span><span id="1873" class="l"><a href="#1873">1873: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
+</span><span id="1874" class="l"><a href="#1874">1874: </a>        {
+</span><span id="1875" class="l"><a href="#1875">1875: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1876" class="l"><a href="#1876">1876: </a>        }
+</span><span id="1877" class="l"><a href="#1877">1877: </a>
+</span><span id="1878" class="l"><a href="#1878">1878: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1879" class="l"><a href="#1879">1879: </a>    }
+</span><span id="1880" class="l"><a href="#1880">1880: </a>
+</span><span id="1881" class="l"><a href="#1881">1881: </a>    <span class="php-comment">/**
+</span></span><span id="1882" class="l"><a href="#1882">1882: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
+</span></span><span id="1883" class="l"><a href="#1883">1883: </a><span class="php-comment">     *
+</span></span><span id="1884" class="l"><a href="#1884">1884: </a><span class="php-comment">     * @access protected
+</span></span><span id="1885" class="l"><a href="#1885">1885: </a><span class="php-comment">     * @return void
+</span></span><span id="1886" class="l"><a href="#1886">1886: </a><span class="php-comment">     */</span>
+</span><span id="1887" class="l"><a href="#1887">1887: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
+</span><span id="1888" class="l"><a href="#1888">1888: </a>    {
+</span><span id="1889" class="l"><a href="#1889">1889: </a>        <span class="php-comment">// Get the auth_source config item</span>
+</span><span id="1890" class="l"><a href="#1890">1890: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
+</span><span id="1891" class="l"><a href="#1891">1891: </a>
+</span><span id="1892" class="l"><a href="#1892">1892: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
+</span><span id="1893" class="l"><a href="#1893">1893: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
+</span><span id="1894" class="l"><a href="#1894">1894: </a>        {
+</span><span id="1895" class="l"><a href="#1895">1895: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1896" class="l"><a href="#1896">1896: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1897" class="l"><a href="#1897">1897: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1898" class="l"><a href="#1898">1898: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unauthorized'</span>)
+</span><span id="1899" class="l"><a href="#1899">1899: </a>                ], self::HTTP_UNAUTHORIZED);
 </span><span id="1900" class="l"><a href="#1900">1900: </a>        }
 </span><span id="1901" class="l"><a href="#1901">1901: </a>    }
 </span><span id="1902" class="l"><a href="#1902">1902: </a>
 </span><span id="1903" class="l"><a href="#1903">1903: </a>    <span class="php-comment">/**
-</span></span><span id="1904" class="l"><a href="#1904">1904: </a><span class="php-comment">     * Prepares for digest authentication
+</span></span><span id="1904" class="l"><a href="#1904">1904: </a><span class="php-comment">     * Prepares for basic authentication
 </span></span><span id="1905" class="l"><a href="#1905">1905: </a><span class="php-comment">     *
 </span></span><span id="1906" class="l"><a href="#1906">1906: </a><span class="php-comment">     * @access protected
 </span></span><span id="1907" class="l"><a href="#1907">1907: </a><span class="php-comment">     * @return void
 </span></span><span id="1908" class="l"><a href="#1908">1908: </a><span class="php-comment">     */</span>
-</span><span id="1909" class="l"><a href="#1909">1909: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
+</span><span id="1909" class="l"><a href="#1909">1909: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
 </span><span id="1910" class="l"><a href="#1910">1910: </a>    {
 </span><span id="1911" class="l"><a href="#1911">1911: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
 </span><span id="1912" class="l"><a href="#1912">1912: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
@@ -2008,208 +2008,249 @@ <h3>Classes</h3>
 </span><span id="1914" class="l"><a href="#1914">1914: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
 </span><span id="1915" class="l"><a href="#1915">1915: </a>        }
 </span><span id="1916" class="l"><a href="#1916">1916: </a>
-</span><span id="1917" class="l"><a href="#1917">1917: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
-</span><span id="1918" class="l"><a href="#1918">1918: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
-</span><span id="1919" class="l"><a href="#1919">1919: </a>        <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
-</span><span id="1920" class="l"><a href="#1920">1920: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$digest_string</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1921" class="l"><a href="#1921">1921: </a>        {
-</span><span id="1922" class="l"><a href="#1922">1922: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
-</span><span id="1923" class="l"><a href="#1923">1923: </a>        }
-</span><span id="1924" class="l"><a href="#1924">1924: </a>
-</span><span id="1925" class="l"><a href="#1925">1925: </a>        <span class="php-var">$unique_id</span> = <span class="php-keyword2">uniqid</span>();
-</span><span id="1926" class="l"><a href="#1926">1926: </a>
-</span><span id="1927" class="l"><a href="#1927">1927: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
-</span><span id="1928" class="l"><a href="#1928">1928: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
-</span><span id="1929" class="l"><a href="#1929">1929: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
-</span><span id="1930" class="l"><a href="#1930">1930: </a>        {
-</span><span id="1931" class="l"><a href="#1931">1931: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
-</span><span id="1932" class="l"><a href="#1932">1932: </a>        }
-</span><span id="1933" class="l"><a href="#1933">1933: </a>
-</span><span id="1934" class="l"><a href="#1934">1934: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
-</span><span id="1935" class="l"><a href="#1935">1935: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="1936" class="l"><a href="#1936">1936: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
-</span><span id="1937" class="l"><a href="#1937">1937: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
-</span><span id="1938" class="l"><a href="#1938">1938: </a>
-</span><span id="1939" class="l"><a href="#1939">1939: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config</span>
-</span><span id="1940" class="l"><a href="#1940">1940: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
-</span><span id="1941" class="l"><a href="#1941">1941: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$username</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1942" class="l"><a href="#1942">1942: </a>        {
-</span><span id="1943" class="l"><a href="#1943">1943: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
-</span><span id="1944" class="l"><a href="#1944">1944: </a>        }
-</span><span id="1945" class="l"><a href="#1945">1945: </a>
-</span><span id="1946" class="l"><a href="#1946">1946: </a>        <span class="php-var">$md5</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method) . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
-</span><span id="1947" class="l"><a href="#1947">1947: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$md5</span>);
-</span><span id="1948" class="l"><a href="#1948">1948: </a>
-</span><span id="1949" class="l"><a href="#1949">1949: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
-</span><span id="1950" class="l"><a href="#1950">1950: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
-</span><span id="1951" class="l"><a href="#1951">1951: </a>        {
-</span><span id="1952" class="l"><a href="#1952">1952: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1953" class="l"><a href="#1953">1953: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1954" class="l"><a href="#1954">1954: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1955" class="l"><a href="#1955">1955: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_invalid_credentials'</span>)
-</span><span id="1956" class="l"><a href="#1956">1956: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="1957" class="l"><a href="#1957">1957: </a>        }
-</span><span id="1958" class="l"><a href="#1958">1958: </a>    }
-</span><span id="1959" class="l"><a href="#1959">1959: </a>
-</span><span id="1960" class="l"><a href="#1960">1960: </a>    <span class="php-comment">/**
-</span></span><span id="1961" class="l"><a href="#1961">1961: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
-</span></span><span id="1962" class="l"><a href="#1962">1962: </a><span class="php-comment">     *
-</span></span><span id="1963" class="l"><a href="#1963">1963: </a><span class="php-comment">     * @access protected
-</span></span><span id="1964" class="l"><a href="#1964">1964: </a><span class="php-comment">     * @return void
-</span></span><span id="1965" class="l"><a href="#1965">1965: </a><span class="php-comment">     */</span>
-</span><span id="1966" class="l"><a href="#1966">1966: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
-</span><span id="1967" class="l"><a href="#1967">1967: </a>    {
-</span><span id="1968" class="l"><a href="#1968">1968: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
-</span><span id="1969" class="l"><a href="#1969">1969: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
-</span><span id="1970" class="l"><a href="#1970">1970: </a>
-</span><span id="1971" class="l"><a href="#1971">1971: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
-</span><span id="1972" class="l"><a href="#1972">1972: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
-</span><span id="1973" class="l"><a href="#1973">1973: </a>        {
-</span><span id="1974" class="l"><a href="#1974">1974: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1975" class="l"><a href="#1975">1975: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1976" class="l"><a href="#1976">1976: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1977" class="l"><a href="#1977">1977: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ip_denied'</span>)
-</span><span id="1978" class="l"><a href="#1978">1978: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="1979" class="l"><a href="#1979">1979: </a>        }
-</span><span id="1980" class="l"><a href="#1980">1980: </a>    }
-</span><span id="1981" class="l"><a href="#1981">1981: </a>
-</span><span id="1982" class="l"><a href="#1982">1982: </a>    <span class="php-comment">/**
-</span></span><span id="1983" class="l"><a href="#1983">1983: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
-</span></span><span id="1984" class="l"><a href="#1984">1984: </a><span class="php-comment">     *
-</span></span><span id="1985" class="l"><a href="#1985">1985: </a><span class="php-comment">     * @access protected
-</span></span><span id="1986" class="l"><a href="#1986">1986: </a><span class="php-comment">     * @return void
-</span></span><span id="1987" class="l"><a href="#1987">1987: </a><span class="php-comment">     */</span>
-</span><span id="1988" class="l"><a href="#1988">1988: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
-</span><span id="1989" class="l"><a href="#1989">1989: </a>    {
-</span><span id="1990" class="l"><a href="#1990">1990: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
-</span><span id="1991" class="l"><a href="#1991">1991: </a>
-</span><span id="1992" class="l"><a href="#1992">1992: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
-</span><span id="1993" class="l"><a href="#1993">1993: </a>
-</span><span id="1994" class="l"><a href="#1994">1994: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$ip</span>)
-</span><span id="1995" class="l"><a href="#1995">1995: </a>        {
-</span><span id="1996" class="l"><a href="#1996">1996: </a>            <span class="php-comment">// As $ip is a reference, trim leading and trailing whitespace, then store the new value</span>
-</span><span id="1997" class="l"><a href="#1997">1997: </a>            <span class="php-comment">// using the reference</span>
-</span><span id="1998" class="l"><a href="#1998">1998: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
-</span><span id="1999" class="l"><a href="#1999">1999: </a>        }
+</span><span id="1917" class="l"><a href="#1917">1917: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
+</span><span id="1918" class="l"><a href="#1918">1918: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
+</span><span id="1919" class="l"><a href="#1919">1919: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
+</span><span id="1920" class="l"><a href="#1920">1920: </a>
+</span><span id="1921" class="l"><a href="#1921">1921: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1922" class="l"><a href="#1922">1922: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1923" class="l"><a href="#1923">1923: </a>        {
+</span><span id="1924" class="l"><a href="#1924">1924: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
+</span><span id="1925" class="l"><a href="#1925">1925: </a>        }
+</span><span id="1926" class="l"><a href="#1926">1926: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1927" class="l"><a href="#1927">1927: </a>        {
+</span><span id="1928" class="l"><a href="#1928">1928: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
+</span><span id="1929" class="l"><a href="#1929">1929: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
+</span><span id="1930" class="l"><a href="#1930">1930: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
+</span><span id="1931" class="l"><a href="#1931">1931: </a>            {
+</span><span id="1932" class="l"><a href="#1932">1932: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
+</span><span id="1933" class="l"><a href="#1933">1933: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
+</span><span id="1934" class="l"><a href="#1934">1934: </a>            }
+</span><span id="1935" class="l"><a href="#1935">1935: </a>        }
+</span><span id="1936" class="l"><a href="#1936">1936: </a>
+</span><span id="1937" class="l"><a href="#1937">1937: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
+</span><span id="1938" class="l"><a href="#1938">1938: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1939" class="l"><a href="#1939">1939: </a>        {
+</span><span id="1940" class="l"><a href="#1940">1940: </a>            <span class="php-var">$this</span>-&gt;_force_login();
+</span><span id="1941" class="l"><a href="#1941">1941: </a>        }
+</span><span id="1942" class="l"><a href="#1942">1942: </a>    }
+</span><span id="1943" class="l"><a href="#1943">1943: </a>
+</span><span id="1944" class="l"><a href="#1944">1944: </a>    <span class="php-comment">/**
+</span></span><span id="1945" class="l"><a href="#1945">1945: </a><span class="php-comment">     * Prepares for digest authentication
+</span></span><span id="1946" class="l"><a href="#1946">1946: </a><span class="php-comment">     *
+</span></span><span id="1947" class="l"><a href="#1947">1947: </a><span class="php-comment">     * @access protected
+</span></span><span id="1948" class="l"><a href="#1948">1948: </a><span class="php-comment">     * @return void
+</span></span><span id="1949" class="l"><a href="#1949">1949: </a><span class="php-comment">     */</span>
+</span><span id="1950" class="l"><a href="#1950">1950: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
+</span><span id="1951" class="l"><a href="#1951">1951: </a>    {
+</span><span id="1952" class="l"><a href="#1952">1952: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1953" class="l"><a href="#1953">1953: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1954" class="l"><a href="#1954">1954: </a>        {
+</span><span id="1955" class="l"><a href="#1955">1955: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1956" class="l"><a href="#1956">1956: </a>        }
+</span><span id="1957" class="l"><a href="#1957">1957: </a>
+</span><span id="1958" class="l"><a href="#1958">1958: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
+</span><span id="1959" class="l"><a href="#1959">1959: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
+</span><span id="1960" class="l"><a href="#1960">1960: </a>        <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
+</span><span id="1961" class="l"><a href="#1961">1961: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$digest_string</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1962" class="l"><a href="#1962">1962: </a>        {
+</span><span id="1963" class="l"><a href="#1963">1963: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
+</span><span id="1964" class="l"><a href="#1964">1964: </a>        }
+</span><span id="1965" class="l"><a href="#1965">1965: </a>
+</span><span id="1966" class="l"><a href="#1966">1966: </a>        <span class="php-var">$unique_id</span> = <span class="php-keyword2">uniqid</span>();
+</span><span id="1967" class="l"><a href="#1967">1967: </a>
+</span><span id="1968" class="l"><a href="#1968">1968: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
+</span><span id="1969" class="l"><a href="#1969">1969: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
+</span><span id="1970" class="l"><a href="#1970">1970: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
+</span><span id="1971" class="l"><a href="#1971">1971: </a>        {
+</span><span id="1972" class="l"><a href="#1972">1972: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
+</span><span id="1973" class="l"><a href="#1973">1973: </a>        }
+</span><span id="1974" class="l"><a href="#1974">1974: </a>
+</span><span id="1975" class="l"><a href="#1975">1975: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
+</span><span id="1976" class="l"><a href="#1976">1976: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="1977" class="l"><a href="#1977">1977: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
+</span><span id="1978" class="l"><a href="#1978">1978: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
+</span><span id="1979" class="l"><a href="#1979">1979: </a>
+</span><span id="1980" class="l"><a href="#1980">1980: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username see rest.php::auth_library_function config</span>
+</span><span id="1981" class="l"><a href="#1981">1981: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
+</span><span id="1982" class="l"><a href="#1982">1982: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$username</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1983" class="l"><a href="#1983">1983: </a>        {
+</span><span id="1984" class="l"><a href="#1984">1984: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
+</span><span id="1985" class="l"><a href="#1985">1985: </a>        }
+</span><span id="1986" class="l"><a href="#1986">1986: </a>
+</span><span id="1987" class="l"><a href="#1987">1987: </a>        <span class="php-var">$md5</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method).<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
+</span><span id="1988" class="l"><a href="#1988">1988: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$username</span>.<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>].<span class="php-quote">':'</span>.<span class="php-var">$md5</span>);
+</span><span id="1989" class="l"><a href="#1989">1989: </a>
+</span><span id="1990" class="l"><a href="#1990">1990: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
+</span><span id="1991" class="l"><a href="#1991">1991: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
+</span><span id="1992" class="l"><a href="#1992">1992: </a>        {
+</span><span id="1993" class="l"><a href="#1993">1993: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1994" class="l"><a href="#1994">1994: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1995" class="l"><a href="#1995">1995: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1996" class="l"><a href="#1996">1996: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_invalid_credentials'</span>)
+</span><span id="1997" class="l"><a href="#1997">1997: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="1998" class="l"><a href="#1998">1998: </a>        }
+</span><span id="1999" class="l"><a href="#1999">1999: </a>    }
 </span><span id="2000" class="l"><a href="#2000">2000: </a>
-</span><span id="2001" class="l"><a href="#2001">2001: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="2002" class="l"><a href="#2002">2002: </a>        {
-</span><span id="2003" class="l"><a href="#2003">2003: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="2004" class="l"><a href="#2004">2004: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="2005" class="l"><a href="#2005">2005: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ip_unauthorized'</span>)
-</span><span id="2006" class="l"><a href="#2006">2006: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="2007" class="l"><a href="#2007">2007: </a>        }
-</span><span id="2008" class="l"><a href="#2008">2008: </a>    }
-</span><span id="2009" class="l"><a href="#2009">2009: </a>
-</span><span id="2010" class="l"><a href="#2010">2010: </a>    <span class="php-comment">/**
-</span></span><span id="2011" class="l"><a href="#2011">2011: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
-</span></span><span id="2012" class="l"><a href="#2012">2012: </a><span class="php-comment">     *
-</span></span><span id="2013" class="l"><a href="#2013">2013: </a><span class="php-comment">     * @access protected
-</span></span><span id="2014" class="l"><a href="#2014">2014: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
-</span></span><span id="2015" class="l"><a href="#2015">2015: </a><span class="php-comment">     * each time
-</span></span><span id="2016" class="l"><a href="#2016">2016: </a><span class="php-comment">     * @return void
-</span></span><span id="2017" class="l"><a href="#2017">2017: </a><span class="php-comment">     */</span>
-</span><span id="2018" class="l"><a href="#2018">2018: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
-</span><span id="2019" class="l"><a href="#2019">2019: </a>    {
-</span><span id="2020" class="l"><a href="#2020">2020: </a>        <span class="php-var">$rest_auth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
-</span><span id="2021" class="l"><a href="#2021">2021: </a>        <span class="php-var">$rest_realm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
-</span><span id="2022" class="l"><a href="#2022">2022: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'basic'</span>)
-</span><span id="2023" class="l"><a href="#2023">2023: </a>        {
-</span><span id="2024" class="l"><a href="#2024">2024: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
-</span><span id="2025" class="l"><a href="#2025">2025: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span> . <span class="php-var">$rest_realm</span> . <span class="php-quote">'&quot;'</span>);
-</span><span id="2026" class="l"><a href="#2026">2026: </a>        }
-</span><span id="2027" class="l"><a href="#2027">2027: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'digest'</span>)
-</span><span id="2028" class="l"><a href="#2028">2028: </a>        {
-</span><span id="2029" class="l"><a href="#2029">2029: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
-</span><span id="2030" class="l"><a href="#2030">2030: </a>            <span class="php-keyword2">header</span>(
-</span><span id="2031" class="l"><a href="#2031">2031: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span> . <span class="php-var">$rest_realm</span>
-</span><span id="2032" class="l"><a href="#2032">2032: </a>                . <span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span> . <span class="php-var">$nonce</span>
-</span><span id="2033" class="l"><a href="#2033">2033: </a>                . <span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$rest_realm</span>) . <span class="php-quote">'&quot;'</span>);
-</span><span id="2034" class="l"><a href="#2034">2034: </a>        }
-</span><span id="2035" class="l"><a href="#2035">2035: </a>
-</span><span id="2036" class="l"><a href="#2036">2036: </a>        <span class="php-comment">// Display an error response</span>
-</span><span id="2037" class="l"><a href="#2037">2037: </a>        <span class="php-var">$this</span>-&gt;response([
-</span><span id="2038" class="l"><a href="#2038">2038: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="2039" class="l"><a href="#2039">2039: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unauthorized'</span>)
-</span><span id="2040" class="l"><a href="#2040">2040: </a>            ], self::HTTP_UNAUTHORIZED);
-</span><span id="2041" class="l"><a href="#2041">2041: </a>    }
-</span><span id="2042" class="l"><a href="#2042">2042: </a>
-</span><span id="2043" class="l"><a href="#2043">2043: </a>    <span class="php-comment">/**
-</span></span><span id="2044" class="l"><a href="#2044">2044: </a><span class="php-comment">     * Updates the log table with the total access time
-</span></span><span id="2045" class="l"><a href="#2045">2045: </a><span class="php-comment">     *
-</span></span><span id="2046" class="l"><a href="#2046">2046: </a><span class="php-comment">     * @access protected
-</span></span><span id="2047" class="l"><a href="#2047">2047: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="2048" class="l"><a href="#2048">2048: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="2049" class="l"><a href="#2049">2049: </a><span class="php-comment">     */</span>
-</span><span id="2050" class="l"><a href="#2050">2050: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
-</span><span id="2051" class="l"><a href="#2051">2051: </a>    {
-</span><span id="2052" class="l"><a href="#2052">2052: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
-</span><span id="2053" class="l"><a href="#2053">2053: </a>
-</span><span id="2054" class="l"><a href="#2054">2054: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
-</span><span id="2055" class="l"><a href="#2055">2055: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="2056" class="l"><a href="#2056">2056: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="2057" class="l"><a href="#2057">2057: </a>            ]);
-</span><span id="2058" class="l"><a href="#2058">2058: </a>    }
-</span><span id="2059" class="l"><a href="#2059">2059: </a>
-</span><span id="2060" class="l"><a href="#2060">2060: </a>    <span class="php-comment">/**
-</span></span><span id="2061" class="l"><a href="#2061">2061: </a><span class="php-comment">     * Updates the log table with HTTP response code
-</span></span><span id="2062" class="l"><a href="#2062">2062: </a><span class="php-comment">     *
-</span></span><span id="2063" class="l"><a href="#2063">2063: </a><span class="php-comment">     * @access protected
-</span></span><span id="2064" class="l"><a href="#2064">2064: </a><span class="php-comment">     * @author Justin Chen
-</span></span><span id="2065" class="l"><a href="#2065">2065: </a><span class="php-comment">     * @param $http_code int HTTP status code
-</span></span><span id="2066" class="l"><a href="#2066">2066: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="2067" class="l"><a href="#2067">2067: </a><span class="php-comment">     */</span>
-</span><span id="2068" class="l"><a href="#2068">2068: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
-</span><span id="2069" class="l"><a href="#2069">2069: </a>    {
-</span><span id="2070" class="l"><a href="#2070">2070: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
-</span><span id="2071" class="l"><a href="#2071">2071: </a>
-</span><span id="2072" class="l"><a href="#2072">2072: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
-</span><span id="2073" class="l"><a href="#2073">2073: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="2074" class="l"><a href="#2074">2074: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="2075" class="l"><a href="#2075">2075: </a>        ]);
-</span><span id="2076" class="l"><a href="#2076">2076: </a>    }
-</span><span id="2077" class="l"><a href="#2077">2077: </a>
-</span><span id="2078" class="l"><a href="#2078">2078: </a>    <span class="php-comment">/**
-</span></span><span id="2079" class="l"><a href="#2079">2079: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
-</span></span><span id="2080" class="l"><a href="#2080">2080: </a><span class="php-comment">     *
-</span></span><span id="2081" class="l"><a href="#2081">2081: </a><span class="php-comment">     * @access protected
-</span></span><span id="2082" class="l"><a href="#2082">2082: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
-</span></span><span id="2083" class="l"><a href="#2083">2083: </a><span class="php-comment">     */</span>
-</span><span id="2084" class="l"><a href="#2084">2084: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
-</span><span id="2085" class="l"><a href="#2085">2085: </a>    {
-</span><span id="2086" class="l"><a href="#2086">2086: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
-</span><span id="2087" class="l"><a href="#2087">2087: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="2088" class="l"><a href="#2088">2088: </a>        {
-</span><span id="2089" class="l"><a href="#2089">2089: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="2090" class="l"><a href="#2090">2090: </a>        }
-</span><span id="2091" class="l"><a href="#2091">2091: </a>
-</span><span id="2092" class="l"><a href="#2092">2092: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
-</span><span id="2093" class="l"><a href="#2093">2093: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
-</span><span id="2094" class="l"><a href="#2094">2094: </a>            <span class="php-quote">'/'</span>, [
-</span><span id="2095" class="l"><a href="#2095">2095: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
-</span><span id="2096" class="l"><a href="#2096">2096: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
-</span><span id="2097" class="l"><a href="#2097">2097: </a>        ]);
-</span><span id="2098" class="l"><a href="#2098">2098: </a>
-</span><span id="2099" class="l"><a href="#2099">2099: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
-</span><span id="2100" class="l"><a href="#2100">2100: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
-</span><span id="2101" class="l"><a href="#2101">2101: </a>
-</span><span id="2102" class="l"><a href="#2102">2102: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
-</span><span id="2103" class="l"><a href="#2103">2103: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="2104" class="l"><a href="#2104">2104: </a>            -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="2105" class="l"><a href="#2105">2105: </a>            -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
-</span><span id="2106" class="l"><a href="#2106">2106: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
-</span><span id="2107" class="l"><a href="#2107">2107: </a>            -&gt;num_rows() &gt; <span class="php-num">0</span>;
-</span><span id="2108" class="l"><a href="#2108">2108: </a>    }
-</span><span id="2109" class="l"><a href="#2109">2109: </a>
-</span><span id="2110" class="l"><a href="#2110">2110: </a>}
-</span><span id="2111" class="l"><a href="#2111">2111: </a></span></code></pre>
+</span><span id="2001" class="l"><a href="#2001">2001: </a>    <span class="php-comment">/**
+</span></span><span id="2002" class="l"><a href="#2002">2002: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
+</span></span><span id="2003" class="l"><a href="#2003">2003: </a><span class="php-comment">     *
+</span></span><span id="2004" class="l"><a href="#2004">2004: </a><span class="php-comment">     * @access protected
+</span></span><span id="2005" class="l"><a href="#2005">2005: </a><span class="php-comment">     * @return void
+</span></span><span id="2006" class="l"><a href="#2006">2006: </a><span class="php-comment">     */</span>
+</span><span id="2007" class="l"><a href="#2007">2007: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
+</span><span id="2008" class="l"><a href="#2008">2008: </a>    {
+</span><span id="2009" class="l"><a href="#2009">2009: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
+</span><span id="2010" class="l"><a href="#2010">2010: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
+</span><span id="2011" class="l"><a href="#2011">2011: </a>
+</span><span id="2012" class="l"><a href="#2012">2012: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
+</span><span id="2013" class="l"><a href="#2013">2013: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
+</span><span id="2014" class="l"><a href="#2014">2014: </a>        {
+</span><span id="2015" class="l"><a href="#2015">2015: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="2016" class="l"><a href="#2016">2016: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="2017" class="l"><a href="#2017">2017: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="2018" class="l"><a href="#2018">2018: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ip_denied'</span>)
+</span><span id="2019" class="l"><a href="#2019">2019: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="2020" class="l"><a href="#2020">2020: </a>        }
+</span><span id="2021" class="l"><a href="#2021">2021: </a>    }
+</span><span id="2022" class="l"><a href="#2022">2022: </a>
+</span><span id="2023" class="l"><a href="#2023">2023: </a>    <span class="php-comment">/**
+</span></span><span id="2024" class="l"><a href="#2024">2024: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
+</span></span><span id="2025" class="l"><a href="#2025">2025: </a><span class="php-comment">     *
+</span></span><span id="2026" class="l"><a href="#2026">2026: </a><span class="php-comment">     * @access protected
+</span></span><span id="2027" class="l"><a href="#2027">2027: </a><span class="php-comment">     * @return void
+</span></span><span id="2028" class="l"><a href="#2028">2028: </a><span class="php-comment">     */</span>
+</span><span id="2029" class="l"><a href="#2029">2029: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
+</span><span id="2030" class="l"><a href="#2030">2030: </a>    {
+</span><span id="2031" class="l"><a href="#2031">2031: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
+</span><span id="2032" class="l"><a href="#2032">2032: </a>
+</span><span id="2033" class="l"><a href="#2033">2033: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
+</span><span id="2034" class="l"><a href="#2034">2034: </a>
+</span><span id="2035" class="l"><a href="#2035">2035: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$ip</span>)
+</span><span id="2036" class="l"><a href="#2036">2036: </a>        {
+</span><span id="2037" class="l"><a href="#2037">2037: </a>            <span class="php-comment">// As $ip is a reference, trim leading and trailing whitespace, then store the new value</span>
+</span><span id="2038" class="l"><a href="#2038">2038: </a>            <span class="php-comment">// using the reference</span>
+</span><span id="2039" class="l"><a href="#2039">2039: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
+</span><span id="2040" class="l"><a href="#2040">2040: </a>        }
+</span><span id="2041" class="l"><a href="#2041">2041: </a>
+</span><span id="2042" class="l"><a href="#2042">2042: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="2043" class="l"><a href="#2043">2043: </a>        {
+</span><span id="2044" class="l"><a href="#2044">2044: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="2045" class="l"><a href="#2045">2045: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="2046" class="l"><a href="#2046">2046: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ip_unauthorized'</span>)
+</span><span id="2047" class="l"><a href="#2047">2047: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="2048" class="l"><a href="#2048">2048: </a>        }
+</span><span id="2049" class="l"><a href="#2049">2049: </a>    }
+</span><span id="2050" class="l"><a href="#2050">2050: </a>
+</span><span id="2051" class="l"><a href="#2051">2051: </a>    <span class="php-comment">/**
+</span></span><span id="2052" class="l"><a href="#2052">2052: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
+</span></span><span id="2053" class="l"><a href="#2053">2053: </a><span class="php-comment">     *
+</span></span><span id="2054" class="l"><a href="#2054">2054: </a><span class="php-comment">     * @access protected
+</span></span><span id="2055" class="l"><a href="#2055">2055: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
+</span></span><span id="2056" class="l"><a href="#2056">2056: </a><span class="php-comment">     * each time
+</span></span><span id="2057" class="l"><a href="#2057">2057: </a><span class="php-comment">     * @return void
+</span></span><span id="2058" class="l"><a href="#2058">2058: </a><span class="php-comment">     */</span>
+</span><span id="2059" class="l"><a href="#2059">2059: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
+</span><span id="2060" class="l"><a href="#2060">2060: </a>    {
+</span><span id="2061" class="l"><a href="#2061">2061: </a>        <span class="php-var">$rest_auth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
+</span><span id="2062" class="l"><a href="#2062">2062: </a>        <span class="php-var">$rest_realm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
+</span><span id="2063" class="l"><a href="#2063">2063: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'basic'</span>)
+</span><span id="2064" class="l"><a href="#2064">2064: </a>        {
+</span><span id="2065" class="l"><a href="#2065">2065: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
+</span><span id="2066" class="l"><a href="#2066">2066: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span>.<span class="php-var">$rest_realm</span>.<span class="php-quote">'&quot;'</span>);
+</span><span id="2067" class="l"><a href="#2067">2067: </a>        }
+</span><span id="2068" class="l"><a href="#2068">2068: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'digest'</span>)
+</span><span id="2069" class="l"><a href="#2069">2069: </a>        {
+</span><span id="2070" class="l"><a href="#2070">2070: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
+</span><span id="2071" class="l"><a href="#2071">2071: </a>            <span class="php-keyword2">header</span>(
+</span><span id="2072" class="l"><a href="#2072">2072: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span>.<span class="php-var">$rest_realm</span>
+</span><span id="2073" class="l"><a href="#2073">2073: </a>                .<span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span>.<span class="php-var">$nonce</span>
+</span><span id="2074" class="l"><a href="#2074">2074: </a>                .<span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$rest_realm</span>).<span class="php-quote">'&quot;'</span>);
+</span><span id="2075" class="l"><a href="#2075">2075: </a>        }
+</span><span id="2076" class="l"><a href="#2076">2076: </a>
+</span><span id="2077" class="l"><a href="#2077">2077: </a>        <span class="php-comment">// Display an error response</span>
+</span><span id="2078" class="l"><a href="#2078">2078: </a>        <span class="php-var">$this</span>-&gt;response([
+</span><span id="2079" class="l"><a href="#2079">2079: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="2080" class="l"><a href="#2080">2080: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unauthorized'</span>)
+</span><span id="2081" class="l"><a href="#2081">2081: </a>            ], self::HTTP_UNAUTHORIZED);
+</span><span id="2082" class="l"><a href="#2082">2082: </a>    }
+</span><span id="2083" class="l"><a href="#2083">2083: </a>
+</span><span id="2084" class="l"><a href="#2084">2084: </a>    <span class="php-comment">/**
+</span></span><span id="2085" class="l"><a href="#2085">2085: </a><span class="php-comment">     * Updates the log table with the total access time
+</span></span><span id="2086" class="l"><a href="#2086">2086: </a><span class="php-comment">     *
+</span></span><span id="2087" class="l"><a href="#2087">2087: </a><span class="php-comment">     * @access protected
+</span></span><span id="2088" class="l"><a href="#2088">2088: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="2089" class="l"><a href="#2089">2089: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="2090" class="l"><a href="#2090">2090: </a><span class="php-comment">     */</span>
+</span><span id="2091" class="l"><a href="#2091">2091: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
+</span><span id="2092" class="l"><a href="#2092">2092: </a>    {
+</span><span id="2093" class="l"><a href="#2093">2093: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
+</span><span id="2094" class="l"><a href="#2094">2094: </a>
+</span><span id="2095" class="l"><a href="#2095">2095: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
+</span><span id="2096" class="l"><a href="#2096">2096: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="2097" class="l"><a href="#2097">2097: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="2098" class="l"><a href="#2098">2098: </a>            ]);
+</span><span id="2099" class="l"><a href="#2099">2099: </a>    }
+</span><span id="2100" class="l"><a href="#2100">2100: </a>
+</span><span id="2101" class="l"><a href="#2101">2101: </a>    <span class="php-comment">/**
+</span></span><span id="2102" class="l"><a href="#2102">2102: </a><span class="php-comment">     * Updates the log table with HTTP response code
+</span></span><span id="2103" class="l"><a href="#2103">2103: </a><span class="php-comment">     *
+</span></span><span id="2104" class="l"><a href="#2104">2104: </a><span class="php-comment">     * @access protected
+</span></span><span id="2105" class="l"><a href="#2105">2105: </a><span class="php-comment">     * @author Justin Chen
+</span></span><span id="2106" class="l"><a href="#2106">2106: </a><span class="php-comment">     * @param $http_code int HTTP status code
+</span></span><span id="2107" class="l"><a href="#2107">2107: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="2108" class="l"><a href="#2108">2108: </a><span class="php-comment">     */</span>
+</span><span id="2109" class="l"><a href="#2109">2109: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
+</span><span id="2110" class="l"><a href="#2110">2110: </a>    {
+</span><span id="2111" class="l"><a href="#2111">2111: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
+</span><span id="2112" class="l"><a href="#2112">2112: </a>
+</span><span id="2113" class="l"><a href="#2113">2113: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
+</span><span id="2114" class="l"><a href="#2114">2114: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="2115" class="l"><a href="#2115">2115: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="2116" class="l"><a href="#2116">2116: </a>        ]);
+</span><span id="2117" class="l"><a href="#2117">2117: </a>    }
+</span><span id="2118" class="l"><a href="#2118">2118: </a>
+</span><span id="2119" class="l"><a href="#2119">2119: </a>    <span class="php-comment">/**
+</span></span><span id="2120" class="l"><a href="#2120">2120: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
+</span></span><span id="2121" class="l"><a href="#2121">2121: </a><span class="php-comment">     *
+</span></span><span id="2122" class="l"><a href="#2122">2122: </a><span class="php-comment">     * @access protected
+</span></span><span id="2123" class="l"><a href="#2123">2123: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
+</span></span><span id="2124" class="l"><a href="#2124">2124: </a><span class="php-comment">     */</span>
+</span><span id="2125" class="l"><a href="#2125">2125: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
+</span><span id="2126" class="l"><a href="#2126">2126: </a>    {
+</span><span id="2127" class="l"><a href="#2127">2127: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
+</span><span id="2128" class="l"><a href="#2128">2128: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="2129" class="l"><a href="#2129">2129: </a>        {
+</span><span id="2130" class="l"><a href="#2130">2130: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="2131" class="l"><a href="#2131">2131: </a>        }
+</span><span id="2132" class="l"><a href="#2132">2132: </a>
+</span><span id="2133" class="l"><a href="#2133">2133: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
+</span><span id="2134" class="l"><a href="#2134">2134: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
+</span><span id="2135" class="l"><a href="#2135">2135: </a>            <span class="php-quote">'/'</span>, [
+</span><span id="2136" class="l"><a href="#2136">2136: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
+</span><span id="2137" class="l"><a href="#2137">2137: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
+</span><span id="2138" class="l"><a href="#2138">2138: </a>        ]);
+</span><span id="2139" class="l"><a href="#2139">2139: </a>
+</span><span id="2140" class="l"><a href="#2140">2140: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
+</span><span id="2141" class="l"><a href="#2141">2141: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
+</span><span id="2142" class="l"><a href="#2142">2142: </a>
+</span><span id="2143" class="l"><a href="#2143">2143: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
+</span><span id="2144" class="l"><a href="#2144">2144: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="2145" class="l"><a href="#2145">2145: </a>            -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="2146" class="l"><a href="#2146">2146: </a>            -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
+</span><span id="2147" class="l"><a href="#2147">2147: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
+</span><span id="2148" class="l"><a href="#2148">2148: </a>            -&gt;num_rows() &gt; <span class="php-num">0</span>;
+</span><span id="2149" class="l"><a href="#2149">2149: </a>    }
+</span><span id="2150" class="l"><a href="#2150">2150: </a>
+</span><span id="2151" class="l"><a href="#2151">2151: </a>}
+</span><span id="2152" class="l"><a href="#2152">2152: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
+<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
 <script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Welcome.html b/documentation/source-class-Welcome.html
index 6a681eb1..a32b765a 100644
--- a/documentation/source-class-Welcome.html
+++ b/documentation/source-class-Welcome.html
@@ -110,7 +110,7 @@ <h3>Classes</h3>
 </span></span><span id="16" class="l"><a href="#16">16: </a><span class="php-comment">     *
 </span></span><span id="17" class="l"><a href="#17">17: </a><span class="php-comment">     * So any other public methods not prefixed with an underscore will
 </span></span><span id="18" class="l"><a href="#18">18: </a><span class="php-comment">     * map to /index.php/welcome/&lt;method_name&gt;
-</span></span><span id="19" class="l"><a href="#19">19: </a><span class="php-comment">     * @see http://codeigniter.com/user_guide/general/urls.html
+</span></span><span id="19" class="l"><a href="#19">19: </a><span class="php-comment">     * @see https://codeigniter.com/user_guide/general/urls.html
 </span></span><span id="20" class="l"><a href="#20">20: </a><span class="php-comment">     */</span>
 </span><span id="21" class="l"><a href="#21">21: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> index()
 </span><span id="22" class="l"><a href="#22">22: </a>    {
@@ -126,7 +126,7 @@ <h3>Classes</h3>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
+<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
 <script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>

From 1eb8cb962a4fe65e0f86f2278a093556475f54d4 Mon Sep 17 00:00:00 2001
From: Frank Sierra <sierrafayad@gmail.com>
Date: Fri, 12 Feb 2016 12:06:42 -0500
Subject: [PATCH 187/354] Always fails when using API keys Authorization

---
 application/libraries/REST_Controller.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index ea4bbcce..2f4f5c30 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -664,16 +664,17 @@ public function _remap($object_called, $arguments = [])
 
             // If no level is set, or it is lower than/equal to the key's level
             $authorized = $level <= $this->rest->level;
-
             // IM TELLIN!
             if ($this->config->item('rest_enable_logging') && $log_method)
             {
                 $this->_log_request($authorized);
             }
-
-            // They don't have good enough perms
-            $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_permissions')];
-            $authorized || $this->response($response, self::HTTP_UNAUTHORIZED);
+            if($authorized===false)
+            {
+                // They don't have good enough perms
+                $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_permissions')];
+                $authorized || $this->response($response, self::HTTP_UNAUTHORIZED);
+            }
         }
 
         // No key stuff, but record that stuff is happening

From 56ed45bfffd7eb98b1cf9f0400d53694cd839e09 Mon Sep 17 00:00:00 2001
From: Frank Sierra <sierrafayad@gmail.com>
Date: Fri, 12 Feb 2016 12:41:18 -0500
Subject: [PATCH 188/354] Logic failure when checking for auth_override

if auth_override is true it shall not pass
---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 2f4f5c30..cdd259e8 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -540,7 +540,7 @@ public function __construct($config = 'rest')
         }
 
         // When there is no specific override for the current class/method, use the default auth value set in the config
-        if ($this->auth_override === FALSE && !($this->config->item('rest_enable_keys') && $this->_allow === TRUE) || ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE))
+        if ($this->auth_override === FALSE && (!($this->config->item('rest_enable_keys') && $this->_allow === TRUE) || ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE)))
         {
             $rest_auth = strtolower($this->config->item('rest_auth'));
             switch ($rest_auth)

From 42bf6be00163e1249803a9f8a854e958d041a7a2 Mon Sep 17 00:00:00 2001
From: Frank Sierra <sierrafayad@gmail.com>
Date: Fri, 12 Feb 2016 12:45:06 -0500
Subject: [PATCH 189/354] unnecessary boolean check

---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index cdd259e8..16866623 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -673,7 +673,7 @@ public function _remap($object_called, $arguments = [])
             {
                 // They don't have good enough perms
                 $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_permissions')];
-                $authorized || $this->response($response, self::HTTP_UNAUTHORIZED);
+                $this->response($response, self::HTTP_UNAUTHORIZED);
             }
         }
 

From 1d30c20c9468a36f48892462ef48fadcf2fd95b2 Mon Sep 17 00:00:00 2001
From: Frank Sierra <sierrafayad@gmail.com>
Date: Fri, 12 Feb 2016 17:17:03 -0500
Subject: [PATCH 190/354] Code Style

---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 16866623..6882e2cb 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -669,7 +669,7 @@ public function _remap($object_called, $arguments = [])
             {
                 $this->_log_request($authorized);
             }
-            if($authorized===false)
+            if($authorized === FALSE)
             {
                 // They don't have good enough perms
                 $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_permissions')];

From e31c07c1083727ff3e8cf430f1a357af945db6a4 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 18 Feb 2016 22:19:26 +0200
Subject: [PATCH 191/354] Fixed negation styling

---
 application/libraries/REST_Controller.php | 30 +++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index be69f2d5..94bec8a3 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -415,7 +415,7 @@ public function __construct($config = 'rest')
             $supported_formats = [];
         }
 
-        if (!is_array($supported_formats))
+        if ( ! is_array($supported_formats))
         {
             $supported_formats = [$supported_formats];
         }
@@ -540,7 +540,7 @@ public function __construct($config = 'rest')
         }
 
         // When there is no specific override for the current class/method, use the default auth value set in the config
-        if ($this->auth_override === FALSE && !($this->config->item('rest_enable_keys') && $this->_allow === TRUE) || ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE))
+        if ($this->auth_override === FALSE && ! ($this->config->item('rest_enable_keys') && $this->_allow === TRUE) || ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE))
         {
             $rest_auth = strtolower($this->config->item('rest_auth'));
             switch ($rest_auth)
@@ -607,10 +607,10 @@ public function _remap($object_called, $arguments = [])
         $controller_method = $object_called.'_'.$this->request->method;
 
         // Do we want to log this method (if allowed by config)?
-        $log_method = !(isset($this->methods[$controller_method]['log']) && $this->methods[$controller_method]['log'] === FALSE);
+        $log_method = ! (isset($this->methods[$controller_method]['log']) && $this->methods[$controller_method]['log'] === FALSE);
 
         // Use keys for this method?
-        $use_key = !(isset($this->methods[$controller_method]['key']) && $this->methods[$controller_method]['key'] === FALSE);
+        $use_key = ! (isset($this->methods[$controller_method]['key']) && $this->methods[$controller_method]['key'] === FALSE);
 
         // They provided a key, but it wasn't valid, so get them out of here
         if ($this->config->item('rest_enable_keys') && $use_key && $this->_allow === FALSE)
@@ -971,7 +971,7 @@ 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($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row()))
+            if ( ! ($row = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row()))
             {
                 return FALSE;
             }
@@ -1199,12 +1199,12 @@ protected function _auth_override_check()
         $auth_override_class_method = $this->config->item('auth_override_class_method');
 
         // Check to see if the override array is even populated
-        if (!empty($auth_override_class_method))
+        if ( ! empty($auth_override_class_method))
         {
-            // check for wildcard flag for rules for classes
-            if (!empty($auth_override_class_method[$this->router->class]['*'])) // Check for class overrides
+            // Check for wildcard flag for rules for classes
+            if ( ! empty($auth_override_class_method[$this->router->class]['*'])) // Check for class overrides
             {
-                // None auth override found, prepare nothing but send back a TRUE override flag
+                // No auth override found, prepare nothing but send back a TRUE override flag
                 if ($auth_override_class_method[$this->router->class]['*'] === 'none')
                 {
                     return TRUE;
@@ -1244,7 +1244,7 @@ protected function _auth_override_check()
             }
 
             // Check to see if there's an override value set for the current class/method being called
-            if (!empty($auth_override_class_method[$this->router->class][$this->router->method]))
+            if ( ! empty($auth_override_class_method[$this->router->class][$this->router->method]))
             {
                 // None auth override found, prepare nothing but send back a TRUE override flag
                 if ($auth_override_class_method[$this->router->class][$this->router->method] === 'none')
@@ -1290,10 +1290,10 @@ protected function _auth_override_check()
         $auth_override_class_method_http = $this->config->item('auth_override_class_method_http');
 
         // Check to see if the override array is even populated
-        if (!empty($auth_override_class_method_http))
+        if ( ! empty($auth_override_class_method_http))
         {
             // check for wildcard flag for rules for classes
-            if(!empty($auth_override_class_method_http[$this->router->class]['*'][$this->request->method]))
+            if ( ! empty($auth_override_class_method_http[$this->router->class]['*'][$this->request->method]))
             {
                 // None auth override found, prepare nothing but send back a TRUE override flag
                 if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'none')
@@ -1335,7 +1335,7 @@ protected function _auth_override_check()
             }
 
             // Check to see if there's an override value set for the current class/method/HTTP-method being called
-            if(!empty($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method]))
+            if ( ! empty($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method]))
             {
                 // None auth override found, prepare nothing but send back a TRUE override flag
                 if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'none')
@@ -1840,7 +1840,7 @@ protected function _check_login($username = NULL, $password = FALSE)
         $rest_auth = strtolower($this->config->item('rest_auth'));
         $valid_logins = $this->config->item('rest_valid_logins');
 
-        if (!$this->config->item('auth_source') && $rest_auth === 'digest')
+        if ( ! $this->config->item('auth_source') && $rest_auth === 'digest')
         {
             // For digest we do not have a password passed as argument
             return md5($username.':'.$this->config->item('rest_realm').':'.(isset($valid_logins[$username]) ? $valid_logins[$username] : ''));
@@ -1890,7 +1890,7 @@ protected function _check_php_session()
         $key = $this->config->item('auth_source');
 
         // If falsy, then the user isn't logged in
-        if (!$this->session->userdata($key))
+        if ( ! $this->session->userdata($key))
         {
             // Display an error response
             $this->response([

From 80290f1d4750de0a98c73f2f9138655421cd8182 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 18 Feb 2016 22:20:08 +0200
Subject: [PATCH 192/354] Fixed basepath check

---
 application/views/welcome_message.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php
index 7a407656..9ba456fc 100644
--- a/application/views/welcome_message.php
+++ b/application/views/welcome_message.php
@@ -1,6 +1,8 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-?><!DOCTYPE html>
+    defined('BASEPATH') OR exit('No direct script access allowed');
+?>
+
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8">

From 8e018e3a960e6b06cd2a7163f9e2cca7a12d0ed9 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 21 Feb 2016 12:44:52 +0200
Subject: [PATCH 193/354] Fixed _detect_input_format

---
 application/libraries/REST_Controller.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 94bec8a3..c618647f 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -811,20 +811,20 @@ protected function _detect_input_format()
 
         if (empty($content_type) === FALSE)
         {
-            // Check all formats against the HTTP_ACCEPT header
-            foreach ($this->_supported_formats as $key => $value)
-            {
-                // $key = format e.g. csv
-                // $value = mime type e.g. application/csv
+            // If a semi-colon exists in the string, then explode by ; and get the value of where
+            // the current array pointer resides. This will generally be the first element of the array
+            $content_type = (strpos($content_type, ';') !== FALSE ? current(explode(';', $content_type)) : $content_type);
 
-                // If a semi-colon exists in the string, then explode by ; and get the value of where
-                // the current array pointer resides. This will generally be the first element of the array
-                $content_type = (strpos($content_type, ';') !== FALSE ? current(explode(';', $content_type)) : $content_type);
+            // Check all formats against the CONTENT-TYPE header
+            foreach ($this->_supported_formats as $type => $mime)
+            {
+                // $type = format e.g. csv
+                // $mime = mime type e.g. application/csv
 
                 // If both the mime types match, then return the format
-                if ($content_type === $value)
+                if ($content_type === $mime)
                 {
-                    return $key;
+                    return $type;
                 }
             }
         }

From 031f10592ebdd47c5b093c1ae5ac1567f583320a Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 21 Feb 2016 12:50:39 +0200
Subject: [PATCH 194/354] Re-built documentation

---
 .../source-class-REST_Controller.html         | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/documentation/source-class-REST_Controller.html b/documentation/source-class-REST_Controller.html
index d049c3bc..c6372682 100644
--- a/documentation/source-class-REST_Controller.html
+++ b/documentation/source-class-REST_Controller.html
@@ -509,7 +509,7 @@ <h3>Classes</h3>
 </span><span id="415" class="l"><a href="#415"> 415: </a>            <span class="php-var">$supported_formats</span> = [];
 </span><span id="416" class="l"><a href="#416"> 416: </a>        }
 </span><span id="417" class="l"><a href="#417"> 417: </a>
-</span><span id="418" class="l"><a href="#418"> 418: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword2">is_array</span>(<span class="php-var">$supported_formats</span>))
+</span><span id="418" class="l"><a href="#418"> 418: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword2">is_array</span>(<span class="php-var">$supported_formats</span>))
 </span><span id="419" class="l"><a href="#419"> 419: </a>        {
 </span><span id="420" class="l"><a href="#420"> 420: </a>            <span class="php-var">$supported_formats</span> = [<span class="php-var">$supported_formats</span>];
 </span><span id="421" class="l"><a href="#421"> 421: </a>        }
@@ -634,7 +634,7 @@ <h3>Classes</h3>
 </span><span id="540" class="l"><a href="#540"> 540: </a>        }
 </span><span id="541" class="l"><a href="#541"> 541: </a>
 </span><span id="542" class="l"><a href="#542"> 542: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
-</span><span id="543" class="l"><a href="#543"> 543: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; !(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>) || (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'allow_auth_and_keys'</span>) === <span class="php-keyword1">TRUE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
+</span><span id="543" class="l"><a href="#543"> 543: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; ! (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>) || (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'allow_auth_and_keys'</span>) === <span class="php-keyword1">TRUE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
 </span><span id="544" class="l"><a href="#544"> 544: </a>        {
 </span><span id="545" class="l"><a href="#545"> 545: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
 </span><span id="546" class="l"><a href="#546"> 546: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
@@ -701,10 +701,10 @@ <h3>Classes</h3>
 </span><span id="607" class="l"><a href="#607"> 607: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span>.<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method;
 </span><span id="608" class="l"><a href="#608"> 608: </a>
 </span><span id="609" class="l"><a href="#609"> 609: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
-</span><span id="610" class="l"><a href="#610"> 610: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] === <span class="php-keyword1">FALSE</span>);
+</span><span id="610" class="l"><a href="#610"> 610: </a>        <span class="php-var">$log_method</span> = ! (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] === <span class="php-keyword1">FALSE</span>);
 </span><span id="611" class="l"><a href="#611"> 611: </a>
 </span><span id="612" class="l"><a href="#612"> 612: </a>        <span class="php-comment">// Use keys for this method?</span>
-</span><span id="613" class="l"><a href="#613"> 613: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] === <span class="php-keyword1">FALSE</span>);
+</span><span id="613" class="l"><a href="#613"> 613: </a>        <span class="php-var">$use_key</span> = ! (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] === <span class="php-keyword1">FALSE</span>);
 </span><span id="614" class="l"><a href="#614"> 614: </a>
 </span><span id="615" class="l"><a href="#615"> 615: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here</span>
 </span><span id="616" class="l"><a href="#616"> 616: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
@@ -905,20 +905,20 @@ <h3>Classes</h3>
 </span><span id="811" class="l"><a href="#811"> 811: </a>
 </span><span id="812" class="l"><a href="#812"> 812: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$content_type</span>) === <span class="php-keyword1">FALSE</span>)
 </span><span id="813" class="l"><a href="#813"> 813: </a>        {
-</span><span id="814" class="l"><a href="#814"> 814: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="815" class="l"><a href="#815"> 815: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
-</span><span id="816" class="l"><a href="#816"> 816: </a>            {
-</span><span id="817" class="l"><a href="#817"> 817: </a>                <span class="php-comment">// $key = format e.g. csv</span>
-</span><span id="818" class="l"><a href="#818"> 818: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
-</span><span id="819" class="l"><a href="#819"> 819: </a>
-</span><span id="820" class="l"><a href="#820"> 820: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
-</span><span id="821" class="l"><a href="#821"> 821: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
-</span><span id="822" class="l"><a href="#822"> 822: </a>                <span class="php-var">$content_type</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$content_type</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$content_type</span>)) : <span class="php-var">$content_type</span>);
+</span><span id="814" class="l"><a href="#814"> 814: </a>            <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
+</span><span id="815" class="l"><a href="#815"> 815: </a>            <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
+</span><span id="816" class="l"><a href="#816"> 816: </a>            <span class="php-var">$content_type</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$content_type</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$content_type</span>)) : <span class="php-var">$content_type</span>);
+</span><span id="817" class="l"><a href="#817"> 817: </a>
+</span><span id="818" class="l"><a href="#818"> 818: </a>            <span class="php-comment">// Check all formats against the CONTENT-TYPE header</span>
+</span><span id="819" class="l"><a href="#819"> 819: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$type</span> =&gt; <span class="php-var">$mime</span>)
+</span><span id="820" class="l"><a href="#820"> 820: </a>            {
+</span><span id="821" class="l"><a href="#821"> 821: </a>                <span class="php-comment">// $type = format e.g. csv</span>
+</span><span id="822" class="l"><a href="#822"> 822: </a>                <span class="php-comment">// $mime = mime type e.g. application/csv</span>
 </span><span id="823" class="l"><a href="#823"> 823: </a>
 </span><span id="824" class="l"><a href="#824"> 824: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
-</span><span id="825" class="l"><a href="#825"> 825: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$content_type</span> === <span class="php-var">$value</span>)
+</span><span id="825" class="l"><a href="#825"> 825: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$content_type</span> === <span class="php-var">$mime</span>)
 </span><span id="826" class="l"><a href="#826"> 826: </a>                {
-</span><span id="827" class="l"><a href="#827"> 827: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
+</span><span id="827" class="l"><a href="#827"> 827: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$type</span>;
 </span><span id="828" class="l"><a href="#828"> 828: </a>                }
 </span><span id="829" class="l"><a href="#829"> 829: </a>            }
 </span><span id="830" class="l"><a href="#830"> 830: </a>        }
@@ -1065,7 +1065,7 @@ <h3>Classes</h3>
 </span><span id="971" class="l"><a href="#971"> 971: </a>        <span class="php-comment">// Find the key from server or arguments</span>
 </span><span id="972" class="l"><a href="#972"> 972: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
 </span><span id="973" class="l"><a href="#973"> 973: </a>        {
-</span><span id="974" class="l"><a href="#974"> 974: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
+</span><span id="974" class="l"><a href="#974"> 974: </a>            <span class="php-keyword1">if</span> ( ! (<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
 </span><span id="975" class="l"><a href="#975"> 975: </a>            {
 </span><span id="976" class="l"><a href="#976"> 976: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
 </span><span id="977" class="l"><a href="#977"> 977: </a>            }
@@ -1293,12 +1293,12 @@ <h3>Classes</h3>
 </span><span id="1199" class="l"><a href="#1199">1199: </a>        <span class="php-var">$auth_override_class_method</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
 </span><span id="1200" class="l"><a href="#1200">1200: </a>
 </span><span id="1201" class="l"><a href="#1201">1201: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
-</span><span id="1202" class="l"><a href="#1202">1202: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>))
+</span><span id="1202" class="l"><a href="#1202">1202: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>))
 </span><span id="1203" class="l"><a href="#1203">1203: </a>        {
-</span><span id="1204" class="l"><a href="#1204">1204: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="1205" class="l"><a href="#1205">1205: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>])) <span class="php-comment">// Check for class overrides</span>
+</span><span id="1204" class="l"><a href="#1204">1204: </a>            <span class="php-comment">// Check for wildcard flag for rules for classes</span>
+</span><span id="1205" class="l"><a href="#1205">1205: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>])) <span class="php-comment">// Check for class overrides</span>
 </span><span id="1206" class="l"><a href="#1206">1206: </a>            {
-</span><span id="1207" class="l"><a href="#1207">1207: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1207" class="l"><a href="#1207">1207: </a>                <span class="php-comment">// No auth override found, prepare nothing but send back a TRUE override flag</span>
 </span><span id="1208" class="l"><a href="#1208">1208: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'none'</span>)
 </span><span id="1209" class="l"><a href="#1209">1209: </a>                {
 </span><span id="1210" class="l"><a href="#1210">1210: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
@@ -1338,7 +1338,7 @@ <h3>Classes</h3>
 </span><span id="1244" class="l"><a href="#1244">1244: </a>            }
 </span><span id="1245" class="l"><a href="#1245">1245: </a>
 </span><span id="1246" class="l"><a href="#1246">1246: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
-</span><span id="1247" class="l"><a href="#1247">1247: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
+</span><span id="1247" class="l"><a href="#1247">1247: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
 </span><span id="1248" class="l"><a href="#1248">1248: </a>            {
 </span><span id="1249" class="l"><a href="#1249">1249: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
 </span><span id="1250" class="l"><a href="#1250">1250: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'none'</span>)
@@ -1384,10 +1384,10 @@ <h3>Classes</h3>
 </span><span id="1290" class="l"><a href="#1290">1290: </a>        <span class="php-var">$auth_override_class_method_http</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method_http'</span>);
 </span><span id="1291" class="l"><a href="#1291">1291: </a>
 </span><span id="1292" class="l"><a href="#1292">1292: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
-</span><span id="1293" class="l"><a href="#1293">1293: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>))
+</span><span id="1293" class="l"><a href="#1293">1293: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>))
 </span><span id="1294" class="l"><a href="#1294">1294: </a>        {
 </span><span id="1295" class="l"><a href="#1295">1295: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="1296" class="l"><a href="#1296">1296: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method]))
+</span><span id="1296" class="l"><a href="#1296">1296: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method]))
 </span><span id="1297" class="l"><a href="#1297">1297: </a>            {
 </span><span id="1298" class="l"><a href="#1298">1298: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
 </span><span id="1299" class="l"><a href="#1299">1299: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
@@ -1429,7 +1429,7 @@ <h3>Classes</h3>
 </span><span id="1335" class="l"><a href="#1335">1335: </a>            }
 </span><span id="1336" class="l"><a href="#1336">1336: </a>
 </span><span id="1337" class="l"><a href="#1337">1337: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method/HTTP-method being called</span>
-</span><span id="1338" class="l"><a href="#1338">1338: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method]))
+</span><span id="1338" class="l"><a href="#1338">1338: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method]))
 </span><span id="1339" class="l"><a href="#1339">1339: </a>            {
 </span><span id="1340" class="l"><a href="#1340">1340: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
 </span><span id="1341" class="l"><a href="#1341">1341: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
@@ -1934,7 +1934,7 @@ <h3>Classes</h3>
 </span><span id="1840" class="l"><a href="#1840">1840: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
 </span><span id="1841" class="l"><a href="#1841">1841: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
 </span><span id="1842" class="l"><a href="#1842">1842: </a>
-</span><span id="1843" class="l"><a href="#1843">1843: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
+</span><span id="1843" class="l"><a href="#1843">1843: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
 </span><span id="1844" class="l"><a href="#1844">1844: </a>        {
 </span><span id="1845" class="l"><a href="#1845">1845: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
 </span><span id="1846" class="l"><a href="#1846">1846: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span>.<span class="php-quote">':'</span>.<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>).<span class="php-quote">':'</span>.(<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
@@ -1984,7 +1984,7 @@ <h3>Classes</h3>
 </span><span id="1890" class="l"><a href="#1890">1890: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
 </span><span id="1891" class="l"><a href="#1891">1891: </a>
 </span><span id="1892" class="l"><a href="#1892">1892: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
-</span><span id="1893" class="l"><a href="#1893">1893: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
+</span><span id="1893" class="l"><a href="#1893">1893: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
 </span><span id="1894" class="l"><a href="#1894">1894: </a>        {
 </span><span id="1895" class="l"><a href="#1895">1895: </a>            <span class="php-comment">// Display an error response</span>
 </span><span id="1896" class="l"><a href="#1896">1896: </a>            <span class="php-var">$this</span>-&gt;response([

From 9ca8c293d1132527f3e60f09406b04daa6db04fd Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sat, 6 Feb 2016 10:52:48 +0200
Subject: [PATCH 195/354] Updated API before possible release

Related #609
---
 application/config/routes.php                 |    2 +-
 application/controllers/Welcome.php           |    2 +-
 application/libraries/Format.php              |   10 +-
 application/libraries/REST_Controller.php     |   44 +-
 application/views/rest_server.php             |   32 +-
 application/views/welcome_message.php         |    2 +-
 documentation/class-Example.html              |    1 +
 documentation/class-Key.html                  |    1 +
 documentation/class-REST_Controller.html      |  224 +-
 documentation/class-Welcome.html              |    8 +-
 documentation/source-class-Format.html        |   32 +-
 documentation/source-class-Key.html           |    2 +-
 .../source-class-REST_Controller.html         | 3383 +++++++++--------
 documentation/source-class-Welcome.html       |    4 +-
 14 files changed, 1919 insertions(+), 1828 deletions(-)

diff --git a/application/config/routes.php b/application/config/routes.php
index 5cbeb064..f2d051f7 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -19,7 +19,7 @@
 |
 | Please see the user guide for complete details:
 |
-| http://codeigniter.com/user_guide/general/routing.html
+| https://codeigniter.com/user_guide/general/routing.html
 |
 | -------------------------------------------------------------------------
 | RESERVED ROUTES
diff --git a/application/controllers/Welcome.php b/application/controllers/Welcome.php
index d16a4dee..59818c7f 100644
--- a/application/controllers/Welcome.php
+++ b/application/controllers/Welcome.php
@@ -16,7 +16,7 @@ class Welcome extends CI_Controller {
 	 *
 	 * So any other public methods not prefixed with an underscore will
 	 * map to /index.php/welcome/<method_name>
-	 * @see http://codeigniter.com/user_guide/general/urls.html
+	 * @see https://codeigniter.com/user_guide/general/urls.html
 	 */
 	public function index()
 	{
diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 0d3bf773..4f058e25 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -91,13 +91,13 @@ public function __construct($data = NULL, $from_type = NULL)
         // If the provided data is already formatted we should probably convert it to an array
         if ($from_type !== NULL)
         {
-            if (method_exists($this, '_from_' . $from_type))
+            if (method_exists($this, '_from_'.$from_type))
             {
-                $data = call_user_func([$this, '_from_' . $from_type], $data);
+                $data = call_user_func([$this, '_from_'.$from_type], $data);
             }
             else
             {
-                throw new Exception('Format class does not support conversion from "' . $from_type . '".');
+                throw new Exception('Format class does not support conversion from "'.$from_type.'".');
             }
         }
 
@@ -416,12 +416,12 @@ public function to_json($data = NULL)
         elseif (preg_match('/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i', $callback))
         {
             // Return the data as encoded json with a callback
-            return $callback . '(' . json_encode($data) . ');';
+            return $callback.'('.json_encode($data).');';
         }
 
         // An invalid jsonp callback function provided.
         // Though I don't believe this should be hardcoded here
-        $data['warning'] = 'INVALID JSONP CALLBACK: ' . $callback;
+        $data['warning'] = 'INVALID JSONP CALLBACK: '.$callback;
 
         return json_encode($data);
     }
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 0c7c552f..6f477683 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -388,7 +388,7 @@ public function __construct($config = 'rest')
         if (is_php('5.4') === FALSE)
         {
             // CodeIgniter 3 is recommended for v5.4 or above
-            throw new Exception('Using PHP v' . PHP_VERSION . ', though PHP v5.4 or greater is required');
+            throw new Exception('Using PHP v'.PHP_VERSION.', though PHP v5.4 or greater is required');
         }
 
         // Check to see if this is CI 3.x
@@ -471,9 +471,9 @@ public function __construct($config = 'rest')
         }
 
         // Create an argument container if it doesn't exist e.g. _get_args
-        if (isset($this->{'_' . $this->request->method . '_args'}) === FALSE)
+        if (isset($this->{'_'.$this->request->method.'_args'}) === FALSE)
         {
-            $this->{'_' . $this->request->method . '_args'} = [];
+            $this->{'_'.$this->request->method.'_args'} = [];
         }
 
         // Set up the query parameters
@@ -495,7 +495,7 @@ public function __construct($config = 'rest')
         {
             $this->request->body = $this->format->factory($this->request->body, $this->request->format)->to_array();
             // Assign payload arguments to proper method container
-            $this->{'_' . $this->request->method . '_args'} = $this->request->body;
+            $this->{'_'.$this->request->method.'_args'} = $this->request->body;
         }
 
         // Merge both for one mega-args variable
@@ -507,7 +507,7 @@ public function __construct($config = 'rest')
             $this->_put_args,
             $this->_post_args,
             $this->_delete_args,
-            $this->{'_' . $this->request->method . '_args'}
+            $this->{'_'.$this->request->method.'_args'}
         );
 
         // Which format should the data be returned in?
@@ -615,9 +615,9 @@ public function _remap($object_called, $arguments = [])
         }
 
         // Remove the supported format from the function name e.g. index.json => index
-        $object_called = preg_replace('/^(.*)\.(?:' . implode('|', array_keys($this->_supported_formats)) . ')$/', '$1', $object_called);
+        $object_called = preg_replace('/^(.*)\.(?:'.implode('|', array_keys($this->_supported_formats)).')$/', '$1', $object_called);
 
-        $controller_method = $object_called . '_' . $this->request->method;
+        $controller_method = $object_called.'_'.$this->request->method;
 
         // Do we want to log this method (if allowed by config)?
         $log_method = !(isset($this->methods[$controller_method]['log']) && $this->methods[$controller_method]['log'] === FALSE);
@@ -869,7 +869,7 @@ protected function _get_default_output_format()
     protected function _detect_output_format()
     {
         // Concatenate formats to a regex pattern e.g. \.(csv|json|xml)
-        $pattern = '/\.(' . implode('|', array_keys($this->_supported_formats)) . ')($|\/)/';
+        $pattern = '/\.('.implode('|', array_keys($this->_supported_formats)).')($|\/)/';
         $matches = [];
 
         // Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2
@@ -1134,7 +1134,7 @@ protected function _check_limit($controller_method)
             {
                 $limited_uri = substr($limited_uri,0, -strlen($this->response->format) - 1);
             }
-            $limited_uri = 'uri:' . $limited_uri . ':' . $this->request->method; // It's good to differentiate GET from PUT
+            $limited_uri = 'uri:'.$limited_uri.':'.$this->request->method; // It's good to differentiate GET from PUT
             $limited_method_name = $controller_method;
             break;
         }
@@ -1736,11 +1736,11 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
         $ldapconn = ldap_connect($ldap['host'], $ldap['port']);
         if ($ldapconn)
         {
-            log_message('debug', 'Setting timeout to ' . $ldap['timeout'] . ' seconds');
+            log_message('debug', 'Setting timeout to '.$ldap['timeout'].' seconds');
 
             ldap_set_option($ldapconn, LDAP_OPT_NETWORK_TIMEOUT, $ldap['timeout']);
 
-            log_message('debug', 'LDAP Auth: Binding to ' . $ldap['host'] . ' with dn ' . $ldap['rdn']);
+            log_message('debug', 'LDAP Auth: Binding to '.$ldap['host'].' with dn '.$ldap['rdn']);
 
             // Binding to the ldap server
             $ldapbind = ldap_bind($ldapconn, $ldap['rdn'], $ldap['pass']);
@@ -1758,13 +1758,13 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
         // Search for user
         if (($res_id = ldap_search($ldapconn, $ldap['basedn'], "uid=$username")) === FALSE)
         {
-            log_message('error', 'LDAP Auth: User ' . $username . ' not found in search');
+            log_message('error', 'LDAP Auth: User '.$username.' not found in search');
             return FALSE;
         }
 
         if (ldap_count_entries($ldapconn, $res_id) !== 1)
         {
-            log_message('error', 'LDAP Auth: Failure, username ' . $username . 'found more than once');
+            log_message('error', 'LDAP Auth: Failure, username '.$username.'found more than once');
             return FALSE;
         }
 
@@ -1787,7 +1787,7 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
             return FALSE;
         }
 
-        log_message('debug', 'LDAP Auth: Success ' . $user_dn . ' authenticated successfully');
+        log_message('debug', 'LDAP Auth: Success '.$user_dn.' authenticated successfully');
 
         $this->_user_ldap_dn = $user_dn;
 
@@ -1857,7 +1857,7 @@ protected function _check_login($username = NULL, $password = FALSE)
         if (!$this->config->item('auth_source') && $rest_auth === 'digest')
         {
             // For digest we do not have a password passed as argument
-            return md5($username . ':' . $this->config->item('rest_realm') . ':' . (isset($valid_logins[$username]) ? $valid_logins[$username] : ''));
+            return md5($username.':'.$this->config->item('rest_realm').':'.(isset($valid_logins[$username]) ? $valid_logins[$username] : ''));
         }
 
         if ($password === FALSE)
@@ -1991,15 +1991,15 @@ protected function _prepare_digest_auth()
         preg_match_all('@(username|nonce|uri|nc|cnonce|qop|response)=[\'"]?([^\'",]+)@', $digest_string, $matches);
         $digest = (empty($matches[1]) || empty($matches[2])) ? [] : array_combine($matches[1], $matches[2]);
 
-        // For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config
+        // For digest authentication the library function should return already stored md5(username:restrealm:password) for that username see rest.php::auth_library_function config
         $username = $this->_check_login($digest['username'], TRUE);
         if (array_key_exists('username', $digest) === FALSE || $username === FALSE)
         {
             $this->_force_login($unique_id);
         }
 
-        $md5 = md5(strtoupper($this->request->method) . ':' . $digest['uri']);
-        $valid_response = md5($username . ':' . $digest['nonce'] . ':' . $digest['nc'] . ':' . $digest['cnonce'] . ':' . $digest['qop'] . ':' . $md5);
+        $md5 = md5(strtoupper($this->request->method).':'.$digest['uri']);
+        $valid_response = md5($username.':'.$digest['nonce'].':'.$digest['nc'].':'.$digest['cnonce'].':'.$digest['qop'].':'.$md5);
 
         // Check if the string don't compare (case-insensitive)
         if (strcasecmp($digest['response'], $valid_response) !== 0)
@@ -2077,15 +2077,15 @@ protected function _force_login($nonce = '')
         if (strtolower($rest_auth) === 'basic')
         {
             // See http://tools.ietf.org/html/rfc2617#page-5
-            header('WWW-Authenticate: Basic realm="' . $rest_realm . '"');
+            header('WWW-Authenticate: Basic realm="'.$rest_realm.'"');
         }
         elseif (strtolower($rest_auth) === 'digest')
         {
             // See http://tools.ietf.org/html/rfc2617#page-18
             header(
-                'WWW-Authenticate: Digest realm="' . $rest_realm
-                . '", qop="auth", nonce="' . $nonce
-                . '", opaque="' . md5($rest_realm) . '"');
+                'WWW-Authenticate: Digest realm="'.$rest_realm
+                .'", qop="auth", nonce="'.$nonce
+                .'", opaque="' . md5($rest_realm).'"');
         }
 
         // Display an error response
diff --git a/application/views/rest_server.php b/application/views/rest_server.php
index a6c3ce3f..5212e6da 100644
--- a/application/views/rest_server.php
+++ b/application/views/rest_server.php
@@ -112,17 +112,17 @@
 
     </div>
 
-    <p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>' . CI_VERSION . '</strong>' : '' ?></p>
+    <p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>'.CI_VERSION.'</strong>' : '' ?></p>
 </div>
 
-<script src="https://code.jquery.com/jquery-1.11.3.js"></script>
+<script src="https://code.jquery.com/jquery-1.12.0.js"></script>
 
 <script>
     // Create an 'App' namespace
     var App = App || {};
 
     // Basic rest module using an IIFE as a way of enclosing private variables
-    App.rest = (function (window, $) {
+    App.rest = (function restModule(window) {
         // Fields
         var _alert = window.alert;
         var _JSON = window.JSON;
@@ -130,6 +130,9 @@
         // Cache the jQuery selector
         var _$ajax = null;
 
+        // Cache the jQuery object
+        var $ = null;
+
         // Methods (private)
 
         /**
@@ -154,13 +157,13 @@ function _ajaxFail() {
         /**
          * On Ajax request
          *
-         * @param {HTMLElement} $this Current element selected
+         * @param {jQuery} $element Current element selected
          * @return {undefined}
          */
-        function _ajaxEvent($this) {
+        function _ajaxEvent($element) {
             $.ajax({
                     // URL from the link that was 'clicked' on
-                    url: $this.attr('href')
+                    url: $element.attr('href')
                 })
                 .done(_ajaxDone)
                 .fail(_ajaxFail);
@@ -192,20 +195,27 @@ function _cacheDom() {
 
         // Public API
         return {
-            init: function () {
+            /**
+             * Initialise the following module
+             *
+             * @param {object} jQuery Reference to jQuery
+             * @return {undefined}
+             */
+            init: function init(jQuery) {
+                $ = jQuery;
+
                 // Cache the DOM and bind event(s)
                 _cacheDom();
                 _bindEvents();
             }
         };
-    }(window, window.jQuery));
+    }(window));
 
     // DOM ready event
-    $(function () {
+    $(function domReady($) {
         // Initialise the App module
-        App.rest.init();
+        App.rest.init($);
     });
-
 </script>
 
 </body>
diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php
index 69acde90..7a407656 100644
--- a/application/views/welcome_message.php
+++ b/application/views/welcome_message.php
@@ -92,7 +92,7 @@
         <?php endif ?>
     </div>
 
-    <p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>' . CI_VERSION . '</strong>' : '' ?></p>
+    <p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>'.CI_VERSION.'</strong>' : '' ?></p>
 </div>
 
 </body>
diff --git a/documentation/class-Example.html b/documentation/class-Example.html
index e8af6477..18482b73 100644
--- a/documentation/class-Example.html
+++ b/documentation/class-Example.html
@@ -294,6 +294,7 @@ <h4>Overrides</h4>
 			<a href="http://github.com/class-REST_Controller.html#__detect_method">_detect_method()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_output_format">_detect_output_format()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__force_login">_force_login()</a>, 
+			<a href="http://github.com/class-REST_Controller.html#__get_default_output_format">_get_default_output_format()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__log_access_time">_log_access_time()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__log_request">_log_request()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__log_response_code">_log_response_code()</a>, 
diff --git a/documentation/class-Key.html b/documentation/class-Key.html
index 540d7d3e..957df227 100644
--- a/documentation/class-Key.html
+++ b/documentation/class-Key.html
@@ -317,6 +317,7 @@ <h1>Class Key</h1>
 			<a href="http://github.com/class-REST_Controller.html#__detect_method">_detect_method()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__detect_output_format">_detect_output_format()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__force_login">_force_login()</a>, 
+			<a href="http://github.com/class-REST_Controller.html#__get_default_output_format">_get_default_output_format()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__log_access_time">_log_access_time()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__log_request">_log_request()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__log_response_code">_log_response_code()</a>, 
diff --git a/documentation/class-REST_Controller.html b/documentation/class-REST_Controller.html
index fc94cfdb..34c4d2aa 100644
--- a/documentation/class-REST_Controller.html
+++ b/documentation/class-REST_Controller.html
@@ -137,7 +137,7 @@ <h4>Direct known subclasses</h4>
 				3.0.0<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-2110" title="Go to source code">libraries/REST_Controller.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-2151" title="Go to source code">libraries/REST_Controller.php</a>
 		<br>
 	</div>
 
@@ -187,7 +187,7 @@ <h4>Direct known subclasses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___construct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#365-539" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#365-563" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
 
 		<div class="description short">
 			<p>Constructor for the REST API</p>
@@ -223,7 +223,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___destruct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#541-558" title="Go to source code">__destruct</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#565-582" title="Go to source code">__destruct</a>( )</code>
 
 		<div class="description short">
 			<p>Deconstructor</p>
@@ -257,18 +257,18 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__remap">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#560-677" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#584-701" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var> = []</span> )</code>
 
 		<div class="description short">
 			<p>Requests are not made to methods directly, the request will be for
 an "object". This simply maps the object and method to the correct
-Controller method.</p>
+Controller method</p>
 		</div>
 
 		<div class="description detailed hidden">
 			<p>Requests are not made to methods directly, the request will be for
 an "object". This simply maps the object and method to the correct
-Controller method.</p>
+Controller method</p>
 
 
 				<h4>Parameters</h4>
@@ -276,7 +276,7 @@ <h4>Parameters</h4>
 					<dt><var>$object_called</var></dt>
 					<dd></dd>
 					<dt><var>$arguments</var></dt>
-					<dd>The arguments passed to the controller method.</dd>
+					<dd>The arguments passed to the controller method</dd>
 				</dl></div>
 
 
@@ -298,7 +298,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#679-760" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#703-784" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Takes mixed data and optionally a status code, then creates the response</p>
@@ -338,20 +338,20 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_set_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#762-775" title="Go to source code">set_response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#786-799" title="Go to source code">set_response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Takes mixed data and optionally a status code, then creates the response
 within the buffers of the Output class. The response is sent to the client
 lately by the framework, after the current controller's method termination.
-All the hooks after the controller's method termination are executable.</p>
+All the hooks after the controller's method termination are executable</p>
 		</div>
 
 		<div class="description detailed hidden">
 			<p>Takes mixed data and optionally a status code, then creates the response
 within the buffers of the Output class. The response is sent to the client
 lately by the framework, after the current controller's method termination.
-All the hooks after the controller's method termination are executable.</p>
+All the hooks after the controller's method termination are executable</p>
 
 
 				<h4>Parameters</h4>
@@ -381,7 +381,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_input_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#777-809" title="Go to source code">_detect_input_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#801-833" title="Go to source code">_detect_input_format</a>( )</code>
 
 		<div class="description short">
 			<p>Get the input format e.g. json or xml</p>
@@ -400,6 +400,44 @@ <h4>Returns</h4>
 
 
 
+		</div>
+		</div></td>
+	</tr>
+	<tr data-order="_get_default_output_format" id="__get_default_output_format">
+
+		<td class="attributes"><code>
+			 protected 
+
+			string
+			
+			</code>
+		</td>
+
+		<td class="name"><div>
+		<a class="anchor" href="#__get_default_output_format">#</a>
+		<code><a href="http://github.com/source-class-REST_Controller.html#835-847" title="Go to source code">_get_default_output_format</a>( )</code>
+
+		<div class="description short">
+			<p>Gets the default format from the configuration. Fallbacks to 'json'
+if the corresponding configuration option $config['rest_default_format']
+is missing or is empty</p>
+		</div>
+
+		<div class="description detailed hidden">
+			<p>Gets the default format from the configuration. Fallbacks to 'json'
+if the corresponding configuration option $config['rest_default_format']
+is missing or is empty</p>
+
+
+
+				<h4>Returns</h4>
+				<div class="list">
+					string<br>The default supported input format
+				</div>
+
+
+
+
 		</div>
 		</div></td>
 	</tr>
@@ -415,7 +453,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_output_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#811-880" title="Go to source code">_detect_output_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#849-918" title="Go to source code">_detect_output_format</a>( )</code>
 
 		<div class="description short">
 			<p>Detect which format should be used to output the data</p>
@@ -449,7 +487,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_method">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#882-912" title="Go to source code">_detect_method</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#920-950" title="Go to source code">_detect_method</a>( )</code>
 
 		<div class="description short">
 			<p>Get the HTTP request string e.g. get or post</p>
@@ -483,7 +521,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_api_key">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#914-986" title="Go to source code">_detect_api_key</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#952-1024" title="Go to source code">_detect_api_key</a>( )</code>
 
 		<div class="description short">
 			<p>See if the user has provided an API key</p>
@@ -517,7 +555,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_lang">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#988-1020" title="Go to source code">_detect_lang</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1026-1058" title="Go to source code">_detect_lang</a>( )</code>
 
 		<div class="description short">
 			<p>Preferred return language</p>
@@ -551,7 +589,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_request">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1022-1048" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1060-1086" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Add the request to the log table</p>
@@ -590,7 +628,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_limit">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1050-1150" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1088-1188" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
 
 		<div class="description short">
 			<p>Check if the requests to a controller method exceed a limit</p>
@@ -629,7 +667,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__auth_override_check">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1152-1310" title="Go to source code">_auth_override_check</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1190-1380" title="Go to source code">_auth_override_check</a>( )</code>
 
 		<div class="description short">
 			<p>Check if there is a specific auth type set for the current class/method/HTTP-method being called</p>
@@ -663,7 +701,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1312-1322" title="Go to source code">_parse_get</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1382-1392" title="Go to source code">_parse_get</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the GET request arguments</p>
@@ -693,7 +731,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1324-1338" title="Go to source code">_parse_post</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1394-1408" title="Go to source code">_parse_post</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the POST request arguments</p>
@@ -723,7 +761,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1340-1360" title="Go to source code">_parse_put</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1410-1427" title="Go to source code">_parse_put</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PUT request arguments</p>
@@ -753,7 +791,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1362-1375" title="Go to source code">_parse_head</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1429-1442" title="Go to source code">_parse_head</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the HEAD request arguments</p>
@@ -783,7 +821,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1377-1390" title="Go to source code">_parse_options</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1444-1457" title="Go to source code">_parse_options</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the OPTIONS request arguments</p>
@@ -813,7 +851,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1392-1413" title="Go to source code">_parse_patch</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1459-1477" title="Go to source code">_parse_patch</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PATCH request arguments</p>
@@ -843,7 +881,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1415-1428" title="Go to source code">_parse_delete</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1479-1492" title="Go to source code">_parse_delete</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the DELETE request arguments</p>
@@ -873,7 +911,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1430-1462" title="Go to source code">_parse_query</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1494-1503" title="Go to source code">_parse_query</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the query parameters</p>
@@ -903,7 +941,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1466-1483" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1507-1524" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a GET request</p>
@@ -945,7 +983,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1485-1502" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1526-1543" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a OPTIONS request</p>
@@ -987,7 +1025,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1504-1521" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1545-1562" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a HEAD request</p>
@@ -1029,7 +1067,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1523-1540" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1564-1581" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a POST request</p>
@@ -1071,7 +1109,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1542-1559" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1583-1600" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PUT request</p>
@@ -1113,7 +1151,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1561-1578" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1602-1619" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a DELETE request</p>
@@ -1155,7 +1193,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1580-1597" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1621-1638" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PATCH request</p>
@@ -1197,7 +1235,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1599-1616" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1640-1657" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from the query parameters</p>
@@ -1239,16 +1277,16 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__xss_clean">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1618-1632" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1659-1673" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
 
 		<div class="description short">
 			<p>Sanitizes data so that Cross Site Scripting Hacks can be
-prevented.</p>
+prevented</p>
 		</div>
 
 		<div class="description detailed hidden">
 			<p>Sanitizes data so that Cross Site Scripting Hacks can be
-prevented.</p>
+prevented</p>
 
 
 				<h4>Parameters</h4>
@@ -1282,7 +1320,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_validation_errors">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1634-1645" title="Go to source code">validation_errors</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1675-1686" title="Go to source code">validation_errors</a>( )</code>
 
 		<div class="description short">
 			<p>Retrieve the validation errors</p>
@@ -1316,7 +1354,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_ldap_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1649-1742" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1690-1783" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform LDAP Authentication</p>
@@ -1357,7 +1395,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_library_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1744-1781" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1785-1822" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform Library Authentication - Override this function to change the way the library is called</p>
@@ -1398,7 +1436,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1783-1838" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1824-1879" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Check if the user is logged in</p>
@@ -1439,7 +1477,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_php_session">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1840-1860" title="Go to source code">_check_php_session</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1881-1901" title="Go to source code">_check_php_session</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the user is logged in with a PHP session key</p>
@@ -1469,7 +1507,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_basic_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1862-1901" title="Go to source code">_prepare_basic_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1903-1942" title="Go to source code">_prepare_basic_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for basic authentication</p>
@@ -1499,7 +1537,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_digest_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1903-1958" title="Go to source code">_prepare_digest_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1944-1999" title="Go to source code">_prepare_digest_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for digest authentication</p>
@@ -1529,7 +1567,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_blacklist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1960-1980" title="Go to source code">_check_blacklist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2001-2021" title="Go to source code">_check_blacklist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response</p>
@@ -1559,7 +1597,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_whitelist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1982-2008" title="Go to source code">_check_whitelist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2023-2049" title="Go to source code">_check_whitelist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response</p>
@@ -1589,7 +1627,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__force_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2010-2041" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2051-2082" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
 
 		<div class="description short">
 			<p>Force logging in by setting the WWW-Authenticate header</p>
@@ -1625,7 +1663,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_access_time">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2043-2058" title="Go to source code">_log_access_time</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2084-2099" title="Go to source code">_log_access_time</a>( )</code>
 
 		<div class="description short">
 			<p>Updates the log table with the total access time</p>
@@ -1663,7 +1701,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_response_code">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2060-2076" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2101-2117" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
 
 		<div class="description short">
 			<p>Updates the log table with HTTP response code</p>
@@ -1706,7 +1744,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_access">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2078-2108" title="Go to source code">_check_access</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2119-2149" title="Go to source code">_check_access</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the API key has access to the controller and methods</p>
@@ -3204,13 +3242,13 @@ <h4>Returns</h4>
 				<a href="http://github.com/source-class-REST_Controller.html#152-158" title="Go to source code"><var>$rest_format</var></a>
 
 			<div class="description short">
-				<p>This defines the rest format.
-Must be overridden it in a controller so that it is set.</p>
+				<p>This defines the rest format
+Must be overridden it in a controller so that it is set</p>
 			</div>
 
 			<div class="description detailed hidden">
-				<p>This defines the rest format.
-Must be overridden it in a controller so that it is set.</p>
+				<p>This defines the rest format
+Must be overridden it in a controller so that it is set</p>
 
 			</div>
 		</td>
@@ -3408,31 +3446,6 @@ <h4>Returns</h4>
 			</div>
 		</td>
 	</tr>
-	<tr data-order="_insert_id" id="$_insert_id">
-		<td class="attributes"><code>
-			protected  
-			string
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#215-220" title="Go to source code"><var>$_insert_id</var></a>
-
-			<div class="description short">
-				<p>The insert_id of the log entry (if we have one)</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The insert_id of the log entry (if we have one)</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_insert_id" class="anchor">#</a>
-				<code><span class="php-quote">''</span></code>
-			</div>
-		</td>
-	</tr>
 	<tr data-order="_put_args" id="$_put_args">
 		<td class="attributes"><code>
 			protected  
@@ -3440,7 +3453,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#222-227" title="Go to source code"><var>$_put_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#215-220" title="Go to source code"><var>$_put_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the PUT request method</p>
@@ -3465,7 +3478,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#229-234" title="Go to source code"><var>$_delete_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#222-227" title="Go to source code"><var>$_delete_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the DELETE request method</p>
@@ -3490,7 +3503,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#236-241" title="Go to source code"><var>$_patch_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#229-234" title="Go to source code"><var>$_patch_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the PATCH request method</p>
@@ -3515,7 +3528,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#243-248" title="Go to source code"><var>$_head_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#236-241" title="Go to source code"><var>$_head_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the HEAD request method</p>
@@ -3540,7 +3553,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#250-255" title="Go to source code"><var>$_options_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#243-248" title="Go to source code"><var>$_options_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the OPTIONS request method</p>
@@ -3565,7 +3578,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#257-262" title="Go to source code"><var>$_query_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#250-255" title="Go to source code"><var>$_query_args</var></a>
 
 			<div class="description short">
 				<p>The arguments for the query parameters</p>
@@ -3590,7 +3603,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#264-269" title="Go to source code"><var>$_args</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#257-262" title="Go to source code"><var>$_args</var></a>
 
 			<div class="description short">
 				<p>The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined</p>
@@ -3608,6 +3621,31 @@ <h4>Returns</h4>
 			</div>
 		</td>
 	</tr>
+	<tr data-order="_insert_id" id="$_insert_id">
+		<td class="attributes"><code>
+			protected  
+			string
+		</code></td>
+
+		<td class="name">
+				<a href="http://github.com/source-class-REST_Controller.html#264-269" title="Go to source code"><var>$_insert_id</var></a>
+
+			<div class="description short">
+				<p>The insert_id of the log entry (if we have one)</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>The insert_id of the log entry (if we have one)</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#$_insert_id" class="anchor">#</a>
+				<code><span class="php-quote">''</span></code>
+			</div>
+		</td>
+	</tr>
 	<tr data-order="_allow" id="$_allow">
 		<td class="attributes"><code>
 			protected  
@@ -3618,11 +3656,11 @@ <h4>Returns</h4>
 				<a href="http://github.com/source-class-REST_Controller.html#271-276" title="Go to source code"><var>$_allow</var></a>
 
 			<div class="description short">
-				<p>If the request is allowed based on the API key provided.</p>
+				<p>If the request is allowed based on the API key provided</p>
 			</div>
 
 			<div class="description detailed hidden">
-				<p>If the request is allowed based on the API key provided.</p>
+				<p>If the request is allowed based on the API key provided</p>
 
 			</div>
 		</td>
@@ -3779,15 +3817,15 @@ <h4>Returns</h4>
 			<div class="description short">
 				<p>Enable XSS flag
 Determines whether the XSS filter is always active when
-GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered.
-Set automatically based on config setting.</p>
+GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered
+Set automatically based on config setting</p>
 			</div>
 
 			<div class="description detailed hidden">
 				<p>Enable XSS flag
 Determines whether the XSS filter is always active when
-GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered.
-Set automatically based on config setting.</p>
+GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered
+Set automatically based on config setting</p>
 
 			</div>
 		</td>
diff --git a/documentation/class-Welcome.html b/documentation/class-Welcome.html
index 2ba710ee..cb9f0f28 100644
--- a/documentation/class-Welcome.html
+++ b/documentation/class-Welcome.html
@@ -149,9 +149,9 @@ <h1>Class Welcome</h1>
 		<div class="description detailed hidden">
 			<p>Index Page for this controller.</p>
 
-<p>Maps to the following URL
-http://example.com/index.php/welcome - or -
-http://example.com/index.php/welcome/index - or -
+<p>Maps to the following URL http://example.com/index.php/welcome
+- or - http://example.com/index.php/welcome/index
+- or -
 Since this controller is set as the default controller in
 config/routes.php, it's displayed at http://example.com/</p>
 
@@ -164,7 +164,7 @@ <h1>Class Welcome</h1>
 
 				<h4>See</h4>
 				<div class="list">
-						http://codeigniter.com/user_guide/general/urls.html<br>
+						https://codeigniter.com/user_guide/general/urls.html<br>
 				</div>
 
 
diff --git a/documentation/source-class-Format.html b/documentation/source-class-Format.html
index 050cbd84..d1b5353d 100644
--- a/documentation/source-class-Format.html
+++ b/documentation/source-class-Format.html
@@ -150,7 +150,7 @@ <h3>Classes</h3>
 </span></span><span id="56" class="l"><a href="#56"> 56: </a><span class="php-comment">     *
 </span></span><span id="57" class="l"><a href="#57"> 57: </a><span class="php-comment">     * @var object
 </span></span><span id="58" class="l"><a href="#58"> 58: </a><span class="php-comment">     */</span>
-</span><span id="59" class="l"><a href="#59"> 59: </a>    <span class="php-keyword1">private</span> <span class="php-var">$_ci</span>;
+</span><span id="59" class="l"><a href="#59"> 59: </a>    <span class="php-keyword1">private</span> <span class="php-var">$_CI</span>;
 </span><span id="60" class="l"><a href="#60"> 60: </a>
 </span><span id="61" class="l"><a href="#61"> 61: </a>    <span class="php-comment">/**
 </span></span><span id="62" class="l"><a href="#62"> 62: </a><span class="php-comment">     * Data to parse
@@ -177,21 +177,21 @@ <h3>Classes</h3>
 </span><span id="83" class="l"><a href="#83"> 83: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$from_type</span> = <span class="php-keyword1">NULL</span>)
 </span><span id="84" class="l"><a href="#84"> 84: </a>    {
 </span><span id="85" class="l"><a href="#85"> 85: </a>        <span class="php-comment">// Get the CodeIgniter reference</span>
-</span><span id="86" class="l"><a href="#86"> 86: </a>        <span class="php-var">$this</span>-&gt;_ci = &amp;get_instance();
+</span><span id="86" class="l"><a href="#86"> 86: </a>        <span class="php-var">$this</span>-&gt;_CI = &amp;get_instance();
 </span><span id="87" class="l"><a href="#87"> 87: </a>
 </span><span id="88" class="l"><a href="#88"> 88: </a>        <span class="php-comment">// Load the inflector helper</span>
-</span><span id="89" class="l"><a href="#89"> 89: </a>        <span class="php-var">$this</span>-&gt;_ci-&gt;load-&gt;helper(<span class="php-quote">'inflector'</span>);
+</span><span id="89" class="l"><a href="#89"> 89: </a>        <span class="php-var">$this</span>-&gt;_CI-&gt;load-&gt;helper(<span class="php-quote">'inflector'</span>);
 </span><span id="90" class="l"><a href="#90"> 90: </a>
 </span><span id="91" class="l"><a href="#91"> 91: </a>        <span class="php-comment">// If the provided data is already formatted we should probably convert it to an array</span>
 </span><span id="92" class="l"><a href="#92"> 92: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$from_type</span> !== <span class="php-keyword1">NULL</span>)
 </span><span id="93" class="l"><a href="#93"> 93: </a>        {
-</span><span id="94" class="l"><a href="#94"> 94: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span> . <span class="php-var">$from_type</span>))
+</span><span id="94" class="l"><a href="#94"> 94: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span>.<span class="php-var">$from_type</span>))
 </span><span id="95" class="l"><a href="#95"> 95: </a>            {
-</span><span id="96" class="l"><a href="#96"> 96: </a>                <span class="php-var">$data</span> = <span class="php-keyword2">call_user_func</span>([<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span> . <span class="php-var">$from_type</span>], <span class="php-var">$data</span>);
+</span><span id="96" class="l"><a href="#96"> 96: </a>                <span class="php-var">$data</span> = <span class="php-keyword2">call_user_func</span>([<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span>.<span class="php-var">$from_type</span>], <span class="php-var">$data</span>);
 </span><span id="97" class="l"><a href="#97"> 97: </a>            }
 </span><span id="98" class="l"><a href="#98"> 98: </a>            <span class="php-keyword1">else</span>
 </span><span id="99" class="l"><a href="#99"> 99: </a>            {
-</span><span id="100" class="l"><a href="#100">100: </a>                <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'Format class does not support conversion from &quot;'</span> . <span class="php-var">$from_type</span> . <span class="php-quote">'&quot;.'</span>);
+</span><span id="100" class="l"><a href="#100">100: </a>                <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'Format class does not support conversion from &quot;'</span>.<span class="php-var">$from_type</span>.<span class="php-quote">'&quot;.'</span>);
 </span><span id="101" class="l"><a href="#101">101: </a>            }
 </span><span id="102" class="l"><a href="#102">102: </a>        }
 </span><span id="103" class="l"><a href="#103">103: </a>
@@ -377,20 +377,20 @@ <h3>Classes</h3>
 </span><span id="283" class="l"><a href="#283">283: </a>        }
 </span><span id="284" class="l"><a href="#284">284: </a>
 </span><span id="285" class="l"><a href="#285">285: </a>        <span class="php-comment">// Load the table library</span>
-</span><span id="286" class="l"><a href="#286">286: </a>        <span class="php-var">$this</span>-&gt;_ci-&gt;load-&gt;library(<span class="php-quote">'table'</span>);
+</span><span id="286" class="l"><a href="#286">286: </a>        <span class="php-var">$this</span>-&gt;_CI-&gt;load-&gt;library(<span class="php-quote">'table'</span>);
 </span><span id="287" class="l"><a href="#287">287: </a>
-</span><span id="288" class="l"><a href="#288">288: </a>        <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;set_heading(<span class="php-var">$headings</span>);
+</span><span id="288" class="l"><a href="#288">288: </a>        <span class="php-var">$this</span>-&gt;_CI-&gt;table-&gt;set_heading(<span class="php-var">$headings</span>);
 </span><span id="289" class="l"><a href="#289">289: </a>
 </span><span id="290" class="l"><a href="#290">290: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$row</span>)
 </span><span id="291" class="l"><a href="#291">291: </a>        {
-</span><span id="292" class="l"><a href="#292">292: </a>            <span class="php-comment">// Suppressing the &quot;array to string conversion&quot; notice.</span>
-</span><span id="293" class="l"><a href="#293">293: </a>            <span class="php-comment">// Keep the &quot;evil&quot; @ here.</span>
-</span><span id="294" class="l"><a href="#294">294: </a>            <span class="php-var">$row</span> = @ <span class="php-keyword2">array_map</span>(<span class="php-quote">'strval'</span>, <span class="php-var">$row</span>);
+</span><span id="292" class="l"><a href="#292">292: </a>            <span class="php-comment">// Suppressing the &quot;array to string conversion&quot; notice</span>
+</span><span id="293" class="l"><a href="#293">293: </a>            <span class="php-comment">// Keep the &quot;evil&quot; @ here</span>
+</span><span id="294" class="l"><a href="#294">294: </a>            <span class="php-var">$row</span> = @<span class="php-keyword2">array_map</span>(<span class="php-quote">'strval'</span>, <span class="php-var">$row</span>);
 </span><span id="295" class="l"><a href="#295">295: </a>
-</span><span id="296" class="l"><a href="#296">296: </a>            <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;add_row(<span class="php-var">$row</span>);
+</span><span id="296" class="l"><a href="#296">296: </a>            <span class="php-var">$this</span>-&gt;_CI-&gt;table-&gt;add_row(<span class="php-var">$row</span>);
 </span><span id="297" class="l"><a href="#297">297: </a>        }
 </span><span id="298" class="l"><a href="#298">298: </a>
-</span><span id="299" class="l"><a href="#299">299: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_ci-&gt;table-&gt;generate();
+</span><span id="299" class="l"><a href="#299">299: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_CI-&gt;table-&gt;generate();
 </span><span id="300" class="l"><a href="#300">300: </a>    }
 </span><span id="301" class="l"><a href="#301">301: </a>
 </span><span id="302" class="l"><a href="#302">302: </a>    <span class="php-comment">/**
@@ -499,7 +499,7 @@ <h3>Classes</h3>
 </span><span id="405" class="l"><a href="#405">405: </a>        }
 </span><span id="406" class="l"><a href="#406">406: </a>
 </span><span id="407" class="l"><a href="#407">407: </a>        <span class="php-comment">// Get the callback parameter (if set)</span>
-</span><span id="408" class="l"><a href="#408">408: </a>        <span class="php-var">$callback</span> = <span class="php-var">$this</span>-&gt;_ci-&gt;input-&gt;get(<span class="php-quote">'callback'</span>);
+</span><span id="408" class="l"><a href="#408">408: </a>        <span class="php-var">$callback</span> = <span class="php-var">$this</span>-&gt;_CI-&gt;input-&gt;get(<span class="php-quote">'callback'</span>);
 </span><span id="409" class="l"><a href="#409">409: </a>
 </span><span id="410" class="l"><a href="#410">410: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$callback</span>) === <span class="php-keyword1">TRUE</span>)
 </span><span id="411" class="l"><a href="#411">411: </a>        {
@@ -510,12 +510,12 @@ <h3>Classes</h3>
 </span><span id="416" class="l"><a href="#416">416: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">preg_match</span>(<span class="php-quote">'/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i'</span>, <span class="php-var">$callback</span>))
 </span><span id="417" class="l"><a href="#417">417: </a>        {
 </span><span id="418" class="l"><a href="#418">418: </a>            <span class="php-comment">// Return the data as encoded json with a callback</span>
-</span><span id="419" class="l"><a href="#419">419: </a>            <span class="php-keyword1">return</span> <span class="php-var">$callback</span> . <span class="php-quote">'('</span> . <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>) . <span class="php-quote">');'</span>;
+</span><span id="419" class="l"><a href="#419">419: </a>            <span class="php-keyword1">return</span> <span class="php-var">$callback</span>.<span class="php-quote">'('</span>.<span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>).<span class="php-quote">');'</span>;
 </span><span id="420" class="l"><a href="#420">420: </a>        }
 </span><span id="421" class="l"><a href="#421">421: </a>
 </span><span id="422" class="l"><a href="#422">422: </a>        <span class="php-comment">// An invalid jsonp callback function provided.</span>
 </span><span id="423" class="l"><a href="#423">423: </a>        <span class="php-comment">// Though I don't believe this should be hardcoded here</span>
-</span><span id="424" class="l"><a href="#424">424: </a>        <span class="php-var">$data</span>[<span class="php-quote">'warning'</span>] = <span class="php-quote">'INVALID JSONP CALLBACK: '</span> . <span class="php-var">$callback</span>;
+</span><span id="424" class="l"><a href="#424">424: </a>        <span class="php-var">$data</span>[<span class="php-quote">'warning'</span>] = <span class="php-quote">'INVALID JSONP CALLBACK: '</span>.<span class="php-var">$callback</span>;
 </span><span id="425" class="l"><a href="#425">425: </a>
 </span><span id="426" class="l"><a href="#426">426: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
 </span><span id="427" class="l"><a href="#427">427: </a>    }
diff --git a/documentation/source-class-Key.html b/documentation/source-class-Key.html
index 0d0e86e9..c6a5c28a 100644
--- a/documentation/source-class-Key.html
+++ b/documentation/source-class-Key.html
@@ -307,7 +307,7 @@ <h3>Classes</h3>
 </span><span id="213" class="l"><a href="#213">213: </a>        <span class="php-keyword1">do</span>
 </span><span id="214" class="l"><a href="#214">214: </a>        {
 </span><span id="215" class="l"><a href="#215">215: </a>            <span class="php-comment">// Generate a random salt</span>
-</span><span id="216" class="l"><a href="#216">216: </a>            <span class="php-var">$salt</span> = <span class="php-var">$this</span>-&gt;security-&gt;get_random_bytes(<span class="php-num">64</span>);
+</span><span id="216" class="l"><a href="#216">216: </a>            <span class="php-var">$salt</span> = <span class="php-keyword2">base_convert</span>(<span class="php-keyword2">bin2hex</span>(<span class="php-var">$this</span>-&gt;security-&gt;get_random_bytes(<span class="php-num">64</span>)), <span class="php-num">16</span>, <span class="php-num">36</span>);
 </span><span id="217" class="l"><a href="#217">217: </a>
 </span><span id="218" class="l"><a href="#218">218: </a>            <span class="php-comment">// If an error occurred, then fall back to the previous method</span>
 </span><span id="219" class="l"><a href="#219">219: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$salt</span> === <span class="php-keyword1">FALSE</span>)
diff --git a/documentation/source-class-REST_Controller.html b/documentation/source-class-REST_Controller.html
index 84d4170f..d049c3bc 100644
--- a/documentation/source-class-REST_Controller.html
+++ b/documentation/source-class-REST_Controller.html
@@ -244,8 +244,8 @@ <h3>Classes</h3>
 </span><span id="150" class="l"><a href="#150"> 150: </a>    <span class="php-keyword1">const</span> HTTP_NETWORK_AUTHENTICATION_REQUIRED = <span class="php-num">511</span>;
 </span><span id="151" class="l"><a href="#151"> 151: </a>
 </span><span id="152" class="l"><a href="#152"> 152: </a>    <span class="php-comment">/**
-</span></span><span id="153" class="l"><a href="#153"> 153: </a><span class="php-comment">     * This defines the rest format.
-</span></span><span id="154" class="l"><a href="#154"> 154: </a><span class="php-comment">     * Must be overridden it in a controller so that it is set.
+</span></span><span id="153" class="l"><a href="#153"> 153: </a><span class="php-comment">     * This defines the rest format
+</span></span><span id="154" class="l"><a href="#154"> 154: </a><span class="php-comment">     * Must be overridden it in a controller so that it is set
 </span></span><span id="155" class="l"><a href="#155"> 155: </a><span class="php-comment">     *
 </span></span><span id="156" class="l"><a href="#156"> 156: </a><span class="php-comment">     * @var string|NULL
 </span></span><span id="157" class="l"><a href="#157"> 157: </a><span class="php-comment">     */</span>
@@ -307,63 +307,63 @@ <h3>Classes</h3>
 </span><span id="213" class="l"><a href="#213"> 213: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_post_args</span> = [];
 </span><span id="214" class="l"><a href="#214"> 214: </a>
 </span><span id="215" class="l"><a href="#215"> 215: </a>    <span class="php-comment">/**
-</span></span><span id="216" class="l"><a href="#216"> 216: </a><span class="php-comment">     * The insert_id of the log entry (if we have one)
+</span></span><span id="216" class="l"><a href="#216"> 216: </a><span class="php-comment">     * The arguments for the PUT request method
 </span></span><span id="217" class="l"><a href="#217"> 217: </a><span class="php-comment">     *
-</span></span><span id="218" class="l"><a href="#218"> 218: </a><span class="php-comment">     * @var string
+</span></span><span id="218" class="l"><a href="#218"> 218: </a><span class="php-comment">     * @var array
 </span></span><span id="219" class="l"><a href="#219"> 219: </a><span class="php-comment">     */</span>
-</span><span id="220" class="l"><a href="#220"> 220: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_insert_id</span> = <span class="php-quote">''</span>;
+</span><span id="220" class="l"><a href="#220"> 220: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_put_args</span> = [];
 </span><span id="221" class="l"><a href="#221"> 221: </a>
 </span><span id="222" class="l"><a href="#222"> 222: </a>    <span class="php-comment">/**
-</span></span><span id="223" class="l"><a href="#223"> 223: </a><span class="php-comment">     * The arguments for the PUT request method
+</span></span><span id="223" class="l"><a href="#223"> 223: </a><span class="php-comment">     * The arguments for the DELETE request method
 </span></span><span id="224" class="l"><a href="#224"> 224: </a><span class="php-comment">     *
 </span></span><span id="225" class="l"><a href="#225"> 225: </a><span class="php-comment">     * @var array
 </span></span><span id="226" class="l"><a href="#226"> 226: </a><span class="php-comment">     */</span>
-</span><span id="227" class="l"><a href="#227"> 227: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_put_args</span> = [];
+</span><span id="227" class="l"><a href="#227"> 227: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_delete_args</span> = [];
 </span><span id="228" class="l"><a href="#228"> 228: </a>
 </span><span id="229" class="l"><a href="#229"> 229: </a>    <span class="php-comment">/**
-</span></span><span id="230" class="l"><a href="#230"> 230: </a><span class="php-comment">     * The arguments for the DELETE request method
+</span></span><span id="230" class="l"><a href="#230"> 230: </a><span class="php-comment">     * The arguments for the PATCH request method
 </span></span><span id="231" class="l"><a href="#231"> 231: </a><span class="php-comment">     *
 </span></span><span id="232" class="l"><a href="#232"> 232: </a><span class="php-comment">     * @var array
 </span></span><span id="233" class="l"><a href="#233"> 233: </a><span class="php-comment">     */</span>
-</span><span id="234" class="l"><a href="#234"> 234: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_delete_args</span> = [];
+</span><span id="234" class="l"><a href="#234"> 234: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_patch_args</span> = [];
 </span><span id="235" class="l"><a href="#235"> 235: </a>
 </span><span id="236" class="l"><a href="#236"> 236: </a>    <span class="php-comment">/**
-</span></span><span id="237" class="l"><a href="#237"> 237: </a><span class="php-comment">     * The arguments for the PATCH request method
+</span></span><span id="237" class="l"><a href="#237"> 237: </a><span class="php-comment">     * The arguments for the HEAD request method
 </span></span><span id="238" class="l"><a href="#238"> 238: </a><span class="php-comment">     *
 </span></span><span id="239" class="l"><a href="#239"> 239: </a><span class="php-comment">     * @var array
 </span></span><span id="240" class="l"><a href="#240"> 240: </a><span class="php-comment">     */</span>
-</span><span id="241" class="l"><a href="#241"> 241: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_patch_args</span> = [];
+</span><span id="241" class="l"><a href="#241"> 241: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_head_args</span> = [];
 </span><span id="242" class="l"><a href="#242"> 242: </a>
 </span><span id="243" class="l"><a href="#243"> 243: </a>    <span class="php-comment">/**
-</span></span><span id="244" class="l"><a href="#244"> 244: </a><span class="php-comment">     * The arguments for the HEAD request method
+</span></span><span id="244" class="l"><a href="#244"> 244: </a><span class="php-comment">     * The arguments for the OPTIONS request method
 </span></span><span id="245" class="l"><a href="#245"> 245: </a><span class="php-comment">     *
 </span></span><span id="246" class="l"><a href="#246"> 246: </a><span class="php-comment">     * @var array
 </span></span><span id="247" class="l"><a href="#247"> 247: </a><span class="php-comment">     */</span>
-</span><span id="248" class="l"><a href="#248"> 248: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_head_args</span> = [];
+</span><span id="248" class="l"><a href="#248"> 248: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_options_args</span> = [];
 </span><span id="249" class="l"><a href="#249"> 249: </a>
 </span><span id="250" class="l"><a href="#250"> 250: </a>    <span class="php-comment">/**
-</span></span><span id="251" class="l"><a href="#251"> 251: </a><span class="php-comment">     * The arguments for the OPTIONS request method
+</span></span><span id="251" class="l"><a href="#251"> 251: </a><span class="php-comment">     * The arguments for the query parameters
 </span></span><span id="252" class="l"><a href="#252"> 252: </a><span class="php-comment">     *
 </span></span><span id="253" class="l"><a href="#253"> 253: </a><span class="php-comment">     * @var array
 </span></span><span id="254" class="l"><a href="#254"> 254: </a><span class="php-comment">     */</span>
-</span><span id="255" class="l"><a href="#255"> 255: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_options_args</span> = [];
+</span><span id="255" class="l"><a href="#255"> 255: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_query_args</span> = [];
 </span><span id="256" class="l"><a href="#256"> 256: </a>
 </span><span id="257" class="l"><a href="#257"> 257: </a>    <span class="php-comment">/**
-</span></span><span id="258" class="l"><a href="#258"> 258: </a><span class="php-comment">     * The arguments for the query parameters
+</span></span><span id="258" class="l"><a href="#258"> 258: </a><span class="php-comment">     * The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined
 </span></span><span id="259" class="l"><a href="#259"> 259: </a><span class="php-comment">     *
 </span></span><span id="260" class="l"><a href="#260"> 260: </a><span class="php-comment">     * @var array
 </span></span><span id="261" class="l"><a href="#261"> 261: </a><span class="php-comment">     */</span>
-</span><span id="262" class="l"><a href="#262"> 262: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_query_args</span> = [];
+</span><span id="262" class="l"><a href="#262"> 262: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_args</span> = [];
 </span><span id="263" class="l"><a href="#263"> 263: </a>
 </span><span id="264" class="l"><a href="#264"> 264: </a>    <span class="php-comment">/**
-</span></span><span id="265" class="l"><a href="#265"> 265: </a><span class="php-comment">     * The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined
+</span></span><span id="265" class="l"><a href="#265"> 265: </a><span class="php-comment">     * The insert_id of the log entry (if we have one)
 </span></span><span id="266" class="l"><a href="#266"> 266: </a><span class="php-comment">     *
-</span></span><span id="267" class="l"><a href="#267"> 267: </a><span class="php-comment">     * @var array
+</span></span><span id="267" class="l"><a href="#267"> 267: </a><span class="php-comment">     * @var string
 </span></span><span id="268" class="l"><a href="#268"> 268: </a><span class="php-comment">     */</span>
-</span><span id="269" class="l"><a href="#269"> 269: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_args</span> = [];
+</span><span id="269" class="l"><a href="#269"> 269: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_insert_id</span> = <span class="php-quote">''</span>;
 </span><span id="270" class="l"><a href="#270"> 270: </a>
 </span><span id="271" class="l"><a href="#271"> 271: </a>    <span class="php-comment">/**
-</span></span><span id="272" class="l"><a href="#272"> 272: </a><span class="php-comment">     * If the request is allowed based on the API key provided.
+</span></span><span id="272" class="l"><a href="#272"> 272: </a><span class="php-comment">     * If the request is allowed based on the API key provided
 </span></span><span id="273" class="l"><a href="#273"> 273: </a><span class="php-comment">     *
 </span></span><span id="274" class="l"><a href="#274"> 274: </a><span class="php-comment">     * @var bool
 </span></span><span id="275" class="l"><a href="#275"> 275: </a><span class="php-comment">     */</span>
@@ -416,8 +416,8 @@ <h3>Classes</h3>
 </span><span id="322" class="l"><a href="#322"> 322: </a>    <span class="php-comment">/**
 </span></span><span id="323" class="l"><a href="#323"> 323: </a><span class="php-comment">     * Enable XSS flag
 </span></span><span id="324" class="l"><a href="#324"> 324: </a><span class="php-comment">     * Determines whether the XSS filter is always active when
-</span></span><span id="325" class="l"><a href="#325"> 325: </a><span class="php-comment">     * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered.
-</span></span><span id="326" class="l"><a href="#326"> 326: </a><span class="php-comment">     * Set automatically based on config setting.
+</span></span><span id="325" class="l"><a href="#325"> 325: </a><span class="php-comment">     * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered
+</span></span><span id="326" class="l"><a href="#326"> 326: </a><span class="php-comment">     * Set automatically based on config setting
 </span></span><span id="327" class="l"><a href="#327"> 327: </a><span class="php-comment">     *
 </span></span><span id="328" class="l"><a href="#328"> 328: </a><span class="php-comment">     * @var bool
 </span></span><span id="329" class="l"><a href="#329"> 329: </a><span class="php-comment">     */</span>
@@ -475,13 +475,13 @@ <h3>Classes</h3>
 </span><span id="381" class="l"><a href="#381"> 381: </a>        <span class="php-keyword1">if</span> (is_php(<span class="php-quote">'5.4'</span>) === <span class="php-keyword1">FALSE</span>)
 </span><span id="382" class="l"><a href="#382"> 382: </a>        {
 </span><span id="383" class="l"><a href="#383"> 383: </a>            <span class="php-comment">// CodeIgniter 3 is recommended for v5.4 or above</span>
-</span><span id="384" class="l"><a href="#384"> 384: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'Using PHP v'</span> . PHP_VERSION . <span class="php-quote">', though PHP v5.4 or greater is required'</span>);
+</span><span id="384" class="l"><a href="#384"> 384: </a>            <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'Using PHP v'</span>.PHP_VERSION.<span class="php-quote">', though PHP v5.4 or greater is required'</span>);
 </span><span id="385" class="l"><a href="#385"> 385: </a>        }
 </span><span id="386" class="l"><a href="#386"> 386: </a>
 </span><span id="387" class="l"><a href="#387"> 387: </a>        <span class="php-comment">// Check to see if this is CI 3.x</span>
 </span><span id="388" class="l"><a href="#388"> 388: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">explode</span>(<span class="php-quote">'.'</span>, CI_VERSION, <span class="php-num">2</span>)[<span class="php-num">0</span>] &lt; <span class="php-num">3</span>)
 </span><span id="389" class="l"><a href="#389"> 389: </a>        {
-</span><span id="390" class="l"><a href="#390"> 390: </a>            <span class="php-keyword1">exit</span>(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
+</span><span id="390" class="l"><a href="#390"> 390: </a>            <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
 </span><span id="391" class="l"><a href="#391"> 391: </a>        }
 </span><span id="392" class="l"><a href="#392"> 392: </a>
 </span><span id="393" class="l"><a href="#393"> 393: </a>        <span class="php-comment">// Set the default value of global xss filtering. Same approach as CodeIgniter 3</span>
@@ -500,1507 +500,1507 @@ <h3>Classes</h3>
 </span><span id="406" class="l"><a href="#406"> 406: </a>        <span class="php-comment">// At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)</span>
 </span><span id="407" class="l"><a href="#407"> 407: </a>        <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-quote">'format'</span>);
 </span><span id="408" class="l"><a href="#408"> 408: </a>
-</span><span id="409" class="l"><a href="#409"> 409: </a>        <span class="php-comment">// Get the language</span>
-</span><span id="410" class="l"><a href="#410"> 410: </a>        <span class="php-var">$language</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_language'</span>);
-</span><span id="411" class="l"><a href="#411"> 411: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$language</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="412" class="l"><a href="#412"> 412: </a>        {
-</span><span id="413" class="l"><a href="#413"> 413: </a>            <span class="php-var">$language</span> = <span class="php-quote">'english'</span>;
-</span><span id="414" class="l"><a href="#414"> 414: </a>        }
-</span><span id="415" class="l"><a href="#415"> 415: </a>
-</span><span id="416" class="l"><a href="#416"> 416: </a>        <span class="php-comment">// Load the language file</span>
-</span><span id="417" class="l"><a href="#417"> 417: </a>        <span class="php-var">$this</span>-&gt;lang-&gt;load(<span class="php-quote">'rest_controller'</span>, <span class="php-var">$language</span>);
-</span><span id="418" class="l"><a href="#418"> 418: </a>
-</span><span id="419" class="l"><a href="#419"> 419: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
-</span><span id="420" class="l"><a href="#420"> 420: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
-</span><span id="421" class="l"><a href="#421"> 421: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
-</span><span id="422" class="l"><a href="#422"> 422: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
-</span><span id="423" class="l"><a href="#423"> 423: </a>
-</span><span id="424" class="l"><a href="#424"> 424: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
-</span><span id="425" class="l"><a href="#425"> 425: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="409" class="l"><a href="#409"> 409: </a>        <span class="php-comment">// Determine supported output formats from configuration</span>
+</span><span id="410" class="l"><a href="#410"> 410: </a>        <span class="php-var">$supported_formats</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_supported_formats'</span>);
+</span><span id="411" class="l"><a href="#411"> 411: </a>
+</span><span id="412" class="l"><a href="#412"> 412: </a>        <span class="php-comment">// Validate the configuration setting output formats</span>
+</span><span id="413" class="l"><a href="#413"> 413: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$supported_formats</span>))
+</span><span id="414" class="l"><a href="#414"> 414: </a>        {
+</span><span id="415" class="l"><a href="#415"> 415: </a>            <span class="php-var">$supported_formats</span> = [];
+</span><span id="416" class="l"><a href="#416"> 416: </a>        }
+</span><span id="417" class="l"><a href="#417"> 417: </a>
+</span><span id="418" class="l"><a href="#418"> 418: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword2">is_array</span>(<span class="php-var">$supported_formats</span>))
+</span><span id="419" class="l"><a href="#419"> 419: </a>        {
+</span><span id="420" class="l"><a href="#420"> 420: </a>            <span class="php-var">$supported_formats</span> = [<span class="php-var">$supported_formats</span>];
+</span><span id="421" class="l"><a href="#421"> 421: </a>        }
+</span><span id="422" class="l"><a href="#422"> 422: </a>
+</span><span id="423" class="l"><a href="#423"> 423: </a>        <span class="php-comment">// Add silently the default output format if it is missing</span>
+</span><span id="424" class="l"><a href="#424"> 424: </a>        <span class="php-var">$default_format</span> = <span class="php-var">$this</span>-&gt;_get_default_output_format();
+</span><span id="425" class="l"><a href="#425"> 425: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword2">in_array</span>(<span class="php-var">$default_format</span>, <span class="php-var">$supported_formats</span>))
 </span><span id="426" class="l"><a href="#426"> 426: </a>        {
-</span><span id="427" class="l"><a href="#427"> 427: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
+</span><span id="427" class="l"><a href="#427"> 427: </a>            <span class="php-var">$supported_formats</span>[] = <span class="php-var">$default_format</span>;
 </span><span id="428" class="l"><a href="#428"> 428: </a>        }
 </span><span id="429" class="l"><a href="#429"> 429: </a>
-</span><span id="430" class="l"><a href="#430"> 430: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
-</span><span id="431" class="l"><a href="#431"> 431: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
+</span><span id="430" class="l"><a href="#430"> 430: </a>        <span class="php-comment">// Now update $this-&gt;_supported_formats</span>
+</span><span id="431" class="l"><a href="#431"> 431: </a>        <span class="php-var">$this</span>-&gt;_supported_formats = <span class="php-keyword2">array_intersect_key</span>(<span class="php-var">$this</span>-&gt;_supported_formats, <span class="php-keyword2">array_flip</span>(<span class="php-var">$supported_formats</span>));
 </span><span id="432" class="l"><a href="#432"> 432: </a>
-</span><span id="433" class="l"><a href="#433"> 433: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
-</span><span id="434" class="l"><a href="#434"> 434: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
-</span><span id="435" class="l"><a href="#435"> 435: </a>
-</span><span id="436" class="l"><a href="#436"> 436: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
-</span><span id="437" class="l"><a href="#437"> 437: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
-</span><span id="438" class="l"><a href="#438"> 438: </a>        {
-</span><span id="439" class="l"><a href="#439"> 439: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = [];
-</span><span id="440" class="l"><a href="#440"> 440: </a>        }
-</span><span id="441" class="l"><a href="#441"> 441: </a>
-</span><span id="442" class="l"><a href="#442"> 442: </a>        <span class="php-comment">// Set up the query parameters</span>
-</span><span id="443" class="l"><a href="#443"> 443: </a>        <span class="php-var">$this</span>-&gt;_parse_query();
-</span><span id="444" class="l"><a href="#444"> 444: </a>
-</span><span id="445" class="l"><a href="#445"> 445: </a>        <span class="php-comment">// Set up the GET variables</span>
-</span><span id="446" class="l"><a href="#446"> 446: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
+</span><span id="433" class="l"><a href="#433"> 433: </a>        <span class="php-comment">// Get the language</span>
+</span><span id="434" class="l"><a href="#434"> 434: </a>        <span class="php-var">$language</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_language'</span>);
+</span><span id="435" class="l"><a href="#435"> 435: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$language</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="436" class="l"><a href="#436"> 436: </a>        {
+</span><span id="437" class="l"><a href="#437"> 437: </a>            <span class="php-var">$language</span> = <span class="php-quote">'english'</span>;
+</span><span id="438" class="l"><a href="#438"> 438: </a>        }
+</span><span id="439" class="l"><a href="#439"> 439: </a>
+</span><span id="440" class="l"><a href="#440"> 440: </a>        <span class="php-comment">// Load the language file</span>
+</span><span id="441" class="l"><a href="#441"> 441: </a>        <span class="php-var">$this</span>-&gt;lang-&gt;load(<span class="php-quote">'rest_controller'</span>, <span class="php-var">$language</span>);
+</span><span id="442" class="l"><a href="#442"> 442: </a>
+</span><span id="443" class="l"><a href="#443"> 443: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
+</span><span id="444" class="l"><a href="#444"> 444: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
+</span><span id="445" class="l"><a href="#445"> 445: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
+</span><span id="446" class="l"><a href="#446"> 446: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
 </span><span id="447" class="l"><a href="#447"> 447: </a>
-</span><span id="448" class="l"><a href="#448"> 448: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
-</span><span id="449" class="l"><a href="#449"> 449: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
-</span><span id="450" class="l"><a href="#450"> 450: </a>
-</span><span id="451" class="l"><a href="#451"> 451: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
-</span><span id="452" class="l"><a href="#452"> 452: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
+</span><span id="448" class="l"><a href="#448"> 448: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
+</span><span id="449" class="l"><a href="#449"> 449: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="450" class="l"><a href="#450"> 450: </a>        {
+</span><span id="451" class="l"><a href="#451"> 451: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
+</span><span id="452" class="l"><a href="#452"> 452: </a>        }
 </span><span id="453" class="l"><a href="#453"> 453: </a>
-</span><span id="454" class="l"><a href="#454"> 454: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
-</span><span id="455" class="l"><a href="#455"> 455: </a>
-</span><span id="456" class="l"><a href="#456"> 456: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
-</span><span id="457" class="l"><a href="#457"> 457: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
-</span><span id="458" class="l"><a href="#458"> 458: </a>        {
-</span><span id="459" class="l"><a href="#459"> 459: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
-</span><span id="460" class="l"><a href="#460"> 460: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
-</span><span id="461" class="l"><a href="#461"> 461: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
-</span><span id="462" class="l"><a href="#462"> 462: </a>        }
-</span><span id="463" class="l"><a href="#463"> 463: </a>
-</span><span id="464" class="l"><a href="#464"> 464: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
-</span><span id="465" class="l"><a href="#465"> 465: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
-</span><span id="466" class="l"><a href="#466"> 466: </a>            <span class="php-var">$this</span>-&gt;_get_args,
-</span><span id="467" class="l"><a href="#467"> 467: </a>            <span class="php-var">$this</span>-&gt;_options_args,
-</span><span id="468" class="l"><a href="#468"> 468: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
-</span><span id="469" class="l"><a href="#469"> 469: </a>            <span class="php-var">$this</span>-&gt;_head_args,
-</span><span id="470" class="l"><a href="#470"> 470: </a>            <span class="php-var">$this</span>-&gt;_put_args,
-</span><span id="471" class="l"><a href="#471"> 471: </a>            <span class="php-var">$this</span>-&gt;_post_args,
-</span><span id="472" class="l"><a href="#472"> 472: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
-</span><span id="473" class="l"><a href="#473"> 473: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method . <span class="php-quote">'_args'</span>}
-</span><span id="474" class="l"><a href="#474"> 474: </a>        );
-</span><span id="475" class="l"><a href="#475"> 475: </a>
-</span><span id="476" class="l"><a href="#476"> 476: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
-</span><span id="477" class="l"><a href="#477"> 477: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
-</span><span id="478" class="l"><a href="#478"> 478: </a>
-</span><span id="479" class="l"><a href="#479"> 479: </a>        <span class="php-comment">// Which language should the data be returned in?</span>
-</span><span id="480" class="l"><a href="#480"> 480: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
-</span><span id="481" class="l"><a href="#481"> 481: </a>
-</span><span id="482" class="l"><a href="#482"> 482: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
-</span><span id="483" class="l"><a href="#483"> 483: </a>        <span class="php-var">$this</span>-&gt;early_checks();
-</span><span id="484" class="l"><a href="#484"> 484: </a>
-</span><span id="485" class="l"><a href="#485"> 485: </a>        <span class="php-comment">// Load DB if its enabled</span>
-</span><span id="486" class="l"><a href="#486"> 486: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
-</span><span id="487" class="l"><a href="#487"> 487: </a>        {
-</span><span id="488" class="l"><a href="#488"> 488: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
-</span><span id="489" class="l"><a href="#489"> 489: </a>        }
-</span><span id="490" class="l"><a href="#490"> 490: </a>
-</span><span id="491" class="l"><a href="#491"> 491: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
-</span><span id="492" class="l"><a href="#492"> 492: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
-</span><span id="493" class="l"><a href="#493"> 493: </a>        {
-</span><span id="494" class="l"><a href="#494"> 494: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
-</span><span id="495" class="l"><a href="#495"> 495: </a>        }
-</span><span id="496" class="l"><a href="#496"> 496: </a>
-</span><span id="497" class="l"><a href="#497"> 497: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
-</span><span id="498" class="l"><a href="#498"> 498: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
-</span><span id="499" class="l"><a href="#499"> 499: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
-</span><span id="500" class="l"><a href="#500"> 500: </a>
-</span><span id="501" class="l"><a href="#501"> 501: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
-</span><span id="502" class="l"><a href="#502"> 502: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
-</span><span id="503" class="l"><a href="#503"> 503: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
-</span><span id="504" class="l"><a href="#504"> 504: </a>        {
-</span><span id="505" class="l"><a href="#505"> 505: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
-</span><span id="506" class="l"><a href="#506"> 506: </a>        }
-</span><span id="507" class="l"><a href="#507"> 507: </a>
-</span><span id="508" class="l"><a href="#508"> 508: </a>        <span class="php-comment">// Only allow ajax requests</span>
-</span><span id="509" class="l"><a href="#509"> 509: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
-</span><span id="510" class="l"><a href="#510"> 510: </a>        {
-</span><span id="511" class="l"><a href="#511"> 511: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="512" class="l"><a href="#512"> 512: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="513" class="l"><a href="#513"> 513: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="514" class="l"><a href="#514"> 514: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ajax_only'</span>)
-</span><span id="515" class="l"><a href="#515"> 515: </a>                ], self::HTTP_NOT_ACCEPTABLE);
-</span><span id="516" class="l"><a href="#516"> 516: </a>        }
-</span><span id="517" class="l"><a href="#517"> 517: </a>
-</span><span id="518" class="l"><a href="#518"> 518: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
-</span><span id="519" class="l"><a href="#519"> 519: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; !(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
-</span><span id="520" class="l"><a href="#520"> 520: </a>        {
-</span><span id="521" class="l"><a href="#521"> 521: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="522" class="l"><a href="#522"> 522: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
-</span><span id="523" class="l"><a href="#523"> 523: </a>            {
-</span><span id="524" class="l"><a href="#524"> 524: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
-</span><span id="525" class="l"><a href="#525"> 525: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="526" class="l"><a href="#526"> 526: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="527" class="l"><a href="#527"> 527: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
-</span><span id="528" class="l"><a href="#528"> 528: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="529" class="l"><a href="#529"> 529: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="530" class="l"><a href="#530"> 530: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
-</span><span id="531" class="l"><a href="#531"> 531: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="532" class="l"><a href="#532"> 532: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="533" class="l"><a href="#533"> 533: </a>            }
-</span><span id="534" class="l"><a href="#534"> 534: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="535" class="l"><a href="#535"> 535: </a>            {
-</span><span id="536" class="l"><a href="#536"> 536: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="537" class="l"><a href="#537"> 537: </a>            }
-</span><span id="538" class="l"><a href="#538"> 538: </a>        }
-</span><span id="539" class="l"><a href="#539"> 539: </a>    }
-</span><span id="540" class="l"><a href="#540"> 540: </a>
-</span><span id="541" class="l"><a href="#541"> 541: </a>    <span class="php-comment">/**
-</span></span><span id="542" class="l"><a href="#542"> 542: </a><span class="php-comment">     * Deconstructor
-</span></span><span id="543" class="l"><a href="#543"> 543: </a><span class="php-comment">     *
-</span></span><span id="544" class="l"><a href="#544"> 544: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="545" class="l"><a href="#545"> 545: </a><span class="php-comment">     * @access public
-</span></span><span id="546" class="l"><a href="#546"> 546: </a><span class="php-comment">     * @return void
-</span></span><span id="547" class="l"><a href="#547"> 547: </a><span class="php-comment">     */</span>
-</span><span id="548" class="l"><a href="#548"> 548: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
-</span><span id="549" class="l"><a href="#549"> 549: </a>    {
-</span><span id="550" class="l"><a href="#550"> 550: </a>        <span class="php-comment">// Get the current timestamp</span>
-</span><span id="551" class="l"><a href="#551"> 551: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="552" class="l"><a href="#552"> 552: </a>
-</span><span id="553" class="l"><a href="#553"> 553: </a>        <span class="php-comment">// Log the loading time to the log table</span>
-</span><span id="554" class="l"><a href="#554"> 554: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="555" class="l"><a href="#555"> 555: </a>        {
-</span><span id="556" class="l"><a href="#556"> 556: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
-</span><span id="557" class="l"><a href="#557"> 557: </a>        }
-</span><span id="558" class="l"><a href="#558"> 558: </a>    }
-</span><span id="559" class="l"><a href="#559"> 559: </a>
-</span><span id="560" class="l"><a href="#560"> 560: </a>    <span class="php-comment">/**
-</span></span><span id="561" class="l"><a href="#561"> 561: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
-</span></span><span id="562" class="l"><a href="#562"> 562: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
-</span></span><span id="563" class="l"><a href="#563"> 563: </a><span class="php-comment">     * Controller method.
-</span></span><span id="564" class="l"><a href="#564"> 564: </a><span class="php-comment">     *
-</span></span><span id="565" class="l"><a href="#565"> 565: </a><span class="php-comment">     * @access public
-</span></span><span id="566" class="l"><a href="#566"> 566: </a><span class="php-comment">     * @param  string $object_called
-</span></span><span id="567" class="l"><a href="#567"> 567: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method.
-</span></span><span id="568" class="l"><a href="#568"> 568: </a><span class="php-comment">     */</span>
-</span><span id="569" class="l"><a href="#569"> 569: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span>)
-</span><span id="570" class="l"><a href="#570"> 570: </a>    {
-</span><span id="571" class="l"><a href="#571"> 571: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
-</span><span id="572" class="l"><a href="#572"> 572: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
-</span><span id="573" class="l"><a href="#573"> 573: </a>        {
-</span><span id="574" class="l"><a href="#574"> 574: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="575" class="l"><a href="#575"> 575: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="576" class="l"><a href="#576"> 576: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unsupported'</span>)
-</span><span id="577" class="l"><a href="#577"> 577: </a>                ], self::HTTP_FORBIDDEN);
-</span><span id="578" class="l"><a href="#578"> 578: </a>        }
-</span><span id="579" class="l"><a href="#579"> 579: </a>
-</span><span id="580" class="l"><a href="#580"> 580: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
-</span><span id="581" class="l"><a href="#581"> 581: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
-</span><span id="582" class="l"><a href="#582"> 582: </a>
-</span><span id="583" class="l"><a href="#583"> 583: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span> . <span class="php-quote">'_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method;
-</span><span id="584" class="l"><a href="#584"> 584: </a>
-</span><span id="585" class="l"><a href="#585"> 585: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
-</span><span id="586" class="l"><a href="#586"> 586: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] === <span class="php-keyword1">FALSE</span>);
-</span><span id="587" class="l"><a href="#587"> 587: </a>
-</span><span id="588" class="l"><a href="#588"> 588: </a>        <span class="php-comment">// Use keys for this method?</span>
-</span><span id="589" class="l"><a href="#589"> 589: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] === <span class="php-keyword1">FALSE</span>);
-</span><span id="590" class="l"><a href="#590"> 590: </a>
-</span><span id="591" class="l"><a href="#591"> 591: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here.</span>
-</span><span id="592" class="l"><a href="#592"> 592: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
-</span><span id="593" class="l"><a href="#593"> 593: </a>        {
-</span><span id="594" class="l"><a href="#594"> 594: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="595" class="l"><a href="#595"> 595: </a>            {
-</span><span id="596" class="l"><a href="#596"> 596: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="597" class="l"><a href="#597"> 597: </a>            }
-</span><span id="598" class="l"><a href="#598"> 598: </a>
-</span><span id="599" class="l"><a href="#599"> 599: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="600" class="l"><a href="#600"> 600: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="601" class="l"><a href="#601"> 601: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-keyword2">sprintf</span>(<span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_invalid_api_key'</span>), <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="602" class="l"><a href="#602"> 602: </a>                ], self::HTTP_FORBIDDEN);
-</span><span id="603" class="l"><a href="#603"> 603: </a>        }
-</span><span id="604" class="l"><a href="#604"> 604: </a>
-</span><span id="605" class="l"><a href="#605"> 605: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller.</span>
-</span><span id="606" class="l"><a href="#606"> 606: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
-</span><span id="607" class="l"><a href="#607"> 607: </a>        {
-</span><span id="608" class="l"><a href="#608"> 608: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="609" class="l"><a href="#609"> 609: </a>            {
-</span><span id="610" class="l"><a href="#610"> 610: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="611" class="l"><a href="#611"> 611: </a>            }
-</span><span id="612" class="l"><a href="#612"> 612: </a>
-</span><span id="613" class="l"><a href="#613"> 613: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="614" class="l"><a href="#614"> 614: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="615" class="l"><a href="#615"> 615: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_unauthorized'</span>)
-</span><span id="616" class="l"><a href="#616"> 616: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="617" class="l"><a href="#617"> 617: </a>        }
-</span><span id="618" class="l"><a href="#618"> 618: </a>
-</span><span id="619" class="l"><a href="#619"> 619: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
-</span><span id="620" class="l"><a href="#620"> 620: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="621" class="l"><a href="#621"> 621: </a>        {
-</span><span id="622" class="l"><a href="#622"> 622: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="623" class="l"><a href="#623"> 623: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="624" class="l"><a href="#624"> 624: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unknown_method'</span>)
-</span><span id="625" class="l"><a href="#625"> 625: </a>                ], self::HTTP_NOT_FOUND);
-</span><span id="626" class="l"><a href="#626"> 626: </a>        }
-</span><span id="627" class="l"><a href="#627"> 627: </a>
-</span><span id="628" class="l"><a href="#628"> 628: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
-</span><span id="629" class="l"><a href="#629"> 629: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="630" class="l"><a href="#630"> 630: </a>        {
-</span><span id="631" class="l"><a href="#631"> 631: </a>            <span class="php-comment">// Check the limit</span>
-</span><span id="632" class="l"><a href="#632"> 632: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="454" class="l"><a href="#454"> 454: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
+</span><span id="455" class="l"><a href="#455"> 455: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
+</span><span id="456" class="l"><a href="#456"> 456: </a>
+</span><span id="457" class="l"><a href="#457"> 457: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
+</span><span id="458" class="l"><a href="#458"> 458: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
+</span><span id="459" class="l"><a href="#459"> 459: </a>
+</span><span id="460" class="l"><a href="#460"> 460: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
+</span><span id="461" class="l"><a href="#461"> 461: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
+</span><span id="462" class="l"><a href="#462"> 462: </a>        {
+</span><span id="463" class="l"><a href="#463"> 463: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>} = [];
+</span><span id="464" class="l"><a href="#464"> 464: </a>        }
+</span><span id="465" class="l"><a href="#465"> 465: </a>
+</span><span id="466" class="l"><a href="#466"> 466: </a>        <span class="php-comment">// Set up the query parameters</span>
+</span><span id="467" class="l"><a href="#467"> 467: </a>        <span class="php-var">$this</span>-&gt;_parse_query();
+</span><span id="468" class="l"><a href="#468"> 468: </a>
+</span><span id="469" class="l"><a href="#469"> 469: </a>        <span class="php-comment">// Set up the GET variables</span>
+</span><span id="470" class="l"><a href="#470"> 470: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
+</span><span id="471" class="l"><a href="#471"> 471: </a>
+</span><span id="472" class="l"><a href="#472"> 472: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
+</span><span id="473" class="l"><a href="#473"> 473: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
+</span><span id="474" class="l"><a href="#474"> 474: </a>
+</span><span id="475" class="l"><a href="#475"> 475: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
+</span><span id="476" class="l"><a href="#476"> 476: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
+</span><span id="477" class="l"><a href="#477"> 477: </a>
+</span><span id="478" class="l"><a href="#478"> 478: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
+</span><span id="479" class="l"><a href="#479"> 479: </a>
+</span><span id="480" class="l"><a href="#480"> 480: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
+</span><span id="481" class="l"><a href="#481"> 481: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
+</span><span id="482" class="l"><a href="#482"> 482: </a>        {
+</span><span id="483" class="l"><a href="#483"> 483: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
+</span><span id="484" class="l"><a href="#484"> 484: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
+</span><span id="485" class="l"><a href="#485"> 485: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
+</span><span id="486" class="l"><a href="#486"> 486: </a>        }
+</span><span id="487" class="l"><a href="#487"> 487: </a>
+</span><span id="488" class="l"><a href="#488"> 488: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
+</span><span id="489" class="l"><a href="#489"> 489: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
+</span><span id="490" class="l"><a href="#490"> 490: </a>            <span class="php-var">$this</span>-&gt;_get_args,
+</span><span id="491" class="l"><a href="#491"> 491: </a>            <span class="php-var">$this</span>-&gt;_options_args,
+</span><span id="492" class="l"><a href="#492"> 492: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
+</span><span id="493" class="l"><a href="#493"> 493: </a>            <span class="php-var">$this</span>-&gt;_head_args,
+</span><span id="494" class="l"><a href="#494"> 494: </a>            <span class="php-var">$this</span>-&gt;_put_args,
+</span><span id="495" class="l"><a href="#495"> 495: </a>            <span class="php-var">$this</span>-&gt;_post_args,
+</span><span id="496" class="l"><a href="#496"> 496: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
+</span><span id="497" class="l"><a href="#497"> 497: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>}
+</span><span id="498" class="l"><a href="#498"> 498: </a>        );
+</span><span id="499" class="l"><a href="#499"> 499: </a>
+</span><span id="500" class="l"><a href="#500"> 500: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
+</span><span id="501" class="l"><a href="#501"> 501: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
+</span><span id="502" class="l"><a href="#502"> 502: </a>
+</span><span id="503" class="l"><a href="#503"> 503: </a>        <span class="php-comment">// Which language should the data be returned in?</span>
+</span><span id="504" class="l"><a href="#504"> 504: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
+</span><span id="505" class="l"><a href="#505"> 505: </a>
+</span><span id="506" class="l"><a href="#506"> 506: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
+</span><span id="507" class="l"><a href="#507"> 507: </a>        <span class="php-var">$this</span>-&gt;early_checks();
+</span><span id="508" class="l"><a href="#508"> 508: </a>
+</span><span id="509" class="l"><a href="#509"> 509: </a>        <span class="php-comment">// Load DB if its enabled</span>
+</span><span id="510" class="l"><a href="#510"> 510: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
+</span><span id="511" class="l"><a href="#511"> 511: </a>        {
+</span><span id="512" class="l"><a href="#512"> 512: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
+</span><span id="513" class="l"><a href="#513"> 513: </a>        }
+</span><span id="514" class="l"><a href="#514"> 514: </a>
+</span><span id="515" class="l"><a href="#515"> 515: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
+</span><span id="516" class="l"><a href="#516"> 516: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
+</span><span id="517" class="l"><a href="#517"> 517: </a>        {
+</span><span id="518" class="l"><a href="#518"> 518: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
+</span><span id="519" class="l"><a href="#519"> 519: </a>        }
+</span><span id="520" class="l"><a href="#520"> 520: </a>
+</span><span id="521" class="l"><a href="#521"> 521: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
+</span><span id="522" class="l"><a href="#522"> 522: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
+</span><span id="523" class="l"><a href="#523"> 523: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
+</span><span id="524" class="l"><a href="#524"> 524: </a>
+</span><span id="525" class="l"><a href="#525"> 525: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
+</span><span id="526" class="l"><a href="#526"> 526: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
+</span><span id="527" class="l"><a href="#527"> 527: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
+</span><span id="528" class="l"><a href="#528"> 528: </a>        {
+</span><span id="529" class="l"><a href="#529"> 529: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
+</span><span id="530" class="l"><a href="#530"> 530: </a>        }
+</span><span id="531" class="l"><a href="#531"> 531: </a>
+</span><span id="532" class="l"><a href="#532"> 532: </a>        <span class="php-comment">// Only allow ajax requests</span>
+</span><span id="533" class="l"><a href="#533"> 533: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
+</span><span id="534" class="l"><a href="#534"> 534: </a>        {
+</span><span id="535" class="l"><a href="#535"> 535: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="536" class="l"><a href="#536"> 536: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="537" class="l"><a href="#537"> 537: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="538" class="l"><a href="#538"> 538: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ajax_only'</span>)
+</span><span id="539" class="l"><a href="#539"> 539: </a>                ], self::HTTP_NOT_ACCEPTABLE);
+</span><span id="540" class="l"><a href="#540"> 540: </a>        }
+</span><span id="541" class="l"><a href="#541"> 541: </a>
+</span><span id="542" class="l"><a href="#542"> 542: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
+</span><span id="543" class="l"><a href="#543"> 543: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; !(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>) || (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'allow_auth_and_keys'</span>) === <span class="php-keyword1">TRUE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
+</span><span id="544" class="l"><a href="#544"> 544: </a>        {
+</span><span id="545" class="l"><a href="#545"> 545: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="546" class="l"><a href="#546"> 546: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
+</span><span id="547" class="l"><a href="#547"> 547: </a>            {
+</span><span id="548" class="l"><a href="#548"> 548: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
+</span><span id="549" class="l"><a href="#549"> 549: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="550" class="l"><a href="#550"> 550: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="551" class="l"><a href="#551"> 551: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
+</span><span id="552" class="l"><a href="#552"> 552: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="553" class="l"><a href="#553"> 553: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="554" class="l"><a href="#554"> 554: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
+</span><span id="555" class="l"><a href="#555"> 555: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="556" class="l"><a href="#556"> 556: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="557" class="l"><a href="#557"> 557: </a>            }
+</span><span id="558" class="l"><a href="#558"> 558: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="559" class="l"><a href="#559"> 559: </a>            {
+</span><span id="560" class="l"><a href="#560"> 560: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="561" class="l"><a href="#561"> 561: </a>            }
+</span><span id="562" class="l"><a href="#562"> 562: </a>        }
+</span><span id="563" class="l"><a href="#563"> 563: </a>    }
+</span><span id="564" class="l"><a href="#564"> 564: </a>
+</span><span id="565" class="l"><a href="#565"> 565: </a>    <span class="php-comment">/**
+</span></span><span id="566" class="l"><a href="#566"> 566: </a><span class="php-comment">     * Deconstructor
+</span></span><span id="567" class="l"><a href="#567"> 567: </a><span class="php-comment">     *
+</span></span><span id="568" class="l"><a href="#568"> 568: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="569" class="l"><a href="#569"> 569: </a><span class="php-comment">     * @access public
+</span></span><span id="570" class="l"><a href="#570"> 570: </a><span class="php-comment">     * @return void
+</span></span><span id="571" class="l"><a href="#571"> 571: </a><span class="php-comment">     */</span>
+</span><span id="572" class="l"><a href="#572"> 572: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
+</span><span id="573" class="l"><a href="#573"> 573: </a>    {
+</span><span id="574" class="l"><a href="#574"> 574: </a>        <span class="php-comment">// Get the current timestamp</span>
+</span><span id="575" class="l"><a href="#575"> 575: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="576" class="l"><a href="#576"> 576: </a>
+</span><span id="577" class="l"><a href="#577"> 577: </a>        <span class="php-comment">// Log the loading time to the log table</span>
+</span><span id="578" class="l"><a href="#578"> 578: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="579" class="l"><a href="#579"> 579: </a>        {
+</span><span id="580" class="l"><a href="#580"> 580: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
+</span><span id="581" class="l"><a href="#581"> 581: </a>        }
+</span><span id="582" class="l"><a href="#582"> 582: </a>    }
+</span><span id="583" class="l"><a href="#583"> 583: </a>
+</span><span id="584" class="l"><a href="#584"> 584: </a>    <span class="php-comment">/**
+</span></span><span id="585" class="l"><a href="#585"> 585: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
+</span></span><span id="586" class="l"><a href="#586"> 586: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
+</span></span><span id="587" class="l"><a href="#587"> 587: </a><span class="php-comment">     * Controller method
+</span></span><span id="588" class="l"><a href="#588"> 588: </a><span class="php-comment">     *
+</span></span><span id="589" class="l"><a href="#589"> 589: </a><span class="php-comment">     * @access public
+</span></span><span id="590" class="l"><a href="#590"> 590: </a><span class="php-comment">     * @param  string $object_called
+</span></span><span id="591" class="l"><a href="#591"> 591: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method
+</span></span><span id="592" class="l"><a href="#592"> 592: </a><span class="php-comment">     */</span>
+</span><span id="593" class="l"><a href="#593"> 593: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span> = [])
+</span><span id="594" class="l"><a href="#594"> 594: </a>    {
+</span><span id="595" class="l"><a href="#595"> 595: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
+</span><span id="596" class="l"><a href="#596"> 596: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
+</span><span id="597" class="l"><a href="#597"> 597: </a>        {
+</span><span id="598" class="l"><a href="#598"> 598: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="599" class="l"><a href="#599"> 599: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="600" class="l"><a href="#600"> 600: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unsupported'</span>)
+</span><span id="601" class="l"><a href="#601"> 601: </a>                ], self::HTTP_FORBIDDEN);
+</span><span id="602" class="l"><a href="#602"> 602: </a>        }
+</span><span id="603" class="l"><a href="#603"> 603: </a>
+</span><span id="604" class="l"><a href="#604"> 604: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
+</span><span id="605" class="l"><a href="#605"> 605: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span>.<span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)).<span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
+</span><span id="606" class="l"><a href="#606"> 606: </a>
+</span><span id="607" class="l"><a href="#607"> 607: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span>.<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method;
+</span><span id="608" class="l"><a href="#608"> 608: </a>
+</span><span id="609" class="l"><a href="#609"> 609: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
+</span><span id="610" class="l"><a href="#610"> 610: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] === <span class="php-keyword1">FALSE</span>);
+</span><span id="611" class="l"><a href="#611"> 611: </a>
+</span><span id="612" class="l"><a href="#612"> 612: </a>        <span class="php-comment">// Use keys for this method?</span>
+</span><span id="613" class="l"><a href="#613"> 613: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] === <span class="php-keyword1">FALSE</span>);
+</span><span id="614" class="l"><a href="#614"> 614: </a>
+</span><span id="615" class="l"><a href="#615"> 615: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here</span>
+</span><span id="616" class="l"><a href="#616"> 616: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
+</span><span id="617" class="l"><a href="#617"> 617: </a>        {
+</span><span id="618" class="l"><a href="#618"> 618: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="619" class="l"><a href="#619"> 619: </a>            {
+</span><span id="620" class="l"><a href="#620"> 620: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="621" class="l"><a href="#621"> 621: </a>            }
+</span><span id="622" class="l"><a href="#622"> 622: </a>
+</span><span id="623" class="l"><a href="#623"> 623: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="624" class="l"><a href="#624"> 624: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="625" class="l"><a href="#625"> 625: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-keyword2">sprintf</span>(<span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_invalid_api_key'</span>), <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="626" class="l"><a href="#626"> 626: </a>                ], self::HTTP_FORBIDDEN);
+</span><span id="627" class="l"><a href="#627"> 627: </a>        }
+</span><span id="628" class="l"><a href="#628"> 628: </a>
+</span><span id="629" class="l"><a href="#629"> 629: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller</span>
+</span><span id="630" class="l"><a href="#630"> 630: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
+</span><span id="631" class="l"><a href="#631"> 631: </a>        {
+</span><span id="632" class="l"><a href="#632"> 632: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
 </span><span id="633" class="l"><a href="#633"> 633: </a>            {
-</span><span id="634" class="l"><a href="#634"> 634: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_time_limit'</span>)];
-</span><span id="635" class="l"><a href="#635"> 635: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
-</span><span id="636" class="l"><a href="#636"> 636: </a>            }
-</span><span id="637" class="l"><a href="#637"> 637: </a>
-</span><span id="638" class="l"><a href="#638"> 638: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
-</span><span id="639" class="l"><a href="#639"> 639: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
-</span><span id="640" class="l"><a href="#640"> 640: </a>
-</span><span id="641" class="l"><a href="#641"> 641: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
-</span><span id="642" class="l"><a href="#642"> 642: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
-</span><span id="643" class="l"><a href="#643"> 643: </a>
-</span><span id="644" class="l"><a href="#644"> 644: </a>            <span class="php-comment">// IM TELLIN!</span>
-</span><span id="645" class="l"><a href="#645"> 645: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="646" class="l"><a href="#646"> 646: </a>            {
-</span><span id="647" class="l"><a href="#647"> 647: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
-</span><span id="648" class="l"><a href="#648"> 648: </a>            }
-</span><span id="649" class="l"><a href="#649"> 649: </a>
-</span><span id="650" class="l"><a href="#650"> 650: </a>            <span class="php-comment">// They don't have good enough perms</span>
-</span><span id="651" class="l"><a href="#651"> 651: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_permissions'</span>)];
-</span><span id="652" class="l"><a href="#652"> 652: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
-</span><span id="653" class="l"><a href="#653"> 653: </a>        }
-</span><span id="654" class="l"><a href="#654"> 654: </a>
-</span><span id="655" class="l"><a href="#655"> 655: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
-</span><span id="656" class="l"><a href="#656"> 656: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="657" class="l"><a href="#657"> 657: </a>        {
-</span><span id="658" class="l"><a href="#658"> 658: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
-</span><span id="659" class="l"><a href="#659"> 659: </a>        }
-</span><span id="660" class="l"><a href="#660"> 660: </a>
-</span><span id="661" class="l"><a href="#661"> 661: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
-</span><span id="662" class="l"><a href="#662"> 662: </a>        <span class="php-keyword1">try</span>
-</span><span id="663" class="l"><a href="#663"> 663: </a>        {
-</span><span id="664" class="l"><a href="#664"> 664: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
-</span><span id="665" class="l"><a href="#665"> 665: </a>        }
-</span><span id="666" class="l"><a href="#666"> 666: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
-</span><span id="667" class="l"><a href="#667"> 667: </a>        {
-</span><span id="668" class="l"><a href="#668"> 668: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
-</span><span id="669" class="l"><a href="#669"> 669: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="670" class="l"><a href="#670"> 670: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="671" class="l"><a href="#671"> 671: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
-</span><span id="672" class="l"><a href="#672"> 672: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
-</span><span id="673" class="l"><a href="#673"> 673: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
-</span><span id="674" class="l"><a href="#674"> 674: </a>                    ]
-</span><span id="675" class="l"><a href="#675"> 675: </a>                ], self::HTTP_INTERNAL_SERVER_ERROR);
-</span><span id="676" class="l"><a href="#676"> 676: </a>        }
-</span><span id="677" class="l"><a href="#677"> 677: </a>    }
+</span><span id="634" class="l"><a href="#634"> 634: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="635" class="l"><a href="#635"> 635: </a>            }
+</span><span id="636" class="l"><a href="#636"> 636: </a>
+</span><span id="637" class="l"><a href="#637"> 637: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="638" class="l"><a href="#638"> 638: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="639" class="l"><a href="#639"> 639: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_unauthorized'</span>)
+</span><span id="640" class="l"><a href="#640"> 640: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="641" class="l"><a href="#641"> 641: </a>        }
+</span><span id="642" class="l"><a href="#642"> 642: </a>
+</span><span id="643" class="l"><a href="#643"> 643: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
+</span><span id="644" class="l"><a href="#644"> 644: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="645" class="l"><a href="#645"> 645: </a>        {
+</span><span id="646" class="l"><a href="#646"> 646: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="647" class="l"><a href="#647"> 647: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="648" class="l"><a href="#648"> 648: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unknown_method'</span>)
+</span><span id="649" class="l"><a href="#649"> 649: </a>                ], self::HTTP_NOT_FOUND);
+</span><span id="650" class="l"><a href="#650"> 650: </a>        }
+</span><span id="651" class="l"><a href="#651"> 651: </a>
+</span><span id="652" class="l"><a href="#652"> 652: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
+</span><span id="653" class="l"><a href="#653"> 653: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="654" class="l"><a href="#654"> 654: </a>        {
+</span><span id="655" class="l"><a href="#655"> 655: </a>            <span class="php-comment">// Check the limit</span>
+</span><span id="656" class="l"><a href="#656"> 656: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="657" class="l"><a href="#657"> 657: </a>            {
+</span><span id="658" class="l"><a href="#658"> 658: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_time_limit'</span>)];
+</span><span id="659" class="l"><a href="#659"> 659: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
+</span><span id="660" class="l"><a href="#660"> 660: </a>            }
+</span><span id="661" class="l"><a href="#661"> 661: </a>
+</span><span id="662" class="l"><a href="#662"> 662: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
+</span><span id="663" class="l"><a href="#663"> 663: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
+</span><span id="664" class="l"><a href="#664"> 664: </a>
+</span><span id="665" class="l"><a href="#665"> 665: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
+</span><span id="666" class="l"><a href="#666"> 666: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
+</span><span id="667" class="l"><a href="#667"> 667: </a>
+</span><span id="668" class="l"><a href="#668"> 668: </a>            <span class="php-comment">// IM TELLIN!</span>
+</span><span id="669" class="l"><a href="#669"> 669: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="670" class="l"><a href="#670"> 670: </a>            {
+</span><span id="671" class="l"><a href="#671"> 671: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
+</span><span id="672" class="l"><a href="#672"> 672: </a>            }
+</span><span id="673" class="l"><a href="#673"> 673: </a>
+</span><span id="674" class="l"><a href="#674"> 674: </a>            <span class="php-comment">// They don't have good enough perms</span>
+</span><span id="675" class="l"><a href="#675"> 675: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_permissions'</span>)];
+</span><span id="676" class="l"><a href="#676"> 676: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
+</span><span id="677" class="l"><a href="#677"> 677: </a>        }
 </span><span id="678" class="l"><a href="#678"> 678: </a>
-</span><span id="679" class="l"><a href="#679"> 679: </a>    <span class="php-comment">/**
-</span></span><span id="680" class="l"><a href="#680"> 680: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
-</span></span><span id="681" class="l"><a href="#681"> 681: </a><span class="php-comment">     *
-</span></span><span id="682" class="l"><a href="#682"> 682: </a><span class="php-comment">     * @access public
-</span></span><span id="683" class="l"><a href="#683"> 683: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
-</span></span><span id="684" class="l"><a href="#684"> 684: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
-</span></span><span id="685" class="l"><a href="#685"> 685: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
-</span></span><span id="686" class="l"><a href="#686"> 686: </a><span class="php-comment">     * running the script; otherwise, exit
-</span></span><span id="687" class="l"><a href="#687"> 687: </a><span class="php-comment">     */</span>
-</span><span id="688" class="l"><a href="#688"> 688: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="689" class="l"><a href="#689"> 689: </a>    {
-</span><span id="690" class="l"><a href="#690"> 690: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
-</span><span id="691" class="l"><a href="#691"> 691: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="692" class="l"><a href="#692"> 692: </a>        {
-</span><span id="693" class="l"><a href="#693"> 693: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
-</span><span id="694" class="l"><a href="#694"> 694: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
-</span><span id="695" class="l"><a href="#695"> 695: </a>        }
-</span><span id="696" class="l"><a href="#696"> 696: </a>
-</span><span id="697" class="l"><a href="#697"> 697: </a>        <span class="php-comment">// Set the output as NULL by default</span>
-</span><span id="698" class="l"><a href="#698"> 698: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="699" class="l"><a href="#699"> 699: </a>
-</span><span id="700" class="l"><a href="#700"> 700: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
-</span><span id="701" class="l"><a href="#701"> 701: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="702" class="l"><a href="#702"> 702: </a>        {
-</span><span id="703" class="l"><a href="#703"> 703: </a>            <span class="php-var">$http_code</span> = self::HTTP_NOT_FOUND;
-</span><span id="704" class="l"><a href="#704"> 704: </a>        }
-</span><span id="705" class="l"><a href="#705"> 705: </a>
-</span><span id="706" class="l"><a href="#706"> 706: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
-</span><span id="707" class="l"><a href="#707"> 707: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="708" class="l"><a href="#708"> 708: </a>        {
-</span><span id="709" class="l"><a href="#709"> 709: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
-</span><span id="710" class="l"><a href="#710"> 710: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
-</span><span id="711" class="l"><a href="#711"> 711: </a>            {
-</span><span id="712" class="l"><a href="#712"> 712: </a>                <span class="php-comment">// Set the format header</span>
-</span><span id="713" class="l"><a href="#713"> 713: </a>                <span class="php-var">$this</span>-&gt;output-&gt;set_content_type(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format], <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
-</span><span id="714" class="l"><a href="#714"> 714: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
-</span><span id="715" class="l"><a href="#715"> 715: </a>
-</span><span id="716" class="l"><a href="#716"> 716: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error.</span>
-</span><span id="717" class="l"><a href="#717"> 717: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
-</span><span id="718" class="l"><a href="#718"> 718: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
-</span><span id="719" class="l"><a href="#719"> 719: </a>                {
-</span><span id="720" class="l"><a href="#720"> 720: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="721" class="l"><a href="#721"> 721: </a>                }
-</span><span id="722" class="l"><a href="#722"> 722: </a>            }
-</span><span id="723" class="l"><a href="#723"> 723: </a>            <span class="php-keyword1">else</span>
-</span><span id="724" class="l"><a href="#724"> 724: </a>            {
-</span><span id="725" class="l"><a href="#725"> 725: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
-</span><span id="726" class="l"><a href="#726"> 726: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
-</span><span id="727" class="l"><a href="#727"> 727: </a>                {
-</span><span id="728" class="l"><a href="#728"> 728: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="729" class="l"><a href="#729"> 729: </a>                }
-</span><span id="730" class="l"><a href="#730"> 730: </a>
-</span><span id="731" class="l"><a href="#731"> 731: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
-</span><span id="732" class="l"><a href="#732"> 732: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
-</span><span id="733" class="l"><a href="#733"> 733: </a>            }
-</span><span id="734" class="l"><a href="#734"> 734: </a>        }
-</span><span id="735" class="l"><a href="#735"> 735: </a>
-</span><span id="736" class="l"><a href="#736"> 736: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
-</span><span id="737" class="l"><a href="#737"> 737: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
-</span><span id="738" class="l"><a href="#738"> 738: </a>        <span class="php-comment">// correct HTTP status code</span>
-</span><span id="739" class="l"><a href="#739"> 739: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = self::HTTP_OK;
-</span><span id="740" class="l"><a href="#740"> 740: </a>
-</span><span id="741" class="l"><a href="#741"> 741: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_status_header(<span class="php-var">$http_code</span>);
-</span><span id="742" class="l"><a href="#742"> 742: </a>
-</span><span id="743" class="l"><a href="#743"> 743: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
-</span><span id="744" class="l"><a href="#744"> 744: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="745" class="l"><a href="#745"> 745: </a>        {
-</span><span id="746" class="l"><a href="#746"> 746: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
-</span><span id="747" class="l"><a href="#747"> 747: </a>        }
-</span><span id="748" class="l"><a href="#748"> 748: </a>
-</span><span id="749" class="l"><a href="#749"> 749: </a>        <span class="php-comment">// Output the data</span>
-</span><span id="750" class="l"><a href="#750"> 750: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_output(<span class="php-var">$output</span>);
-</span><span id="751" class="l"><a href="#751"> 751: </a>
-</span><span id="752" class="l"><a href="#752"> 752: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="753" class="l"><a href="#753"> 753: </a>        {
-</span><span id="754" class="l"><a href="#754"> 754: </a>            <span class="php-comment">// Display the data and exit execution</span>
-</span><span id="755" class="l"><a href="#755"> 755: </a>            <span class="php-var">$this</span>-&gt;output-&gt;_display();
-</span><span id="756" class="l"><a href="#756"> 756: </a>            <span class="php-keyword1">exit</span>;
-</span><span id="757" class="l"><a href="#757"> 757: </a>        }
-</span><span id="758" class="l"><a href="#758"> 758: </a>
-</span><span id="759" class="l"><a href="#759"> 759: </a>        <span class="php-comment">// Otherwise dump the output automatically</span>
-</span><span id="760" class="l"><a href="#760"> 760: </a>    }
-</span><span id="761" class="l"><a href="#761"> 761: </a>
-</span><span id="762" class="l"><a href="#762"> 762: </a>    <span class="php-comment">/**
-</span></span><span id="763" class="l"><a href="#763"> 763: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
-</span></span><span id="764" class="l"><a href="#764"> 764: </a><span class="php-comment">     * within the buffers of the Output class. The response is sent to the client
-</span></span><span id="765" class="l"><a href="#765"> 765: </a><span class="php-comment">     * lately by the framework, after the current controller's method termination.
-</span></span><span id="766" class="l"><a href="#766"> 766: </a><span class="php-comment">     * All the hooks after the controller's method termination are executable.
-</span></span><span id="767" class="l"><a href="#767"> 767: </a><span class="php-comment">     *
-</span></span><span id="768" class="l"><a href="#768"> 768: </a><span class="php-comment">     * @access public
-</span></span><span id="769" class="l"><a href="#769"> 769: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
-</span></span><span id="770" class="l"><a href="#770"> 770: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
-</span></span><span id="771" class="l"><a href="#771"> 771: </a><span class="php-comment">     */</span>
-</span><span id="772" class="l"><a href="#772"> 772: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> set_response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="773" class="l"><a href="#773"> 773: </a>    {
-</span><span id="774" class="l"><a href="#774"> 774: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$data</span>, <span class="php-var">$http_code</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="775" class="l"><a href="#775"> 775: </a>    }
-</span><span id="776" class="l"><a href="#776"> 776: </a>
-</span><span id="777" class="l"><a href="#777"> 777: </a>    <span class="php-comment">/**
-</span></span><span id="778" class="l"><a href="#778"> 778: </a><span class="php-comment">     * Get the input format e.g. json or xml
-</span></span><span id="779" class="l"><a href="#779"> 779: </a><span class="php-comment">     *
-</span></span><span id="780" class="l"><a href="#780"> 780: </a><span class="php-comment">     * @access protected
-</span></span><span id="781" class="l"><a href="#781"> 781: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
-</span></span><span id="782" class="l"><a href="#782"> 782: </a><span class="php-comment">     */</span>
-</span><span id="783" class="l"><a href="#783"> 783: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
-</span><span id="784" class="l"><a href="#784"> 784: </a>    {
-</span><span id="785" class="l"><a href="#785"> 785: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
-</span><span id="786" class="l"><a href="#786"> 786: </a>        <span class="php-var">$content_type</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
-</span><span id="787" class="l"><a href="#787"> 787: </a>
-</span><span id="788" class="l"><a href="#788"> 788: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$content_type</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="789" class="l"><a href="#789"> 789: </a>        {
-</span><span id="790" class="l"><a href="#790"> 790: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="791" class="l"><a href="#791"> 791: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
-</span><span id="792" class="l"><a href="#792"> 792: </a>            {
-</span><span id="793" class="l"><a href="#793"> 793: </a>                <span class="php-comment">// $key = format e.g. csv</span>
-</span><span id="794" class="l"><a href="#794"> 794: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
-</span><span id="795" class="l"><a href="#795"> 795: </a>
-</span><span id="796" class="l"><a href="#796"> 796: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
-</span><span id="797" class="l"><a href="#797"> 797: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
-</span><span id="798" class="l"><a href="#798"> 798: </a>                <span class="php-var">$content_type</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$content_type</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$content_type</span>)) : <span class="php-var">$content_type</span>);
-</span><span id="799" class="l"><a href="#799"> 799: </a>
-</span><span id="800" class="l"><a href="#800"> 800: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
-</span><span id="801" class="l"><a href="#801"> 801: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$content_type</span> === <span class="php-var">$value</span>)
-</span><span id="802" class="l"><a href="#802"> 802: </a>                {
-</span><span id="803" class="l"><a href="#803"> 803: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
-</span><span id="804" class="l"><a href="#804"> 804: </a>                }
-</span><span id="805" class="l"><a href="#805"> 805: </a>            }
-</span><span id="806" class="l"><a href="#806"> 806: </a>        }
-</span><span id="807" class="l"><a href="#807"> 807: </a>
-</span><span id="808" class="l"><a href="#808"> 808: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="809" class="l"><a href="#809"> 809: </a>    }
-</span><span id="810" class="l"><a href="#810"> 810: </a>
-</span><span id="811" class="l"><a href="#811"> 811: </a>    <span class="php-comment">/**
-</span></span><span id="812" class="l"><a href="#812"> 812: </a><span class="php-comment">     * Detect which format should be used to output the data
-</span></span><span id="813" class="l"><a href="#813"> 813: </a><span class="php-comment">     *
-</span></span><span id="814" class="l"><a href="#814"> 814: </a><span class="php-comment">     * @access protected
-</span></span><span id="815" class="l"><a href="#815"> 815: </a><span class="php-comment">     * @return mixed|NULL|string Output format
-</span></span><span id="816" class="l"><a href="#816"> 816: </a><span class="php-comment">     */</span>
-</span><span id="817" class="l"><a href="#817"> 817: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
-</span><span id="818" class="l"><a href="#818"> 818: </a>    {
-</span><span id="819" class="l"><a href="#819"> 819: </a>        <span class="php-comment">// Concatenate formats to a regex pattern e.g. \.(csv|json|xml)</span>
-</span><span id="820" class="l"><a href="#820"> 820: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)) . <span class="php-quote">')($|\/)/'</span>;
-</span><span id="821" class="l"><a href="#821"> 821: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="822" class="l"><a href="#822"> 822: </a>
-</span><span id="823" class="l"><a href="#823"> 823: </a>        <span class="php-comment">// Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2</span>
-</span><span id="824" class="l"><a href="#824"> 824: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
-</span><span id="825" class="l"><a href="#825"> 825: </a>        {
-</span><span id="826" class="l"><a href="#826"> 826: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
-</span><span id="827" class="l"><a href="#827"> 827: </a>        }
-</span><span id="828" class="l"><a href="#828"> 828: </a>
-</span><span id="829" class="l"><a href="#829"> 829: </a>        <span class="php-comment">// Get the format parameter named as 'format'</span>
-</span><span id="830" class="l"><a href="#830"> 830: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]))
-</span><span id="831" class="l"><a href="#831"> 831: </a>        {
-</span><span id="832" class="l"><a href="#832"> 832: </a>            <span class="php-var">$format</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]);
-</span><span id="833" class="l"><a href="#833"> 833: </a>
-</span><span id="834" class="l"><a href="#834"> 834: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]) === <span class="php-keyword1">TRUE</span>)
-</span><span id="835" class="l"><a href="#835"> 835: </a>            {
-</span><span id="836" class="l"><a href="#836"> 836: </a>                <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="837" class="l"><a href="#837"> 837: </a>            }
-</span><span id="838" class="l"><a href="#838"> 838: </a>        }
-</span><span id="839" class="l"><a href="#839"> 839: </a>
-</span><span id="840" class="l"><a href="#840"> 840: </a>        <span class="php-comment">// Get the HTTP_ACCEPT server variable</span>
-</span><span id="841" class="l"><a href="#841"> 841: </a>        <span class="php-var">$http_accept</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>);
-</span><span id="842" class="l"><a href="#842"> 842: </a>
-</span><span id="843" class="l"><a href="#843"> 843: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT server variable</span>
-</span><span id="844" class="l"><a href="#844"> 844: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$http_accept</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="845" class="l"><a href="#845"> 845: </a>        {
-</span><span id="846" class="l"><a href="#846"> 846: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="847" class="l"><a href="#847"> 847: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
-</span><span id="848" class="l"><a href="#848"> 848: </a>            {
-</span><span id="849" class="l"><a href="#849"> 849: </a>                <span class="php-comment">// Has this format been requested?</span>
-</span><span id="850" class="l"><a href="#850"> 850: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="851" class="l"><a href="#851"> 851: </a>                {
-</span><span id="852" class="l"><a href="#852"> 852: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
-</span><span id="853" class="l"><a href="#853"> 853: </a>                    {
-</span><span id="854" class="l"><a href="#854"> 854: </a>                        <span class="php-comment">// If not HTML or XML assume it's correct</span>
-</span><span id="855" class="l"><a href="#855"> 855: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="856" class="l"><a href="#856"> 856: </a>                    }
-</span><span id="857" class="l"><a href="#857"> 857: </a>                    <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="858" class="l"><a href="#858"> 858: </a>                    {
-</span><span id="859" class="l"><a href="#859"> 859: </a>                        <span class="php-comment">// HTML or XML have shown up as a match</span>
-</span><span id="860" class="l"><a href="#860"> 860: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
-</span><span id="861" class="l"><a href="#861"> 861: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="862" class="l"><a href="#862"> 862: </a>                    }
-</span><span id="863" class="l"><a href="#863"> 863: </a>                    <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="864" class="l"><a href="#864"> 864: </a>                    {
-</span><span id="865" class="l"><a href="#865"> 865: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
-</span><span id="866" class="l"><a href="#866"> 866: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="867" class="l"><a href="#867"> 867: </a>                    }
-</span><span id="868" class="l"><a href="#868"> 868: </a>                }
-</span><span id="869" class="l"><a href="#869"> 869: </a>            }
-</span><span id="870" class="l"><a href="#870"> 870: </a>        }
+</span><span id="679" class="l"><a href="#679"> 679: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
+</span><span id="680" class="l"><a href="#680"> 680: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="681" class="l"><a href="#681"> 681: </a>        {
+</span><span id="682" class="l"><a href="#682"> 682: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
+</span><span id="683" class="l"><a href="#683"> 683: </a>        }
+</span><span id="684" class="l"><a href="#684"> 684: </a>
+</span><span id="685" class="l"><a href="#685"> 685: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
+</span><span id="686" class="l"><a href="#686"> 686: </a>        <span class="php-keyword1">try</span>
+</span><span id="687" class="l"><a href="#687"> 687: </a>        {
+</span><span id="688" class="l"><a href="#688"> 688: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
+</span><span id="689" class="l"><a href="#689"> 689: </a>        }
+</span><span id="690" class="l"><a href="#690"> 690: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
+</span><span id="691" class="l"><a href="#691"> 691: </a>        {
+</span><span id="692" class="l"><a href="#692"> 692: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
+</span><span id="693" class="l"><a href="#693"> 693: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="694" class="l"><a href="#694"> 694: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="695" class="l"><a href="#695"> 695: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
+</span><span id="696" class="l"><a href="#696"> 696: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
+</span><span id="697" class="l"><a href="#697"> 697: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
+</span><span id="698" class="l"><a href="#698"> 698: </a>                    ]
+</span><span id="699" class="l"><a href="#699"> 699: </a>                ], self::HTTP_INTERNAL_SERVER_ERROR);
+</span><span id="700" class="l"><a href="#700"> 700: </a>        }
+</span><span id="701" class="l"><a href="#701"> 701: </a>    }
+</span><span id="702" class="l"><a href="#702"> 702: </a>
+</span><span id="703" class="l"><a href="#703"> 703: </a>    <span class="php-comment">/**
+</span></span><span id="704" class="l"><a href="#704"> 704: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
+</span></span><span id="705" class="l"><a href="#705"> 705: </a><span class="php-comment">     *
+</span></span><span id="706" class="l"><a href="#706"> 706: </a><span class="php-comment">     * @access public
+</span></span><span id="707" class="l"><a href="#707"> 707: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
+</span></span><span id="708" class="l"><a href="#708"> 708: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
+</span></span><span id="709" class="l"><a href="#709"> 709: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
+</span></span><span id="710" class="l"><a href="#710"> 710: </a><span class="php-comment">     * running the script; otherwise, exit
+</span></span><span id="711" class="l"><a href="#711"> 711: </a><span class="php-comment">     */</span>
+</span><span id="712" class="l"><a href="#712"> 712: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="713" class="l"><a href="#713"> 713: </a>    {
+</span><span id="714" class="l"><a href="#714"> 714: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
+</span><span id="715" class="l"><a href="#715"> 715: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="716" class="l"><a href="#716"> 716: </a>        {
+</span><span id="717" class="l"><a href="#717"> 717: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
+</span><span id="718" class="l"><a href="#718"> 718: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
+</span><span id="719" class="l"><a href="#719"> 719: </a>        }
+</span><span id="720" class="l"><a href="#720"> 720: </a>
+</span><span id="721" class="l"><a href="#721"> 721: </a>        <span class="php-comment">// Set the output as NULL by default</span>
+</span><span id="722" class="l"><a href="#722"> 722: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="723" class="l"><a href="#723"> 723: </a>
+</span><span id="724" class="l"><a href="#724"> 724: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
+</span><span id="725" class="l"><a href="#725"> 725: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="726" class="l"><a href="#726"> 726: </a>        {
+</span><span id="727" class="l"><a href="#727"> 727: </a>            <span class="php-var">$http_code</span> = self::HTTP_NOT_FOUND;
+</span><span id="728" class="l"><a href="#728"> 728: </a>        }
+</span><span id="729" class="l"><a href="#729"> 729: </a>
+</span><span id="730" class="l"><a href="#730"> 730: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
+</span><span id="731" class="l"><a href="#731"> 731: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="732" class="l"><a href="#732"> 732: </a>        {
+</span><span id="733" class="l"><a href="#733"> 733: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
+</span><span id="734" class="l"><a href="#734"> 734: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
+</span><span id="735" class="l"><a href="#735"> 735: </a>            {
+</span><span id="736" class="l"><a href="#736"> 736: </a>                <span class="php-comment">// Set the format header</span>
+</span><span id="737" class="l"><a href="#737"> 737: </a>                <span class="php-var">$this</span>-&gt;output-&gt;set_content_type(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format], <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
+</span><span id="738" class="l"><a href="#738"> 738: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
+</span><span id="739" class="l"><a href="#739"> 739: </a>
+</span><span id="740" class="l"><a href="#740"> 740: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error</span>
+</span><span id="741" class="l"><a href="#741"> 741: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
+</span><span id="742" class="l"><a href="#742"> 742: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
+</span><span id="743" class="l"><a href="#743"> 743: </a>                {
+</span><span id="744" class="l"><a href="#744"> 744: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="745" class="l"><a href="#745"> 745: </a>                }
+</span><span id="746" class="l"><a href="#746"> 746: </a>            }
+</span><span id="747" class="l"><a href="#747"> 747: </a>            <span class="php-keyword1">else</span>
+</span><span id="748" class="l"><a href="#748"> 748: </a>            {
+</span><span id="749" class="l"><a href="#749"> 749: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
+</span><span id="750" class="l"><a href="#750"> 750: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
+</span><span id="751" class="l"><a href="#751"> 751: </a>                {
+</span><span id="752" class="l"><a href="#752"> 752: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="753" class="l"><a href="#753"> 753: </a>                }
+</span><span id="754" class="l"><a href="#754"> 754: </a>
+</span><span id="755" class="l"><a href="#755"> 755: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
+</span><span id="756" class="l"><a href="#756"> 756: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
+</span><span id="757" class="l"><a href="#757"> 757: </a>            }
+</span><span id="758" class="l"><a href="#758"> 758: </a>        }
+</span><span id="759" class="l"><a href="#759"> 759: </a>
+</span><span id="760" class="l"><a href="#760"> 760: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
+</span><span id="761" class="l"><a href="#761"> 761: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
+</span><span id="762" class="l"><a href="#762"> 762: </a>        <span class="php-comment">// correct HTTP status code</span>
+</span><span id="763" class="l"><a href="#763"> 763: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = self::HTTP_OK;
+</span><span id="764" class="l"><a href="#764"> 764: </a>
+</span><span id="765" class="l"><a href="#765"> 765: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_status_header(<span class="php-var">$http_code</span>);
+</span><span id="766" class="l"><a href="#766"> 766: </a>
+</span><span id="767" class="l"><a href="#767"> 767: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
+</span><span id="768" class="l"><a href="#768"> 768: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="769" class="l"><a href="#769"> 769: </a>        {
+</span><span id="770" class="l"><a href="#770"> 770: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
+</span><span id="771" class="l"><a href="#771"> 771: </a>        }
+</span><span id="772" class="l"><a href="#772"> 772: </a>
+</span><span id="773" class="l"><a href="#773"> 773: </a>        <span class="php-comment">// Output the data</span>
+</span><span id="774" class="l"><a href="#774"> 774: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_output(<span class="php-var">$output</span>);
+</span><span id="775" class="l"><a href="#775"> 775: </a>
+</span><span id="776" class="l"><a href="#776"> 776: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="777" class="l"><a href="#777"> 777: </a>        {
+</span><span id="778" class="l"><a href="#778"> 778: </a>            <span class="php-comment">// Display the data and exit execution</span>
+</span><span id="779" class="l"><a href="#779"> 779: </a>            <span class="php-var">$this</span>-&gt;output-&gt;_display();
+</span><span id="780" class="l"><a href="#780"> 780: </a>            <span class="php-keyword1">exit</span>;
+</span><span id="781" class="l"><a href="#781"> 781: </a>        }
+</span><span id="782" class="l"><a href="#782"> 782: </a>
+</span><span id="783" class="l"><a href="#783"> 783: </a>        <span class="php-comment">// Otherwise dump the output automatically</span>
+</span><span id="784" class="l"><a href="#784"> 784: </a>    }
+</span><span id="785" class="l"><a href="#785"> 785: </a>
+</span><span id="786" class="l"><a href="#786"> 786: </a>    <span class="php-comment">/**
+</span></span><span id="787" class="l"><a href="#787"> 787: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
+</span></span><span id="788" class="l"><a href="#788"> 788: </a><span class="php-comment">     * within the buffers of the Output class. The response is sent to the client
+</span></span><span id="789" class="l"><a href="#789"> 789: </a><span class="php-comment">     * lately by the framework, after the current controller's method termination.
+</span></span><span id="790" class="l"><a href="#790"> 790: </a><span class="php-comment">     * All the hooks after the controller's method termination are executable
+</span></span><span id="791" class="l"><a href="#791"> 791: </a><span class="php-comment">     *
+</span></span><span id="792" class="l"><a href="#792"> 792: </a><span class="php-comment">     * @access public
+</span></span><span id="793" class="l"><a href="#793"> 793: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
+</span></span><span id="794" class="l"><a href="#794"> 794: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
+</span></span><span id="795" class="l"><a href="#795"> 795: </a><span class="php-comment">     */</span>
+</span><span id="796" class="l"><a href="#796"> 796: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> set_response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="797" class="l"><a href="#797"> 797: </a>    {
+</span><span id="798" class="l"><a href="#798"> 798: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$data</span>, <span class="php-var">$http_code</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="799" class="l"><a href="#799"> 799: </a>    }
+</span><span id="800" class="l"><a href="#800"> 800: </a>
+</span><span id="801" class="l"><a href="#801"> 801: </a>    <span class="php-comment">/**
+</span></span><span id="802" class="l"><a href="#802"> 802: </a><span class="php-comment">     * Get the input format e.g. json or xml
+</span></span><span id="803" class="l"><a href="#803"> 803: </a><span class="php-comment">     *
+</span></span><span id="804" class="l"><a href="#804"> 804: </a><span class="php-comment">     * @access protected
+</span></span><span id="805" class="l"><a href="#805"> 805: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
+</span></span><span id="806" class="l"><a href="#806"> 806: </a><span class="php-comment">     */</span>
+</span><span id="807" class="l"><a href="#807"> 807: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
+</span><span id="808" class="l"><a href="#808"> 808: </a>    {
+</span><span id="809" class="l"><a href="#809"> 809: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
+</span><span id="810" class="l"><a href="#810"> 810: </a>        <span class="php-var">$content_type</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
+</span><span id="811" class="l"><a href="#811"> 811: </a>
+</span><span id="812" class="l"><a href="#812"> 812: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$content_type</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="813" class="l"><a href="#813"> 813: </a>        {
+</span><span id="814" class="l"><a href="#814"> 814: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="815" class="l"><a href="#815"> 815: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
+</span><span id="816" class="l"><a href="#816"> 816: </a>            {
+</span><span id="817" class="l"><a href="#817"> 817: </a>                <span class="php-comment">// $key = format e.g. csv</span>
+</span><span id="818" class="l"><a href="#818"> 818: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
+</span><span id="819" class="l"><a href="#819"> 819: </a>
+</span><span id="820" class="l"><a href="#820"> 820: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
+</span><span id="821" class="l"><a href="#821"> 821: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
+</span><span id="822" class="l"><a href="#822"> 822: </a>                <span class="php-var">$content_type</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$content_type</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$content_type</span>)) : <span class="php-var">$content_type</span>);
+</span><span id="823" class="l"><a href="#823"> 823: </a>
+</span><span id="824" class="l"><a href="#824"> 824: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
+</span><span id="825" class="l"><a href="#825"> 825: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$content_type</span> === <span class="php-var">$value</span>)
+</span><span id="826" class="l"><a href="#826"> 826: </a>                {
+</span><span id="827" class="l"><a href="#827"> 827: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
+</span><span id="828" class="l"><a href="#828"> 828: </a>                }
+</span><span id="829" class="l"><a href="#829"> 829: </a>            }
+</span><span id="830" class="l"><a href="#830"> 830: </a>        }
+</span><span id="831" class="l"><a href="#831"> 831: </a>
+</span><span id="832" class="l"><a href="#832"> 832: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="833" class="l"><a href="#833"> 833: </a>    }
+</span><span id="834" class="l"><a href="#834"> 834: </a>
+</span><span id="835" class="l"><a href="#835"> 835: </a>    <span class="php-comment">/**
+</span></span><span id="836" class="l"><a href="#836"> 836: </a><span class="php-comment">     * Gets the default format from the configuration. Fallbacks to 'json'
+</span></span><span id="837" class="l"><a href="#837"> 837: </a><span class="php-comment">     * if the corresponding configuration option $config['rest_default_format']
+</span></span><span id="838" class="l"><a href="#838"> 838: </a><span class="php-comment">     * is missing or is empty
+</span></span><span id="839" class="l"><a href="#839"> 839: </a><span class="php-comment">     *
+</span></span><span id="840" class="l"><a href="#840"> 840: </a><span class="php-comment">     * @access protected
+</span></span><span id="841" class="l"><a href="#841"> 841: </a><span class="php-comment">     * @return string The default supported input format
+</span></span><span id="842" class="l"><a href="#842"> 842: </a><span class="php-comment">     */</span>
+</span><span id="843" class="l"><a href="#843"> 843: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _get_default_output_format()
+</span><span id="844" class="l"><a href="#844"> 844: </a>    {
+</span><span id="845" class="l"><a href="#845"> 845: </a>        <span class="php-var">$default_format</span> = (string) <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
+</span><span id="846" class="l"><a href="#846"> 846: </a>        <span class="php-keyword1">return</span> <span class="php-var">$default_format</span> === <span class="php-quote">''</span> ? <span class="php-quote">'json'</span> : <span class="php-var">$default_format</span>;
+</span><span id="847" class="l"><a href="#847"> 847: </a>    }
+</span><span id="848" class="l"><a href="#848"> 848: </a>
+</span><span id="849" class="l"><a href="#849"> 849: </a>    <span class="php-comment">/**
+</span></span><span id="850" class="l"><a href="#850"> 850: </a><span class="php-comment">     * Detect which format should be used to output the data
+</span></span><span id="851" class="l"><a href="#851"> 851: </a><span class="php-comment">     *
+</span></span><span id="852" class="l"><a href="#852"> 852: </a><span class="php-comment">     * @access protected
+</span></span><span id="853" class="l"><a href="#853"> 853: </a><span class="php-comment">     * @return mixed|NULL|string Output format
+</span></span><span id="854" class="l"><a href="#854"> 854: </a><span class="php-comment">     */</span>
+</span><span id="855" class="l"><a href="#855"> 855: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
+</span><span id="856" class="l"><a href="#856"> 856: </a>    {
+</span><span id="857" class="l"><a href="#857"> 857: </a>        <span class="php-comment">// Concatenate formats to a regex pattern e.g. \.(csv|json|xml)</span>
+</span><span id="858" class="l"><a href="#858"> 858: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span>.<span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)).<span class="php-quote">')($|\/)/'</span>;
+</span><span id="859" class="l"><a href="#859"> 859: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="860" class="l"><a href="#860"> 860: </a>
+</span><span id="861" class="l"><a href="#861"> 861: </a>        <span class="php-comment">// Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2</span>
+</span><span id="862" class="l"><a href="#862"> 862: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
+</span><span id="863" class="l"><a href="#863"> 863: </a>        {
+</span><span id="864" class="l"><a href="#864"> 864: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
+</span><span id="865" class="l"><a href="#865"> 865: </a>        }
+</span><span id="866" class="l"><a href="#866"> 866: </a>
+</span><span id="867" class="l"><a href="#867"> 867: </a>        <span class="php-comment">// Get the format parameter named as 'format'</span>
+</span><span id="868" class="l"><a href="#868"> 868: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]))
+</span><span id="869" class="l"><a href="#869"> 869: </a>        {
+</span><span id="870" class="l"><a href="#870"> 870: </a>            <span class="php-var">$format</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]);
 </span><span id="871" class="l"><a href="#871"> 871: </a>
-</span><span id="872" class="l"><a href="#872"> 872: </a>        <span class="php-comment">// Check if the controller has a default format</span>
-</span><span id="873" class="l"><a href="#873"> 873: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
-</span><span id="874" class="l"><a href="#874"> 874: </a>        {
-</span><span id="875" class="l"><a href="#875"> 875: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
+</span><span id="872" class="l"><a href="#872"> 872: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]) === <span class="php-keyword1">TRUE</span>)
+</span><span id="873" class="l"><a href="#873"> 873: </a>            {
+</span><span id="874" class="l"><a href="#874"> 874: </a>                <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="875" class="l"><a href="#875"> 875: </a>            }
 </span><span id="876" class="l"><a href="#876"> 876: </a>        }
 </span><span id="877" class="l"><a href="#877"> 877: </a>
-</span><span id="878" class="l"><a href="#878"> 878: </a>        <span class="php-comment">// Obtain the default format from the configuration</span>
-</span><span id="879" class="l"><a href="#879"> 879: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
-</span><span id="880" class="l"><a href="#880"> 880: </a>    }
-</span><span id="881" class="l"><a href="#881"> 881: </a>
-</span><span id="882" class="l"><a href="#882"> 882: </a>    <span class="php-comment">/**
-</span></span><span id="883" class="l"><a href="#883"> 883: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
-</span></span><span id="884" class="l"><a href="#884"> 884: </a><span class="php-comment">     *
-</span></span><span id="885" class="l"><a href="#885"> 885: </a><span class="php-comment">     * @access protected
-</span></span><span id="886" class="l"><a href="#886"> 886: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
-</span></span><span id="887" class="l"><a href="#887"> 887: </a><span class="php-comment">     */</span>
-</span><span id="888" class="l"><a href="#888"> 888: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
-</span><span id="889" class="l"><a href="#889"> 889: </a>    {
-</span><span id="890" class="l"><a href="#890"> 890: </a>        <span class="php-comment">// Declare a variable to store the method</span>
-</span><span id="891" class="l"><a href="#891"> 891: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="892" class="l"><a href="#892"> 892: </a>
-</span><span id="893" class="l"><a href="#893"> 893: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
-</span><span id="894" class="l"><a href="#894"> 894: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="895" class="l"><a href="#895"> 895: </a>        {
-</span><span id="896" class="l"><a href="#896"> 896: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
-</span><span id="897" class="l"><a href="#897"> 897: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="898" class="l"><a href="#898"> 898: </a>            {
-</span><span id="899" class="l"><a href="#899"> 899: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
-</span><span id="900" class="l"><a href="#900"> 900: </a>            }
-</span><span id="901" class="l"><a href="#901"> 901: </a>
-</span><span id="902" class="l"><a href="#902"> 902: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
-</span><span id="903" class="l"><a href="#903"> 903: </a>        }
-</span><span id="904" class="l"><a href="#904"> 904: </a>
-</span><span id="905" class="l"><a href="#905"> 905: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
-</span><span id="906" class="l"><a href="#906"> 906: </a>        {
-</span><span id="907" class="l"><a href="#907"> 907: </a>            <span class="php-comment">// Get the request method as a lowercase string.</span>
-</span><span id="908" class="l"><a href="#908"> 908: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
-</span><span id="909" class="l"><a href="#909"> 909: </a>        }
-</span><span id="910" class="l"><a href="#910"> 910: </a>
-</span><span id="911" class="l"><a href="#911"> 911: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
-</span><span id="912" class="l"><a href="#912"> 912: </a>    }
-</span><span id="913" class="l"><a href="#913"> 913: </a>
-</span><span id="914" class="l"><a href="#914"> 914: </a>    <span class="php-comment">/**
-</span></span><span id="915" class="l"><a href="#915"> 915: </a><span class="php-comment">     * See if the user has provided an API key
-</span></span><span id="916" class="l"><a href="#916"> 916: </a><span class="php-comment">     *
-</span></span><span id="917" class="l"><a href="#917"> 917: </a><span class="php-comment">     * @access protected
-</span></span><span id="918" class="l"><a href="#918"> 918: </a><span class="php-comment">     * @return bool
-</span></span><span id="919" class="l"><a href="#919"> 919: </a><span class="php-comment">     */</span>
-</span><span id="920" class="l"><a href="#920"> 920: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
-</span><span id="921" class="l"><a href="#921"> 921: </a>    {
-</span><span id="922" class="l"><a href="#922"> 922: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
-</span><span id="923" class="l"><a href="#923"> 923: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
-</span><span id="924" class="l"><a href="#924"> 924: </a>
-</span><span id="925" class="l"><a href="#925"> 925: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
-</span><span id="926" class="l"><a href="#926"> 926: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
-</span><span id="927" class="l"><a href="#927"> 927: </a>
-</span><span id="928" class="l"><a href="#928"> 928: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="929" class="l"><a href="#929"> 929: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
-</span><span id="930" class="l"><a href="#930"> 930: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
-</span><span id="931" class="l"><a href="#931"> 931: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
-</span><span id="932" class="l"><a href="#932"> 932: </a>
-</span><span id="933" class="l"><a href="#933"> 933: </a>        <span class="php-comment">// Find the key from server or arguments</span>
-</span><span id="934" class="l"><a href="#934"> 934: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
-</span><span id="935" class="l"><a href="#935"> 935: </a>        {
-</span><span id="936" class="l"><a href="#936"> 936: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
-</span><span id="937" class="l"><a href="#937"> 937: </a>            {
-</span><span id="938" class="l"><a href="#938"> 938: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="939" class="l"><a href="#939"> 939: </a>            }
-</span><span id="940" class="l"><a href="#940"> 940: </a>
-</span><span id="941" class="l"><a href="#941"> 941: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
+</span><span id="878" class="l"><a href="#878"> 878: </a>        <span class="php-comment">// Get the HTTP_ACCEPT server variable</span>
+</span><span id="879" class="l"><a href="#879"> 879: </a>        <span class="php-var">$http_accept</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>);
+</span><span id="880" class="l"><a href="#880"> 880: </a>
+</span><span id="881" class="l"><a href="#881"> 881: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT server variable</span>
+</span><span id="882" class="l"><a href="#882"> 882: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$http_accept</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="883" class="l"><a href="#883"> 883: </a>        {
+</span><span id="884" class="l"><a href="#884"> 884: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="885" class="l"><a href="#885"> 885: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
+</span><span id="886" class="l"><a href="#886"> 886: </a>            {
+</span><span id="887" class="l"><a href="#887"> 887: </a>                <span class="php-comment">// Has this format been requested?</span>
+</span><span id="888" class="l"><a href="#888"> 888: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="889" class="l"><a href="#889"> 889: </a>                {
+</span><span id="890" class="l"><a href="#890"> 890: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
+</span><span id="891" class="l"><a href="#891"> 891: </a>                    {
+</span><span id="892" class="l"><a href="#892"> 892: </a>                        <span class="php-comment">// If not HTML or XML assume it's correct</span>
+</span><span id="893" class="l"><a href="#893"> 893: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="894" class="l"><a href="#894"> 894: </a>                    }
+</span><span id="895" class="l"><a href="#895"> 895: </a>                    <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="896" class="l"><a href="#896"> 896: </a>                    {
+</span><span id="897" class="l"><a href="#897"> 897: </a>                        <span class="php-comment">// HTML or XML have shown up as a match</span>
+</span><span id="898" class="l"><a href="#898"> 898: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
+</span><span id="899" class="l"><a href="#899"> 899: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="900" class="l"><a href="#900"> 900: </a>                    }
+</span><span id="901" class="l"><a href="#901"> 901: </a>                    <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="902" class="l"><a href="#902"> 902: </a>                    {
+</span><span id="903" class="l"><a href="#903"> 903: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
+</span><span id="904" class="l"><a href="#904"> 904: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="905" class="l"><a href="#905"> 905: </a>                    }
+</span><span id="906" class="l"><a href="#906"> 906: </a>                }
+</span><span id="907" class="l"><a href="#907"> 907: </a>            }
+</span><span id="908" class="l"><a href="#908"> 908: </a>        }
+</span><span id="909" class="l"><a href="#909"> 909: </a>
+</span><span id="910" class="l"><a href="#910"> 910: </a>        <span class="php-comment">// Check if the controller has a default format</span>
+</span><span id="911" class="l"><a href="#911"> 911: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
+</span><span id="912" class="l"><a href="#912"> 912: </a>        {
+</span><span id="913" class="l"><a href="#913"> 913: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
+</span><span id="914" class="l"><a href="#914"> 914: </a>        }
+</span><span id="915" class="l"><a href="#915"> 915: </a>
+</span><span id="916" class="l"><a href="#916"> 916: </a>        <span class="php-comment">// Obtain the default format from the configuration</span>
+</span><span id="917" class="l"><a href="#917"> 917: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_default_output_format();
+</span><span id="918" class="l"><a href="#918"> 918: </a>    }
+</span><span id="919" class="l"><a href="#919"> 919: </a>
+</span><span id="920" class="l"><a href="#920"> 920: </a>    <span class="php-comment">/**
+</span></span><span id="921" class="l"><a href="#921"> 921: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
+</span></span><span id="922" class="l"><a href="#922"> 922: </a><span class="php-comment">     *
+</span></span><span id="923" class="l"><a href="#923"> 923: </a><span class="php-comment">     * @access protected
+</span></span><span id="924" class="l"><a href="#924"> 924: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
+</span></span><span id="925" class="l"><a href="#925"> 925: </a><span class="php-comment">     */</span>
+</span><span id="926" class="l"><a href="#926"> 926: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
+</span><span id="927" class="l"><a href="#927"> 927: </a>    {
+</span><span id="928" class="l"><a href="#928"> 928: </a>        <span class="php-comment">// Declare a variable to store the method</span>
+</span><span id="929" class="l"><a href="#929"> 929: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="930" class="l"><a href="#930"> 930: </a>
+</span><span id="931" class="l"><a href="#931"> 931: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
+</span><span id="932" class="l"><a href="#932"> 932: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="933" class="l"><a href="#933"> 933: </a>        {
+</span><span id="934" class="l"><a href="#934"> 934: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
+</span><span id="935" class="l"><a href="#935"> 935: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="936" class="l"><a href="#936"> 936: </a>            {
+</span><span id="937" class="l"><a href="#937"> 937: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
+</span><span id="938" class="l"><a href="#938"> 938: </a>            }
+</span><span id="939" class="l"><a href="#939"> 939: </a>
+</span><span id="940" class="l"><a href="#940"> 940: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
+</span><span id="941" class="l"><a href="#941"> 941: </a>        }
 </span><span id="942" class="l"><a href="#942"> 942: </a>
-</span><span id="943" class="l"><a href="#943"> 943: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
-</span><span id="944" class="l"><a href="#944"> 944: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
-</span><span id="945" class="l"><a href="#945"> 945: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
-</span><span id="946" class="l"><a href="#946"> 946: </a>
-</span><span id="947" class="l"><a href="#947"> 947: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
+</span><span id="943" class="l"><a href="#943"> 943: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
+</span><span id="944" class="l"><a href="#944"> 944: </a>        {
+</span><span id="945" class="l"><a href="#945"> 945: </a>            <span class="php-comment">// Get the request method as a lowercase string</span>
+</span><span id="946" class="l"><a href="#946"> 946: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
+</span><span id="947" class="l"><a href="#947"> 947: </a>        }
 </span><span id="948" class="l"><a href="#948"> 948: </a>
-</span><span id="949" class="l"><a href="#949"> 949: </a>            <span class="php-comment">/*
-</span></span><span id="950" class="l"><a href="#950"> 950: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
-</span></span><span id="951" class="l"><a href="#951"> 951: </a><span class="php-comment">             * of valid ip addresses stored in the database.
-</span></span><span id="952" class="l"><a href="#952"> 952: </a><span class="php-comment">             */</span>
-</span><span id="953" class="l"><a href="#953"> 953: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
-</span><span id="954" class="l"><a href="#954"> 954: </a>            {
-</span><span id="955" class="l"><a href="#955"> 955: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
-</span><span id="956" class="l"><a href="#956"> 956: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
-</span><span id="957" class="l"><a href="#957"> 957: </a>                {
-</span><span id="958" class="l"><a href="#958"> 958: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
-</span><span id="959" class="l"><a href="#959"> 959: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
-</span><span id="960" class="l"><a href="#960"> 960: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
-</span><span id="961" class="l"><a href="#961"> 961: </a>
-</span><span id="962" class="l"><a href="#962"> 962: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
-</span><span id="963" class="l"><a href="#963"> 963: </a>                    {
-</span><span id="964" class="l"><a href="#964"> 964: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() === <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
-</span><span id="965" class="l"><a href="#965"> 965: </a>                        {
-</span><span id="966" class="l"><a href="#966"> 966: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
-</span><span id="967" class="l"><a href="#967"> 967: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
-</span><span id="968" class="l"><a href="#968"> 968: </a>                            <span class="php-keyword1">break</span>;
-</span><span id="969" class="l"><a href="#969"> 969: </a>                        }
-</span><span id="970" class="l"><a href="#970"> 970: </a>                    }
-</span><span id="971" class="l"><a href="#971"> 971: </a>
-</span><span id="972" class="l"><a href="#972"> 972: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
-</span><span id="973" class="l"><a href="#973"> 973: </a>                }
-</span><span id="974" class="l"><a href="#974"> 974: </a>                <span class="php-keyword1">else</span>
-</span><span id="975" class="l"><a href="#975"> 975: </a>                {
-</span><span id="976" class="l"><a href="#976"> 976: </a>                    <span class="php-comment">// There should be at least one IP address for this private key.</span>
-</span><span id="977" class="l"><a href="#977"> 977: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="978" class="l"><a href="#978"> 978: </a>                }
-</span><span id="979" class="l"><a href="#979"> 979: </a>            }
+</span><span id="949" class="l"><a href="#949"> 949: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
+</span><span id="950" class="l"><a href="#950"> 950: </a>    }
+</span><span id="951" class="l"><a href="#951"> 951: </a>
+</span><span id="952" class="l"><a href="#952"> 952: </a>    <span class="php-comment">/**
+</span></span><span id="953" class="l"><a href="#953"> 953: </a><span class="php-comment">     * See if the user has provided an API key
+</span></span><span id="954" class="l"><a href="#954"> 954: </a><span class="php-comment">     *
+</span></span><span id="955" class="l"><a href="#955"> 955: </a><span class="php-comment">     * @access protected
+</span></span><span id="956" class="l"><a href="#956"> 956: </a><span class="php-comment">     * @return bool
+</span></span><span id="957" class="l"><a href="#957"> 957: </a><span class="php-comment">     */</span>
+</span><span id="958" class="l"><a href="#958"> 958: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
+</span><span id="959" class="l"><a href="#959"> 959: </a>    {
+</span><span id="960" class="l"><a href="#960"> 960: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
+</span><span id="961" class="l"><a href="#961"> 961: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
+</span><span id="962" class="l"><a href="#962"> 962: </a>
+</span><span id="963" class="l"><a href="#963"> 963: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
+</span><span id="964" class="l"><a href="#964"> 964: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
+</span><span id="965" class="l"><a href="#965"> 965: </a>
+</span><span id="966" class="l"><a href="#966"> 966: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="967" class="l"><a href="#967"> 967: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
+</span><span id="968" class="l"><a href="#968"> 968: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
+</span><span id="969" class="l"><a href="#969"> 969: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
+</span><span id="970" class="l"><a href="#970"> 970: </a>
+</span><span id="971" class="l"><a href="#971"> 971: </a>        <span class="php-comment">// Find the key from server or arguments</span>
+</span><span id="972" class="l"><a href="#972"> 972: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
+</span><span id="973" class="l"><a href="#973"> 973: </a>        {
+</span><span id="974" class="l"><a href="#974"> 974: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
+</span><span id="975" class="l"><a href="#975"> 975: </a>            {
+</span><span id="976" class="l"><a href="#976"> 976: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="977" class="l"><a href="#977"> 977: </a>            }
+</span><span id="978" class="l"><a href="#978"> 978: </a>
+</span><span id="979" class="l"><a href="#979"> 979: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
 </span><span id="980" class="l"><a href="#980"> 980: </a>
-</span><span id="981" class="l"><a href="#981"> 981: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="982" class="l"><a href="#982"> 982: </a>        }
-</span><span id="983" class="l"><a href="#983"> 983: </a>
-</span><span id="984" class="l"><a href="#984"> 984: </a>        <span class="php-comment">// No key has been sent</span>
-</span><span id="985" class="l"><a href="#985"> 985: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="986" class="l"><a href="#986"> 986: </a>    }
-</span><span id="987" class="l"><a href="#987"> 987: </a>
-</span><span id="988" class="l"><a href="#988"> 988: </a>    <span class="php-comment">/**
-</span></span><span id="989" class="l"><a href="#989"> 989: </a><span class="php-comment">     * Preferred return language
-</span></span><span id="990" class="l"><a href="#990"> 990: </a><span class="php-comment">     *
-</span></span><span id="991" class="l"><a href="#991"> 991: </a><span class="php-comment">     * @access protected
-</span></span><span id="992" class="l"><a href="#992"> 992: </a><span class="php-comment">     * @return string|NULL The language code
-</span></span><span id="993" class="l"><a href="#993"> 993: </a><span class="php-comment">     */</span>
-</span><span id="994" class="l"><a href="#994"> 994: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
-</span><span id="995" class="l"><a href="#995"> 995: </a>    {
-</span><span id="996" class="l"><a href="#996"> 996: </a>        <span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>);
-</span><span id="997" class="l"><a href="#997"> 997: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$lang</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="998" class="l"><a href="#998"> 998: </a>        {
-</span><span id="999" class="l"><a href="#999"> 999: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="1000" class="l"><a href="#1000">1000: </a>        }
-</span><span id="1001" class="l"><a href="#1001">1001: </a>
-</span><span id="1002" class="l"><a href="#1002">1002: </a>        <span class="php-comment">// It appears more than one language has been sent using a comma delimiter</span>
-</span><span id="1003" class="l"><a href="#1003">1003: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="1004" class="l"><a href="#1004">1004: </a>        {
-</span><span id="1005" class="l"><a href="#1005">1005: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
-</span><span id="1006" class="l"><a href="#1006">1006: </a>
-</span><span id="1007" class="l"><a href="#1007">1007: </a>            <span class="php-var">$return_langs</span> = [];
-</span><span id="1008" class="l"><a href="#1008">1008: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
-</span><span id="1009" class="l"><a href="#1009">1009: </a>            {
-</span><span id="1010" class="l"><a href="#1010">1010: </a>                <span class="php-comment">// Remove weight and trim leading and trailing whitespace</span>
-</span><span id="1011" class="l"><a href="#1011">1011: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
-</span><span id="1012" class="l"><a href="#1012">1012: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
-</span><span id="1013" class="l"><a href="#1013">1013: </a>            }
-</span><span id="1014" class="l"><a href="#1014">1014: </a>
-</span><span id="1015" class="l"><a href="#1015">1015: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
-</span><span id="1016" class="l"><a href="#1016">1016: </a>        }
-</span><span id="1017" class="l"><a href="#1017">1017: </a>
-</span><span id="1018" class="l"><a href="#1018">1018: </a>        <span class="php-comment">// Otherwise simply return as a string</span>
-</span><span id="1019" class="l"><a href="#1019">1019: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
-</span><span id="1020" class="l"><a href="#1020">1020: </a>    }
+</span><span id="981" class="l"><a href="#981"> 981: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
+</span><span id="982" class="l"><a href="#982"> 982: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
+</span><span id="983" class="l"><a href="#983"> 983: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
+</span><span id="984" class="l"><a href="#984"> 984: </a>
+</span><span id="985" class="l"><a href="#985"> 985: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
+</span><span id="986" class="l"><a href="#986"> 986: </a>
+</span><span id="987" class="l"><a href="#987"> 987: </a>            <span class="php-comment">/*
+</span></span><span id="988" class="l"><a href="#988"> 988: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
+</span></span><span id="989" class="l"><a href="#989"> 989: </a><span class="php-comment">             * of valid ip addresses stored in the database
+</span></span><span id="990" class="l"><a href="#990"> 990: </a><span class="php-comment">             */</span>
+</span><span id="991" class="l"><a href="#991"> 991: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
+</span><span id="992" class="l"><a href="#992"> 992: </a>            {
+</span><span id="993" class="l"><a href="#993"> 993: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
+</span><span id="994" class="l"><a href="#994"> 994: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
+</span><span id="995" class="l"><a href="#995"> 995: </a>                {
+</span><span id="996" class="l"><a href="#996"> 996: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
+</span><span id="997" class="l"><a href="#997"> 997: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
+</span><span id="998" class="l"><a href="#998"> 998: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
+</span><span id="999" class="l"><a href="#999"> 999: </a>
+</span><span id="1000" class="l"><a href="#1000">1000: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
+</span><span id="1001" class="l"><a href="#1001">1001: </a>                    {
+</span><span id="1002" class="l"><a href="#1002">1002: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() === <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
+</span><span id="1003" class="l"><a href="#1003">1003: </a>                        {
+</span><span id="1004" class="l"><a href="#1004">1004: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
+</span><span id="1005" class="l"><a href="#1005">1005: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
+</span><span id="1006" class="l"><a href="#1006">1006: </a>                            <span class="php-keyword1">break</span>;
+</span><span id="1007" class="l"><a href="#1007">1007: </a>                        }
+</span><span id="1008" class="l"><a href="#1008">1008: </a>                    }
+</span><span id="1009" class="l"><a href="#1009">1009: </a>
+</span><span id="1010" class="l"><a href="#1010">1010: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
+</span><span id="1011" class="l"><a href="#1011">1011: </a>                }
+</span><span id="1012" class="l"><a href="#1012">1012: </a>                <span class="php-keyword1">else</span>
+</span><span id="1013" class="l"><a href="#1013">1013: </a>                {
+</span><span id="1014" class="l"><a href="#1014">1014: </a>                    <span class="php-comment">// There should be at least one IP address for this private key</span>
+</span><span id="1015" class="l"><a href="#1015">1015: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1016" class="l"><a href="#1016">1016: </a>                }
+</span><span id="1017" class="l"><a href="#1017">1017: </a>            }
+</span><span id="1018" class="l"><a href="#1018">1018: </a>
+</span><span id="1019" class="l"><a href="#1019">1019: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1020" class="l"><a href="#1020">1020: </a>        }
 </span><span id="1021" class="l"><a href="#1021">1021: </a>
-</span><span id="1022" class="l"><a href="#1022">1022: </a>    <span class="php-comment">/**
-</span></span><span id="1023" class="l"><a href="#1023">1023: </a><span class="php-comment">     * Add the request to the log table
-</span></span><span id="1024" class="l"><a href="#1024">1024: </a><span class="php-comment">     *
-</span></span><span id="1025" class="l"><a href="#1025">1025: </a><span class="php-comment">     * @access protected
-</span></span><span id="1026" class="l"><a href="#1026">1026: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
-</span></span><span id="1027" class="l"><a href="#1027">1027: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
-</span></span><span id="1028" class="l"><a href="#1028">1028: </a><span class="php-comment">     */</span>
-</span><span id="1029" class="l"><a href="#1029">1029: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1030" class="l"><a href="#1030">1030: </a>    {
-</span><span id="1031" class="l"><a href="#1031">1031: </a>        <span class="php-comment">// Insert the request into the log table</span>
-</span><span id="1032" class="l"><a href="#1032">1032: </a>        <span class="php-var">$is_inserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1033" class="l"><a href="#1033">1033: </a>            -&gt;insert(
-</span><span id="1034" class="l"><a href="#1034">1034: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
-</span><span id="1035" class="l"><a href="#1035">1035: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
-</span><span id="1036" class="l"><a href="#1036">1036: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
-</span><span id="1037" class="l"><a href="#1037">1037: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
-</span><span id="1038" class="l"><a href="#1038">1038: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="1039" class="l"><a href="#1039">1039: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
-</span><span id="1040" class="l"><a href="#1040">1040: </a>                <span class="php-quote">'time'</span> =&gt; now(), <span class="php-comment">// Used to be: function_exists('now') ? now() : time()</span>
-</span><span id="1041" class="l"><a href="#1041">1041: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
-</span><span id="1042" class="l"><a href="#1042">1042: </a>            ]);
-</span><span id="1043" class="l"><a href="#1043">1043: </a>
-</span><span id="1044" class="l"><a href="#1044">1044: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
-</span><span id="1045" class="l"><a href="#1045">1045: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
-</span><span id="1046" class="l"><a href="#1046">1046: </a>
-</span><span id="1047" class="l"><a href="#1047">1047: </a>        <span class="php-keyword1">return</span> <span class="php-var">$is_inserted</span>;
-</span><span id="1048" class="l"><a href="#1048">1048: </a>    }
-</span><span id="1049" class="l"><a href="#1049">1049: </a>
-</span><span id="1050" class="l"><a href="#1050">1050: </a>    <span class="php-comment">/**
-</span></span><span id="1051" class="l"><a href="#1051">1051: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
-</span></span><span id="1052" class="l"><a href="#1052">1052: </a><span class="php-comment">     *
-</span></span><span id="1053" class="l"><a href="#1053">1053: </a><span class="php-comment">     * @access protected
-</span></span><span id="1054" class="l"><a href="#1054">1054: </a><span class="php-comment">     * @param  string $controller_method The method being called
-</span></span><span id="1055" class="l"><a href="#1055">1055: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
-</span></span><span id="1056" class="l"><a href="#1056">1056: </a><span class="php-comment">     */</span>
-</span><span id="1057" class="l"><a href="#1057">1057: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
-</span><span id="1058" class="l"><a href="#1058">1058: </a>    {
-</span><span id="1059" class="l"><a href="#1059">1059: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
-</span><span id="1060" class="l"><a href="#1060">1060: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1061" class="l"><a href="#1061">1061: </a>        {
-</span><span id="1062" class="l"><a href="#1062">1062: </a>            <span class="php-comment">// Everything is fine</span>
-</span><span id="1063" class="l"><a href="#1063">1063: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1064" class="l"><a href="#1064">1064: </a>        }
-</span><span id="1065" class="l"><a href="#1065">1065: </a>
-</span><span id="1066" class="l"><a href="#1066">1066: </a>        <span class="php-keyword1">switch</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_method'</span>))
-</span><span id="1067" class="l"><a href="#1067">1067: </a>        {
-</span><span id="1068" class="l"><a href="#1068">1068: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'API_KEY'</span>:
-</span><span id="1069" class="l"><a href="#1069">1069: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'api-key:'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>);
-</span><span id="1070" class="l"><a href="#1070">1070: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>;
-</span><span id="1071" class="l"><a href="#1071">1071: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1072" class="l"><a href="#1072">1072: </a>
-</span><span id="1073" class="l"><a href="#1073">1073: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'METHOD_NAME'</span>:
-</span><span id="1074" class="l"><a href="#1074">1074: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'method-name:'</span> . <span class="php-var">$controller_method</span>;
-</span><span id="1075" class="l"><a href="#1075">1075: </a>            <span class="php-var">$limited_method_name</span> =  <span class="php-var">$controller_method</span>;
-</span><span id="1076" class="l"><a href="#1076">1076: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1077" class="l"><a href="#1077">1077: </a>
-</span><span id="1078" class="l"><a href="#1078">1078: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'ROUTED_URL'</span>:
-</span><span id="1079" class="l"><a href="#1079">1079: </a>          <span class="php-keyword1">default</span>:
-</span><span id="1080" class="l"><a href="#1080">1080: </a>            <span class="php-var">$limited_uri</span> = <span class="php-var">$this</span>-&gt;uri-&gt;ruri_string();
-</span><span id="1081" class="l"><a href="#1081">1081: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$limited_uri</span>), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
-</span><span id="1082" class="l"><a href="#1082">1082: </a>            {
-</span><span id="1083" class="l"><a href="#1083">1083: </a>                <span class="php-var">$limited_uri</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$limited_uri</span>,<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format) - <span class="php-num">1</span>);
-</span><span id="1084" class="l"><a href="#1084">1084: </a>            }
-</span><span id="1085" class="l"><a href="#1085">1085: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'uri:'</span> . <span class="php-var">$limited_uri</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method; <span class="php-comment">// It's good to differentiate GET from PUT</span>
-</span><span id="1086" class="l"><a href="#1086">1086: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-var">$controller_method</span>;
-</span><span id="1087" class="l"><a href="#1087">1087: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1088" class="l"><a href="#1088">1088: </a>        }
-</span><span id="1089" class="l"><a href="#1089">1089: </a>
-</span><span id="1090" class="l"><a href="#1090">1090: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span> )
-</span><span id="1091" class="l"><a href="#1091">1091: </a>        {
-</span><span id="1092" class="l"><a href="#1092">1092: </a>            <span class="php-comment">// Everything is fine</span>
-</span><span id="1093" class="l"><a href="#1093">1093: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1094" class="l"><a href="#1094">1094: </a>        }
-</span><span id="1095" class="l"><a href="#1095">1095: </a>
-</span><span id="1096" class="l"><a href="#1096">1096: </a>        <span class="php-comment">// How many times can you get to this method in a defined time_limit (default: 1 hour)?</span>
-</span><span id="1097" class="l"><a href="#1097">1097: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>];
-</span><span id="1098" class="l"><a href="#1098">1098: </a>
-</span><span id="1099" class="l"><a href="#1099">1099: </a>        <span class="php-var">$time_limit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>] : <span class="php-num">3600</span>); <span class="php-comment">// 3600 = 60 * 60</span>
-</span><span id="1100" class="l"><a href="#1100">1100: </a>
-</span><span id="1101" class="l"><a href="#1101">1101: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
-</span><span id="1102" class="l"><a href="#1102">1102: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1103" class="l"><a href="#1103">1103: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1104" class="l"><a href="#1104">1104: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1105" class="l"><a href="#1105">1105: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
-</span><span id="1106" class="l"><a href="#1106">1106: </a>            -&gt;row();
-</span><span id="1107" class="l"><a href="#1107">1107: </a>
-</span><span id="1108" class="l"><a href="#1108">1108: </a>        <span class="php-comment">// No calls have been made for this key</span>
-</span><span id="1109" class="l"><a href="#1109">1109: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1110" class="l"><a href="#1110">1110: </a>        {
-</span><span id="1111" class="l"><a href="#1111">1111: </a>            <span class="php-comment">// Create a new row for the following key</span>
-</span><span id="1112" class="l"><a href="#1112">1112: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
-</span><span id="1113" class="l"><a href="#1113">1113: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$limited_uri</span>,
-</span><span id="1114" class="l"><a href="#1114">1114: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="1115" class="l"><a href="#1115">1115: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
-</span><span id="1116" class="l"><a href="#1116">1116: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
-</span><span id="1117" class="l"><a href="#1117">1117: </a>            ]);
-</span><span id="1118" class="l"><a href="#1118">1118: </a>        }
-</span><span id="1119" class="l"><a href="#1119">1119: </a>
-</span><span id="1120" class="l"><a href="#1120">1120: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
-</span><span id="1121" class="l"><a href="#1121">1121: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$time_limit</span>))
-</span><span id="1122" class="l"><a href="#1122">1122: </a>        {
-</span><span id="1123" class="l"><a href="#1123">1123: </a>            <span class="php-comment">// Reset the started period and count</span>
-</span><span id="1124" class="l"><a href="#1124">1124: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1125" class="l"><a href="#1125">1125: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1126" class="l"><a href="#1126">1126: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
-</span><span id="1127" class="l"><a href="#1127">1127: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
-</span><span id="1128" class="l"><a href="#1128">1128: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
-</span><span id="1129" class="l"><a href="#1129">1129: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1130" class="l"><a href="#1130">1130: </a>        }
-</span><span id="1131" class="l"><a href="#1131">1131: </a>
-</span><span id="1132" class="l"><a href="#1132">1132: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
-</span><span id="1133" class="l"><a href="#1133">1133: </a>        <span class="php-keyword1">else</span>
-</span><span id="1134" class="l"><a href="#1134">1134: </a>        {
-</span><span id="1135" class="l"><a href="#1135">1135: </a>            <span class="php-comment">// The limit has been exceeded</span>
-</span><span id="1136" class="l"><a href="#1136">1136: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
-</span><span id="1137" class="l"><a href="#1137">1137: </a>            {
-</span><span id="1138" class="l"><a href="#1138">1138: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1139" class="l"><a href="#1139">1139: </a>            }
-</span><span id="1140" class="l"><a href="#1140">1140: </a>
-</span><span id="1141" class="l"><a href="#1141">1141: </a>            <span class="php-comment">// Increase the count by one</span>
-</span><span id="1142" class="l"><a href="#1142">1142: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1143" class="l"><a href="#1143">1143: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1144" class="l"><a href="#1144">1144: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1145" class="l"><a href="#1145">1145: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
-</span><span id="1146" class="l"><a href="#1146">1146: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1147" class="l"><a href="#1147">1147: </a>        }
-</span><span id="1148" class="l"><a href="#1148">1148: </a>
-</span><span id="1149" class="l"><a href="#1149">1149: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1150" class="l"><a href="#1150">1150: </a>    }
-</span><span id="1151" class="l"><a href="#1151">1151: </a>
-</span><span id="1152" class="l"><a href="#1152">1152: </a>    <span class="php-comment">/**
-</span></span><span id="1153" class="l"><a href="#1153">1153: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method/HTTP-method being called
-</span></span><span id="1154" class="l"><a href="#1154">1154: </a><span class="php-comment">     *
-</span></span><span id="1155" class="l"><a href="#1155">1155: </a><span class="php-comment">     * @access protected
-</span></span><span id="1156" class="l"><a href="#1156">1156: </a><span class="php-comment">     * @return bool
-</span></span><span id="1157" class="l"><a href="#1157">1157: </a><span class="php-comment">     */</span>
-</span><span id="1158" class="l"><a href="#1158">1158: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
-</span><span id="1159" class="l"><a href="#1159">1159: </a>    {
-</span><span id="1160" class="l"><a href="#1160">1160: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
-</span><span id="1161" class="l"><a href="#1161">1161: </a>        <span class="php-var">$auth_override_class_method</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
-</span><span id="1162" class="l"><a href="#1162">1162: </a>
-</span><span id="1163" class="l"><a href="#1163">1163: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
-</span><span id="1164" class="l"><a href="#1164">1164: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>))
-</span><span id="1165" class="l"><a href="#1165">1165: </a>        {
-</span><span id="1166" class="l"><a href="#1166">1166: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="1167" class="l"><a href="#1167">1167: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>])) <span class="php-comment">// Check for class overrides</span>
-</span><span id="1168" class="l"><a href="#1168">1168: </a>            {
-</span><span id="1169" class="l"><a href="#1169">1169: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1170" class="l"><a href="#1170">1170: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'none'</span>)
-</span><span id="1171" class="l"><a href="#1171">1171: </a>                {
-</span><span id="1172" class="l"><a href="#1172">1172: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1173" class="l"><a href="#1173">1173: </a>                }
-</span><span id="1174" class="l"><a href="#1174">1174: </a>
-</span><span id="1175" class="l"><a href="#1175">1175: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1176" class="l"><a href="#1176">1176: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'basic'</span>)
-</span><span id="1177" class="l"><a href="#1177">1177: </a>                {
-</span><span id="1178" class="l"><a href="#1178">1178: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1179" class="l"><a href="#1179">1179: </a>
-</span><span id="1180" class="l"><a href="#1180">1180: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1181" class="l"><a href="#1181">1181: </a>                }
-</span><span id="1182" class="l"><a href="#1182">1182: </a>
-</span><span id="1183" class="l"><a href="#1183">1183: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1184" class="l"><a href="#1184">1184: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'digest'</span>)
-</span><span id="1185" class="l"><a href="#1185">1185: </a>                {
-</span><span id="1186" class="l"><a href="#1186">1186: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1187" class="l"><a href="#1187">1187: </a>
-</span><span id="1188" class="l"><a href="#1188">1188: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1189" class="l"><a href="#1189">1189: </a>                }
-</span><span id="1190" class="l"><a href="#1190">1190: </a>
-</span><span id="1191" class="l"><a href="#1191">1191: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1192" class="l"><a href="#1192">1192: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1193" class="l"><a href="#1193">1193: </a>                {
-</span><span id="1194" class="l"><a href="#1194">1194: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1195" class="l"><a href="#1195">1195: </a>
-</span><span id="1196" class="l"><a href="#1196">1196: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1197" class="l"><a href="#1197">1197: </a>                }
-</span><span id="1198" class="l"><a href="#1198">1198: </a>            }
-</span><span id="1199" class="l"><a href="#1199">1199: </a>
-</span><span id="1200" class="l"><a href="#1200">1200: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
-</span><span id="1201" class="l"><a href="#1201">1201: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
-</span><span id="1202" class="l"><a href="#1202">1202: </a>            {
-</span><span id="1203" class="l"><a href="#1203">1203: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1204" class="l"><a href="#1204">1204: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'none'</span>)
-</span><span id="1205" class="l"><a href="#1205">1205: </a>                {
-</span><span id="1206" class="l"><a href="#1206">1206: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1207" class="l"><a href="#1207">1207: </a>                }
-</span><span id="1208" class="l"><a href="#1208">1208: </a>
-</span><span id="1209" class="l"><a href="#1209">1209: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1210" class="l"><a href="#1210">1210: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'basic'</span>)
-</span><span id="1211" class="l"><a href="#1211">1211: </a>                {
-</span><span id="1212" class="l"><a href="#1212">1212: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1213" class="l"><a href="#1213">1213: </a>
-</span><span id="1214" class="l"><a href="#1214">1214: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1215" class="l"><a href="#1215">1215: </a>                }
-</span><span id="1216" class="l"><a href="#1216">1216: </a>
-</span><span id="1217" class="l"><a href="#1217">1217: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1218" class="l"><a href="#1218">1218: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'digest'</span>)
-</span><span id="1219" class="l"><a href="#1219">1219: </a>                {
-</span><span id="1220" class="l"><a href="#1220">1220: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1221" class="l"><a href="#1221">1221: </a>
-</span><span id="1222" class="l"><a href="#1222">1222: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1223" class="l"><a href="#1223">1223: </a>                }
-</span><span id="1224" class="l"><a href="#1224">1224: </a>
-</span><span id="1225" class="l"><a href="#1225">1225: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1226" class="l"><a href="#1226">1226: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1227" class="l"><a href="#1227">1227: </a>                {
-</span><span id="1228" class="l"><a href="#1228">1228: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1229" class="l"><a href="#1229">1229: </a>
-</span><span id="1230" class="l"><a href="#1230">1230: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1231" class="l"><a href="#1231">1231: </a>                }
-</span><span id="1232" class="l"><a href="#1232">1232: </a>            }
-</span><span id="1233" class="l"><a href="#1233">1233: </a>        }
-</span><span id="1234" class="l"><a href="#1234">1234: </a>
-</span><span id="1235" class="l"><a href="#1235">1235: </a>        <span class="php-comment">// Assign the class/method/HTTP-method auth type override array from the config</span>
-</span><span id="1236" class="l"><a href="#1236">1236: </a>        <span class="php-var">$auth_override_class_method_http</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method_http'</span>);
-</span><span id="1237" class="l"><a href="#1237">1237: </a>
-</span><span id="1238" class="l"><a href="#1238">1238: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
-</span><span id="1239" class="l"><a href="#1239">1239: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>))
-</span><span id="1240" class="l"><a href="#1240">1240: </a>        {
-</span><span id="1241" class="l"><a href="#1241">1241: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="1242" class="l"><a href="#1242">1242: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method]))
-</span><span id="1243" class="l"><a href="#1243">1243: </a>            {
-</span><span id="1244" class="l"><a href="#1244">1244: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1245" class="l"><a href="#1245">1245: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
-</span><span id="1246" class="l"><a href="#1246">1246: </a>                {
-</span><span id="1247" class="l"><a href="#1247">1247: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1248" class="l"><a href="#1248">1248: </a>                }
-</span><span id="1249" class="l"><a href="#1249">1249: </a>
-</span><span id="1250" class="l"><a href="#1250">1250: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1251" class="l"><a href="#1251">1251: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
-</span><span id="1252" class="l"><a href="#1252">1252: </a>                {
-</span><span id="1253" class="l"><a href="#1253">1253: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1022" class="l"><a href="#1022">1022: </a>        <span class="php-comment">// No key has been sent</span>
+</span><span id="1023" class="l"><a href="#1023">1023: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1024" class="l"><a href="#1024">1024: </a>    }
+</span><span id="1025" class="l"><a href="#1025">1025: </a>
+</span><span id="1026" class="l"><a href="#1026">1026: </a>    <span class="php-comment">/**
+</span></span><span id="1027" class="l"><a href="#1027">1027: </a><span class="php-comment">     * Preferred return language
+</span></span><span id="1028" class="l"><a href="#1028">1028: </a><span class="php-comment">     *
+</span></span><span id="1029" class="l"><a href="#1029">1029: </a><span class="php-comment">     * @access protected
+</span></span><span id="1030" class="l"><a href="#1030">1030: </a><span class="php-comment">     * @return string|NULL The language code
+</span></span><span id="1031" class="l"><a href="#1031">1031: </a><span class="php-comment">     */</span>
+</span><span id="1032" class="l"><a href="#1032">1032: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
+</span><span id="1033" class="l"><a href="#1033">1033: </a>    {
+</span><span id="1034" class="l"><a href="#1034">1034: </a>        <span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>);
+</span><span id="1035" class="l"><a href="#1035">1035: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$lang</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1036" class="l"><a href="#1036">1036: </a>        {
+</span><span id="1037" class="l"><a href="#1037">1037: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="1038" class="l"><a href="#1038">1038: </a>        }
+</span><span id="1039" class="l"><a href="#1039">1039: </a>
+</span><span id="1040" class="l"><a href="#1040">1040: </a>        <span class="php-comment">// It appears more than one language has been sent using a comma delimiter</span>
+</span><span id="1041" class="l"><a href="#1041">1041: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="1042" class="l"><a href="#1042">1042: </a>        {
+</span><span id="1043" class="l"><a href="#1043">1043: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
+</span><span id="1044" class="l"><a href="#1044">1044: </a>
+</span><span id="1045" class="l"><a href="#1045">1045: </a>            <span class="php-var">$return_langs</span> = [];
+</span><span id="1046" class="l"><a href="#1046">1046: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
+</span><span id="1047" class="l"><a href="#1047">1047: </a>            {
+</span><span id="1048" class="l"><a href="#1048">1048: </a>                <span class="php-comment">// Remove weight and trim leading and trailing whitespace</span>
+</span><span id="1049" class="l"><a href="#1049">1049: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
+</span><span id="1050" class="l"><a href="#1050">1050: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
+</span><span id="1051" class="l"><a href="#1051">1051: </a>            }
+</span><span id="1052" class="l"><a href="#1052">1052: </a>
+</span><span id="1053" class="l"><a href="#1053">1053: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
+</span><span id="1054" class="l"><a href="#1054">1054: </a>        }
+</span><span id="1055" class="l"><a href="#1055">1055: </a>
+</span><span id="1056" class="l"><a href="#1056">1056: </a>        <span class="php-comment">// Otherwise simply return as a string</span>
+</span><span id="1057" class="l"><a href="#1057">1057: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
+</span><span id="1058" class="l"><a href="#1058">1058: </a>    }
+</span><span id="1059" class="l"><a href="#1059">1059: </a>
+</span><span id="1060" class="l"><a href="#1060">1060: </a>    <span class="php-comment">/**
+</span></span><span id="1061" class="l"><a href="#1061">1061: </a><span class="php-comment">     * Add the request to the log table
+</span></span><span id="1062" class="l"><a href="#1062">1062: </a><span class="php-comment">     *
+</span></span><span id="1063" class="l"><a href="#1063">1063: </a><span class="php-comment">     * @access protected
+</span></span><span id="1064" class="l"><a href="#1064">1064: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
+</span></span><span id="1065" class="l"><a href="#1065">1065: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
+</span></span><span id="1066" class="l"><a href="#1066">1066: </a><span class="php-comment">     */</span>
+</span><span id="1067" class="l"><a href="#1067">1067: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="1068" class="l"><a href="#1068">1068: </a>    {
+</span><span id="1069" class="l"><a href="#1069">1069: </a>        <span class="php-comment">// Insert the request into the log table</span>
+</span><span id="1070" class="l"><a href="#1070">1070: </a>        <span class="php-var">$is_inserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1071" class="l"><a href="#1071">1071: </a>            -&gt;insert(
+</span><span id="1072" class="l"><a href="#1072">1072: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
+</span><span id="1073" class="l"><a href="#1073">1073: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
+</span><span id="1074" class="l"><a href="#1074">1074: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
+</span><span id="1075" class="l"><a href="#1075">1075: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
+</span><span id="1076" class="l"><a href="#1076">1076: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="1077" class="l"><a href="#1077">1077: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
+</span><span id="1078" class="l"><a href="#1078">1078: </a>                <span class="php-quote">'time'</span> =&gt; <span class="php-keyword2">time</span>(),
+</span><span id="1079" class="l"><a href="#1079">1079: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
+</span><span id="1080" class="l"><a href="#1080">1080: </a>            ]);
+</span><span id="1081" class="l"><a href="#1081">1081: </a>
+</span><span id="1082" class="l"><a href="#1082">1082: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
+</span><span id="1083" class="l"><a href="#1083">1083: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
+</span><span id="1084" class="l"><a href="#1084">1084: </a>
+</span><span id="1085" class="l"><a href="#1085">1085: </a>        <span class="php-keyword1">return</span> <span class="php-var">$is_inserted</span>;
+</span><span id="1086" class="l"><a href="#1086">1086: </a>    }
+</span><span id="1087" class="l"><a href="#1087">1087: </a>
+</span><span id="1088" class="l"><a href="#1088">1088: </a>    <span class="php-comment">/**
+</span></span><span id="1089" class="l"><a href="#1089">1089: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
+</span></span><span id="1090" class="l"><a href="#1090">1090: </a><span class="php-comment">     *
+</span></span><span id="1091" class="l"><a href="#1091">1091: </a><span class="php-comment">     * @access protected
+</span></span><span id="1092" class="l"><a href="#1092">1092: </a><span class="php-comment">     * @param  string $controller_method The method being called
+</span></span><span id="1093" class="l"><a href="#1093">1093: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
+</span></span><span id="1094" class="l"><a href="#1094">1094: </a><span class="php-comment">     */</span>
+</span><span id="1095" class="l"><a href="#1095">1095: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
+</span><span id="1096" class="l"><a href="#1096">1096: </a>    {
+</span><span id="1097" class="l"><a href="#1097">1097: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
+</span><span id="1098" class="l"><a href="#1098">1098: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1099" class="l"><a href="#1099">1099: </a>        {
+</span><span id="1100" class="l"><a href="#1100">1100: </a>            <span class="php-comment">// Everything is fine</span>
+</span><span id="1101" class="l"><a href="#1101">1101: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1102" class="l"><a href="#1102">1102: </a>        }
+</span><span id="1103" class="l"><a href="#1103">1103: </a>
+</span><span id="1104" class="l"><a href="#1104">1104: </a>        <span class="php-keyword1">switch</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_method'</span>))
+</span><span id="1105" class="l"><a href="#1105">1105: </a>        {
+</span><span id="1106" class="l"><a href="#1106">1106: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'API_KEY'</span>:
+</span><span id="1107" class="l"><a href="#1107">1107: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'api-key:'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>);
+</span><span id="1108" class="l"><a href="#1108">1108: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>;
+</span><span id="1109" class="l"><a href="#1109">1109: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1110" class="l"><a href="#1110">1110: </a>
+</span><span id="1111" class="l"><a href="#1111">1111: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'METHOD_NAME'</span>:
+</span><span id="1112" class="l"><a href="#1112">1112: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'method-name:'</span> . <span class="php-var">$controller_method</span>;
+</span><span id="1113" class="l"><a href="#1113">1113: </a>            <span class="php-var">$limited_method_name</span> =  <span class="php-var">$controller_method</span>;
+</span><span id="1114" class="l"><a href="#1114">1114: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1115" class="l"><a href="#1115">1115: </a>
+</span><span id="1116" class="l"><a href="#1116">1116: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'ROUTED_URL'</span>:
+</span><span id="1117" class="l"><a href="#1117">1117: </a>          <span class="php-keyword1">default</span>:
+</span><span id="1118" class="l"><a href="#1118">1118: </a>            <span class="php-var">$limited_uri</span> = <span class="php-var">$this</span>-&gt;uri-&gt;ruri_string();
+</span><span id="1119" class="l"><a href="#1119">1119: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$limited_uri</span>), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
+</span><span id="1120" class="l"><a href="#1120">1120: </a>            {
+</span><span id="1121" class="l"><a href="#1121">1121: </a>                <span class="php-var">$limited_uri</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$limited_uri</span>,<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format) - <span class="php-num">1</span>);
+</span><span id="1122" class="l"><a href="#1122">1122: </a>            }
+</span><span id="1123" class="l"><a href="#1123">1123: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'uri:'</span>.<span class="php-var">$limited_uri</span>.<span class="php-quote">':'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method; <span class="php-comment">// It's good to differentiate GET from PUT</span>
+</span><span id="1124" class="l"><a href="#1124">1124: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-var">$controller_method</span>;
+</span><span id="1125" class="l"><a href="#1125">1125: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1126" class="l"><a href="#1126">1126: </a>        }
+</span><span id="1127" class="l"><a href="#1127">1127: </a>
+</span><span id="1128" class="l"><a href="#1128">1128: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span> )
+</span><span id="1129" class="l"><a href="#1129">1129: </a>        {
+</span><span id="1130" class="l"><a href="#1130">1130: </a>            <span class="php-comment">// Everything is fine</span>
+</span><span id="1131" class="l"><a href="#1131">1131: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1132" class="l"><a href="#1132">1132: </a>        }
+</span><span id="1133" class="l"><a href="#1133">1133: </a>
+</span><span id="1134" class="l"><a href="#1134">1134: </a>        <span class="php-comment">// How many times can you get to this method in a defined time_limit (default: 1 hour)?</span>
+</span><span id="1135" class="l"><a href="#1135">1135: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>];
+</span><span id="1136" class="l"><a href="#1136">1136: </a>
+</span><span id="1137" class="l"><a href="#1137">1137: </a>        <span class="php-var">$time_limit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>] : <span class="php-num">3600</span>); <span class="php-comment">// 3600 = 60 * 60</span>
+</span><span id="1138" class="l"><a href="#1138">1138: </a>
+</span><span id="1139" class="l"><a href="#1139">1139: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
+</span><span id="1140" class="l"><a href="#1140">1140: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1141" class="l"><a href="#1141">1141: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1142" class="l"><a href="#1142">1142: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1143" class="l"><a href="#1143">1143: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
+</span><span id="1144" class="l"><a href="#1144">1144: </a>            -&gt;row();
+</span><span id="1145" class="l"><a href="#1145">1145: </a>
+</span><span id="1146" class="l"><a href="#1146">1146: </a>        <span class="php-comment">// No calls have been made for this key</span>
+</span><span id="1147" class="l"><a href="#1147">1147: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1148" class="l"><a href="#1148">1148: </a>        {
+</span><span id="1149" class="l"><a href="#1149">1149: </a>            <span class="php-comment">// Create a new row for the following key</span>
+</span><span id="1150" class="l"><a href="#1150">1150: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
+</span><span id="1151" class="l"><a href="#1151">1151: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$limited_uri</span>,
+</span><span id="1152" class="l"><a href="#1152">1152: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="1153" class="l"><a href="#1153">1153: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
+</span><span id="1154" class="l"><a href="#1154">1154: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
+</span><span id="1155" class="l"><a href="#1155">1155: </a>            ]);
+</span><span id="1156" class="l"><a href="#1156">1156: </a>        }
+</span><span id="1157" class="l"><a href="#1157">1157: </a>
+</span><span id="1158" class="l"><a href="#1158">1158: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
+</span><span id="1159" class="l"><a href="#1159">1159: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$time_limit</span>))
+</span><span id="1160" class="l"><a href="#1160">1160: </a>        {
+</span><span id="1161" class="l"><a href="#1161">1161: </a>            <span class="php-comment">// Reset the started period and count</span>
+</span><span id="1162" class="l"><a href="#1162">1162: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1163" class="l"><a href="#1163">1163: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1164" class="l"><a href="#1164">1164: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
+</span><span id="1165" class="l"><a href="#1165">1165: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
+</span><span id="1166" class="l"><a href="#1166">1166: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
+</span><span id="1167" class="l"><a href="#1167">1167: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1168" class="l"><a href="#1168">1168: </a>        }
+</span><span id="1169" class="l"><a href="#1169">1169: </a>
+</span><span id="1170" class="l"><a href="#1170">1170: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
+</span><span id="1171" class="l"><a href="#1171">1171: </a>        <span class="php-keyword1">else</span>
+</span><span id="1172" class="l"><a href="#1172">1172: </a>        {
+</span><span id="1173" class="l"><a href="#1173">1173: </a>            <span class="php-comment">// The limit has been exceeded</span>
+</span><span id="1174" class="l"><a href="#1174">1174: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
+</span><span id="1175" class="l"><a href="#1175">1175: </a>            {
+</span><span id="1176" class="l"><a href="#1176">1176: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1177" class="l"><a href="#1177">1177: </a>            }
+</span><span id="1178" class="l"><a href="#1178">1178: </a>
+</span><span id="1179" class="l"><a href="#1179">1179: </a>            <span class="php-comment">// Increase the count by one</span>
+</span><span id="1180" class="l"><a href="#1180">1180: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1181" class="l"><a href="#1181">1181: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1182" class="l"><a href="#1182">1182: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1183" class="l"><a href="#1183">1183: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
+</span><span id="1184" class="l"><a href="#1184">1184: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1185" class="l"><a href="#1185">1185: </a>        }
+</span><span id="1186" class="l"><a href="#1186">1186: </a>
+</span><span id="1187" class="l"><a href="#1187">1187: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1188" class="l"><a href="#1188">1188: </a>    }
+</span><span id="1189" class="l"><a href="#1189">1189: </a>
+</span><span id="1190" class="l"><a href="#1190">1190: </a>    <span class="php-comment">/**
+</span></span><span id="1191" class="l"><a href="#1191">1191: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method/HTTP-method being called
+</span></span><span id="1192" class="l"><a href="#1192">1192: </a><span class="php-comment">     *
+</span></span><span id="1193" class="l"><a href="#1193">1193: </a><span class="php-comment">     * @access protected
+</span></span><span id="1194" class="l"><a href="#1194">1194: </a><span class="php-comment">     * @return bool
+</span></span><span id="1195" class="l"><a href="#1195">1195: </a><span class="php-comment">     */</span>
+</span><span id="1196" class="l"><a href="#1196">1196: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
+</span><span id="1197" class="l"><a href="#1197">1197: </a>    {
+</span><span id="1198" class="l"><a href="#1198">1198: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
+</span><span id="1199" class="l"><a href="#1199">1199: </a>        <span class="php-var">$auth_override_class_method</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
+</span><span id="1200" class="l"><a href="#1200">1200: </a>
+</span><span id="1201" class="l"><a href="#1201">1201: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
+</span><span id="1202" class="l"><a href="#1202">1202: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>))
+</span><span id="1203" class="l"><a href="#1203">1203: </a>        {
+</span><span id="1204" class="l"><a href="#1204">1204: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
+</span><span id="1205" class="l"><a href="#1205">1205: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>])) <span class="php-comment">// Check for class overrides</span>
+</span><span id="1206" class="l"><a href="#1206">1206: </a>            {
+</span><span id="1207" class="l"><a href="#1207">1207: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1208" class="l"><a href="#1208">1208: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'none'</span>)
+</span><span id="1209" class="l"><a href="#1209">1209: </a>                {
+</span><span id="1210" class="l"><a href="#1210">1210: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1211" class="l"><a href="#1211">1211: </a>                }
+</span><span id="1212" class="l"><a href="#1212">1212: </a>
+</span><span id="1213" class="l"><a href="#1213">1213: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1214" class="l"><a href="#1214">1214: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'basic'</span>)
+</span><span id="1215" class="l"><a href="#1215">1215: </a>                {
+</span><span id="1216" class="l"><a href="#1216">1216: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1217" class="l"><a href="#1217">1217: </a>
+</span><span id="1218" class="l"><a href="#1218">1218: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1219" class="l"><a href="#1219">1219: </a>                }
+</span><span id="1220" class="l"><a href="#1220">1220: </a>
+</span><span id="1221" class="l"><a href="#1221">1221: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1222" class="l"><a href="#1222">1222: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'digest'</span>)
+</span><span id="1223" class="l"><a href="#1223">1223: </a>                {
+</span><span id="1224" class="l"><a href="#1224">1224: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1225" class="l"><a href="#1225">1225: </a>
+</span><span id="1226" class="l"><a href="#1226">1226: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1227" class="l"><a href="#1227">1227: </a>                }
+</span><span id="1228" class="l"><a href="#1228">1228: </a>
+</span><span id="1229" class="l"><a href="#1229">1229: </a>                <span class="php-comment">// Session auth override found, check session</span>
+</span><span id="1230" class="l"><a href="#1230">1230: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'session'</span>)
+</span><span id="1231" class="l"><a href="#1231">1231: </a>                {
+</span><span id="1232" class="l"><a href="#1232">1232: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="1233" class="l"><a href="#1233">1233: </a>
+</span><span id="1234" class="l"><a href="#1234">1234: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1235" class="l"><a href="#1235">1235: </a>                }
+</span><span id="1236" class="l"><a href="#1236">1236: </a>
+</span><span id="1237" class="l"><a href="#1237">1237: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1238" class="l"><a href="#1238">1238: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1239" class="l"><a href="#1239">1239: </a>                {
+</span><span id="1240" class="l"><a href="#1240">1240: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1241" class="l"><a href="#1241">1241: </a>
+</span><span id="1242" class="l"><a href="#1242">1242: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1243" class="l"><a href="#1243">1243: </a>                }
+</span><span id="1244" class="l"><a href="#1244">1244: </a>            }
+</span><span id="1245" class="l"><a href="#1245">1245: </a>
+</span><span id="1246" class="l"><a href="#1246">1246: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
+</span><span id="1247" class="l"><a href="#1247">1247: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
+</span><span id="1248" class="l"><a href="#1248">1248: </a>            {
+</span><span id="1249" class="l"><a href="#1249">1249: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1250" class="l"><a href="#1250">1250: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'none'</span>)
+</span><span id="1251" class="l"><a href="#1251">1251: </a>                {
+</span><span id="1252" class="l"><a href="#1252">1252: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1253" class="l"><a href="#1253">1253: </a>                }
 </span><span id="1254" class="l"><a href="#1254">1254: </a>
-</span><span id="1255" class="l"><a href="#1255">1255: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1256" class="l"><a href="#1256">1256: </a>                }
-</span><span id="1257" class="l"><a href="#1257">1257: </a>
-</span><span id="1258" class="l"><a href="#1258">1258: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1259" class="l"><a href="#1259">1259: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
-</span><span id="1260" class="l"><a href="#1260">1260: </a>                {
-</span><span id="1261" class="l"><a href="#1261">1261: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1255" class="l"><a href="#1255">1255: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1256" class="l"><a href="#1256">1256: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'basic'</span>)
+</span><span id="1257" class="l"><a href="#1257">1257: </a>                {
+</span><span id="1258" class="l"><a href="#1258">1258: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1259" class="l"><a href="#1259">1259: </a>
+</span><span id="1260" class="l"><a href="#1260">1260: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1261" class="l"><a href="#1261">1261: </a>                }
 </span><span id="1262" class="l"><a href="#1262">1262: </a>
-</span><span id="1263" class="l"><a href="#1263">1263: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1264" class="l"><a href="#1264">1264: </a>                }
-</span><span id="1265" class="l"><a href="#1265">1265: </a>
-</span><span id="1266" class="l"><a href="#1266">1266: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1267" class="l"><a href="#1267">1267: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1268" class="l"><a href="#1268">1268: </a>                {
-</span><span id="1269" class="l"><a href="#1269">1269: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1263" class="l"><a href="#1263">1263: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1264" class="l"><a href="#1264">1264: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'digest'</span>)
+</span><span id="1265" class="l"><a href="#1265">1265: </a>                {
+</span><span id="1266" class="l"><a href="#1266">1266: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1267" class="l"><a href="#1267">1267: </a>
+</span><span id="1268" class="l"><a href="#1268">1268: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1269" class="l"><a href="#1269">1269: </a>                }
 </span><span id="1270" class="l"><a href="#1270">1270: </a>
-</span><span id="1271" class="l"><a href="#1271">1271: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1272" class="l"><a href="#1272">1272: </a>                }
-</span><span id="1273" class="l"><a href="#1273">1273: </a>            }
-</span><span id="1274" class="l"><a href="#1274">1274: </a>
-</span><span id="1275" class="l"><a href="#1275">1275: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method/HTTP-method being called</span>
-</span><span id="1276" class="l"><a href="#1276">1276: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method]))
-</span><span id="1277" class="l"><a href="#1277">1277: </a>            {
-</span><span id="1278" class="l"><a href="#1278">1278: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1279" class="l"><a href="#1279">1279: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
-</span><span id="1280" class="l"><a href="#1280">1280: </a>                {
-</span><span id="1281" class="l"><a href="#1281">1281: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1282" class="l"><a href="#1282">1282: </a>                }
+</span><span id="1271" class="l"><a href="#1271">1271: </a>                <span class="php-comment">// Session auth override found, check session</span>
+</span><span id="1272" class="l"><a href="#1272">1272: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'session'</span>)
+</span><span id="1273" class="l"><a href="#1273">1273: </a>                {
+</span><span id="1274" class="l"><a href="#1274">1274: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="1275" class="l"><a href="#1275">1275: </a>
+</span><span id="1276" class="l"><a href="#1276">1276: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1277" class="l"><a href="#1277">1277: </a>                }
+</span><span id="1278" class="l"><a href="#1278">1278: </a>
+</span><span id="1279" class="l"><a href="#1279">1279: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1280" class="l"><a href="#1280">1280: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1281" class="l"><a href="#1281">1281: </a>                {
+</span><span id="1282" class="l"><a href="#1282">1282: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
 </span><span id="1283" class="l"><a href="#1283">1283: </a>
-</span><span id="1284" class="l"><a href="#1284">1284: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1285" class="l"><a href="#1285">1285: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
-</span><span id="1286" class="l"><a href="#1286">1286: </a>                {
-</span><span id="1287" class="l"><a href="#1287">1287: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1284" class="l"><a href="#1284">1284: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1285" class="l"><a href="#1285">1285: </a>                }
+</span><span id="1286" class="l"><a href="#1286">1286: </a>            }
+</span><span id="1287" class="l"><a href="#1287">1287: </a>        }
 </span><span id="1288" class="l"><a href="#1288">1288: </a>
-</span><span id="1289" class="l"><a href="#1289">1289: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1290" class="l"><a href="#1290">1290: </a>                }
+</span><span id="1289" class="l"><a href="#1289">1289: </a>        <span class="php-comment">// Assign the class/method/HTTP-method auth type override array from the config</span>
+</span><span id="1290" class="l"><a href="#1290">1290: </a>        <span class="php-var">$auth_override_class_method_http</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method_http'</span>);
 </span><span id="1291" class="l"><a href="#1291">1291: </a>
-</span><span id="1292" class="l"><a href="#1292">1292: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1293" class="l"><a href="#1293">1293: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
-</span><span id="1294" class="l"><a href="#1294">1294: </a>                {
-</span><span id="1295" class="l"><a href="#1295">1295: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1296" class="l"><a href="#1296">1296: </a>
-</span><span id="1297" class="l"><a href="#1297">1297: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1298" class="l"><a href="#1298">1298: </a>                }
-</span><span id="1299" class="l"><a href="#1299">1299: </a>
-</span><span id="1300" class="l"><a href="#1300">1300: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1301" class="l"><a href="#1301">1301: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1302" class="l"><a href="#1302">1302: </a>                {
-</span><span id="1303" class="l"><a href="#1303">1303: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1304" class="l"><a href="#1304">1304: </a>
-</span><span id="1305" class="l"><a href="#1305">1305: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1306" class="l"><a href="#1306">1306: </a>                }
-</span><span id="1307" class="l"><a href="#1307">1307: </a>            }
-</span><span id="1308" class="l"><a href="#1308">1308: </a>        }
-</span><span id="1309" class="l"><a href="#1309">1309: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1310" class="l"><a href="#1310">1310: </a>    }
+</span><span id="1292" class="l"><a href="#1292">1292: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
+</span><span id="1293" class="l"><a href="#1293">1293: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>))
+</span><span id="1294" class="l"><a href="#1294">1294: </a>        {
+</span><span id="1295" class="l"><a href="#1295">1295: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
+</span><span id="1296" class="l"><a href="#1296">1296: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method]))
+</span><span id="1297" class="l"><a href="#1297">1297: </a>            {
+</span><span id="1298" class="l"><a href="#1298">1298: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1299" class="l"><a href="#1299">1299: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
+</span><span id="1300" class="l"><a href="#1300">1300: </a>                {
+</span><span id="1301" class="l"><a href="#1301">1301: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1302" class="l"><a href="#1302">1302: </a>                }
+</span><span id="1303" class="l"><a href="#1303">1303: </a>
+</span><span id="1304" class="l"><a href="#1304">1304: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1305" class="l"><a href="#1305">1305: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
+</span><span id="1306" class="l"><a href="#1306">1306: </a>                {
+</span><span id="1307" class="l"><a href="#1307">1307: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1308" class="l"><a href="#1308">1308: </a>
+</span><span id="1309" class="l"><a href="#1309">1309: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1310" class="l"><a href="#1310">1310: </a>                }
 </span><span id="1311" class="l"><a href="#1311">1311: </a>
-</span><span id="1312" class="l"><a href="#1312">1312: </a>    <span class="php-comment">/**
-</span></span><span id="1313" class="l"><a href="#1313">1313: </a><span class="php-comment">     * Parse the GET request arguments
-</span></span><span id="1314" class="l"><a href="#1314">1314: </a><span class="php-comment">     *
-</span></span><span id="1315" class="l"><a href="#1315">1315: </a><span class="php-comment">     * @access protected
-</span></span><span id="1316" class="l"><a href="#1316">1316: </a><span class="php-comment">     * @return void
-</span></span><span id="1317" class="l"><a href="#1317">1317: </a><span class="php-comment">     */</span>
-</span><span id="1318" class="l"><a href="#1318">1318: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
-</span><span id="1319" class="l"><a href="#1319">1319: </a>    {
-</span><span id="1320" class="l"><a href="#1320">1320: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
-</span><span id="1321" class="l"><a href="#1321">1321: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
-</span><span id="1322" class="l"><a href="#1322">1322: </a>    }
-</span><span id="1323" class="l"><a href="#1323">1323: </a>
-</span><span id="1324" class="l"><a href="#1324">1324: </a>    <span class="php-comment">/**
-</span></span><span id="1325" class="l"><a href="#1325">1325: </a><span class="php-comment">     * Parse the POST request arguments
-</span></span><span id="1326" class="l"><a href="#1326">1326: </a><span class="php-comment">     *
-</span></span><span id="1327" class="l"><a href="#1327">1327: </a><span class="php-comment">     * @access protected
-</span></span><span id="1328" class="l"><a href="#1328">1328: </a><span class="php-comment">     * @return void
-</span></span><span id="1329" class="l"><a href="#1329">1329: </a><span class="php-comment">     */</span>
-</span><span id="1330" class="l"><a href="#1330">1330: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
-</span><span id="1331" class="l"><a href="#1331">1331: </a>    {
-</span><span id="1332" class="l"><a href="#1332">1332: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
-</span><span id="1333" class="l"><a href="#1333">1333: </a>
-</span><span id="1334" class="l"><a href="#1334">1334: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1335" class="l"><a href="#1335">1335: </a>        {
-</span><span id="1336" class="l"><a href="#1336">1336: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1337" class="l"><a href="#1337">1337: </a>        }
-</span><span id="1338" class="l"><a href="#1338">1338: </a>    }
-</span><span id="1339" class="l"><a href="#1339">1339: </a>
-</span><span id="1340" class="l"><a href="#1340">1340: </a>    <span class="php-comment">/**
-</span></span><span id="1341" class="l"><a href="#1341">1341: </a><span class="php-comment">     * Parse the PUT request arguments
-</span></span><span id="1342" class="l"><a href="#1342">1342: </a><span class="php-comment">     *
-</span></span><span id="1343" class="l"><a href="#1343">1343: </a><span class="php-comment">     * @access protected
-</span></span><span id="1344" class="l"><a href="#1344">1344: </a><span class="php-comment">     * @return void
-</span></span><span id="1345" class="l"><a href="#1345">1345: </a><span class="php-comment">     */</span>
-</span><span id="1346" class="l"><a href="#1346">1346: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
-</span><span id="1347" class="l"><a href="#1347">1347: </a>    {
-</span><span id="1348" class="l"><a href="#1348">1348: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1349" class="l"><a href="#1349">1349: </a>        {
-</span><span id="1350" class="l"><a href="#1350">1350: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1351" class="l"><a href="#1351">1351: </a>        }
-</span><span id="1352" class="l"><a href="#1352">1352: </a>        <span class="php-keyword1">else</span>
-</span><span id="1353" class="l"><a href="#1353">1353: </a>        {
-</span><span id="1354" class="l"><a href="#1354">1354: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1355" class="l"><a href="#1355">1355: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
-</span><span id="1356" class="l"><a href="#1356">1356: </a>            {
-</span><span id="1357" class="l"><a href="#1357">1357: </a>                <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1358" class="l"><a href="#1358">1358: </a>            }
-</span><span id="1359" class="l"><a href="#1359">1359: </a>        }
-</span><span id="1360" class="l"><a href="#1360">1360: </a>    }
+</span><span id="1312" class="l"><a href="#1312">1312: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1313" class="l"><a href="#1313">1313: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
+</span><span id="1314" class="l"><a href="#1314">1314: </a>                {
+</span><span id="1315" class="l"><a href="#1315">1315: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1316" class="l"><a href="#1316">1316: </a>
+</span><span id="1317" class="l"><a href="#1317">1317: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1318" class="l"><a href="#1318">1318: </a>                }
+</span><span id="1319" class="l"><a href="#1319">1319: </a>
+</span><span id="1320" class="l"><a href="#1320">1320: </a>                <span class="php-comment">// Session auth override found, check session</span>
+</span><span id="1321" class="l"><a href="#1321">1321: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'session'</span>)
+</span><span id="1322" class="l"><a href="#1322">1322: </a>                {
+</span><span id="1323" class="l"><a href="#1323">1323: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="1324" class="l"><a href="#1324">1324: </a>
+</span><span id="1325" class="l"><a href="#1325">1325: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1326" class="l"><a href="#1326">1326: </a>                }
+</span><span id="1327" class="l"><a href="#1327">1327: </a>
+</span><span id="1328" class="l"><a href="#1328">1328: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1329" class="l"><a href="#1329">1329: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1330" class="l"><a href="#1330">1330: </a>                {
+</span><span id="1331" class="l"><a href="#1331">1331: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1332" class="l"><a href="#1332">1332: </a>
+</span><span id="1333" class="l"><a href="#1333">1333: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1334" class="l"><a href="#1334">1334: </a>                }
+</span><span id="1335" class="l"><a href="#1335">1335: </a>            }
+</span><span id="1336" class="l"><a href="#1336">1336: </a>
+</span><span id="1337" class="l"><a href="#1337">1337: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method/HTTP-method being called</span>
+</span><span id="1338" class="l"><a href="#1338">1338: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method]))
+</span><span id="1339" class="l"><a href="#1339">1339: </a>            {
+</span><span id="1340" class="l"><a href="#1340">1340: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1341" class="l"><a href="#1341">1341: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
+</span><span id="1342" class="l"><a href="#1342">1342: </a>                {
+</span><span id="1343" class="l"><a href="#1343">1343: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1344" class="l"><a href="#1344">1344: </a>                }
+</span><span id="1345" class="l"><a href="#1345">1345: </a>
+</span><span id="1346" class="l"><a href="#1346">1346: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1347" class="l"><a href="#1347">1347: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
+</span><span id="1348" class="l"><a href="#1348">1348: </a>                {
+</span><span id="1349" class="l"><a href="#1349">1349: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1350" class="l"><a href="#1350">1350: </a>
+</span><span id="1351" class="l"><a href="#1351">1351: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1352" class="l"><a href="#1352">1352: </a>                }
+</span><span id="1353" class="l"><a href="#1353">1353: </a>
+</span><span id="1354" class="l"><a href="#1354">1354: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1355" class="l"><a href="#1355">1355: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
+</span><span id="1356" class="l"><a href="#1356">1356: </a>                {
+</span><span id="1357" class="l"><a href="#1357">1357: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1358" class="l"><a href="#1358">1358: </a>
+</span><span id="1359" class="l"><a href="#1359">1359: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1360" class="l"><a href="#1360">1360: </a>                }
 </span><span id="1361" class="l"><a href="#1361">1361: </a>
-</span><span id="1362" class="l"><a href="#1362">1362: </a>    <span class="php-comment">/**
-</span></span><span id="1363" class="l"><a href="#1363">1363: </a><span class="php-comment">     * Parse the HEAD request arguments
-</span></span><span id="1364" class="l"><a href="#1364">1364: </a><span class="php-comment">     *
-</span></span><span id="1365" class="l"><a href="#1365">1365: </a><span class="php-comment">     * @access protected
-</span></span><span id="1366" class="l"><a href="#1366">1366: </a><span class="php-comment">     * @return void
-</span></span><span id="1367" class="l"><a href="#1367">1367: </a><span class="php-comment">     */</span>
-</span><span id="1368" class="l"><a href="#1368">1368: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
-</span><span id="1369" class="l"><a href="#1369">1369: </a>    {
-</span><span id="1370" class="l"><a href="#1370">1370: </a>        <span class="php-comment">// Parse the HEAD variables</span>
-</span><span id="1371" class="l"><a href="#1371">1371: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
-</span><span id="1372" class="l"><a href="#1372">1372: </a>
-</span><span id="1373" class="l"><a href="#1373">1373: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
-</span><span id="1374" class="l"><a href="#1374">1374: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
-</span><span id="1375" class="l"><a href="#1375">1375: </a>    }
-</span><span id="1376" class="l"><a href="#1376">1376: </a>
-</span><span id="1377" class="l"><a href="#1377">1377: </a>    <span class="php-comment">/**
-</span></span><span id="1378" class="l"><a href="#1378">1378: </a><span class="php-comment">     * Parse the OPTIONS request arguments
-</span></span><span id="1379" class="l"><a href="#1379">1379: </a><span class="php-comment">     *
-</span></span><span id="1380" class="l"><a href="#1380">1380: </a><span class="php-comment">     * @access protected
-</span></span><span id="1381" class="l"><a href="#1381">1381: </a><span class="php-comment">     * @return void
-</span></span><span id="1382" class="l"><a href="#1382">1382: </a><span class="php-comment">     */</span>
-</span><span id="1383" class="l"><a href="#1383">1383: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
-</span><span id="1384" class="l"><a href="#1384">1384: </a>    {
-</span><span id="1385" class="l"><a href="#1385">1385: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
-</span><span id="1386" class="l"><a href="#1386">1386: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
-</span><span id="1387" class="l"><a href="#1387">1387: </a>
-</span><span id="1388" class="l"><a href="#1388">1388: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
-</span><span id="1389" class="l"><a href="#1389">1389: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
-</span><span id="1390" class="l"><a href="#1390">1390: </a>    }
-</span><span id="1391" class="l"><a href="#1391">1391: </a>
-</span><span id="1392" class="l"><a href="#1392">1392: </a>    <span class="php-comment">/**
-</span></span><span id="1393" class="l"><a href="#1393">1393: </a><span class="php-comment">     * Parse the PATCH request arguments
-</span></span><span id="1394" class="l"><a href="#1394">1394: </a><span class="php-comment">     *
-</span></span><span id="1395" class="l"><a href="#1395">1395: </a><span class="php-comment">     * @access protected
-</span></span><span id="1396" class="l"><a href="#1396">1396: </a><span class="php-comment">     * @return void
-</span></span><span id="1397" class="l"><a href="#1397">1397: </a><span class="php-comment">     */</span>
-</span><span id="1398" class="l"><a href="#1398">1398: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
-</span><span id="1399" class="l"><a href="#1399">1399: </a>    {
-</span><span id="1400" class="l"><a href="#1400">1400: </a>        <span class="php-comment">// It might be a HTTP body</span>
-</span><span id="1401" class="l"><a href="#1401">1401: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1402" class="l"><a href="#1402">1402: </a>        {
-</span><span id="1403" class="l"><a href="#1403">1403: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1404" class="l"><a href="#1404">1404: </a>        }
-</span><span id="1405" class="l"><a href="#1405">1405: </a>        <span class="php-keyword1">else</span>
-</span><span id="1406" class="l"><a href="#1406">1406: </a>        {
-</span><span id="1407" class="l"><a href="#1407">1407: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1408" class="l"><a href="#1408">1408: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
-</span><span id="1409" class="l"><a href="#1409">1409: </a>            {
-</span><span id="1410" class="l"><a href="#1410">1410: </a>                <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1411" class="l"><a href="#1411">1411: </a>            }
-</span><span id="1412" class="l"><a href="#1412">1412: </a>        }
-</span><span id="1413" class="l"><a href="#1413">1413: </a>    }
-</span><span id="1414" class="l"><a href="#1414">1414: </a>
-</span><span id="1415" class="l"><a href="#1415">1415: </a>    <span class="php-comment">/**
-</span></span><span id="1416" class="l"><a href="#1416">1416: </a><span class="php-comment">     * Parse the DELETE request arguments
-</span></span><span id="1417" class="l"><a href="#1417">1417: </a><span class="php-comment">     *
-</span></span><span id="1418" class="l"><a href="#1418">1418: </a><span class="php-comment">     * @access protected
-</span></span><span id="1419" class="l"><a href="#1419">1419: </a><span class="php-comment">     * @return void
-</span></span><span id="1420" class="l"><a href="#1420">1420: </a><span class="php-comment">     */</span>
-</span><span id="1421" class="l"><a href="#1421">1421: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
-</span><span id="1422" class="l"><a href="#1422">1422: </a>    {
-</span><span id="1423" class="l"><a href="#1423">1423: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
-</span><span id="1424" class="l"><a href="#1424">1424: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
-</span><span id="1425" class="l"><a href="#1425">1425: </a>        {
-</span><span id="1426" class="l"><a href="#1426">1426: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1427" class="l"><a href="#1427">1427: </a>        }
-</span><span id="1428" class="l"><a href="#1428">1428: </a>    }
-</span><span id="1429" class="l"><a href="#1429">1429: </a>
-</span><span id="1430" class="l"><a href="#1430">1430: </a>    <span class="php-comment">/**
-</span></span><span id="1431" class="l"><a href="#1431">1431: </a><span class="php-comment">     * Parse the query parameters
-</span></span><span id="1432" class="l"><a href="#1432">1432: </a><span class="php-comment">     *
-</span></span><span id="1433" class="l"><a href="#1433">1433: </a><span class="php-comment">     * @access protected
-</span></span><span id="1434" class="l"><a href="#1434">1434: </a><span class="php-comment">     * @return void
-</span></span><span id="1435" class="l"><a href="#1435">1435: </a><span class="php-comment">     */</span>
-</span><span id="1436" class="l"><a href="#1436">1436: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
-</span><span id="1437" class="l"><a href="#1437">1437: </a>    {
-</span><span id="1438" class="l"><a href="#1438">1438: </a>        <span class="php-comment">// Declare a variable that will hold the REQUEST_URI</span>
-</span><span id="1439" class="l"><a href="#1439">1439: </a>        <span class="php-var">$request_uri</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1440" class="l"><a href="#1440">1440: </a>
-</span><span id="1441" class="l"><a href="#1441">1441: </a>        <span class="php-comment">// If using the commandline version</span>
-</span><span id="1442" class="l"><a href="#1442">1442: </a>        <span class="php-keyword1">if</span> (is_cli())
-</span><span id="1443" class="l"><a href="#1443">1443: </a>        {
-</span><span id="1444" class="l"><a href="#1444">1444: </a>            <span class="php-var">$args</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'argv'</span>);
-</span><span id="1445" class="l"><a href="#1445">1445: </a>            <span class="php-keyword1">unset</span>(<span class="php-var">$args</span>[<span class="php-num">0</span>]);
-</span><span id="1446" class="l"><a href="#1446">1446: </a>
-</span><span id="1447" class="l"><a href="#1447">1447: </a>            <span class="php-comment">// Combine the arguments using '/' as the delimiter</span>
-</span><span id="1448" class="l"><a href="#1448">1448: </a>            <span class="php-var">$request_uri</span> = <span class="php-quote">'/'</span> . <span class="php-keyword2">implode</span>(<span class="php-quote">'/'</span>, <span class="php-var">$args</span>) . <span class="php-quote">'/'</span>;
-</span><span id="1449" class="l"><a href="#1449">1449: </a>
-</span><span id="1450" class="l"><a href="#1450">1450: </a>            <span class="php-comment">// Set the following server variables (perhaps not required anymore?)</span>
-</span><span id="1451" class="l"><a href="#1451">1451: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'REQUEST_URI'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1452" class="l"><a href="#1452">1452: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'PATH_INFO'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1453" class="l"><a href="#1453">1453: </a>            <span class="php-var">$_SERVER</span>[<span class="php-quote">'QUERY_STRING'</span>] = <span class="php-var">$request_uri</span>;
-</span><span id="1454" class="l"><a href="#1454">1454: </a>        }
-</span><span id="1455" class="l"><a href="#1455">1455: </a>        <span class="php-keyword1">else</span>
-</span><span id="1456" class="l"><a href="#1456">1456: </a>        {
-</span><span id="1457" class="l"><a href="#1457">1457: </a>            <span class="php-var">$request_uri</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>);
-</span><span id="1458" class="l"><a href="#1458">1458: </a>        }
-</span><span id="1459" class="l"><a href="#1459">1459: </a>
-</span><span id="1460" class="l"><a href="#1460">1460: </a>        <span class="php-comment">// Parse the query parameters from the query string</span>
-</span><span id="1461" class="l"><a href="#1461">1461: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$request_uri</span>, PHP_URL_QUERY), <span class="php-var">$this</span>-&gt;_query_args);
-</span><span id="1462" class="l"><a href="#1462">1462: </a>    }
-</span><span id="1463" class="l"><a href="#1463">1463: </a>
-</span><span id="1464" class="l"><a href="#1464">1464: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
-</span><span id="1465" class="l"><a href="#1465">1465: </a>
-</span><span id="1466" class="l"><a href="#1466">1466: </a>    <span class="php-comment">/**
-</span></span><span id="1467" class="l"><a href="#1467">1467: </a><span class="php-comment">     * Retrieve a value from a GET request
-</span></span><span id="1468" class="l"><a href="#1468">1468: </a><span class="php-comment">     *
-</span></span><span id="1469" class="l"><a href="#1469">1469: </a><span class="php-comment">     * @access public
-</span></span><span id="1470" class="l"><a href="#1470">1470: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
-</span></span><span id="1471" class="l"><a href="#1471">1471: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1472" class="l"><a href="#1472">1472: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1473" class="l"><a href="#1473">1473: </a><span class="php-comment">     * @return array|string|NULL Value from the GET request; otherwise, NULL
-</span></span><span id="1474" class="l"><a href="#1474">1474: </a><span class="php-comment">     */</span>
-</span><span id="1475" class="l"><a href="#1475">1475: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1476" class="l"><a href="#1476">1476: </a>    {
-</span><span id="1477" class="l"><a href="#1477">1477: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1478" class="l"><a href="#1478">1478: </a>        {
-</span><span id="1479" class="l"><a href="#1479">1479: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
-</span><span id="1480" class="l"><a href="#1480">1480: </a>        }
-</span><span id="1481" class="l"><a href="#1481">1481: </a>
-</span><span id="1482" class="l"><a href="#1482">1482: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1483" class="l"><a href="#1483">1483: </a>    }
-</span><span id="1484" class="l"><a href="#1484">1484: </a>
-</span><span id="1485" class="l"><a href="#1485">1485: </a>    <span class="php-comment">/**
-</span></span><span id="1486" class="l"><a href="#1486">1486: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
-</span></span><span id="1487" class="l"><a href="#1487">1487: </a><span class="php-comment">     *
-</span></span><span id="1488" class="l"><a href="#1488">1488: </a><span class="php-comment">     * @access public
-</span></span><span id="1489" class="l"><a href="#1489">1489: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
-</span></span><span id="1490" class="l"><a href="#1490">1490: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1491" class="l"><a href="#1491">1491: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1492" class="l"><a href="#1492">1492: </a><span class="php-comment">     * @return array|string|NULL Value from the OPTIONS request; otherwise, NULL
-</span></span><span id="1493" class="l"><a href="#1493">1493: </a><span class="php-comment">     */</span>
-</span><span id="1494" class="l"><a href="#1494">1494: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1495" class="l"><a href="#1495">1495: </a>    {
-</span><span id="1496" class="l"><a href="#1496">1496: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1497" class="l"><a href="#1497">1497: </a>        {
-</span><span id="1498" class="l"><a href="#1498">1498: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
-</span><span id="1499" class="l"><a href="#1499">1499: </a>        }
-</span><span id="1500" class="l"><a href="#1500">1500: </a>
-</span><span id="1501" class="l"><a href="#1501">1501: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1502" class="l"><a href="#1502">1502: </a>    }
-</span><span id="1503" class="l"><a href="#1503">1503: </a>
-</span><span id="1504" class="l"><a href="#1504">1504: </a>    <span class="php-comment">/**
-</span></span><span id="1505" class="l"><a href="#1505">1505: </a><span class="php-comment">     * Retrieve a value from a HEAD request
-</span></span><span id="1506" class="l"><a href="#1506">1506: </a><span class="php-comment">     *
-</span></span><span id="1507" class="l"><a href="#1507">1507: </a><span class="php-comment">     * @access public
-</span></span><span id="1508" class="l"><a href="#1508">1508: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
-</span></span><span id="1509" class="l"><a href="#1509">1509: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1510" class="l"><a href="#1510">1510: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1511" class="l"><a href="#1511">1511: </a><span class="php-comment">     * @return array|string|NULL Value from the HEAD request; otherwise, NULL
-</span></span><span id="1512" class="l"><a href="#1512">1512: </a><span class="php-comment">     */</span>
-</span><span id="1513" class="l"><a href="#1513">1513: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1514" class="l"><a href="#1514">1514: </a>    {
-</span><span id="1515" class="l"><a href="#1515">1515: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1516" class="l"><a href="#1516">1516: </a>        {
-</span><span id="1517" class="l"><a href="#1517">1517: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;head_args;
-</span><span id="1518" class="l"><a href="#1518">1518: </a>        }
-</span><span id="1519" class="l"><a href="#1519">1519: </a>
-</span><span id="1520" class="l"><a href="#1520">1520: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1521" class="l"><a href="#1521">1521: </a>    }
+</span><span id="1362" class="l"><a href="#1362">1362: </a>                <span class="php-comment">// Session auth override found, check session</span>
+</span><span id="1363" class="l"><a href="#1363">1363: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'session'</span>)
+</span><span id="1364" class="l"><a href="#1364">1364: </a>                {
+</span><span id="1365" class="l"><a href="#1365">1365: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="1366" class="l"><a href="#1366">1366: </a>
+</span><span id="1367" class="l"><a href="#1367">1367: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1368" class="l"><a href="#1368">1368: </a>                }
+</span><span id="1369" class="l"><a href="#1369">1369: </a>
+</span><span id="1370" class="l"><a href="#1370">1370: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1371" class="l"><a href="#1371">1371: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1372" class="l"><a href="#1372">1372: </a>                {
+</span><span id="1373" class="l"><a href="#1373">1373: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1374" class="l"><a href="#1374">1374: </a>
+</span><span id="1375" class="l"><a href="#1375">1375: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1376" class="l"><a href="#1376">1376: </a>                }
+</span><span id="1377" class="l"><a href="#1377">1377: </a>            }
+</span><span id="1378" class="l"><a href="#1378">1378: </a>        }
+</span><span id="1379" class="l"><a href="#1379">1379: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1380" class="l"><a href="#1380">1380: </a>    }
+</span><span id="1381" class="l"><a href="#1381">1381: </a>
+</span><span id="1382" class="l"><a href="#1382">1382: </a>    <span class="php-comment">/**
+</span></span><span id="1383" class="l"><a href="#1383">1383: </a><span class="php-comment">     * Parse the GET request arguments
+</span></span><span id="1384" class="l"><a href="#1384">1384: </a><span class="php-comment">     *
+</span></span><span id="1385" class="l"><a href="#1385">1385: </a><span class="php-comment">     * @access protected
+</span></span><span id="1386" class="l"><a href="#1386">1386: </a><span class="php-comment">     * @return void
+</span></span><span id="1387" class="l"><a href="#1387">1387: </a><span class="php-comment">     */</span>
+</span><span id="1388" class="l"><a href="#1388">1388: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
+</span><span id="1389" class="l"><a href="#1389">1389: </a>    {
+</span><span id="1390" class="l"><a href="#1390">1390: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
+</span><span id="1391" class="l"><a href="#1391">1391: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
+</span><span id="1392" class="l"><a href="#1392">1392: </a>    }
+</span><span id="1393" class="l"><a href="#1393">1393: </a>
+</span><span id="1394" class="l"><a href="#1394">1394: </a>    <span class="php-comment">/**
+</span></span><span id="1395" class="l"><a href="#1395">1395: </a><span class="php-comment">     * Parse the POST request arguments
+</span></span><span id="1396" class="l"><a href="#1396">1396: </a><span class="php-comment">     *
+</span></span><span id="1397" class="l"><a href="#1397">1397: </a><span class="php-comment">     * @access protected
+</span></span><span id="1398" class="l"><a href="#1398">1398: </a><span class="php-comment">     * @return void
+</span></span><span id="1399" class="l"><a href="#1399">1399: </a><span class="php-comment">     */</span>
+</span><span id="1400" class="l"><a href="#1400">1400: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
+</span><span id="1401" class="l"><a href="#1401">1401: </a>    {
+</span><span id="1402" class="l"><a href="#1402">1402: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
+</span><span id="1403" class="l"><a href="#1403">1403: </a>
+</span><span id="1404" class="l"><a href="#1404">1404: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1405" class="l"><a href="#1405">1405: </a>        {
+</span><span id="1406" class="l"><a href="#1406">1406: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1407" class="l"><a href="#1407">1407: </a>        }
+</span><span id="1408" class="l"><a href="#1408">1408: </a>    }
+</span><span id="1409" class="l"><a href="#1409">1409: </a>
+</span><span id="1410" class="l"><a href="#1410">1410: </a>    <span class="php-comment">/**
+</span></span><span id="1411" class="l"><a href="#1411">1411: </a><span class="php-comment">     * Parse the PUT request arguments
+</span></span><span id="1412" class="l"><a href="#1412">1412: </a><span class="php-comment">     *
+</span></span><span id="1413" class="l"><a href="#1413">1413: </a><span class="php-comment">     * @access protected
+</span></span><span id="1414" class="l"><a href="#1414">1414: </a><span class="php-comment">     * @return void
+</span></span><span id="1415" class="l"><a href="#1415">1415: </a><span class="php-comment">     */</span>
+</span><span id="1416" class="l"><a href="#1416">1416: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
+</span><span id="1417" class="l"><a href="#1417">1417: </a>    {
+</span><span id="1418" class="l"><a href="#1418">1418: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1419" class="l"><a href="#1419">1419: </a>        {
+</span><span id="1420" class="l"><a href="#1420">1420: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1421" class="l"><a href="#1421">1421: </a>        }
+</span><span id="1422" class="l"><a href="#1422">1422: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
+</span><span id="1423" class="l"><a href="#1423">1423: </a>        {
+</span><span id="1424" class="l"><a href="#1424">1424: </a>           <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1425" class="l"><a href="#1425">1425: </a>           <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1426" class="l"><a href="#1426">1426: </a>        }
+</span><span id="1427" class="l"><a href="#1427">1427: </a>    }
+</span><span id="1428" class="l"><a href="#1428">1428: </a>
+</span><span id="1429" class="l"><a href="#1429">1429: </a>    <span class="php-comment">/**
+</span></span><span id="1430" class="l"><a href="#1430">1430: </a><span class="php-comment">     * Parse the HEAD request arguments
+</span></span><span id="1431" class="l"><a href="#1431">1431: </a><span class="php-comment">     *
+</span></span><span id="1432" class="l"><a href="#1432">1432: </a><span class="php-comment">     * @access protected
+</span></span><span id="1433" class="l"><a href="#1433">1433: </a><span class="php-comment">     * @return void
+</span></span><span id="1434" class="l"><a href="#1434">1434: </a><span class="php-comment">     */</span>
+</span><span id="1435" class="l"><a href="#1435">1435: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
+</span><span id="1436" class="l"><a href="#1436">1436: </a>    {
+</span><span id="1437" class="l"><a href="#1437">1437: </a>        <span class="php-comment">// Parse the HEAD variables</span>
+</span><span id="1438" class="l"><a href="#1438">1438: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
+</span><span id="1439" class="l"><a href="#1439">1439: </a>
+</span><span id="1440" class="l"><a href="#1440">1440: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
+</span><span id="1441" class="l"><a href="#1441">1441: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
+</span><span id="1442" class="l"><a href="#1442">1442: </a>    }
+</span><span id="1443" class="l"><a href="#1443">1443: </a>
+</span><span id="1444" class="l"><a href="#1444">1444: </a>    <span class="php-comment">/**
+</span></span><span id="1445" class="l"><a href="#1445">1445: </a><span class="php-comment">     * Parse the OPTIONS request arguments
+</span></span><span id="1446" class="l"><a href="#1446">1446: </a><span class="php-comment">     *
+</span></span><span id="1447" class="l"><a href="#1447">1447: </a><span class="php-comment">     * @access protected
+</span></span><span id="1448" class="l"><a href="#1448">1448: </a><span class="php-comment">     * @return void
+</span></span><span id="1449" class="l"><a href="#1449">1449: </a><span class="php-comment">     */</span>
+</span><span id="1450" class="l"><a href="#1450">1450: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
+</span><span id="1451" class="l"><a href="#1451">1451: </a>    {
+</span><span id="1452" class="l"><a href="#1452">1452: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
+</span><span id="1453" class="l"><a href="#1453">1453: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
+</span><span id="1454" class="l"><a href="#1454">1454: </a>
+</span><span id="1455" class="l"><a href="#1455">1455: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
+</span><span id="1456" class="l"><a href="#1456">1456: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
+</span><span id="1457" class="l"><a href="#1457">1457: </a>    }
+</span><span id="1458" class="l"><a href="#1458">1458: </a>
+</span><span id="1459" class="l"><a href="#1459">1459: </a>    <span class="php-comment">/**
+</span></span><span id="1460" class="l"><a href="#1460">1460: </a><span class="php-comment">     * Parse the PATCH request arguments
+</span></span><span id="1461" class="l"><a href="#1461">1461: </a><span class="php-comment">     *
+</span></span><span id="1462" class="l"><a href="#1462">1462: </a><span class="php-comment">     * @access protected
+</span></span><span id="1463" class="l"><a href="#1463">1463: </a><span class="php-comment">     * @return void
+</span></span><span id="1464" class="l"><a href="#1464">1464: </a><span class="php-comment">     */</span>
+</span><span id="1465" class="l"><a href="#1465">1465: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
+</span><span id="1466" class="l"><a href="#1466">1466: </a>    {
+</span><span id="1467" class="l"><a href="#1467">1467: </a>        <span class="php-comment">// It might be a HTTP body</span>
+</span><span id="1468" class="l"><a href="#1468">1468: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1469" class="l"><a href="#1469">1469: </a>        {
+</span><span id="1470" class="l"><a href="#1470">1470: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1471" class="l"><a href="#1471">1471: </a>        }
+</span><span id="1472" class="l"><a href="#1472">1472: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
+</span><span id="1473" class="l"><a href="#1473">1473: </a>        {
+</span><span id="1474" class="l"><a href="#1474">1474: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1475" class="l"><a href="#1475">1475: </a>            <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1476" class="l"><a href="#1476">1476: </a>        }
+</span><span id="1477" class="l"><a href="#1477">1477: </a>    }
+</span><span id="1478" class="l"><a href="#1478">1478: </a>
+</span><span id="1479" class="l"><a href="#1479">1479: </a>    <span class="php-comment">/**
+</span></span><span id="1480" class="l"><a href="#1480">1480: </a><span class="php-comment">     * Parse the DELETE request arguments
+</span></span><span id="1481" class="l"><a href="#1481">1481: </a><span class="php-comment">     *
+</span></span><span id="1482" class="l"><a href="#1482">1482: </a><span class="php-comment">     * @access protected
+</span></span><span id="1483" class="l"><a href="#1483">1483: </a><span class="php-comment">     * @return void
+</span></span><span id="1484" class="l"><a href="#1484">1484: </a><span class="php-comment">     */</span>
+</span><span id="1485" class="l"><a href="#1485">1485: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
+</span><span id="1486" class="l"><a href="#1486">1486: </a>    {
+</span><span id="1487" class="l"><a href="#1487">1487: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
+</span><span id="1488" class="l"><a href="#1488">1488: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
+</span><span id="1489" class="l"><a href="#1489">1489: </a>        {
+</span><span id="1490" class="l"><a href="#1490">1490: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1491" class="l"><a href="#1491">1491: </a>        }
+</span><span id="1492" class="l"><a href="#1492">1492: </a>    }
+</span><span id="1493" class="l"><a href="#1493">1493: </a>
+</span><span id="1494" class="l"><a href="#1494">1494: </a>    <span class="php-comment">/**
+</span></span><span id="1495" class="l"><a href="#1495">1495: </a><span class="php-comment">     * Parse the query parameters
+</span></span><span id="1496" class="l"><a href="#1496">1496: </a><span class="php-comment">     *
+</span></span><span id="1497" class="l"><a href="#1497">1497: </a><span class="php-comment">     * @access protected
+</span></span><span id="1498" class="l"><a href="#1498">1498: </a><span class="php-comment">     * @return void
+</span></span><span id="1499" class="l"><a href="#1499">1499: </a><span class="php-comment">     */</span>
+</span><span id="1500" class="l"><a href="#1500">1500: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
+</span><span id="1501" class="l"><a href="#1501">1501: </a>    {
+</span><span id="1502" class="l"><a href="#1502">1502: </a>        <span class="php-var">$this</span>-&gt;_query_args = <span class="php-var">$this</span>-&gt;input-&gt;get();
+</span><span id="1503" class="l"><a href="#1503">1503: </a>    }
+</span><span id="1504" class="l"><a href="#1504">1504: </a>
+</span><span id="1505" class="l"><a href="#1505">1505: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
+</span><span id="1506" class="l"><a href="#1506">1506: </a>
+</span><span id="1507" class="l"><a href="#1507">1507: </a>    <span class="php-comment">/**
+</span></span><span id="1508" class="l"><a href="#1508">1508: </a><span class="php-comment">     * Retrieve a value from a GET request
+</span></span><span id="1509" class="l"><a href="#1509">1509: </a><span class="php-comment">     *
+</span></span><span id="1510" class="l"><a href="#1510">1510: </a><span class="php-comment">     * @access public
+</span></span><span id="1511" class="l"><a href="#1511">1511: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
+</span></span><span id="1512" class="l"><a href="#1512">1512: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1513" class="l"><a href="#1513">1513: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1514" class="l"><a href="#1514">1514: </a><span class="php-comment">     * @return array|string|NULL Value from the GET request; otherwise, NULL
+</span></span><span id="1515" class="l"><a href="#1515">1515: </a><span class="php-comment">     */</span>
+</span><span id="1516" class="l"><a href="#1516">1516: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1517" class="l"><a href="#1517">1517: </a>    {
+</span><span id="1518" class="l"><a href="#1518">1518: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1519" class="l"><a href="#1519">1519: </a>        {
+</span><span id="1520" class="l"><a href="#1520">1520: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
+</span><span id="1521" class="l"><a href="#1521">1521: </a>        }
 </span><span id="1522" class="l"><a href="#1522">1522: </a>
-</span><span id="1523" class="l"><a href="#1523">1523: </a>    <span class="php-comment">/**
-</span></span><span id="1524" class="l"><a href="#1524">1524: </a><span class="php-comment">     * Retrieve a value from a POST request
-</span></span><span id="1525" class="l"><a href="#1525">1525: </a><span class="php-comment">     *
-</span></span><span id="1526" class="l"><a href="#1526">1526: </a><span class="php-comment">     * @access public
-</span></span><span id="1527" class="l"><a href="#1527">1527: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
-</span></span><span id="1528" class="l"><a href="#1528">1528: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1529" class="l"><a href="#1529">1529: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1530" class="l"><a href="#1530">1530: </a><span class="php-comment">     * @return array|string|NULL Value from the POST request; otherwise, NULL
-</span></span><span id="1531" class="l"><a href="#1531">1531: </a><span class="php-comment">     */</span>
-</span><span id="1532" class="l"><a href="#1532">1532: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1533" class="l"><a href="#1533">1533: </a>    {
-</span><span id="1534" class="l"><a href="#1534">1534: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1535" class="l"><a href="#1535">1535: </a>        {
-</span><span id="1536" class="l"><a href="#1536">1536: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
-</span><span id="1537" class="l"><a href="#1537">1537: </a>        }
-</span><span id="1538" class="l"><a href="#1538">1538: </a>
-</span><span id="1539" class="l"><a href="#1539">1539: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1540" class="l"><a href="#1540">1540: </a>    }
+</span><span id="1523" class="l"><a href="#1523">1523: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1524" class="l"><a href="#1524">1524: </a>    }
+</span><span id="1525" class="l"><a href="#1525">1525: </a>
+</span><span id="1526" class="l"><a href="#1526">1526: </a>    <span class="php-comment">/**
+</span></span><span id="1527" class="l"><a href="#1527">1527: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
+</span></span><span id="1528" class="l"><a href="#1528">1528: </a><span class="php-comment">     *
+</span></span><span id="1529" class="l"><a href="#1529">1529: </a><span class="php-comment">     * @access public
+</span></span><span id="1530" class="l"><a href="#1530">1530: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
+</span></span><span id="1531" class="l"><a href="#1531">1531: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1532" class="l"><a href="#1532">1532: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1533" class="l"><a href="#1533">1533: </a><span class="php-comment">     * @return array|string|NULL Value from the OPTIONS request; otherwise, NULL
+</span></span><span id="1534" class="l"><a href="#1534">1534: </a><span class="php-comment">     */</span>
+</span><span id="1535" class="l"><a href="#1535">1535: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1536" class="l"><a href="#1536">1536: </a>    {
+</span><span id="1537" class="l"><a href="#1537">1537: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1538" class="l"><a href="#1538">1538: </a>        {
+</span><span id="1539" class="l"><a href="#1539">1539: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
+</span><span id="1540" class="l"><a href="#1540">1540: </a>        }
 </span><span id="1541" class="l"><a href="#1541">1541: </a>
-</span><span id="1542" class="l"><a href="#1542">1542: </a>    <span class="php-comment">/**
-</span></span><span id="1543" class="l"><a href="#1543">1543: </a><span class="php-comment">     * Retrieve a value from a PUT request
-</span></span><span id="1544" class="l"><a href="#1544">1544: </a><span class="php-comment">     *
-</span></span><span id="1545" class="l"><a href="#1545">1545: </a><span class="php-comment">     * @access public
-</span></span><span id="1546" class="l"><a href="#1546">1546: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
-</span></span><span id="1547" class="l"><a href="#1547">1547: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1548" class="l"><a href="#1548">1548: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1549" class="l"><a href="#1549">1549: </a><span class="php-comment">     * @return array|string|NULL Value from the PUT request; otherwise, NULL
-</span></span><span id="1550" class="l"><a href="#1550">1550: </a><span class="php-comment">     */</span>
-</span><span id="1551" class="l"><a href="#1551">1551: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1552" class="l"><a href="#1552">1552: </a>    {
-</span><span id="1553" class="l"><a href="#1553">1553: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1554" class="l"><a href="#1554">1554: </a>        {
-</span><span id="1555" class="l"><a href="#1555">1555: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
-</span><span id="1556" class="l"><a href="#1556">1556: </a>        }
-</span><span id="1557" class="l"><a href="#1557">1557: </a>
-</span><span id="1558" class="l"><a href="#1558">1558: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1559" class="l"><a href="#1559">1559: </a>    }
+</span><span id="1542" class="l"><a href="#1542">1542: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1543" class="l"><a href="#1543">1543: </a>    }
+</span><span id="1544" class="l"><a href="#1544">1544: </a>
+</span><span id="1545" class="l"><a href="#1545">1545: </a>    <span class="php-comment">/**
+</span></span><span id="1546" class="l"><a href="#1546">1546: </a><span class="php-comment">     * Retrieve a value from a HEAD request
+</span></span><span id="1547" class="l"><a href="#1547">1547: </a><span class="php-comment">     *
+</span></span><span id="1548" class="l"><a href="#1548">1548: </a><span class="php-comment">     * @access public
+</span></span><span id="1549" class="l"><a href="#1549">1549: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
+</span></span><span id="1550" class="l"><a href="#1550">1550: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1551" class="l"><a href="#1551">1551: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1552" class="l"><a href="#1552">1552: </a><span class="php-comment">     * @return array|string|NULL Value from the HEAD request; otherwise, NULL
+</span></span><span id="1553" class="l"><a href="#1553">1553: </a><span class="php-comment">     */</span>
+</span><span id="1554" class="l"><a href="#1554">1554: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1555" class="l"><a href="#1555">1555: </a>    {
+</span><span id="1556" class="l"><a href="#1556">1556: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1557" class="l"><a href="#1557">1557: </a>        {
+</span><span id="1558" class="l"><a href="#1558">1558: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_head_args;
+</span><span id="1559" class="l"><a href="#1559">1559: </a>        }
 </span><span id="1560" class="l"><a href="#1560">1560: </a>
-</span><span id="1561" class="l"><a href="#1561">1561: </a>    <span class="php-comment">/**
-</span></span><span id="1562" class="l"><a href="#1562">1562: </a><span class="php-comment">     * Retrieve a value from a DELETE request
-</span></span><span id="1563" class="l"><a href="#1563">1563: </a><span class="php-comment">     *
-</span></span><span id="1564" class="l"><a href="#1564">1564: </a><span class="php-comment">     * @access public
-</span></span><span id="1565" class="l"><a href="#1565">1565: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
-</span></span><span id="1566" class="l"><a href="#1566">1566: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1567" class="l"><a href="#1567">1567: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1568" class="l"><a href="#1568">1568: </a><span class="php-comment">     * @return array|string|NULL Value from the DELETE request; otherwise, NULL
-</span></span><span id="1569" class="l"><a href="#1569">1569: </a><span class="php-comment">     */</span>
-</span><span id="1570" class="l"><a href="#1570">1570: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1571" class="l"><a href="#1571">1571: </a>    {
-</span><span id="1572" class="l"><a href="#1572">1572: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1573" class="l"><a href="#1573">1573: </a>        {
-</span><span id="1574" class="l"><a href="#1574">1574: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
-</span><span id="1575" class="l"><a href="#1575">1575: </a>        }
-</span><span id="1576" class="l"><a href="#1576">1576: </a>
-</span><span id="1577" class="l"><a href="#1577">1577: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1578" class="l"><a href="#1578">1578: </a>    }
+</span><span id="1561" class="l"><a href="#1561">1561: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_head_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1562" class="l"><a href="#1562">1562: </a>    }
+</span><span id="1563" class="l"><a href="#1563">1563: </a>
+</span><span id="1564" class="l"><a href="#1564">1564: </a>    <span class="php-comment">/**
+</span></span><span id="1565" class="l"><a href="#1565">1565: </a><span class="php-comment">     * Retrieve a value from a POST request
+</span></span><span id="1566" class="l"><a href="#1566">1566: </a><span class="php-comment">     *
+</span></span><span id="1567" class="l"><a href="#1567">1567: </a><span class="php-comment">     * @access public
+</span></span><span id="1568" class="l"><a href="#1568">1568: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
+</span></span><span id="1569" class="l"><a href="#1569">1569: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1570" class="l"><a href="#1570">1570: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1571" class="l"><a href="#1571">1571: </a><span class="php-comment">     * @return array|string|NULL Value from the POST request; otherwise, NULL
+</span></span><span id="1572" class="l"><a href="#1572">1572: </a><span class="php-comment">     */</span>
+</span><span id="1573" class="l"><a href="#1573">1573: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1574" class="l"><a href="#1574">1574: </a>    {
+</span><span id="1575" class="l"><a href="#1575">1575: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1576" class="l"><a href="#1576">1576: </a>        {
+</span><span id="1577" class="l"><a href="#1577">1577: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
+</span><span id="1578" class="l"><a href="#1578">1578: </a>        }
 </span><span id="1579" class="l"><a href="#1579">1579: </a>
-</span><span id="1580" class="l"><a href="#1580">1580: </a>    <span class="php-comment">/**
-</span></span><span id="1581" class="l"><a href="#1581">1581: </a><span class="php-comment">     * Retrieve a value from a PATCH request
-</span></span><span id="1582" class="l"><a href="#1582">1582: </a><span class="php-comment">     *
-</span></span><span id="1583" class="l"><a href="#1583">1583: </a><span class="php-comment">     * @access public
-</span></span><span id="1584" class="l"><a href="#1584">1584: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
-</span></span><span id="1585" class="l"><a href="#1585">1585: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1586" class="l"><a href="#1586">1586: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1587" class="l"><a href="#1587">1587: </a><span class="php-comment">     * @return array|string|NULL Value from the PATCH request; otherwise, NULL
-</span></span><span id="1588" class="l"><a href="#1588">1588: </a><span class="php-comment">     */</span>
-</span><span id="1589" class="l"><a href="#1589">1589: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1590" class="l"><a href="#1590">1590: </a>    {
-</span><span id="1591" class="l"><a href="#1591">1591: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1592" class="l"><a href="#1592">1592: </a>        {
-</span><span id="1593" class="l"><a href="#1593">1593: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
-</span><span id="1594" class="l"><a href="#1594">1594: </a>        }
-</span><span id="1595" class="l"><a href="#1595">1595: </a>
-</span><span id="1596" class="l"><a href="#1596">1596: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1597" class="l"><a href="#1597">1597: </a>    }
+</span><span id="1580" class="l"><a href="#1580">1580: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1581" class="l"><a href="#1581">1581: </a>    }
+</span><span id="1582" class="l"><a href="#1582">1582: </a>
+</span><span id="1583" class="l"><a href="#1583">1583: </a>    <span class="php-comment">/**
+</span></span><span id="1584" class="l"><a href="#1584">1584: </a><span class="php-comment">     * Retrieve a value from a PUT request
+</span></span><span id="1585" class="l"><a href="#1585">1585: </a><span class="php-comment">     *
+</span></span><span id="1586" class="l"><a href="#1586">1586: </a><span class="php-comment">     * @access public
+</span></span><span id="1587" class="l"><a href="#1587">1587: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
+</span></span><span id="1588" class="l"><a href="#1588">1588: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1589" class="l"><a href="#1589">1589: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1590" class="l"><a href="#1590">1590: </a><span class="php-comment">     * @return array|string|NULL Value from the PUT request; otherwise, NULL
+</span></span><span id="1591" class="l"><a href="#1591">1591: </a><span class="php-comment">     */</span>
+</span><span id="1592" class="l"><a href="#1592">1592: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1593" class="l"><a href="#1593">1593: </a>    {
+</span><span id="1594" class="l"><a href="#1594">1594: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1595" class="l"><a href="#1595">1595: </a>        {
+</span><span id="1596" class="l"><a href="#1596">1596: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
+</span><span id="1597" class="l"><a href="#1597">1597: </a>        }
 </span><span id="1598" class="l"><a href="#1598">1598: </a>
-</span><span id="1599" class="l"><a href="#1599">1599: </a>    <span class="php-comment">/**
-</span></span><span id="1600" class="l"><a href="#1600">1600: </a><span class="php-comment">     * Retrieve a value from the query parameters
-</span></span><span id="1601" class="l"><a href="#1601">1601: </a><span class="php-comment">     *
-</span></span><span id="1602" class="l"><a href="#1602">1602: </a><span class="php-comment">     * @access public
-</span></span><span id="1603" class="l"><a href="#1603">1603: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
-</span></span><span id="1604" class="l"><a href="#1604">1604: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1605" class="l"><a href="#1605">1605: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1606" class="l"><a href="#1606">1606: </a><span class="php-comment">     * @return array|string|NULL Value from the query parameters; otherwise, NULL
-</span></span><span id="1607" class="l"><a href="#1607">1607: </a><span class="php-comment">     */</span>
-</span><span id="1608" class="l"><a href="#1608">1608: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1609" class="l"><a href="#1609">1609: </a>    {
-</span><span id="1610" class="l"><a href="#1610">1610: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1611" class="l"><a href="#1611">1611: </a>        {
-</span><span id="1612" class="l"><a href="#1612">1612: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
-</span><span id="1613" class="l"><a href="#1613">1613: </a>        }
-</span><span id="1614" class="l"><a href="#1614">1614: </a>
-</span><span id="1615" class="l"><a href="#1615">1615: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1616" class="l"><a href="#1616">1616: </a>    }
+</span><span id="1599" class="l"><a href="#1599">1599: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1600" class="l"><a href="#1600">1600: </a>    }
+</span><span id="1601" class="l"><a href="#1601">1601: </a>
+</span><span id="1602" class="l"><a href="#1602">1602: </a>    <span class="php-comment">/**
+</span></span><span id="1603" class="l"><a href="#1603">1603: </a><span class="php-comment">     * Retrieve a value from a DELETE request
+</span></span><span id="1604" class="l"><a href="#1604">1604: </a><span class="php-comment">     *
+</span></span><span id="1605" class="l"><a href="#1605">1605: </a><span class="php-comment">     * @access public
+</span></span><span id="1606" class="l"><a href="#1606">1606: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
+</span></span><span id="1607" class="l"><a href="#1607">1607: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1608" class="l"><a href="#1608">1608: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1609" class="l"><a href="#1609">1609: </a><span class="php-comment">     * @return array|string|NULL Value from the DELETE request; otherwise, NULL
+</span></span><span id="1610" class="l"><a href="#1610">1610: </a><span class="php-comment">     */</span>
+</span><span id="1611" class="l"><a href="#1611">1611: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1612" class="l"><a href="#1612">1612: </a>    {
+</span><span id="1613" class="l"><a href="#1613">1613: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1614" class="l"><a href="#1614">1614: </a>        {
+</span><span id="1615" class="l"><a href="#1615">1615: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
+</span><span id="1616" class="l"><a href="#1616">1616: </a>        }
 </span><span id="1617" class="l"><a href="#1617">1617: </a>
-</span><span id="1618" class="l"><a href="#1618">1618: </a>    <span class="php-comment">/**
-</span></span><span id="1619" class="l"><a href="#1619">1619: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
-</span></span><span id="1620" class="l"><a href="#1620">1620: </a><span class="php-comment">     * prevented.
-</span></span><span id="1621" class="l"><a href="#1621">1621: </a><span class="php-comment">     *
-</span></span><span id="1622" class="l"><a href="#1622">1622: </a><span class="php-comment">     * @access protected
-</span></span><span id="1623" class="l"><a href="#1623">1623: </a><span class="php-comment">     * @param  string $value Input data
-</span></span><span id="1624" class="l"><a href="#1624">1624: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
-</span></span><span id="1625" class="l"><a href="#1625">1625: </a><span class="php-comment">     * @return string
-</span></span><span id="1626" class="l"><a href="#1626">1626: </a><span class="php-comment">     */</span>
-</span><span id="1627" class="l"><a href="#1627">1627: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
-</span><span id="1628" class="l"><a href="#1628">1628: </a>    {
-</span><span id="1629" class="l"><a href="#1629">1629: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) || <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
-</span><span id="1630" class="l"><a href="#1630">1630: </a>
-</span><span id="1631" class="l"><a href="#1631">1631: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
-</span><span id="1632" class="l"><a href="#1632">1632: </a>    }
-</span><span id="1633" class="l"><a href="#1633">1633: </a>
-</span><span id="1634" class="l"><a href="#1634">1634: </a>    <span class="php-comment">/**
-</span></span><span id="1635" class="l"><a href="#1635">1635: </a><span class="php-comment">     * Retrieve the validation errors
-</span></span><span id="1636" class="l"><a href="#1636">1636: </a><span class="php-comment">     *
-</span></span><span id="1637" class="l"><a href="#1637">1637: </a><span class="php-comment">     * @access public
-</span></span><span id="1638" class="l"><a href="#1638">1638: </a><span class="php-comment">     * @return array
-</span></span><span id="1639" class="l"><a href="#1639">1639: </a><span class="php-comment">     */</span>
-</span><span id="1640" class="l"><a href="#1640">1640: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
-</span><span id="1641" class="l"><a href="#1641">1641: </a>    {
-</span><span id="1642" class="l"><a href="#1642">1642: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
-</span><span id="1643" class="l"><a href="#1643">1643: </a>
-</span><span id="1644" class="l"><a href="#1644">1644: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
-</span><span id="1645" class="l"><a href="#1645">1645: </a>    }
-</span><span id="1646" class="l"><a href="#1646">1646: </a>
-</span><span id="1647" class="l"><a href="#1647">1647: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
-</span><span id="1648" class="l"><a href="#1648">1648: </a>
-</span><span id="1649" class="l"><a href="#1649">1649: </a>    <span class="php-comment">/**
-</span></span><span id="1650" class="l"><a href="#1650">1650: </a><span class="php-comment">     * Perform LDAP Authentication
-</span></span><span id="1651" class="l"><a href="#1651">1651: </a><span class="php-comment">     *
-</span></span><span id="1652" class="l"><a href="#1652">1652: </a><span class="php-comment">     * @access protected
-</span></span><span id="1653" class="l"><a href="#1653">1653: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1654" class="l"><a href="#1654">1654: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1655" class="l"><a href="#1655">1655: </a><span class="php-comment">     * @return bool
-</span></span><span id="1656" class="l"><a href="#1656">1656: </a><span class="php-comment">     */</span>
-</span><span id="1657" class="l"><a href="#1657">1657: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1658" class="l"><a href="#1658">1658: </a>    {
-</span><span id="1659" class="l"><a href="#1659">1659: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1660" class="l"><a href="#1660">1660: </a>        {
-</span><span id="1661" class="l"><a href="#1661">1661: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
-</span><span id="1662" class="l"><a href="#1662">1662: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1663" class="l"><a href="#1663">1663: </a>        }
-</span><span id="1664" class="l"><a href="#1664">1664: </a>
-</span><span id="1665" class="l"><a href="#1665">1665: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading configuration'</span>);
-</span><span id="1666" class="l"><a href="#1666">1666: </a>
-</span><span id="1667" class="l"><a href="#1667">1667: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="1668" class="l"><a href="#1668">1668: </a>
-</span><span id="1669" class="l"><a href="#1669">1669: </a>        <span class="php-var">$ldap</span> = [
-</span><span id="1670" class="l"><a href="#1670">1670: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1671" class="l"><a href="#1671">1671: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1672" class="l"><a href="#1672">1672: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1673" class="l"><a href="#1673">1673: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1674" class="l"><a href="#1674">1674: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1675" class="l"><a href="#1675">1675: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1676" class="l"><a href="#1676">1676: </a>        ];
-</span><span id="1677" class="l"><a href="#1677">1677: </a>
-</span><span id="1678" class="l"><a href="#1678">1678: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
-</span><span id="1679" class="l"><a href="#1679">1679: </a>
-</span><span id="1680" class="l"><a href="#1680">1680: </a>        <span class="php-comment">// Connect to the ldap server</span>
-</span><span id="1681" class="l"><a href="#1681">1681: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
-</span><span id="1682" class="l"><a href="#1682">1682: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
-</span><span id="1683" class="l"><a href="#1683">1683: </a>        {
-</span><span id="1684" class="l"><a href="#1684">1684: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>] . <span class="php-quote">' seconds'</span>);
-</span><span id="1685" class="l"><a href="#1685">1685: </a>
-</span><span id="1686" class="l"><a href="#1686">1686: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
+</span><span id="1618" class="l"><a href="#1618">1618: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1619" class="l"><a href="#1619">1619: </a>    }
+</span><span id="1620" class="l"><a href="#1620">1620: </a>
+</span><span id="1621" class="l"><a href="#1621">1621: </a>    <span class="php-comment">/**
+</span></span><span id="1622" class="l"><a href="#1622">1622: </a><span class="php-comment">     * Retrieve a value from a PATCH request
+</span></span><span id="1623" class="l"><a href="#1623">1623: </a><span class="php-comment">     *
+</span></span><span id="1624" class="l"><a href="#1624">1624: </a><span class="php-comment">     * @access public
+</span></span><span id="1625" class="l"><a href="#1625">1625: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
+</span></span><span id="1626" class="l"><a href="#1626">1626: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1627" class="l"><a href="#1627">1627: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1628" class="l"><a href="#1628">1628: </a><span class="php-comment">     * @return array|string|NULL Value from the PATCH request; otherwise, NULL
+</span></span><span id="1629" class="l"><a href="#1629">1629: </a><span class="php-comment">     */</span>
+</span><span id="1630" class="l"><a href="#1630">1630: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1631" class="l"><a href="#1631">1631: </a>    {
+</span><span id="1632" class="l"><a href="#1632">1632: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1633" class="l"><a href="#1633">1633: </a>        {
+</span><span id="1634" class="l"><a href="#1634">1634: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
+</span><span id="1635" class="l"><a href="#1635">1635: </a>        }
+</span><span id="1636" class="l"><a href="#1636">1636: </a>
+</span><span id="1637" class="l"><a href="#1637">1637: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1638" class="l"><a href="#1638">1638: </a>    }
+</span><span id="1639" class="l"><a href="#1639">1639: </a>
+</span><span id="1640" class="l"><a href="#1640">1640: </a>    <span class="php-comment">/**
+</span></span><span id="1641" class="l"><a href="#1641">1641: </a><span class="php-comment">     * Retrieve a value from the query parameters
+</span></span><span id="1642" class="l"><a href="#1642">1642: </a><span class="php-comment">     *
+</span></span><span id="1643" class="l"><a href="#1643">1643: </a><span class="php-comment">     * @access public
+</span></span><span id="1644" class="l"><a href="#1644">1644: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
+</span></span><span id="1645" class="l"><a href="#1645">1645: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1646" class="l"><a href="#1646">1646: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1647" class="l"><a href="#1647">1647: </a><span class="php-comment">     * @return array|string|NULL Value from the query parameters; otherwise, NULL
+</span></span><span id="1648" class="l"><a href="#1648">1648: </a><span class="php-comment">     */</span>
+</span><span id="1649" class="l"><a href="#1649">1649: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1650" class="l"><a href="#1650">1650: </a>    {
+</span><span id="1651" class="l"><a href="#1651">1651: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1652" class="l"><a href="#1652">1652: </a>        {
+</span><span id="1653" class="l"><a href="#1653">1653: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
+</span><span id="1654" class="l"><a href="#1654">1654: </a>        }
+</span><span id="1655" class="l"><a href="#1655">1655: </a>
+</span><span id="1656" class="l"><a href="#1656">1656: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1657" class="l"><a href="#1657">1657: </a>    }
+</span><span id="1658" class="l"><a href="#1658">1658: </a>
+</span><span id="1659" class="l"><a href="#1659">1659: </a>    <span class="php-comment">/**
+</span></span><span id="1660" class="l"><a href="#1660">1660: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
+</span></span><span id="1661" class="l"><a href="#1661">1661: </a><span class="php-comment">     * prevented
+</span></span><span id="1662" class="l"><a href="#1662">1662: </a><span class="php-comment">     *
+</span></span><span id="1663" class="l"><a href="#1663">1663: </a><span class="php-comment">     * @access protected
+</span></span><span id="1664" class="l"><a href="#1664">1664: </a><span class="php-comment">     * @param  string $value Input data
+</span></span><span id="1665" class="l"><a href="#1665">1665: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
+</span></span><span id="1666" class="l"><a href="#1666">1666: </a><span class="php-comment">     * @return string
+</span></span><span id="1667" class="l"><a href="#1667">1667: </a><span class="php-comment">     */</span>
+</span><span id="1668" class="l"><a href="#1668">1668: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
+</span><span id="1669" class="l"><a href="#1669">1669: </a>    {
+</span><span id="1670" class="l"><a href="#1670">1670: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) || <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
+</span><span id="1671" class="l"><a href="#1671">1671: </a>
+</span><span id="1672" class="l"><a href="#1672">1672: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
+</span><span id="1673" class="l"><a href="#1673">1673: </a>    }
+</span><span id="1674" class="l"><a href="#1674">1674: </a>
+</span><span id="1675" class="l"><a href="#1675">1675: </a>    <span class="php-comment">/**
+</span></span><span id="1676" class="l"><a href="#1676">1676: </a><span class="php-comment">     * Retrieve the validation errors
+</span></span><span id="1677" class="l"><a href="#1677">1677: </a><span class="php-comment">     *
+</span></span><span id="1678" class="l"><a href="#1678">1678: </a><span class="php-comment">     * @access public
+</span></span><span id="1679" class="l"><a href="#1679">1679: </a><span class="php-comment">     * @return array
+</span></span><span id="1680" class="l"><a href="#1680">1680: </a><span class="php-comment">     */</span>
+</span><span id="1681" class="l"><a href="#1681">1681: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
+</span><span id="1682" class="l"><a href="#1682">1682: </a>    {
+</span><span id="1683" class="l"><a href="#1683">1683: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
+</span><span id="1684" class="l"><a href="#1684">1684: </a>
+</span><span id="1685" class="l"><a href="#1685">1685: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
+</span><span id="1686" class="l"><a href="#1686">1686: </a>    }
 </span><span id="1687" class="l"><a href="#1687">1687: </a>
-</span><span id="1688" class="l"><a href="#1688">1688: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>] . <span class="php-quote">' with dn '</span> . <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
+</span><span id="1688" class="l"><a href="#1688">1688: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
 </span><span id="1689" class="l"><a href="#1689">1689: </a>
-</span><span id="1690" class="l"><a href="#1690">1690: </a>            <span class="php-comment">// Binding to the ldap server</span>
-</span><span id="1691" class="l"><a href="#1691">1691: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
-</span><span id="1692" class="l"><a href="#1692">1692: </a>
-</span><span id="1693" class="l"><a href="#1693">1693: </a>            <span class="php-comment">// Verify the binding</span>
-</span><span id="1694" class="l"><a href="#1694">1694: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1695" class="l"><a href="#1695">1695: </a>            {
-</span><span id="1696" class="l"><a href="#1696">1696: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind was unsuccessful'</span>);
-</span><span id="1697" class="l"><a href="#1697">1697: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1698" class="l"><a href="#1698">1698: </a>            }
-</span><span id="1699" class="l"><a href="#1699">1699: </a>
-</span><span id="1700" class="l"><a href="#1700">1700: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
-</span><span id="1701" class="l"><a href="#1701">1701: </a>        }
-</span><span id="1702" class="l"><a href="#1702">1702: </a>
-</span><span id="1703" class="l"><a href="#1703">1703: </a>        <span class="php-comment">// Search for user</span>
-</span><span id="1704" class="l"><a href="#1704">1704: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1705" class="l"><a href="#1705">1705: </a>        {
-</span><span id="1706" class="l"><a href="#1706">1706: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span> . <span class="php-var">$username</span> . <span class="php-quote">' not found in search'</span>);
-</span><span id="1707" class="l"><a href="#1707">1707: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1708" class="l"><a href="#1708">1708: </a>        }
+</span><span id="1690" class="l"><a href="#1690">1690: </a>    <span class="php-comment">/**
+</span></span><span id="1691" class="l"><a href="#1691">1691: </a><span class="php-comment">     * Perform LDAP Authentication
+</span></span><span id="1692" class="l"><a href="#1692">1692: </a><span class="php-comment">     *
+</span></span><span id="1693" class="l"><a href="#1693">1693: </a><span class="php-comment">     * @access protected
+</span></span><span id="1694" class="l"><a href="#1694">1694: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1695" class="l"><a href="#1695">1695: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1696" class="l"><a href="#1696">1696: </a><span class="php-comment">     * @return bool
+</span></span><span id="1697" class="l"><a href="#1697">1697: </a><span class="php-comment">     */</span>
+</span><span id="1698" class="l"><a href="#1698">1698: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1699" class="l"><a href="#1699">1699: </a>    {
+</span><span id="1700" class="l"><a href="#1700">1700: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1701" class="l"><a href="#1701">1701: </a>        {
+</span><span id="1702" class="l"><a href="#1702">1702: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
+</span><span id="1703" class="l"><a href="#1703">1703: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1704" class="l"><a href="#1704">1704: </a>        }
+</span><span id="1705" class="l"><a href="#1705">1705: </a>
+</span><span id="1706" class="l"><a href="#1706">1706: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading configuration'</span>);
+</span><span id="1707" class="l"><a href="#1707">1707: </a>
+</span><span id="1708" class="l"><a href="#1708">1708: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
 </span><span id="1709" class="l"><a href="#1709">1709: </a>
-</span><span id="1710" class="l"><a href="#1710">1710: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
-</span><span id="1711" class="l"><a href="#1711">1711: </a>        {
-</span><span id="1712" class="l"><a href="#1712">1712: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username '</span> . <span class="php-var">$username</span> . <span class="php-quote">'found more than once'</span>);
-</span><span id="1713" class="l"><a href="#1713">1713: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1714" class="l"><a href="#1714">1714: </a>        }
-</span><span id="1715" class="l"><a href="#1715">1715: </a>
-</span><span id="1716" class="l"><a href="#1716">1716: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1717" class="l"><a href="#1717">1717: </a>        {
-</span><span id="1718" class="l"><a href="#1718">1718: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, entry of search result could not be fetched'</span>);
-</span><span id="1719" class="l"><a href="#1719">1719: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1720" class="l"><a href="#1720">1720: </a>        }
-</span><span id="1721" class="l"><a href="#1721">1721: </a>
-</span><span id="1722" class="l"><a href="#1722">1722: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1723" class="l"><a href="#1723">1723: </a>        {
-</span><span id="1724" class="l"><a href="#1724">1724: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, user-dn could not be fetched'</span>);
-</span><span id="1725" class="l"><a href="#1725">1725: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1726" class="l"><a href="#1726">1726: </a>        }
-</span><span id="1727" class="l"><a href="#1727">1727: </a>
-</span><span id="1728" class="l"><a href="#1728">1728: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
-</span><span id="1729" class="l"><a href="#1729">1729: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1730" class="l"><a href="#1730">1730: </a>        {
-</span><span id="1731" class="l"><a href="#1731">1731: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
-</span><span id="1732" class="l"><a href="#1732">1732: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1733" class="l"><a href="#1733">1733: </a>        }
-</span><span id="1734" class="l"><a href="#1734">1734: </a>
-</span><span id="1735" class="l"><a href="#1735">1735: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span> . <span class="php-var">$user_dn</span> . <span class="php-quote">' authenticated successfully'</span>);
-</span><span id="1736" class="l"><a href="#1736">1736: </a>
-</span><span id="1737" class="l"><a href="#1737">1737: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
-</span><span id="1738" class="l"><a href="#1738">1738: </a>
-</span><span id="1739" class="l"><a href="#1739">1739: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
+</span><span id="1710" class="l"><a href="#1710">1710: </a>        <span class="php-var">$ldap</span> = [
+</span><span id="1711" class="l"><a href="#1711">1711: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1712" class="l"><a href="#1712">1712: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1713" class="l"><a href="#1713">1713: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1714" class="l"><a href="#1714">1714: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1715" class="l"><a href="#1715">1715: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1716" class="l"><a href="#1716">1716: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1717" class="l"><a href="#1717">1717: </a>        ];
+</span><span id="1718" class="l"><a href="#1718">1718: </a>
+</span><span id="1719" class="l"><a href="#1719">1719: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
+</span><span id="1720" class="l"><a href="#1720">1720: </a>
+</span><span id="1721" class="l"><a href="#1721">1721: </a>        <span class="php-comment">// Connect to the ldap server</span>
+</span><span id="1722" class="l"><a href="#1722">1722: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
+</span><span id="1723" class="l"><a href="#1723">1723: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
+</span><span id="1724" class="l"><a href="#1724">1724: </a>        {
+</span><span id="1725" class="l"><a href="#1725">1725: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span>.<span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>].<span class="php-quote">' seconds'</span>);
+</span><span id="1726" class="l"><a href="#1726">1726: </a>
+</span><span id="1727" class="l"><a href="#1727">1727: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
+</span><span id="1728" class="l"><a href="#1728">1728: </a>
+</span><span id="1729" class="l"><a href="#1729">1729: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span>.<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>].<span class="php-quote">' with dn '</span>.<span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
+</span><span id="1730" class="l"><a href="#1730">1730: </a>
+</span><span id="1731" class="l"><a href="#1731">1731: </a>            <span class="php-comment">// Binding to the ldap server</span>
+</span><span id="1732" class="l"><a href="#1732">1732: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
+</span><span id="1733" class="l"><a href="#1733">1733: </a>
+</span><span id="1734" class="l"><a href="#1734">1734: </a>            <span class="php-comment">// Verify the binding</span>
+</span><span id="1735" class="l"><a href="#1735">1735: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1736" class="l"><a href="#1736">1736: </a>            {
+</span><span id="1737" class="l"><a href="#1737">1737: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind was unsuccessful'</span>);
+</span><span id="1738" class="l"><a href="#1738">1738: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1739" class="l"><a href="#1739">1739: </a>            }
 </span><span id="1740" class="l"><a href="#1740">1740: </a>
-</span><span id="1741" class="l"><a href="#1741">1741: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1742" class="l"><a href="#1742">1742: </a>    }
+</span><span id="1741" class="l"><a href="#1741">1741: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
+</span><span id="1742" class="l"><a href="#1742">1742: </a>        }
 </span><span id="1743" class="l"><a href="#1743">1743: </a>
-</span><span id="1744" class="l"><a href="#1744">1744: </a>    <span class="php-comment">/**
-</span></span><span id="1745" class="l"><a href="#1745">1745: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
-</span></span><span id="1746" class="l"><a href="#1746">1746: </a><span class="php-comment">     *
-</span></span><span id="1747" class="l"><a href="#1747">1747: </a><span class="php-comment">     * @access protected
-</span></span><span id="1748" class="l"><a href="#1748">1748: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1749" class="l"><a href="#1749">1749: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1750" class="l"><a href="#1750">1750: </a><span class="php-comment">     * @return bool
-</span></span><span id="1751" class="l"><a href="#1751">1751: </a><span class="php-comment">     */</span>
-</span><span id="1752" class="l"><a href="#1752">1752: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1753" class="l"><a href="#1753">1753: </a>    {
-</span><span id="1754" class="l"><a href="#1754">1754: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1755" class="l"><a href="#1755">1755: </a>        {
-</span><span id="1756" class="l"><a href="#1756">1756: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: Failure, empty username'</span>);
-</span><span id="1757" class="l"><a href="#1757">1757: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1758" class="l"><a href="#1758">1758: </a>        }
-</span><span id="1759" class="l"><a href="#1759">1759: </a>
-</span><span id="1760" class="l"><a href="#1760">1760: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
-</span><span id="1761" class="l"><a href="#1761">1761: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
+</span><span id="1744" class="l"><a href="#1744">1744: </a>        <span class="php-comment">// Search for user</span>
+</span><span id="1745" class="l"><a href="#1745">1745: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1746" class="l"><a href="#1746">1746: </a>        {
+</span><span id="1747" class="l"><a href="#1747">1747: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span>.<span class="php-var">$username</span>.<span class="php-quote">' not found in search'</span>);
+</span><span id="1748" class="l"><a href="#1748">1748: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1749" class="l"><a href="#1749">1749: </a>        }
+</span><span id="1750" class="l"><a href="#1750">1750: </a>
+</span><span id="1751" class="l"><a href="#1751">1751: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
+</span><span id="1752" class="l"><a href="#1752">1752: </a>        {
+</span><span id="1753" class="l"><a href="#1753">1753: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username '</span>.<span class="php-var">$username</span>.<span class="php-quote">'found more than once'</span>);
+</span><span id="1754" class="l"><a href="#1754">1754: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1755" class="l"><a href="#1755">1755: </a>        }
+</span><span id="1756" class="l"><a href="#1756">1756: </a>
+</span><span id="1757" class="l"><a href="#1757">1757: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1758" class="l"><a href="#1758">1758: </a>        {
+</span><span id="1759" class="l"><a href="#1759">1759: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, entry of search result could not be fetched'</span>);
+</span><span id="1760" class="l"><a href="#1760">1760: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1761" class="l"><a href="#1761">1761: </a>        }
 </span><span id="1762" class="l"><a href="#1762">1762: </a>
-</span><span id="1763" class="l"><a href="#1763">1763: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
+</span><span id="1763" class="l"><a href="#1763">1763: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) === <span class="php-keyword1">FALSE</span>)
 </span><span id="1764" class="l"><a href="#1764">1764: </a>        {
-</span><span id="1765" class="l"><a href="#1765">1765: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_class'</span>);
+</span><span id="1765" class="l"><a href="#1765">1765: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, user-dn could not be fetched'</span>);
 </span><span id="1766" class="l"><a href="#1766">1766: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
 </span><span id="1767" class="l"><a href="#1767">1767: </a>        }
 </span><span id="1768" class="l"><a href="#1768">1768: </a>
-</span><span id="1769" class="l"><a href="#1769">1769: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
-</span><span id="1770" class="l"><a href="#1770">1770: </a>        {
-</span><span id="1771" class="l"><a href="#1771">1771: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_function'</span>);
-</span><span id="1772" class="l"><a href="#1772">1772: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1773" class="l"><a href="#1773">1773: </a>        }
-</span><span id="1774" class="l"><a href="#1774">1774: </a>
-</span><span id="1775" class="l"><a href="#1775">1775: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1776" class="l"><a href="#1776">1776: </a>        {
-</span><span id="1777" class="l"><a href="#1777">1777: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
-</span><span id="1778" class="l"><a href="#1778">1778: </a>        }
+</span><span id="1769" class="l"><a href="#1769">1769: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
+</span><span id="1770" class="l"><a href="#1770">1770: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1771" class="l"><a href="#1771">1771: </a>        {
+</span><span id="1772" class="l"><a href="#1772">1772: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
+</span><span id="1773" class="l"><a href="#1773">1773: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1774" class="l"><a href="#1774">1774: </a>        }
+</span><span id="1775" class="l"><a href="#1775">1775: </a>
+</span><span id="1776" class="l"><a href="#1776">1776: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span>.<span class="php-var">$user_dn</span>.<span class="php-quote">' authenticated successfully'</span>);
+</span><span id="1777" class="l"><a href="#1777">1777: </a>
+</span><span id="1778" class="l"><a href="#1778">1778: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
 </span><span id="1779" class="l"><a href="#1779">1779: </a>
-</span><span id="1780" class="l"><a href="#1780">1780: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1781" class="l"><a href="#1781">1781: </a>    }
-</span><span id="1782" class="l"><a href="#1782">1782: </a>
-</span><span id="1783" class="l"><a href="#1783">1783: </a>    <span class="php-comment">/**
-</span></span><span id="1784" class="l"><a href="#1784">1784: </a><span class="php-comment">     * Check if the user is logged in
-</span></span><span id="1785" class="l"><a href="#1785">1785: </a><span class="php-comment">     *
-</span></span><span id="1786" class="l"><a href="#1786">1786: </a><span class="php-comment">     * @access protected
-</span></span><span id="1787" class="l"><a href="#1787">1787: </a><span class="php-comment">     * @param  string $username The user's name
-</span></span><span id="1788" class="l"><a href="#1788">1788: </a><span class="php-comment">     * @param  bool|string $password The user's password
-</span></span><span id="1789" class="l"><a href="#1789">1789: </a><span class="php-comment">     * @return bool
-</span></span><span id="1790" class="l"><a href="#1790">1790: </a><span class="php-comment">     */</span>
-</span><span id="1791" class="l"><a href="#1791">1791: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1792" class="l"><a href="#1792">1792: </a>    {
-</span><span id="1793" class="l"><a href="#1793">1793: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1794" class="l"><a href="#1794">1794: </a>        {
-</span><span id="1795" class="l"><a href="#1795">1795: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1796" class="l"><a href="#1796">1796: </a>        }
-</span><span id="1797" class="l"><a href="#1797">1797: </a>
-</span><span id="1798" class="l"><a href="#1798">1798: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
-</span><span id="1799" class="l"><a href="#1799">1799: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="1800" class="l"><a href="#1800">1800: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
-</span><span id="1801" class="l"><a href="#1801">1801: </a>
-</span><span id="1802" class="l"><a href="#1802">1802: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
-</span><span id="1803" class="l"><a href="#1803">1803: </a>        {
-</span><span id="1804" class="l"><a href="#1804">1804: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
-</span><span id="1805" class="l"><a href="#1805">1805: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>) . <span class="php-quote">':'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
-</span><span id="1806" class="l"><a href="#1806">1806: </a>        }
-</span><span id="1807" class="l"><a href="#1807">1807: </a>
-</span><span id="1808" class="l"><a href="#1808">1808: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1809" class="l"><a href="#1809">1809: </a>        {
-</span><span id="1810" class="l"><a href="#1810">1810: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1811" class="l"><a href="#1811">1811: </a>        }
-</span><span id="1812" class="l"><a href="#1812">1812: </a>
-</span><span id="1813" class="l"><a href="#1813">1813: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
-</span><span id="1814" class="l"><a href="#1814">1814: </a>        {
-</span><span id="1815" class="l"><a href="#1815">1815: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
-</span><span id="1816" class="l"><a href="#1816">1816: </a>
-</span><span id="1817" class="l"><a href="#1817">1817: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1818" class="l"><a href="#1818">1818: </a>        }
-</span><span id="1819" class="l"><a href="#1819">1819: </a>
-</span><span id="1820" class="l"><a href="#1820">1820: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
-</span><span id="1821" class="l"><a href="#1821">1821: </a>        {
-</span><span id="1822" class="l"><a href="#1822">1822: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1780" class="l"><a href="#1780">1780: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
+</span><span id="1781" class="l"><a href="#1781">1781: </a>
+</span><span id="1782" class="l"><a href="#1782">1782: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1783" class="l"><a href="#1783">1783: </a>    }
+</span><span id="1784" class="l"><a href="#1784">1784: </a>
+</span><span id="1785" class="l"><a href="#1785">1785: </a>    <span class="php-comment">/**
+</span></span><span id="1786" class="l"><a href="#1786">1786: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
+</span></span><span id="1787" class="l"><a href="#1787">1787: </a><span class="php-comment">     *
+</span></span><span id="1788" class="l"><a href="#1788">1788: </a><span class="php-comment">     * @access protected
+</span></span><span id="1789" class="l"><a href="#1789">1789: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1790" class="l"><a href="#1790">1790: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1791" class="l"><a href="#1791">1791: </a><span class="php-comment">     * @return bool
+</span></span><span id="1792" class="l"><a href="#1792">1792: </a><span class="php-comment">     */</span>
+</span><span id="1793" class="l"><a href="#1793">1793: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1794" class="l"><a href="#1794">1794: </a>    {
+</span><span id="1795" class="l"><a href="#1795">1795: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1796" class="l"><a href="#1796">1796: </a>        {
+</span><span id="1797" class="l"><a href="#1797">1797: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: Failure, empty username'</span>);
+</span><span id="1798" class="l"><a href="#1798">1798: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1799" class="l"><a href="#1799">1799: </a>        }
+</span><span id="1800" class="l"><a href="#1800">1800: </a>
+</span><span id="1801" class="l"><a href="#1801">1801: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
+</span><span id="1802" class="l"><a href="#1802">1802: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
+</span><span id="1803" class="l"><a href="#1803">1803: </a>
+</span><span id="1804" class="l"><a href="#1804">1804: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
+</span><span id="1805" class="l"><a href="#1805">1805: </a>        {
+</span><span id="1806" class="l"><a href="#1806">1806: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_class'</span>);
+</span><span id="1807" class="l"><a href="#1807">1807: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1808" class="l"><a href="#1808">1808: </a>        }
+</span><span id="1809" class="l"><a href="#1809">1809: </a>
+</span><span id="1810" class="l"><a href="#1810">1810: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
+</span><span id="1811" class="l"><a href="#1811">1811: </a>        {
+</span><span id="1812" class="l"><a href="#1812">1812: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_function'</span>);
+</span><span id="1813" class="l"><a href="#1813">1813: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1814" class="l"><a href="#1814">1814: </a>        }
+</span><span id="1815" class="l"><a href="#1815">1815: </a>
+</span><span id="1816" class="l"><a href="#1816">1816: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1817" class="l"><a href="#1817">1817: </a>        {
+</span><span id="1818" class="l"><a href="#1818">1818: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
+</span><span id="1819" class="l"><a href="#1819">1819: </a>        }
+</span><span id="1820" class="l"><a href="#1820">1820: </a>
+</span><span id="1821" class="l"><a href="#1821">1821: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1822" class="l"><a href="#1822">1822: </a>    }
 </span><span id="1823" class="l"><a href="#1823">1823: </a>
-</span><span id="1824" class="l"><a href="#1824">1824: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1825" class="l"><a href="#1825">1825: </a>        }
-</span><span id="1826" class="l"><a href="#1826">1826: </a>
-</span><span id="1827" class="l"><a href="#1827">1827: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1828" class="l"><a href="#1828">1828: </a>        {
-</span><span id="1829" class="l"><a href="#1829">1829: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1830" class="l"><a href="#1830">1830: </a>        }
-</span><span id="1831" class="l"><a href="#1831">1831: </a>
-</span><span id="1832" class="l"><a href="#1832">1832: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
-</span><span id="1833" class="l"><a href="#1833">1833: </a>        {
-</span><span id="1834" class="l"><a href="#1834">1834: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1835" class="l"><a href="#1835">1835: </a>        }
-</span><span id="1836" class="l"><a href="#1836">1836: </a>
-</span><span id="1837" class="l"><a href="#1837">1837: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1838" class="l"><a href="#1838">1838: </a>    }
-</span><span id="1839" class="l"><a href="#1839">1839: </a>
-</span><span id="1840" class="l"><a href="#1840">1840: </a>    <span class="php-comment">/**
-</span></span><span id="1841" class="l"><a href="#1841">1841: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
-</span></span><span id="1842" class="l"><a href="#1842">1842: </a><span class="php-comment">     *
-</span></span><span id="1843" class="l"><a href="#1843">1843: </a><span class="php-comment">     * @access protected
-</span></span><span id="1844" class="l"><a href="#1844">1844: </a><span class="php-comment">     * @return void
-</span></span><span id="1845" class="l"><a href="#1845">1845: </a><span class="php-comment">     */</span>
-</span><span id="1846" class="l"><a href="#1846">1846: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
-</span><span id="1847" class="l"><a href="#1847">1847: </a>    {
-</span><span id="1848" class="l"><a href="#1848">1848: </a>        <span class="php-comment">// Get the auth_source config item</span>
-</span><span id="1849" class="l"><a href="#1849">1849: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
-</span><span id="1850" class="l"><a href="#1850">1850: </a>
-</span><span id="1851" class="l"><a href="#1851">1851: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
-</span><span id="1852" class="l"><a href="#1852">1852: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
-</span><span id="1853" class="l"><a href="#1853">1853: </a>        {
-</span><span id="1854" class="l"><a href="#1854">1854: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1855" class="l"><a href="#1855">1855: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1856" class="l"><a href="#1856">1856: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1857" class="l"><a href="#1857">1857: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unauthorized'</span>)
-</span><span id="1858" class="l"><a href="#1858">1858: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="1824" class="l"><a href="#1824">1824: </a>    <span class="php-comment">/**
+</span></span><span id="1825" class="l"><a href="#1825">1825: </a><span class="php-comment">     * Check if the user is logged in
+</span></span><span id="1826" class="l"><a href="#1826">1826: </a><span class="php-comment">     *
+</span></span><span id="1827" class="l"><a href="#1827">1827: </a><span class="php-comment">     * @access protected
+</span></span><span id="1828" class="l"><a href="#1828">1828: </a><span class="php-comment">     * @param  string $username The user's name
+</span></span><span id="1829" class="l"><a href="#1829">1829: </a><span class="php-comment">     * @param  bool|string $password The user's password
+</span></span><span id="1830" class="l"><a href="#1830">1830: </a><span class="php-comment">     * @return bool
+</span></span><span id="1831" class="l"><a href="#1831">1831: </a><span class="php-comment">     */</span>
+</span><span id="1832" class="l"><a href="#1832">1832: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="1833" class="l"><a href="#1833">1833: </a>    {
+</span><span id="1834" class="l"><a href="#1834">1834: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1835" class="l"><a href="#1835">1835: </a>        {
+</span><span id="1836" class="l"><a href="#1836">1836: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1837" class="l"><a href="#1837">1837: </a>        }
+</span><span id="1838" class="l"><a href="#1838">1838: </a>
+</span><span id="1839" class="l"><a href="#1839">1839: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
+</span><span id="1840" class="l"><a href="#1840">1840: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="1841" class="l"><a href="#1841">1841: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
+</span><span id="1842" class="l"><a href="#1842">1842: </a>
+</span><span id="1843" class="l"><a href="#1843">1843: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
+</span><span id="1844" class="l"><a href="#1844">1844: </a>        {
+</span><span id="1845" class="l"><a href="#1845">1845: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
+</span><span id="1846" class="l"><a href="#1846">1846: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span>.<span class="php-quote">':'</span>.<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>).<span class="php-quote">':'</span>.(<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
+</span><span id="1847" class="l"><a href="#1847">1847: </a>        }
+</span><span id="1848" class="l"><a href="#1848">1848: </a>
+</span><span id="1849" class="l"><a href="#1849">1849: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1850" class="l"><a href="#1850">1850: </a>        {
+</span><span id="1851" class="l"><a href="#1851">1851: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1852" class="l"><a href="#1852">1852: </a>        }
+</span><span id="1853" class="l"><a href="#1853">1853: </a>
+</span><span id="1854" class="l"><a href="#1854">1854: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
+</span><span id="1855" class="l"><a href="#1855">1855: </a>        {
+</span><span id="1856" class="l"><a href="#1856">1856: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1857" class="l"><a href="#1857">1857: </a>
+</span><span id="1858" class="l"><a href="#1858">1858: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
 </span><span id="1859" class="l"><a href="#1859">1859: </a>        }
-</span><span id="1860" class="l"><a href="#1860">1860: </a>    }
-</span><span id="1861" class="l"><a href="#1861">1861: </a>
-</span><span id="1862" class="l"><a href="#1862">1862: </a>    <span class="php-comment">/**
-</span></span><span id="1863" class="l"><a href="#1863">1863: </a><span class="php-comment">     * Prepares for basic authentication
-</span></span><span id="1864" class="l"><a href="#1864">1864: </a><span class="php-comment">     *
-</span></span><span id="1865" class="l"><a href="#1865">1865: </a><span class="php-comment">     * @access protected
-</span></span><span id="1866" class="l"><a href="#1866">1866: </a><span class="php-comment">     * @return void
-</span></span><span id="1867" class="l"><a href="#1867">1867: </a><span class="php-comment">     */</span>
-</span><span id="1868" class="l"><a href="#1868">1868: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
-</span><span id="1869" class="l"><a href="#1869">1869: </a>    {
-</span><span id="1870" class="l"><a href="#1870">1870: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1871" class="l"><a href="#1871">1871: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
-</span><span id="1872" class="l"><a href="#1872">1872: </a>        {
-</span><span id="1873" class="l"><a href="#1873">1873: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1874" class="l"><a href="#1874">1874: </a>        }
-</span><span id="1875" class="l"><a href="#1875">1875: </a>
-</span><span id="1876" class="l"><a href="#1876">1876: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
-</span><span id="1877" class="l"><a href="#1877">1877: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
-</span><span id="1878" class="l"><a href="#1878">1878: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
-</span><span id="1879" class="l"><a href="#1879">1879: </a>
-</span><span id="1880" class="l"><a href="#1880">1880: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1881" class="l"><a href="#1881">1881: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1882" class="l"><a href="#1882">1882: </a>        {
-</span><span id="1883" class="l"><a href="#1883">1883: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
-</span><span id="1884" class="l"><a href="#1884">1884: </a>        }
-</span><span id="1885" class="l"><a href="#1885">1885: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1886" class="l"><a href="#1886">1886: </a>        {
-</span><span id="1887" class="l"><a href="#1887">1887: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
-</span><span id="1888" class="l"><a href="#1888">1888: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
-</span><span id="1889" class="l"><a href="#1889">1889: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
-</span><span id="1890" class="l"><a href="#1890">1890: </a>            {
-</span><span id="1891" class="l"><a href="#1891">1891: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
-</span><span id="1892" class="l"><a href="#1892">1892: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
-</span><span id="1893" class="l"><a href="#1893">1893: </a>            }
-</span><span id="1894" class="l"><a href="#1894">1894: </a>        }
-</span><span id="1895" class="l"><a href="#1895">1895: </a>
-</span><span id="1896" class="l"><a href="#1896">1896: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
-</span><span id="1897" class="l"><a href="#1897">1897: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1898" class="l"><a href="#1898">1898: </a>        {
-</span><span id="1899" class="l"><a href="#1899">1899: </a>            <span class="php-var">$this</span>-&gt;_force_login();
+</span><span id="1860" class="l"><a href="#1860">1860: </a>
+</span><span id="1861" class="l"><a href="#1861">1861: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
+</span><span id="1862" class="l"><a href="#1862">1862: </a>        {
+</span><span id="1863" class="l"><a href="#1863">1863: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1864" class="l"><a href="#1864">1864: </a>
+</span><span id="1865" class="l"><a href="#1865">1865: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1866" class="l"><a href="#1866">1866: </a>        }
+</span><span id="1867" class="l"><a href="#1867">1867: </a>
+</span><span id="1868" class="l"><a href="#1868">1868: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1869" class="l"><a href="#1869">1869: </a>        {
+</span><span id="1870" class="l"><a href="#1870">1870: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1871" class="l"><a href="#1871">1871: </a>        }
+</span><span id="1872" class="l"><a href="#1872">1872: </a>
+</span><span id="1873" class="l"><a href="#1873">1873: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
+</span><span id="1874" class="l"><a href="#1874">1874: </a>        {
+</span><span id="1875" class="l"><a href="#1875">1875: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1876" class="l"><a href="#1876">1876: </a>        }
+</span><span id="1877" class="l"><a href="#1877">1877: </a>
+</span><span id="1878" class="l"><a href="#1878">1878: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1879" class="l"><a href="#1879">1879: </a>    }
+</span><span id="1880" class="l"><a href="#1880">1880: </a>
+</span><span id="1881" class="l"><a href="#1881">1881: </a>    <span class="php-comment">/**
+</span></span><span id="1882" class="l"><a href="#1882">1882: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
+</span></span><span id="1883" class="l"><a href="#1883">1883: </a><span class="php-comment">     *
+</span></span><span id="1884" class="l"><a href="#1884">1884: </a><span class="php-comment">     * @access protected
+</span></span><span id="1885" class="l"><a href="#1885">1885: </a><span class="php-comment">     * @return void
+</span></span><span id="1886" class="l"><a href="#1886">1886: </a><span class="php-comment">     */</span>
+</span><span id="1887" class="l"><a href="#1887">1887: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
+</span><span id="1888" class="l"><a href="#1888">1888: </a>    {
+</span><span id="1889" class="l"><a href="#1889">1889: </a>        <span class="php-comment">// Get the auth_source config item</span>
+</span><span id="1890" class="l"><a href="#1890">1890: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
+</span><span id="1891" class="l"><a href="#1891">1891: </a>
+</span><span id="1892" class="l"><a href="#1892">1892: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
+</span><span id="1893" class="l"><a href="#1893">1893: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
+</span><span id="1894" class="l"><a href="#1894">1894: </a>        {
+</span><span id="1895" class="l"><a href="#1895">1895: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1896" class="l"><a href="#1896">1896: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1897" class="l"><a href="#1897">1897: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1898" class="l"><a href="#1898">1898: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unauthorized'</span>)
+</span><span id="1899" class="l"><a href="#1899">1899: </a>                ], self::HTTP_UNAUTHORIZED);
 </span><span id="1900" class="l"><a href="#1900">1900: </a>        }
 </span><span id="1901" class="l"><a href="#1901">1901: </a>    }
 </span><span id="1902" class="l"><a href="#1902">1902: </a>
 </span><span id="1903" class="l"><a href="#1903">1903: </a>    <span class="php-comment">/**
-</span></span><span id="1904" class="l"><a href="#1904">1904: </a><span class="php-comment">     * Prepares for digest authentication
+</span></span><span id="1904" class="l"><a href="#1904">1904: </a><span class="php-comment">     * Prepares for basic authentication
 </span></span><span id="1905" class="l"><a href="#1905">1905: </a><span class="php-comment">     *
 </span></span><span id="1906" class="l"><a href="#1906">1906: </a><span class="php-comment">     * @access protected
 </span></span><span id="1907" class="l"><a href="#1907">1907: </a><span class="php-comment">     * @return void
 </span></span><span id="1908" class="l"><a href="#1908">1908: </a><span class="php-comment">     */</span>
-</span><span id="1909" class="l"><a href="#1909">1909: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
+</span><span id="1909" class="l"><a href="#1909">1909: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
 </span><span id="1910" class="l"><a href="#1910">1910: </a>    {
 </span><span id="1911" class="l"><a href="#1911">1911: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
 </span><span id="1912" class="l"><a href="#1912">1912: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
@@ -2008,208 +2008,249 @@ <h3>Classes</h3>
 </span><span id="1914" class="l"><a href="#1914">1914: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
 </span><span id="1915" class="l"><a href="#1915">1915: </a>        }
 </span><span id="1916" class="l"><a href="#1916">1916: </a>
-</span><span id="1917" class="l"><a href="#1917">1917: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
-</span><span id="1918" class="l"><a href="#1918">1918: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
-</span><span id="1919" class="l"><a href="#1919">1919: </a>        <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
-</span><span id="1920" class="l"><a href="#1920">1920: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$digest_string</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1921" class="l"><a href="#1921">1921: </a>        {
-</span><span id="1922" class="l"><a href="#1922">1922: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
-</span><span id="1923" class="l"><a href="#1923">1923: </a>        }
-</span><span id="1924" class="l"><a href="#1924">1924: </a>
-</span><span id="1925" class="l"><a href="#1925">1925: </a>        <span class="php-var">$unique_id</span> = <span class="php-keyword2">uniqid</span>();
-</span><span id="1926" class="l"><a href="#1926">1926: </a>
-</span><span id="1927" class="l"><a href="#1927">1927: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
-</span><span id="1928" class="l"><a href="#1928">1928: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
-</span><span id="1929" class="l"><a href="#1929">1929: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
-</span><span id="1930" class="l"><a href="#1930">1930: </a>        {
-</span><span id="1931" class="l"><a href="#1931">1931: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
-</span><span id="1932" class="l"><a href="#1932">1932: </a>        }
-</span><span id="1933" class="l"><a href="#1933">1933: </a>
-</span><span id="1934" class="l"><a href="#1934">1934: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
-</span><span id="1935" class="l"><a href="#1935">1935: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="1936" class="l"><a href="#1936">1936: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
-</span><span id="1937" class="l"><a href="#1937">1937: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
-</span><span id="1938" class="l"><a href="#1938">1938: </a>
-</span><span id="1939" class="l"><a href="#1939">1939: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username @see rest.php::auth_library_function config</span>
-</span><span id="1940" class="l"><a href="#1940">1940: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
-</span><span id="1941" class="l"><a href="#1941">1941: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$username</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1942" class="l"><a href="#1942">1942: </a>        {
-</span><span id="1943" class="l"><a href="#1943">1943: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
-</span><span id="1944" class="l"><a href="#1944">1944: </a>        }
-</span><span id="1945" class="l"><a href="#1945">1945: </a>
-</span><span id="1946" class="l"><a href="#1946">1946: </a>        <span class="php-var">$md5</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method) . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
-</span><span id="1947" class="l"><a href="#1947">1947: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$username</span> . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>] . <span class="php-quote">':'</span> . <span class="php-var">$md5</span>);
-</span><span id="1948" class="l"><a href="#1948">1948: </a>
-</span><span id="1949" class="l"><a href="#1949">1949: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
-</span><span id="1950" class="l"><a href="#1950">1950: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
-</span><span id="1951" class="l"><a href="#1951">1951: </a>        {
-</span><span id="1952" class="l"><a href="#1952">1952: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1953" class="l"><a href="#1953">1953: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1954" class="l"><a href="#1954">1954: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1955" class="l"><a href="#1955">1955: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_invalid_credentials'</span>)
-</span><span id="1956" class="l"><a href="#1956">1956: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="1957" class="l"><a href="#1957">1957: </a>        }
-</span><span id="1958" class="l"><a href="#1958">1958: </a>    }
-</span><span id="1959" class="l"><a href="#1959">1959: </a>
-</span><span id="1960" class="l"><a href="#1960">1960: </a>    <span class="php-comment">/**
-</span></span><span id="1961" class="l"><a href="#1961">1961: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
-</span></span><span id="1962" class="l"><a href="#1962">1962: </a><span class="php-comment">     *
-</span></span><span id="1963" class="l"><a href="#1963">1963: </a><span class="php-comment">     * @access protected
-</span></span><span id="1964" class="l"><a href="#1964">1964: </a><span class="php-comment">     * @return void
-</span></span><span id="1965" class="l"><a href="#1965">1965: </a><span class="php-comment">     */</span>
-</span><span id="1966" class="l"><a href="#1966">1966: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
-</span><span id="1967" class="l"><a href="#1967">1967: </a>    {
-</span><span id="1968" class="l"><a href="#1968">1968: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
-</span><span id="1969" class="l"><a href="#1969">1969: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
-</span><span id="1970" class="l"><a href="#1970">1970: </a>
-</span><span id="1971" class="l"><a href="#1971">1971: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
-</span><span id="1972" class="l"><a href="#1972">1972: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
-</span><span id="1973" class="l"><a href="#1973">1973: </a>        {
-</span><span id="1974" class="l"><a href="#1974">1974: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1975" class="l"><a href="#1975">1975: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1976" class="l"><a href="#1976">1976: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1977" class="l"><a href="#1977">1977: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ip_denied'</span>)
-</span><span id="1978" class="l"><a href="#1978">1978: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="1979" class="l"><a href="#1979">1979: </a>        }
-</span><span id="1980" class="l"><a href="#1980">1980: </a>    }
-</span><span id="1981" class="l"><a href="#1981">1981: </a>
-</span><span id="1982" class="l"><a href="#1982">1982: </a>    <span class="php-comment">/**
-</span></span><span id="1983" class="l"><a href="#1983">1983: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
-</span></span><span id="1984" class="l"><a href="#1984">1984: </a><span class="php-comment">     *
-</span></span><span id="1985" class="l"><a href="#1985">1985: </a><span class="php-comment">     * @access protected
-</span></span><span id="1986" class="l"><a href="#1986">1986: </a><span class="php-comment">     * @return void
-</span></span><span id="1987" class="l"><a href="#1987">1987: </a><span class="php-comment">     */</span>
-</span><span id="1988" class="l"><a href="#1988">1988: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
-</span><span id="1989" class="l"><a href="#1989">1989: </a>    {
-</span><span id="1990" class="l"><a href="#1990">1990: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
-</span><span id="1991" class="l"><a href="#1991">1991: </a>
-</span><span id="1992" class="l"><a href="#1992">1992: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
-</span><span id="1993" class="l"><a href="#1993">1993: </a>
-</span><span id="1994" class="l"><a href="#1994">1994: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$ip</span>)
-</span><span id="1995" class="l"><a href="#1995">1995: </a>        {
-</span><span id="1996" class="l"><a href="#1996">1996: </a>            <span class="php-comment">// As $ip is a reference, trim leading and trailing whitespace, then store the new value</span>
-</span><span id="1997" class="l"><a href="#1997">1997: </a>            <span class="php-comment">// using the reference</span>
-</span><span id="1998" class="l"><a href="#1998">1998: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
-</span><span id="1999" class="l"><a href="#1999">1999: </a>        }
+</span><span id="1917" class="l"><a href="#1917">1917: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
+</span><span id="1918" class="l"><a href="#1918">1918: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
+</span><span id="1919" class="l"><a href="#1919">1919: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
+</span><span id="1920" class="l"><a href="#1920">1920: </a>
+</span><span id="1921" class="l"><a href="#1921">1921: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1922" class="l"><a href="#1922">1922: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1923" class="l"><a href="#1923">1923: </a>        {
+</span><span id="1924" class="l"><a href="#1924">1924: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
+</span><span id="1925" class="l"><a href="#1925">1925: </a>        }
+</span><span id="1926" class="l"><a href="#1926">1926: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1927" class="l"><a href="#1927">1927: </a>        {
+</span><span id="1928" class="l"><a href="#1928">1928: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
+</span><span id="1929" class="l"><a href="#1929">1929: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
+</span><span id="1930" class="l"><a href="#1930">1930: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
+</span><span id="1931" class="l"><a href="#1931">1931: </a>            {
+</span><span id="1932" class="l"><a href="#1932">1932: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
+</span><span id="1933" class="l"><a href="#1933">1933: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
+</span><span id="1934" class="l"><a href="#1934">1934: </a>            }
+</span><span id="1935" class="l"><a href="#1935">1935: </a>        }
+</span><span id="1936" class="l"><a href="#1936">1936: </a>
+</span><span id="1937" class="l"><a href="#1937">1937: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
+</span><span id="1938" class="l"><a href="#1938">1938: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1939" class="l"><a href="#1939">1939: </a>        {
+</span><span id="1940" class="l"><a href="#1940">1940: </a>            <span class="php-var">$this</span>-&gt;_force_login();
+</span><span id="1941" class="l"><a href="#1941">1941: </a>        }
+</span><span id="1942" class="l"><a href="#1942">1942: </a>    }
+</span><span id="1943" class="l"><a href="#1943">1943: </a>
+</span><span id="1944" class="l"><a href="#1944">1944: </a>    <span class="php-comment">/**
+</span></span><span id="1945" class="l"><a href="#1945">1945: </a><span class="php-comment">     * Prepares for digest authentication
+</span></span><span id="1946" class="l"><a href="#1946">1946: </a><span class="php-comment">     *
+</span></span><span id="1947" class="l"><a href="#1947">1947: </a><span class="php-comment">     * @access protected
+</span></span><span id="1948" class="l"><a href="#1948">1948: </a><span class="php-comment">     * @return void
+</span></span><span id="1949" class="l"><a href="#1949">1949: </a><span class="php-comment">     */</span>
+</span><span id="1950" class="l"><a href="#1950">1950: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
+</span><span id="1951" class="l"><a href="#1951">1951: </a>    {
+</span><span id="1952" class="l"><a href="#1952">1952: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1953" class="l"><a href="#1953">1953: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1954" class="l"><a href="#1954">1954: </a>        {
+</span><span id="1955" class="l"><a href="#1955">1955: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1956" class="l"><a href="#1956">1956: </a>        }
+</span><span id="1957" class="l"><a href="#1957">1957: </a>
+</span><span id="1958" class="l"><a href="#1958">1958: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
+</span><span id="1959" class="l"><a href="#1959">1959: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
+</span><span id="1960" class="l"><a href="#1960">1960: </a>        <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
+</span><span id="1961" class="l"><a href="#1961">1961: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$digest_string</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1962" class="l"><a href="#1962">1962: </a>        {
+</span><span id="1963" class="l"><a href="#1963">1963: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
+</span><span id="1964" class="l"><a href="#1964">1964: </a>        }
+</span><span id="1965" class="l"><a href="#1965">1965: </a>
+</span><span id="1966" class="l"><a href="#1966">1966: </a>        <span class="php-var">$unique_id</span> = <span class="php-keyword2">uniqid</span>();
+</span><span id="1967" class="l"><a href="#1967">1967: </a>
+</span><span id="1968" class="l"><a href="#1968">1968: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
+</span><span id="1969" class="l"><a href="#1969">1969: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
+</span><span id="1970" class="l"><a href="#1970">1970: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
+</span><span id="1971" class="l"><a href="#1971">1971: </a>        {
+</span><span id="1972" class="l"><a href="#1972">1972: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
+</span><span id="1973" class="l"><a href="#1973">1973: </a>        }
+</span><span id="1974" class="l"><a href="#1974">1974: </a>
+</span><span id="1975" class="l"><a href="#1975">1975: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
+</span><span id="1976" class="l"><a href="#1976">1976: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="1977" class="l"><a href="#1977">1977: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
+</span><span id="1978" class="l"><a href="#1978">1978: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
+</span><span id="1979" class="l"><a href="#1979">1979: </a>
+</span><span id="1980" class="l"><a href="#1980">1980: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username see rest.php::auth_library_function config</span>
+</span><span id="1981" class="l"><a href="#1981">1981: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
+</span><span id="1982" class="l"><a href="#1982">1982: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$username</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1983" class="l"><a href="#1983">1983: </a>        {
+</span><span id="1984" class="l"><a href="#1984">1984: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
+</span><span id="1985" class="l"><a href="#1985">1985: </a>        }
+</span><span id="1986" class="l"><a href="#1986">1986: </a>
+</span><span id="1987" class="l"><a href="#1987">1987: </a>        <span class="php-var">$md5</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method).<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
+</span><span id="1988" class="l"><a href="#1988">1988: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$username</span>.<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>].<span class="php-quote">':'</span>.<span class="php-var">$md5</span>);
+</span><span id="1989" class="l"><a href="#1989">1989: </a>
+</span><span id="1990" class="l"><a href="#1990">1990: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
+</span><span id="1991" class="l"><a href="#1991">1991: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
+</span><span id="1992" class="l"><a href="#1992">1992: </a>        {
+</span><span id="1993" class="l"><a href="#1993">1993: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1994" class="l"><a href="#1994">1994: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1995" class="l"><a href="#1995">1995: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1996" class="l"><a href="#1996">1996: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_invalid_credentials'</span>)
+</span><span id="1997" class="l"><a href="#1997">1997: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="1998" class="l"><a href="#1998">1998: </a>        }
+</span><span id="1999" class="l"><a href="#1999">1999: </a>    }
 </span><span id="2000" class="l"><a href="#2000">2000: </a>
-</span><span id="2001" class="l"><a href="#2001">2001: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="2002" class="l"><a href="#2002">2002: </a>        {
-</span><span id="2003" class="l"><a href="#2003">2003: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="2004" class="l"><a href="#2004">2004: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="2005" class="l"><a href="#2005">2005: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ip_unauthorized'</span>)
-</span><span id="2006" class="l"><a href="#2006">2006: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="2007" class="l"><a href="#2007">2007: </a>        }
-</span><span id="2008" class="l"><a href="#2008">2008: </a>    }
-</span><span id="2009" class="l"><a href="#2009">2009: </a>
-</span><span id="2010" class="l"><a href="#2010">2010: </a>    <span class="php-comment">/**
-</span></span><span id="2011" class="l"><a href="#2011">2011: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
-</span></span><span id="2012" class="l"><a href="#2012">2012: </a><span class="php-comment">     *
-</span></span><span id="2013" class="l"><a href="#2013">2013: </a><span class="php-comment">     * @access protected
-</span></span><span id="2014" class="l"><a href="#2014">2014: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
-</span></span><span id="2015" class="l"><a href="#2015">2015: </a><span class="php-comment">     * each time
-</span></span><span id="2016" class="l"><a href="#2016">2016: </a><span class="php-comment">     * @return void
-</span></span><span id="2017" class="l"><a href="#2017">2017: </a><span class="php-comment">     */</span>
-</span><span id="2018" class="l"><a href="#2018">2018: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
-</span><span id="2019" class="l"><a href="#2019">2019: </a>    {
-</span><span id="2020" class="l"><a href="#2020">2020: </a>        <span class="php-var">$rest_auth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
-</span><span id="2021" class="l"><a href="#2021">2021: </a>        <span class="php-var">$rest_realm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
-</span><span id="2022" class="l"><a href="#2022">2022: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'basic'</span>)
-</span><span id="2023" class="l"><a href="#2023">2023: </a>        {
-</span><span id="2024" class="l"><a href="#2024">2024: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
-</span><span id="2025" class="l"><a href="#2025">2025: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span> . <span class="php-var">$rest_realm</span> . <span class="php-quote">'&quot;'</span>);
-</span><span id="2026" class="l"><a href="#2026">2026: </a>        }
-</span><span id="2027" class="l"><a href="#2027">2027: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'digest'</span>)
-</span><span id="2028" class="l"><a href="#2028">2028: </a>        {
-</span><span id="2029" class="l"><a href="#2029">2029: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
-</span><span id="2030" class="l"><a href="#2030">2030: </a>            <span class="php-keyword2">header</span>(
-</span><span id="2031" class="l"><a href="#2031">2031: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span> . <span class="php-var">$rest_realm</span>
-</span><span id="2032" class="l"><a href="#2032">2032: </a>                . <span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span> . <span class="php-var">$nonce</span>
-</span><span id="2033" class="l"><a href="#2033">2033: </a>                . <span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$rest_realm</span>) . <span class="php-quote">'&quot;'</span>);
-</span><span id="2034" class="l"><a href="#2034">2034: </a>        }
-</span><span id="2035" class="l"><a href="#2035">2035: </a>
-</span><span id="2036" class="l"><a href="#2036">2036: </a>        <span class="php-comment">// Display an error response</span>
-</span><span id="2037" class="l"><a href="#2037">2037: </a>        <span class="php-var">$this</span>-&gt;response([
-</span><span id="2038" class="l"><a href="#2038">2038: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="2039" class="l"><a href="#2039">2039: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unauthorized'</span>)
-</span><span id="2040" class="l"><a href="#2040">2040: </a>            ], self::HTTP_UNAUTHORIZED);
-</span><span id="2041" class="l"><a href="#2041">2041: </a>    }
-</span><span id="2042" class="l"><a href="#2042">2042: </a>
-</span><span id="2043" class="l"><a href="#2043">2043: </a>    <span class="php-comment">/**
-</span></span><span id="2044" class="l"><a href="#2044">2044: </a><span class="php-comment">     * Updates the log table with the total access time
-</span></span><span id="2045" class="l"><a href="#2045">2045: </a><span class="php-comment">     *
-</span></span><span id="2046" class="l"><a href="#2046">2046: </a><span class="php-comment">     * @access protected
-</span></span><span id="2047" class="l"><a href="#2047">2047: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="2048" class="l"><a href="#2048">2048: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="2049" class="l"><a href="#2049">2049: </a><span class="php-comment">     */</span>
-</span><span id="2050" class="l"><a href="#2050">2050: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
-</span><span id="2051" class="l"><a href="#2051">2051: </a>    {
-</span><span id="2052" class="l"><a href="#2052">2052: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
-</span><span id="2053" class="l"><a href="#2053">2053: </a>
-</span><span id="2054" class="l"><a href="#2054">2054: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
-</span><span id="2055" class="l"><a href="#2055">2055: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="2056" class="l"><a href="#2056">2056: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="2057" class="l"><a href="#2057">2057: </a>            ]);
-</span><span id="2058" class="l"><a href="#2058">2058: </a>    }
-</span><span id="2059" class="l"><a href="#2059">2059: </a>
-</span><span id="2060" class="l"><a href="#2060">2060: </a>    <span class="php-comment">/**
-</span></span><span id="2061" class="l"><a href="#2061">2061: </a><span class="php-comment">     * Updates the log table with HTTP response code
-</span></span><span id="2062" class="l"><a href="#2062">2062: </a><span class="php-comment">     *
-</span></span><span id="2063" class="l"><a href="#2063">2063: </a><span class="php-comment">     * @access protected
-</span></span><span id="2064" class="l"><a href="#2064">2064: </a><span class="php-comment">     * @author Justin Chen
-</span></span><span id="2065" class="l"><a href="#2065">2065: </a><span class="php-comment">     * @param $http_code int HTTP status code
-</span></span><span id="2066" class="l"><a href="#2066">2066: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="2067" class="l"><a href="#2067">2067: </a><span class="php-comment">     */</span>
-</span><span id="2068" class="l"><a href="#2068">2068: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
-</span><span id="2069" class="l"><a href="#2069">2069: </a>    {
-</span><span id="2070" class="l"><a href="#2070">2070: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
-</span><span id="2071" class="l"><a href="#2071">2071: </a>
-</span><span id="2072" class="l"><a href="#2072">2072: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
-</span><span id="2073" class="l"><a href="#2073">2073: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="2074" class="l"><a href="#2074">2074: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="2075" class="l"><a href="#2075">2075: </a>        ]);
-</span><span id="2076" class="l"><a href="#2076">2076: </a>    }
-</span><span id="2077" class="l"><a href="#2077">2077: </a>
-</span><span id="2078" class="l"><a href="#2078">2078: </a>    <span class="php-comment">/**
-</span></span><span id="2079" class="l"><a href="#2079">2079: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
-</span></span><span id="2080" class="l"><a href="#2080">2080: </a><span class="php-comment">     *
-</span></span><span id="2081" class="l"><a href="#2081">2081: </a><span class="php-comment">     * @access protected
-</span></span><span id="2082" class="l"><a href="#2082">2082: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
-</span></span><span id="2083" class="l"><a href="#2083">2083: </a><span class="php-comment">     */</span>
-</span><span id="2084" class="l"><a href="#2084">2084: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
-</span><span id="2085" class="l"><a href="#2085">2085: </a>    {
-</span><span id="2086" class="l"><a href="#2086">2086: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
-</span><span id="2087" class="l"><a href="#2087">2087: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="2088" class="l"><a href="#2088">2088: </a>        {
-</span><span id="2089" class="l"><a href="#2089">2089: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="2090" class="l"><a href="#2090">2090: </a>        }
-</span><span id="2091" class="l"><a href="#2091">2091: </a>
-</span><span id="2092" class="l"><a href="#2092">2092: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
-</span><span id="2093" class="l"><a href="#2093">2093: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
-</span><span id="2094" class="l"><a href="#2094">2094: </a>            <span class="php-quote">'/'</span>, [
-</span><span id="2095" class="l"><a href="#2095">2095: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
-</span><span id="2096" class="l"><a href="#2096">2096: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
-</span><span id="2097" class="l"><a href="#2097">2097: </a>        ]);
-</span><span id="2098" class="l"><a href="#2098">2098: </a>
-</span><span id="2099" class="l"><a href="#2099">2099: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
-</span><span id="2100" class="l"><a href="#2100">2100: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
-</span><span id="2101" class="l"><a href="#2101">2101: </a>
-</span><span id="2102" class="l"><a href="#2102">2102: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
-</span><span id="2103" class="l"><a href="#2103">2103: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="2104" class="l"><a href="#2104">2104: </a>            -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="2105" class="l"><a href="#2105">2105: </a>            -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
-</span><span id="2106" class="l"><a href="#2106">2106: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
-</span><span id="2107" class="l"><a href="#2107">2107: </a>            -&gt;num_rows() &gt; <span class="php-num">0</span>;
-</span><span id="2108" class="l"><a href="#2108">2108: </a>    }
-</span><span id="2109" class="l"><a href="#2109">2109: </a>
-</span><span id="2110" class="l"><a href="#2110">2110: </a>}
-</span><span id="2111" class="l"><a href="#2111">2111: </a></span></code></pre>
+</span><span id="2001" class="l"><a href="#2001">2001: </a>    <span class="php-comment">/**
+</span></span><span id="2002" class="l"><a href="#2002">2002: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
+</span></span><span id="2003" class="l"><a href="#2003">2003: </a><span class="php-comment">     *
+</span></span><span id="2004" class="l"><a href="#2004">2004: </a><span class="php-comment">     * @access protected
+</span></span><span id="2005" class="l"><a href="#2005">2005: </a><span class="php-comment">     * @return void
+</span></span><span id="2006" class="l"><a href="#2006">2006: </a><span class="php-comment">     */</span>
+</span><span id="2007" class="l"><a href="#2007">2007: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
+</span><span id="2008" class="l"><a href="#2008">2008: </a>    {
+</span><span id="2009" class="l"><a href="#2009">2009: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
+</span><span id="2010" class="l"><a href="#2010">2010: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
+</span><span id="2011" class="l"><a href="#2011">2011: </a>
+</span><span id="2012" class="l"><a href="#2012">2012: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
+</span><span id="2013" class="l"><a href="#2013">2013: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
+</span><span id="2014" class="l"><a href="#2014">2014: </a>        {
+</span><span id="2015" class="l"><a href="#2015">2015: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="2016" class="l"><a href="#2016">2016: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="2017" class="l"><a href="#2017">2017: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="2018" class="l"><a href="#2018">2018: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ip_denied'</span>)
+</span><span id="2019" class="l"><a href="#2019">2019: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="2020" class="l"><a href="#2020">2020: </a>        }
+</span><span id="2021" class="l"><a href="#2021">2021: </a>    }
+</span><span id="2022" class="l"><a href="#2022">2022: </a>
+</span><span id="2023" class="l"><a href="#2023">2023: </a>    <span class="php-comment">/**
+</span></span><span id="2024" class="l"><a href="#2024">2024: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
+</span></span><span id="2025" class="l"><a href="#2025">2025: </a><span class="php-comment">     *
+</span></span><span id="2026" class="l"><a href="#2026">2026: </a><span class="php-comment">     * @access protected
+</span></span><span id="2027" class="l"><a href="#2027">2027: </a><span class="php-comment">     * @return void
+</span></span><span id="2028" class="l"><a href="#2028">2028: </a><span class="php-comment">     */</span>
+</span><span id="2029" class="l"><a href="#2029">2029: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
+</span><span id="2030" class="l"><a href="#2030">2030: </a>    {
+</span><span id="2031" class="l"><a href="#2031">2031: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
+</span><span id="2032" class="l"><a href="#2032">2032: </a>
+</span><span id="2033" class="l"><a href="#2033">2033: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
+</span><span id="2034" class="l"><a href="#2034">2034: </a>
+</span><span id="2035" class="l"><a href="#2035">2035: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$ip</span>)
+</span><span id="2036" class="l"><a href="#2036">2036: </a>        {
+</span><span id="2037" class="l"><a href="#2037">2037: </a>            <span class="php-comment">// As $ip is a reference, trim leading and trailing whitespace, then store the new value</span>
+</span><span id="2038" class="l"><a href="#2038">2038: </a>            <span class="php-comment">// using the reference</span>
+</span><span id="2039" class="l"><a href="#2039">2039: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
+</span><span id="2040" class="l"><a href="#2040">2040: </a>        }
+</span><span id="2041" class="l"><a href="#2041">2041: </a>
+</span><span id="2042" class="l"><a href="#2042">2042: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="2043" class="l"><a href="#2043">2043: </a>        {
+</span><span id="2044" class="l"><a href="#2044">2044: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="2045" class="l"><a href="#2045">2045: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="2046" class="l"><a href="#2046">2046: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ip_unauthorized'</span>)
+</span><span id="2047" class="l"><a href="#2047">2047: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="2048" class="l"><a href="#2048">2048: </a>        }
+</span><span id="2049" class="l"><a href="#2049">2049: </a>    }
+</span><span id="2050" class="l"><a href="#2050">2050: </a>
+</span><span id="2051" class="l"><a href="#2051">2051: </a>    <span class="php-comment">/**
+</span></span><span id="2052" class="l"><a href="#2052">2052: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
+</span></span><span id="2053" class="l"><a href="#2053">2053: </a><span class="php-comment">     *
+</span></span><span id="2054" class="l"><a href="#2054">2054: </a><span class="php-comment">     * @access protected
+</span></span><span id="2055" class="l"><a href="#2055">2055: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
+</span></span><span id="2056" class="l"><a href="#2056">2056: </a><span class="php-comment">     * each time
+</span></span><span id="2057" class="l"><a href="#2057">2057: </a><span class="php-comment">     * @return void
+</span></span><span id="2058" class="l"><a href="#2058">2058: </a><span class="php-comment">     */</span>
+</span><span id="2059" class="l"><a href="#2059">2059: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
+</span><span id="2060" class="l"><a href="#2060">2060: </a>    {
+</span><span id="2061" class="l"><a href="#2061">2061: </a>        <span class="php-var">$rest_auth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
+</span><span id="2062" class="l"><a href="#2062">2062: </a>        <span class="php-var">$rest_realm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
+</span><span id="2063" class="l"><a href="#2063">2063: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'basic'</span>)
+</span><span id="2064" class="l"><a href="#2064">2064: </a>        {
+</span><span id="2065" class="l"><a href="#2065">2065: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
+</span><span id="2066" class="l"><a href="#2066">2066: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span>.<span class="php-var">$rest_realm</span>.<span class="php-quote">'&quot;'</span>);
+</span><span id="2067" class="l"><a href="#2067">2067: </a>        }
+</span><span id="2068" class="l"><a href="#2068">2068: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'digest'</span>)
+</span><span id="2069" class="l"><a href="#2069">2069: </a>        {
+</span><span id="2070" class="l"><a href="#2070">2070: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
+</span><span id="2071" class="l"><a href="#2071">2071: </a>            <span class="php-keyword2">header</span>(
+</span><span id="2072" class="l"><a href="#2072">2072: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span>.<span class="php-var">$rest_realm</span>
+</span><span id="2073" class="l"><a href="#2073">2073: </a>                .<span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span>.<span class="php-var">$nonce</span>
+</span><span id="2074" class="l"><a href="#2074">2074: </a>                .<span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$rest_realm</span>).<span class="php-quote">'&quot;'</span>);
+</span><span id="2075" class="l"><a href="#2075">2075: </a>        }
+</span><span id="2076" class="l"><a href="#2076">2076: </a>
+</span><span id="2077" class="l"><a href="#2077">2077: </a>        <span class="php-comment">// Display an error response</span>
+</span><span id="2078" class="l"><a href="#2078">2078: </a>        <span class="php-var">$this</span>-&gt;response([
+</span><span id="2079" class="l"><a href="#2079">2079: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="2080" class="l"><a href="#2080">2080: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unauthorized'</span>)
+</span><span id="2081" class="l"><a href="#2081">2081: </a>            ], self::HTTP_UNAUTHORIZED);
+</span><span id="2082" class="l"><a href="#2082">2082: </a>    }
+</span><span id="2083" class="l"><a href="#2083">2083: </a>
+</span><span id="2084" class="l"><a href="#2084">2084: </a>    <span class="php-comment">/**
+</span></span><span id="2085" class="l"><a href="#2085">2085: </a><span class="php-comment">     * Updates the log table with the total access time
+</span></span><span id="2086" class="l"><a href="#2086">2086: </a><span class="php-comment">     *
+</span></span><span id="2087" class="l"><a href="#2087">2087: </a><span class="php-comment">     * @access protected
+</span></span><span id="2088" class="l"><a href="#2088">2088: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="2089" class="l"><a href="#2089">2089: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="2090" class="l"><a href="#2090">2090: </a><span class="php-comment">     */</span>
+</span><span id="2091" class="l"><a href="#2091">2091: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
+</span><span id="2092" class="l"><a href="#2092">2092: </a>    {
+</span><span id="2093" class="l"><a href="#2093">2093: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
+</span><span id="2094" class="l"><a href="#2094">2094: </a>
+</span><span id="2095" class="l"><a href="#2095">2095: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
+</span><span id="2096" class="l"><a href="#2096">2096: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="2097" class="l"><a href="#2097">2097: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="2098" class="l"><a href="#2098">2098: </a>            ]);
+</span><span id="2099" class="l"><a href="#2099">2099: </a>    }
+</span><span id="2100" class="l"><a href="#2100">2100: </a>
+</span><span id="2101" class="l"><a href="#2101">2101: </a>    <span class="php-comment">/**
+</span></span><span id="2102" class="l"><a href="#2102">2102: </a><span class="php-comment">     * Updates the log table with HTTP response code
+</span></span><span id="2103" class="l"><a href="#2103">2103: </a><span class="php-comment">     *
+</span></span><span id="2104" class="l"><a href="#2104">2104: </a><span class="php-comment">     * @access protected
+</span></span><span id="2105" class="l"><a href="#2105">2105: </a><span class="php-comment">     * @author Justin Chen
+</span></span><span id="2106" class="l"><a href="#2106">2106: </a><span class="php-comment">     * @param $http_code int HTTP status code
+</span></span><span id="2107" class="l"><a href="#2107">2107: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="2108" class="l"><a href="#2108">2108: </a><span class="php-comment">     */</span>
+</span><span id="2109" class="l"><a href="#2109">2109: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
+</span><span id="2110" class="l"><a href="#2110">2110: </a>    {
+</span><span id="2111" class="l"><a href="#2111">2111: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
+</span><span id="2112" class="l"><a href="#2112">2112: </a>
+</span><span id="2113" class="l"><a href="#2113">2113: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
+</span><span id="2114" class="l"><a href="#2114">2114: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="2115" class="l"><a href="#2115">2115: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="2116" class="l"><a href="#2116">2116: </a>        ]);
+</span><span id="2117" class="l"><a href="#2117">2117: </a>    }
+</span><span id="2118" class="l"><a href="#2118">2118: </a>
+</span><span id="2119" class="l"><a href="#2119">2119: </a>    <span class="php-comment">/**
+</span></span><span id="2120" class="l"><a href="#2120">2120: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
+</span></span><span id="2121" class="l"><a href="#2121">2121: </a><span class="php-comment">     *
+</span></span><span id="2122" class="l"><a href="#2122">2122: </a><span class="php-comment">     * @access protected
+</span></span><span id="2123" class="l"><a href="#2123">2123: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
+</span></span><span id="2124" class="l"><a href="#2124">2124: </a><span class="php-comment">     */</span>
+</span><span id="2125" class="l"><a href="#2125">2125: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
+</span><span id="2126" class="l"><a href="#2126">2126: </a>    {
+</span><span id="2127" class="l"><a href="#2127">2127: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
+</span><span id="2128" class="l"><a href="#2128">2128: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="2129" class="l"><a href="#2129">2129: </a>        {
+</span><span id="2130" class="l"><a href="#2130">2130: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="2131" class="l"><a href="#2131">2131: </a>        }
+</span><span id="2132" class="l"><a href="#2132">2132: </a>
+</span><span id="2133" class="l"><a href="#2133">2133: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
+</span><span id="2134" class="l"><a href="#2134">2134: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
+</span><span id="2135" class="l"><a href="#2135">2135: </a>            <span class="php-quote">'/'</span>, [
+</span><span id="2136" class="l"><a href="#2136">2136: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
+</span><span id="2137" class="l"><a href="#2137">2137: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
+</span><span id="2138" class="l"><a href="#2138">2138: </a>        ]);
+</span><span id="2139" class="l"><a href="#2139">2139: </a>
+</span><span id="2140" class="l"><a href="#2140">2140: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
+</span><span id="2141" class="l"><a href="#2141">2141: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
+</span><span id="2142" class="l"><a href="#2142">2142: </a>
+</span><span id="2143" class="l"><a href="#2143">2143: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
+</span><span id="2144" class="l"><a href="#2144">2144: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="2145" class="l"><a href="#2145">2145: </a>            -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="2146" class="l"><a href="#2146">2146: </a>            -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
+</span><span id="2147" class="l"><a href="#2147">2147: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
+</span><span id="2148" class="l"><a href="#2148">2148: </a>            -&gt;num_rows() &gt; <span class="php-num">0</span>;
+</span><span id="2149" class="l"><a href="#2149">2149: </a>    }
+</span><span id="2150" class="l"><a href="#2150">2150: </a>
+</span><span id="2151" class="l"><a href="#2151">2151: </a>}
+</span><span id="2152" class="l"><a href="#2152">2152: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
+<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
 <script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>
diff --git a/documentation/source-class-Welcome.html b/documentation/source-class-Welcome.html
index 6a681eb1..a32b765a 100644
--- a/documentation/source-class-Welcome.html
+++ b/documentation/source-class-Welcome.html
@@ -110,7 +110,7 @@ <h3>Classes</h3>
 </span></span><span id="16" class="l"><a href="#16">16: </a><span class="php-comment">     *
 </span></span><span id="17" class="l"><a href="#17">17: </a><span class="php-comment">     * So any other public methods not prefixed with an underscore will
 </span></span><span id="18" class="l"><a href="#18">18: </a><span class="php-comment">     * map to /index.php/welcome/&lt;method_name&gt;
-</span></span><span id="19" class="l"><a href="#19">19: </a><span class="php-comment">     * @see http://codeigniter.com/user_guide/general/urls.html
+</span></span><span id="19" class="l"><a href="#19">19: </a><span class="php-comment">     * @see https://codeigniter.com/user_guide/general/urls.html
 </span></span><span id="20" class="l"><a href="#20">20: </a><span class="php-comment">     */</span>
 </span><span id="21" class="l"><a href="#21">21: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> index()
 </span><span id="22" class="l"><a href="#22">22: </a>    {
@@ -126,7 +126,7 @@ <h3>Classes</h3>
 	</div>
 </div>
 </div>
-<script src="http://github.com/resources/combined.js?9877048b811f8c34a3fcb9eb74c7fb479f1f104d"></script>
+<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
 <script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
 </body>
 </html>

From f9cd854abb3d991147f1350bbb31bb035aaa9479 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 18 Feb 2016 22:19:26 +0200
Subject: [PATCH 196/354] Fixed negation styling

---
 application/libraries/REST_Controller.php | 30 +++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 6f477683..04fbf1eb 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -422,7 +422,7 @@ public function __construct($config = 'rest')
             $supported_formats = [];
         }
 
-        if (!is_array($supported_formats))
+        if ( ! is_array($supported_formats))
         {
             $supported_formats = [$supported_formats];
         }
@@ -553,7 +553,7 @@ public function __construct($config = 'rest')
         }
 
         // When there is no specific override for the current class/method, use the default auth value set in the config
-        if ($this->auth_override === FALSE && (!($this->config->item('rest_enable_keys') && $this->_allow === TRUE) || ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE)))
+        if ($this->auth_override === FALSE && ! ($this->config->item('rest_enable_keys') && $this->_allow === TRUE) || ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE))
         {
             $rest_auth = strtolower($this->config->item('rest_auth'));
             switch ($rest_auth)
@@ -620,10 +620,10 @@ public function _remap($object_called, $arguments = [])
         $controller_method = $object_called.'_'.$this->request->method;
 
         // Do we want to log this method (if allowed by config)?
-        $log_method = !(isset($this->methods[$controller_method]['log']) && $this->methods[$controller_method]['log'] === FALSE);
+        $log_method = ! (isset($this->methods[$controller_method]['log']) && $this->methods[$controller_method]['log'] === FALSE);
 
         // Use keys for this method?
-        $use_key = !(isset($this->methods[$controller_method]['key']) && $this->methods[$controller_method]['key'] === FALSE);
+        $use_key = ! (isset($this->methods[$controller_method]['key']) && $this->methods[$controller_method]['key'] === FALSE);
 
         // They provided a key, but it wasn't valid, so get them out of here
         if ($this->config->item('rest_enable_keys') && $use_key && $this->_allow === FALSE)
@@ -985,7 +985,7 @@ 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($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row()))
+            if ( ! ($row = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row()))
             {
                 return FALSE;
             }
@@ -1213,12 +1213,12 @@ protected function _auth_override_check()
         $auth_override_class_method = $this->config->item('auth_override_class_method');
 
         // Check to see if the override array is even populated
-        if (!empty($auth_override_class_method))
+        if ( ! empty($auth_override_class_method))
         {
-            // check for wildcard flag for rules for classes
-            if (!empty($auth_override_class_method[$this->router->class]['*'])) // Check for class overrides
+            // Check for wildcard flag for rules for classes
+            if ( ! empty($auth_override_class_method[$this->router->class]['*'])) // Check for class overrides
             {
-                // None auth override found, prepare nothing but send back a TRUE override flag
+                // No auth override found, prepare nothing but send back a TRUE override flag
                 if ($auth_override_class_method[$this->router->class]['*'] === 'none')
                 {
                     return TRUE;
@@ -1258,7 +1258,7 @@ protected function _auth_override_check()
             }
 
             // Check to see if there's an override value set for the current class/method being called
-            if (!empty($auth_override_class_method[$this->router->class][$this->router->method]))
+            if ( ! empty($auth_override_class_method[$this->router->class][$this->router->method]))
             {
                 // None auth override found, prepare nothing but send back a TRUE override flag
                 if ($auth_override_class_method[$this->router->class][$this->router->method] === 'none')
@@ -1304,10 +1304,10 @@ protected function _auth_override_check()
         $auth_override_class_method_http = $this->config->item('auth_override_class_method_http');
 
         // Check to see if the override array is even populated
-        if (!empty($auth_override_class_method_http))
+        if ( ! empty($auth_override_class_method_http))
         {
             // check for wildcard flag for rules for classes
-            if(!empty($auth_override_class_method_http[$this->router->class]['*'][$this->request->method]))
+            if ( ! empty($auth_override_class_method_http[$this->router->class]['*'][$this->request->method]))
             {
                 // None auth override found, prepare nothing but send back a TRUE override flag
                 if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'none')
@@ -1349,7 +1349,7 @@ protected function _auth_override_check()
             }
 
             // Check to see if there's an override value set for the current class/method/HTTP-method being called
-            if(!empty($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method]))
+            if ( ! empty($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method]))
             {
                 // None auth override found, prepare nothing but send back a TRUE override flag
                 if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'none')
@@ -1854,7 +1854,7 @@ protected function _check_login($username = NULL, $password = FALSE)
         $rest_auth = strtolower($this->config->item('rest_auth'));
         $valid_logins = $this->config->item('rest_valid_logins');
 
-        if (!$this->config->item('auth_source') && $rest_auth === 'digest')
+        if ( ! $this->config->item('auth_source') && $rest_auth === 'digest')
         {
             // For digest we do not have a password passed as argument
             return md5($username.':'.$this->config->item('rest_realm').':'.(isset($valid_logins[$username]) ? $valid_logins[$username] : ''));
@@ -1904,7 +1904,7 @@ protected function _check_php_session()
         $key = $this->config->item('auth_source');
 
         // If falsy, then the user isn't logged in
-        if (!$this->session->userdata($key))
+        if ( ! $this->session->userdata($key))
         {
             // Display an error response
             $this->response([

From 6e675db4a34bcbdc31397bb50536c886dda3d92f Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Thu, 18 Feb 2016 22:20:08 +0200
Subject: [PATCH 197/354] Fixed basepath check

---
 application/views/welcome_message.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php
index 7a407656..9ba456fc 100644
--- a/application/views/welcome_message.php
+++ b/application/views/welcome_message.php
@@ -1,6 +1,8 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-?><!DOCTYPE html>
+    defined('BASEPATH') OR exit('No direct script access allowed');
+?>
+
+<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="utf-8">

From 91a8bff948e52de905dc2a7d21f18e1b5d344a22 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 21 Feb 2016 12:44:52 +0200
Subject: [PATCH 198/354] Fixed _detect_input_format

---
 application/libraries/REST_Controller.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 04fbf1eb..6f650a2b 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -825,20 +825,20 @@ protected function _detect_input_format()
 
         if (empty($content_type) === FALSE)
         {
-            // Check all formats against the HTTP_ACCEPT header
-            foreach ($this->_supported_formats as $key => $value)
-            {
-                // $key = format e.g. csv
-                // $value = mime type e.g. application/csv
+            // If a semi-colon exists in the string, then explode by ; and get the value of where
+            // the current array pointer resides. This will generally be the first element of the array
+            $content_type = (strpos($content_type, ';') !== FALSE ? current(explode(';', $content_type)) : $content_type);
 
-                // If a semi-colon exists in the string, then explode by ; and get the value of where
-                // the current array pointer resides. This will generally be the first element of the array
-                $content_type = (strpos($content_type, ';') !== FALSE ? current(explode(';', $content_type)) : $content_type);
+            // Check all formats against the CONTENT-TYPE header
+            foreach ($this->_supported_formats as $type => $mime)
+            {
+                // $type = format e.g. csv
+                // $mime = mime type e.g. application/csv
 
                 // If both the mime types match, then return the format
-                if ($content_type === $value)
+                if ($content_type === $mime)
                 {
-                    return $key;
+                    return $type;
                 }
             }
         }

From f514bb2cb64226584711b6c8ef952458100ab936 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 21 Feb 2016 12:50:39 +0200
Subject: [PATCH 199/354] Re-built documentation

---
 .../source-class-REST_Controller.html         | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/documentation/source-class-REST_Controller.html b/documentation/source-class-REST_Controller.html
index d049c3bc..c6372682 100644
--- a/documentation/source-class-REST_Controller.html
+++ b/documentation/source-class-REST_Controller.html
@@ -509,7 +509,7 @@ <h3>Classes</h3>
 </span><span id="415" class="l"><a href="#415"> 415: </a>            <span class="php-var">$supported_formats</span> = [];
 </span><span id="416" class="l"><a href="#416"> 416: </a>        }
 </span><span id="417" class="l"><a href="#417"> 417: </a>
-</span><span id="418" class="l"><a href="#418"> 418: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword2">is_array</span>(<span class="php-var">$supported_formats</span>))
+</span><span id="418" class="l"><a href="#418"> 418: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword2">is_array</span>(<span class="php-var">$supported_formats</span>))
 </span><span id="419" class="l"><a href="#419"> 419: </a>        {
 </span><span id="420" class="l"><a href="#420"> 420: </a>            <span class="php-var">$supported_formats</span> = [<span class="php-var">$supported_formats</span>];
 </span><span id="421" class="l"><a href="#421"> 421: </a>        }
@@ -634,7 +634,7 @@ <h3>Classes</h3>
 </span><span id="540" class="l"><a href="#540"> 540: </a>        }
 </span><span id="541" class="l"><a href="#541"> 541: </a>
 </span><span id="542" class="l"><a href="#542"> 542: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
-</span><span id="543" class="l"><a href="#543"> 543: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; !(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>) || (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'allow_auth_and_keys'</span>) === <span class="php-keyword1">TRUE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
+</span><span id="543" class="l"><a href="#543"> 543: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; ! (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>) || (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'allow_auth_and_keys'</span>) === <span class="php-keyword1">TRUE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
 </span><span id="544" class="l"><a href="#544"> 544: </a>        {
 </span><span id="545" class="l"><a href="#545"> 545: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
 </span><span id="546" class="l"><a href="#546"> 546: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
@@ -701,10 +701,10 @@ <h3>Classes</h3>
 </span><span id="607" class="l"><a href="#607"> 607: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span>.<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method;
 </span><span id="608" class="l"><a href="#608"> 608: </a>
 </span><span id="609" class="l"><a href="#609"> 609: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
-</span><span id="610" class="l"><a href="#610"> 610: </a>        <span class="php-var">$log_method</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] === <span class="php-keyword1">FALSE</span>);
+</span><span id="610" class="l"><a href="#610"> 610: </a>        <span class="php-var">$log_method</span> = ! (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] === <span class="php-keyword1">FALSE</span>);
 </span><span id="611" class="l"><a href="#611"> 611: </a>
 </span><span id="612" class="l"><a href="#612"> 612: </a>        <span class="php-comment">// Use keys for this method?</span>
-</span><span id="613" class="l"><a href="#613"> 613: </a>        <span class="php-var">$use_key</span> = !(<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] === <span class="php-keyword1">FALSE</span>);
+</span><span id="613" class="l"><a href="#613"> 613: </a>        <span class="php-var">$use_key</span> = ! (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] === <span class="php-keyword1">FALSE</span>);
 </span><span id="614" class="l"><a href="#614"> 614: </a>
 </span><span id="615" class="l"><a href="#615"> 615: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here</span>
 </span><span id="616" class="l"><a href="#616"> 616: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
@@ -905,20 +905,20 @@ <h3>Classes</h3>
 </span><span id="811" class="l"><a href="#811"> 811: </a>
 </span><span id="812" class="l"><a href="#812"> 812: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$content_type</span>) === <span class="php-keyword1">FALSE</span>)
 </span><span id="813" class="l"><a href="#813"> 813: </a>        {
-</span><span id="814" class="l"><a href="#814"> 814: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="815" class="l"><a href="#815"> 815: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
-</span><span id="816" class="l"><a href="#816"> 816: </a>            {
-</span><span id="817" class="l"><a href="#817"> 817: </a>                <span class="php-comment">// $key = format e.g. csv</span>
-</span><span id="818" class="l"><a href="#818"> 818: </a>                <span class="php-comment">// $value = mime type e.g. application/csv</span>
-</span><span id="819" class="l"><a href="#819"> 819: </a>
-</span><span id="820" class="l"><a href="#820"> 820: </a>                <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
-</span><span id="821" class="l"><a href="#821"> 821: </a>                <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
-</span><span id="822" class="l"><a href="#822"> 822: </a>                <span class="php-var">$content_type</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$content_type</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$content_type</span>)) : <span class="php-var">$content_type</span>);
+</span><span id="814" class="l"><a href="#814"> 814: </a>            <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
+</span><span id="815" class="l"><a href="#815"> 815: </a>            <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
+</span><span id="816" class="l"><a href="#816"> 816: </a>            <span class="php-var">$content_type</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$content_type</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$content_type</span>)) : <span class="php-var">$content_type</span>);
+</span><span id="817" class="l"><a href="#817"> 817: </a>
+</span><span id="818" class="l"><a href="#818"> 818: </a>            <span class="php-comment">// Check all formats against the CONTENT-TYPE header</span>
+</span><span id="819" class="l"><a href="#819"> 819: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$type</span> =&gt; <span class="php-var">$mime</span>)
+</span><span id="820" class="l"><a href="#820"> 820: </a>            {
+</span><span id="821" class="l"><a href="#821"> 821: </a>                <span class="php-comment">// $type = format e.g. csv</span>
+</span><span id="822" class="l"><a href="#822"> 822: </a>                <span class="php-comment">// $mime = mime type e.g. application/csv</span>
 </span><span id="823" class="l"><a href="#823"> 823: </a>
 </span><span id="824" class="l"><a href="#824"> 824: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
-</span><span id="825" class="l"><a href="#825"> 825: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$content_type</span> === <span class="php-var">$value</span>)
+</span><span id="825" class="l"><a href="#825"> 825: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$content_type</span> === <span class="php-var">$mime</span>)
 </span><span id="826" class="l"><a href="#826"> 826: </a>                {
-</span><span id="827" class="l"><a href="#827"> 827: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$key</span>;
+</span><span id="827" class="l"><a href="#827"> 827: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$type</span>;
 </span><span id="828" class="l"><a href="#828"> 828: </a>                }
 </span><span id="829" class="l"><a href="#829"> 829: </a>            }
 </span><span id="830" class="l"><a href="#830"> 830: </a>        }
@@ -1065,7 +1065,7 @@ <h3>Classes</h3>
 </span><span id="971" class="l"><a href="#971"> 971: </a>        <span class="php-comment">// Find the key from server or arguments</span>
 </span><span id="972" class="l"><a href="#972"> 972: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
 </span><span id="973" class="l"><a href="#973"> 973: </a>        {
-</span><span id="974" class="l"><a href="#974"> 974: </a>            <span class="php-keyword1">if</span> (!(<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
+</span><span id="974" class="l"><a href="#974"> 974: </a>            <span class="php-keyword1">if</span> ( ! (<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
 </span><span id="975" class="l"><a href="#975"> 975: </a>            {
 </span><span id="976" class="l"><a href="#976"> 976: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
 </span><span id="977" class="l"><a href="#977"> 977: </a>            }
@@ -1293,12 +1293,12 @@ <h3>Classes</h3>
 </span><span id="1199" class="l"><a href="#1199">1199: </a>        <span class="php-var">$auth_override_class_method</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
 </span><span id="1200" class="l"><a href="#1200">1200: </a>
 </span><span id="1201" class="l"><a href="#1201">1201: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
-</span><span id="1202" class="l"><a href="#1202">1202: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>))
+</span><span id="1202" class="l"><a href="#1202">1202: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>))
 </span><span id="1203" class="l"><a href="#1203">1203: </a>        {
-</span><span id="1204" class="l"><a href="#1204">1204: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="1205" class="l"><a href="#1205">1205: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>])) <span class="php-comment">// Check for class overrides</span>
+</span><span id="1204" class="l"><a href="#1204">1204: </a>            <span class="php-comment">// Check for wildcard flag for rules for classes</span>
+</span><span id="1205" class="l"><a href="#1205">1205: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>])) <span class="php-comment">// Check for class overrides</span>
 </span><span id="1206" class="l"><a href="#1206">1206: </a>            {
-</span><span id="1207" class="l"><a href="#1207">1207: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1207" class="l"><a href="#1207">1207: </a>                <span class="php-comment">// No auth override found, prepare nothing but send back a TRUE override flag</span>
 </span><span id="1208" class="l"><a href="#1208">1208: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'none'</span>)
 </span><span id="1209" class="l"><a href="#1209">1209: </a>                {
 </span><span id="1210" class="l"><a href="#1210">1210: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
@@ -1338,7 +1338,7 @@ <h3>Classes</h3>
 </span><span id="1244" class="l"><a href="#1244">1244: </a>            }
 </span><span id="1245" class="l"><a href="#1245">1245: </a>
 </span><span id="1246" class="l"><a href="#1246">1246: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
-</span><span id="1247" class="l"><a href="#1247">1247: </a>            <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
+</span><span id="1247" class="l"><a href="#1247">1247: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
 </span><span id="1248" class="l"><a href="#1248">1248: </a>            {
 </span><span id="1249" class="l"><a href="#1249">1249: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
 </span><span id="1250" class="l"><a href="#1250">1250: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'none'</span>)
@@ -1384,10 +1384,10 @@ <h3>Classes</h3>
 </span><span id="1290" class="l"><a href="#1290">1290: </a>        <span class="php-var">$auth_override_class_method_http</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method_http'</span>);
 </span><span id="1291" class="l"><a href="#1291">1291: </a>
 </span><span id="1292" class="l"><a href="#1292">1292: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
-</span><span id="1293" class="l"><a href="#1293">1293: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>))
+</span><span id="1293" class="l"><a href="#1293">1293: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>))
 </span><span id="1294" class="l"><a href="#1294">1294: </a>        {
 </span><span id="1295" class="l"><a href="#1295">1295: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="1296" class="l"><a href="#1296">1296: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method]))
+</span><span id="1296" class="l"><a href="#1296">1296: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method]))
 </span><span id="1297" class="l"><a href="#1297">1297: </a>            {
 </span><span id="1298" class="l"><a href="#1298">1298: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
 </span><span id="1299" class="l"><a href="#1299">1299: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
@@ -1429,7 +1429,7 @@ <h3>Classes</h3>
 </span><span id="1335" class="l"><a href="#1335">1335: </a>            }
 </span><span id="1336" class="l"><a href="#1336">1336: </a>
 </span><span id="1337" class="l"><a href="#1337">1337: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method/HTTP-method being called</span>
-</span><span id="1338" class="l"><a href="#1338">1338: </a>            <span class="php-keyword1">if</span>(!<span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method]))
+</span><span id="1338" class="l"><a href="#1338">1338: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method]))
 </span><span id="1339" class="l"><a href="#1339">1339: </a>            {
 </span><span id="1340" class="l"><a href="#1340">1340: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
 </span><span id="1341" class="l"><a href="#1341">1341: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
@@ -1934,7 +1934,7 @@ <h3>Classes</h3>
 </span><span id="1840" class="l"><a href="#1840">1840: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
 </span><span id="1841" class="l"><a href="#1841">1841: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
 </span><span id="1842" class="l"><a href="#1842">1842: </a>
-</span><span id="1843" class="l"><a href="#1843">1843: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
+</span><span id="1843" class="l"><a href="#1843">1843: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
 </span><span id="1844" class="l"><a href="#1844">1844: </a>        {
 </span><span id="1845" class="l"><a href="#1845">1845: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
 </span><span id="1846" class="l"><a href="#1846">1846: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span>.<span class="php-quote">':'</span>.<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>).<span class="php-quote">':'</span>.(<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
@@ -1984,7 +1984,7 @@ <h3>Classes</h3>
 </span><span id="1890" class="l"><a href="#1890">1890: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
 </span><span id="1891" class="l"><a href="#1891">1891: </a>
 </span><span id="1892" class="l"><a href="#1892">1892: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
-</span><span id="1893" class="l"><a href="#1893">1893: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
+</span><span id="1893" class="l"><a href="#1893">1893: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
 </span><span id="1894" class="l"><a href="#1894">1894: </a>        {
 </span><span id="1895" class="l"><a href="#1895">1895: </a>            <span class="php-comment">// Display an error response</span>
 </span><span id="1896" class="l"><a href="#1896">1896: </a>            <span class="php-var">$this</span>-&gt;response([

From 89bbcacc1bafd3cae5eb6ba0e31091c8a99b50c4 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 3 Apr 2016 08:50:13 +0300
Subject: [PATCH 200/354] Fixed styling errors with #601

---
 application/config/rest.php | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/application/config/rest.php b/application/config/rest.php
index 668306b4..68511c9c 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -528,20 +528,19 @@
 | CORS Check
 |--------------------------------------------------------------------------
 |
-| Set to true to enable Cross-Origin Resource Sharing (CORS). Useful if you
-|  are hosting your API on a different domain from the appolication that
-|  will access it through a browser.
+| Set to TRUE to enable Cross-Origin Resource Sharing (CORS). Useful if you
+| are hosting your API on a different domain from the application that
+| will access it through a browser
 |
 */
-$config['check_cors'] = false;
+$config['check_cors'] = FALSE;
 
 /*
 |--------------------------------------------------------------------------
 | CORS Allowable Headers
 |--------------------------------------------------------------------------
 |
-| If using CORS checks, set the allowable headers here. Add any custom headers you may
-|  be using in tyou application to the array
+| If using CORS checks, set the allowable headers here
 |
 */
 $config['allowed_cors_headers'] = [
@@ -557,7 +556,7 @@
 | CORS Allowable Methods
 |--------------------------------------------------------------------------
 |
-| If using CORS checks, you can set the methods you want to be allowed here.
+| If using CORS checks, you can set the methods you want to be allowed
 |
 */
 $config['allowed_cors_methods'] = [
@@ -574,22 +573,21 @@
 | CORS Allow Any Domain
 |--------------------------------------------------------------------------
 |
-| Set to true to enable Cross-Origin Resource Sharing (CORS) from any
-|  source domain
+| Set to TRUE to enable Cross-Origin Resource Sharing (CORS) from any
+| source domain
 |
 */
-$config['allow_any_cors_domain'] = false;
+$config['allow_any_cors_domain'] = FALSE;
 
 /*
 |--------------------------------------------------------------------------
 | CORS Allowable Domains
 |--------------------------------------------------------------------------
 |
-| Used if $config['check_cors'] is set to true and $config['allow_any_cors_domain']
-|  is set to false. Set all the allowable domains within the array.
+| Used if $config['check_cors'] is set to TRUE and $config['allow_any_cors_domain']
+| is set to FALSE. Set all the allowable domains within the array
 |
 | e.g. $config['allowed_origins'] = ['http://www.example.com/', 'https://spa.example.com/']
 |
 */
 $config['allowed_cors_origins'] = [];
-

From 8d510509389ef481eba426f3410540cfc0311be7 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 3 Apr 2016 08:50:47 +0300
Subject: [PATCH 201/354] Fixed styling errors with #601

---
 application/libraries/REST_Controller.php | 31 +++++++++++++----------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 6f650a2b..01f9850f 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -466,8 +466,9 @@ public function __construct($config = 'rest')
 
         // Check for CORS access request
         $check_cors = $this->config->item('check_cors');
-        if ($check_cors === true) {
-          $this->_check_cors();
+        if ($check_cors === TRUE)
+        {
+            $this->_check_cors();
         }
 
         // Create an argument container if it doesn't exist e.g. _get_args
@@ -2175,33 +2176,35 @@ protected function _check_cors()
         $allowed_methods = implode(' ,', $this->config->item('allowed_cors_methods'));
 
         // If we want to allow any domain to access the API
-        if ($this->config->item('allow_any_cors_domain') === true)
+        if ($this->config->item('allow_any_cors_domain') === TRUE)
         {
             header('Access-Control-Allow-Origin: *');
-            header('Access-Control-Allow-Headers: ' . $allowed_headers);
-            header('Access-Control-Allow-Methods: ' . $allowed_methods);
+            header('Access-Control-Allow-Headers: '.$allowed_headers);
+            header('Access-Control-Allow-Methods: '.$allowed_methods);
         }
-        // We're going to allow only certain domains access
         else
         {
+            // We're going to allow only certain domains access
             // Store the HTTP Origin header
-            $origin = (isset($_SERVER['HTTP_ORIGIN']) ? $_SERVER['HTTP_ORIGIN'] : '');
+            $origin = $this->input->server('HTTP_ORIGIN');
+            if ($origin === NULL)
+            {
+                $origin = '';
+            }
 
             // If the origin domain is in the allowed_cors_origins list, then add the Access Control headers
             if (in_array($origin, $this->config->item('allowed_cors_origins')))
             {
-                header('Access-Control-Allow-Origin: ' . $origin);
-                header('Access-Control-Allow-Headers: ' . $allowed_headers);
-                header('Access-Control-Allow-Methods: ' . $allowed_methods);
+                header('Access-Control-Allow-Origin: '.$origin);
+                header('Access-Control-Allow-Headers: '.$allowed_headers);
+                header('Access-Control-Allow-Methods: '.$allowed_methods);
             }
         }
 
         // If the request HTTP method is 'OPTIONS', kill the response and send it to the client
-        $method = $_SERVER['REQUEST_METHOD'];
-
-        if ($method === 'OPTIONS')
+        if ($this->input->method() === 'options')
         {
-            die();
+            exit;
         }
     }
 

From 457bcbf95bab2dec88f408ab461a1f6ce7767b0a Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 3 Apr 2016 08:53:13 +0300
Subject: [PATCH 202/354] Re-generated documentation

---
 documentation/class-Example.html              |    2 +
 documentation/class-Key.html                  |    2 +
 documentation/class-REST_Controller.html      |  151 +-
 .../source-class-REST_Controller.html         | 3556 +++++++++--------
 4 files changed, 1915 insertions(+), 1796 deletions(-)

diff --git a/documentation/class-Example.html b/documentation/class-Example.html
index 18482b73..7959da84 100644
--- a/documentation/class-Example.html
+++ b/documentation/class-Example.html
@@ -284,6 +284,7 @@ <h4>Overrides</h4>
 			<a href="http://github.com/class-REST_Controller.html#__auth_override_check">_auth_override_check()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__check_access">_check_access()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__check_blacklist_auth">_check_blacklist_auth()</a>, 
+			<a href="http://github.com/class-REST_Controller.html#__check_cors">_check_cors()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__check_limit">_check_limit()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__check_login">_check_login()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__check_php_session">_check_php_session()</a>, 
@@ -428,6 +429,7 @@ <h4>Overrides</h4>
 			<a href="http://github.com/class-REST_Controller.html#$_supported_formats"><var>$_supported_formats</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_user_ldap_dn"><var>$_user_ldap_dn</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$allowed_http_methods"><var>$allowed_http_methods</var></a>, 
+			<a href="http://github.com/class-REST_Controller.html#$check_cors"><var>$check_cors</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$http_status_codes"><var>$http_status_codes</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$methods"><var>$methods</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$request"><var>$request</var></a>, 
diff --git a/documentation/class-Key.html b/documentation/class-Key.html
index 957df227..d999bfa1 100644
--- a/documentation/class-Key.html
+++ b/documentation/class-Key.html
@@ -307,6 +307,7 @@ <h1>Class Key</h1>
 			<a href="http://github.com/class-REST_Controller.html#__auth_override_check">_auth_override_check()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__check_access">_check_access()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__check_blacklist_auth">_check_blacklist_auth()</a>, 
+			<a href="http://github.com/class-REST_Controller.html#__check_cors">_check_cors()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__check_limit">_check_limit()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__check_login">_check_login()</a>, 
 			<a href="http://github.com/class-REST_Controller.html#__check_php_session">_check_php_session()</a>, 
@@ -484,6 +485,7 @@ <h1>Class Key</h1>
 			<a href="http://github.com/class-REST_Controller.html#$_supported_formats"><var>$_supported_formats</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$_user_ldap_dn"><var>$_user_ldap_dn</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$allowed_http_methods"><var>$allowed_http_methods</var></a>, 
+			<a href="http://github.com/class-REST_Controller.html#$check_cors"><var>$check_cors</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$http_status_codes"><var>$http_status_codes</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$request"><var>$request</var></a>, 
 			<a href="http://github.com/class-REST_Controller.html#$response"><var>$response</var></a>, 
diff --git a/documentation/class-REST_Controller.html b/documentation/class-REST_Controller.html
index 34c4d2aa..1537c7cc 100644
--- a/documentation/class-REST_Controller.html
+++ b/documentation/class-REST_Controller.html
@@ -137,7 +137,7 @@ <h4>Direct known subclasses</h4>
 				3.0.0<br>
 				<b>Link:</b>
 				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-2151" title="Go to source code">libraries/REST_Controller.php</a>
+			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-2211" title="Go to source code">libraries/REST_Controller.php</a>
 		<br>
 	</div>
 
@@ -157,7 +157,7 @@ <h4>Direct known subclasses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_early_checks">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#355-363" title="Go to source code">early_checks</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#362-370" title="Go to source code">early_checks</a>( )</code>
 
 		<div class="description short">
 			<p>Extend this function to apply additional checking early on in the process</p>
@@ -187,7 +187,7 @@ <h4>Direct known subclasses</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___construct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#365-563" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#372-577" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
 
 		<div class="description short">
 			<p>Constructor for the REST API</p>
@@ -223,7 +223,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#___destruct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#565-582" title="Go to source code">__destruct</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#579-596" title="Go to source code">__destruct</a>( )</code>
 
 		<div class="description short">
 			<p>Deconstructor</p>
@@ -257,7 +257,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__remap">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#584-701" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var> = []</span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#598-716" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var> = []</span> )</code>
 
 		<div class="description short">
 			<p>Requests are not made to methods directly, the request will be for
@@ -298,7 +298,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#703-784" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#718-799" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Takes mixed data and optionally a status code, then creates the response</p>
@@ -338,7 +338,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_set_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#786-799" title="Go to source code">set_response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#801-814" title="Go to source code">set_response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Takes mixed data and optionally a status code, then creates the response
@@ -381,7 +381,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_input_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#801-833" title="Go to source code">_detect_input_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#816-848" title="Go to source code">_detect_input_format</a>( )</code>
 
 		<div class="description short">
 			<p>Get the input format e.g. json or xml</p>
@@ -415,7 +415,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__get_default_output_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#835-847" title="Go to source code">_get_default_output_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#850-862" title="Go to source code">_get_default_output_format</a>( )</code>
 
 		<div class="description short">
 			<p>Gets the default format from the configuration. Fallbacks to 'json'
@@ -453,7 +453,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_output_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#849-918" title="Go to source code">_detect_output_format</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#864-933" title="Go to source code">_detect_output_format</a>( )</code>
 
 		<div class="description short">
 			<p>Detect which format should be used to output the data</p>
@@ -487,7 +487,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_method">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#920-950" title="Go to source code">_detect_method</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#935-965" title="Go to source code">_detect_method</a>( )</code>
 
 		<div class="description short">
 			<p>Get the HTTP request string e.g. get or post</p>
@@ -521,7 +521,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_api_key">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#952-1024" title="Go to source code">_detect_api_key</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#967-1039" title="Go to source code">_detect_api_key</a>( )</code>
 
 		<div class="description short">
 			<p>See if the user has provided an API key</p>
@@ -555,7 +555,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__detect_lang">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1026-1058" title="Go to source code">_detect_lang</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1041-1073" title="Go to source code">_detect_lang</a>( )</code>
 
 		<div class="description short">
 			<p>Preferred return language</p>
@@ -589,7 +589,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_request">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1060-1086" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1075-1101" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Add the request to the log table</p>
@@ -628,7 +628,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_limit">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1088-1188" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1103-1203" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
 
 		<div class="description short">
 			<p>Check if the requests to a controller method exceed a limit</p>
@@ -667,7 +667,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__auth_override_check">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1190-1380" title="Go to source code">_auth_override_check</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1205-1395" title="Go to source code">_auth_override_check</a>( )</code>
 
 		<div class="description short">
 			<p>Check if there is a specific auth type set for the current class/method/HTTP-method being called</p>
@@ -701,7 +701,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1382-1392" title="Go to source code">_parse_get</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1397-1407" title="Go to source code">_parse_get</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the GET request arguments</p>
@@ -731,7 +731,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1394-1408" title="Go to source code">_parse_post</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1409-1423" title="Go to source code">_parse_post</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the POST request arguments</p>
@@ -761,7 +761,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1410-1427" title="Go to source code">_parse_put</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1425-1442" title="Go to source code">_parse_put</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PUT request arguments</p>
@@ -791,7 +791,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1429-1442" title="Go to source code">_parse_head</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1444-1457" title="Go to source code">_parse_head</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the HEAD request arguments</p>
@@ -821,7 +821,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1444-1457" title="Go to source code">_parse_options</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1459-1472" title="Go to source code">_parse_options</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the OPTIONS request arguments</p>
@@ -851,7 +851,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1459-1477" title="Go to source code">_parse_patch</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1474-1492" title="Go to source code">_parse_patch</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the PATCH request arguments</p>
@@ -881,7 +881,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1479-1492" title="Go to source code">_parse_delete</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1494-1507" title="Go to source code">_parse_delete</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the DELETE request arguments</p>
@@ -911,7 +911,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__parse_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1494-1503" title="Go to source code">_parse_query</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1509-1518" title="Go to source code">_parse_query</a>( )</code>
 
 		<div class="description short">
 			<p>Parse the query parameters</p>
@@ -941,7 +941,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1507-1524" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1522-1539" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a GET request</p>
@@ -983,7 +983,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1526-1543" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1541-1558" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a OPTIONS request</p>
@@ -1025,7 +1025,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1545-1562" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1560-1577" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a HEAD request</p>
@@ -1067,7 +1067,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1564-1581" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1579-1596" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a POST request</p>
@@ -1109,7 +1109,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1583-1600" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1598-1615" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PUT request</p>
@@ -1151,7 +1151,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1602-1619" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1617-1634" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a DELETE request</p>
@@ -1193,7 +1193,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1621-1638" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1636-1653" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from a PATCH request</p>
@@ -1235,7 +1235,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1640-1657" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1655-1672" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Retrieve a value from the query parameters</p>
@@ -1277,7 +1277,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__xss_clean">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1659-1673" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1674-1688" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
 
 		<div class="description short">
 			<p>Sanitizes data so that Cross Site Scripting Hacks can be
@@ -1320,7 +1320,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#_validation_errors">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1675-1686" title="Go to source code">validation_errors</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1690-1701" title="Go to source code">validation_errors</a>( )</code>
 
 		<div class="description short">
 			<p>Retrieve the validation errors</p>
@@ -1354,7 +1354,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_ldap_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1690-1783" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1705-1798" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform LDAP Authentication</p>
@@ -1395,7 +1395,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__perform_library_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1785-1822" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1800-1837" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
 
 		<div class="description short">
 			<p>Perform Library Authentication - Override this function to change the way the library is called</p>
@@ -1436,7 +1436,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1824-1879" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1839-1894" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
 
 		<div class="description short">
 			<p>Check if the user is logged in</p>
@@ -1477,7 +1477,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_php_session">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1881-1901" title="Go to source code">_check_php_session</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1896-1916" title="Go to source code">_check_php_session</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the user is logged in with a PHP session key</p>
@@ -1507,7 +1507,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_basic_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1903-1942" title="Go to source code">_prepare_basic_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1918-1957" title="Go to source code">_prepare_basic_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for basic authentication</p>
@@ -1537,7 +1537,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__prepare_digest_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1944-1999" title="Go to source code">_prepare_digest_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#1959-2014" title="Go to source code">_prepare_digest_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Prepares for digest authentication</p>
@@ -1567,7 +1567,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_blacklist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2001-2021" title="Go to source code">_check_blacklist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2016-2036" title="Go to source code">_check_blacklist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response</p>
@@ -1597,7 +1597,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_whitelist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2023-2049" title="Go to source code">_check_whitelist_auth</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2038-2064" title="Go to source code">_check_whitelist_auth</a>( )</code>
 
 		<div class="description short">
 			<p>Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response</p>
@@ -1627,7 +1627,7 @@ <h4>Returns</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__force_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2051-2082" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2066-2097" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
 
 		<div class="description short">
 			<p>Force logging in by setting the WWW-Authenticate header</p>
@@ -1663,7 +1663,7 @@ <h4>Parameters</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_access_time">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2084-2099" title="Go to source code">_log_access_time</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2099-2114" title="Go to source code">_log_access_time</a>( )</code>
 
 		<div class="description short">
 			<p>Updates the log table with the total access time</p>
@@ -1701,7 +1701,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__log_response_code">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2101-2117" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2116-2132" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
 
 		<div class="description short">
 			<p>Updates the log table with HTTP response code</p>
@@ -1744,7 +1744,7 @@ <h4>Author</h4>
 
 		<td class="name"><div>
 		<a class="anchor" href="#__check_access">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2119-2149" title="Go to source code">_check_access</a>( )</code>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2134-2164" title="Go to source code">_check_access</a>( )</code>
 
 		<div class="description short">
 			<p>Check to see if the API key has access to the controller and methods</p>
@@ -1763,6 +1763,36 @@ <h4>Returns</h4>
 
 
 
+		</div>
+		</div></td>
+	</tr>
+	<tr data-order="_check_cors" id="__check_cors">
+
+		<td class="attributes"><code>
+			 protected 
+
+			
+			
+			</code>
+		</td>
+
+		<td class="name"><div>
+		<a class="anchor" href="#__check_cors">#</a>
+		<code><a href="http://github.com/source-class-REST_Controller.html#2166-2209" title="Go to source code">_check_cors</a>( )</code>
+
+		<div class="description short">
+			<p>Checks allowed domains, and adds appropriate headers for HTTP access control (CORS)</p>
+		</div>
+
+		<div class="description detailed hidden">
+			<p>Checks allowed domains, and adds appropriate headers for HTTP access control (CORS)</p>
+
+
+
+
+
+
+
 		</div>
 		</div></td>
 	</tr>
@@ -3805,6 +3835,31 @@ <h4>Returns</h4>
 			</div>
 		</td>
 	</tr>
+	<tr data-order="check_cors" id="$check_cors">
+		<td class="attributes"><code>
+			protected  
+			boolean
+		</code></td>
+
+		<td class="name">
+				<a href="http://github.com/source-class-REST_Controller.html#322-327" title="Go to source code"><var>$check_cors</var></a>
+
+			<div class="description short">
+				<p>Whether or not to perform a CORS check and apply CORS headers to the request</p>
+			</div>
+
+			<div class="description detailed hidden">
+				<p>Whether or not to perform a CORS check and apply CORS headers to the request</p>
+
+			</div>
+		</td>
+		<td class="value">
+			<div>
+				<a href="#$check_cors" class="anchor">#</a>
+				<code><span class="php-keyword1">NULL</span></code>
+			</div>
+		</td>
+	</tr>
 	<tr data-order="_enable_xss" id="$_enable_xss">
 		<td class="attributes"><code>
 			protected  
@@ -3812,7 +3867,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#322-330" title="Go to source code"><var>$_enable_xss</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#329-337" title="Go to source code"><var>$_enable_xss</var></a>
 
 			<div class="description short">
 				<p>Enable XSS flag
@@ -3843,7 +3898,7 @@ <h4>Returns</h4>
 		</code></td>
 
 		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#332-353" title="Go to source code"><var>$http_status_codes</var></a>
+				<a href="http://github.com/source-class-REST_Controller.html#339-360" title="Go to source code"><var>$http_status_codes</var></a>
 
 			<div class="description short">
 				<p>HTTP status codes and their respective description
diff --git a/documentation/source-class-REST_Controller.html b/documentation/source-class-REST_Controller.html
index c6372682..cd14e705 100644
--- a/documentation/source-class-REST_Controller.html
+++ b/documentation/source-class-REST_Controller.html
@@ -414,314 +414,314 @@ <h3>Classes</h3>
 </span><span id="320" class="l"><a href="#320"> 320: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_apiuser</span>;
 </span><span id="321" class="l"><a href="#321"> 321: </a>
 </span><span id="322" class="l"><a href="#322"> 322: </a>    <span class="php-comment">/**
-</span></span><span id="323" class="l"><a href="#323"> 323: </a><span class="php-comment">     * Enable XSS flag
-</span></span><span id="324" class="l"><a href="#324"> 324: </a><span class="php-comment">     * Determines whether the XSS filter is always active when
-</span></span><span id="325" class="l"><a href="#325"> 325: </a><span class="php-comment">     * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered
-</span></span><span id="326" class="l"><a href="#326"> 326: </a><span class="php-comment">     * Set automatically based on config setting
-</span></span><span id="327" class="l"><a href="#327"> 327: </a><span class="php-comment">     *
-</span></span><span id="328" class="l"><a href="#328"> 328: </a><span class="php-comment">     * @var bool
-</span></span><span id="329" class="l"><a href="#329"> 329: </a><span class="php-comment">     */</span>
-</span><span id="330" class="l"><a href="#330"> 330: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_enable_xss</span> = <span class="php-keyword1">FALSE</span>;
-</span><span id="331" class="l"><a href="#331"> 331: </a>
-</span><span id="332" class="l"><a href="#332"> 332: </a>    <span class="php-comment">/**
-</span></span><span id="333" class="l"><a href="#333"> 333: </a><span class="php-comment">     * HTTP status codes and their respective description
-</span></span><span id="334" class="l"><a href="#334"> 334: </a><span class="php-comment">     * Note: Only the widely used HTTP status codes are used
-</span></span><span id="335" class="l"><a href="#335"> 335: </a><span class="php-comment">     *
-</span></span><span id="336" class="l"><a href="#336"> 336: </a><span class="php-comment">     * @var array
-</span></span><span id="337" class="l"><a href="#337"> 337: </a><span class="php-comment">     * @link http://www.restapitutorial.com/httpstatuscodes.html
-</span></span><span id="338" class="l"><a href="#338"> 338: </a><span class="php-comment">     */</span>
-</span><span id="339" class="l"><a href="#339"> 339: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$http_status_codes</span> = [
-</span><span id="340" class="l"><a href="#340"> 340: </a>        self::HTTP_OK =&gt; <span class="php-quote">'OK'</span>,
-</span><span id="341" class="l"><a href="#341"> 341: </a>        self::HTTP_CREATED =&gt; <span class="php-quote">'CREATED'</span>,
-</span><span id="342" class="l"><a href="#342"> 342: </a>        self::HTTP_NO_CONTENT =&gt; <span class="php-quote">'NO CONTENT'</span>,
-</span><span id="343" class="l"><a href="#343"> 343: </a>        self::HTTP_NOT_MODIFIED =&gt; <span class="php-quote">'NOT MODIFIED'</span>,
-</span><span id="344" class="l"><a href="#344"> 344: </a>        self::HTTP_BAD_REQUEST =&gt; <span class="php-quote">'BAD REQUEST'</span>,
-</span><span id="345" class="l"><a href="#345"> 345: </a>        self::HTTP_UNAUTHORIZED =&gt; <span class="php-quote">'UNAUTHORIZED'</span>,
-</span><span id="346" class="l"><a href="#346"> 346: </a>        self::HTTP_FORBIDDEN =&gt; <span class="php-quote">'FORBIDDEN'</span>,
-</span><span id="347" class="l"><a href="#347"> 347: </a>        self::HTTP_NOT_FOUND =&gt; <span class="php-quote">'NOT FOUND'</span>,
-</span><span id="348" class="l"><a href="#348"> 348: </a>        self::HTTP_METHOD_NOT_ALLOWED =&gt; <span class="php-quote">'METHOD NOT ALLOWED'</span>,
-</span><span id="349" class="l"><a href="#349"> 349: </a>        self::HTTP_NOT_ACCEPTABLE =&gt; <span class="php-quote">'NOT ACCEPTABLE'</span>,
-</span><span id="350" class="l"><a href="#350"> 350: </a>        self::HTTP_CONFLICT =&gt; <span class="php-quote">'CONFLICT'</span>,
-</span><span id="351" class="l"><a href="#351"> 351: </a>        self::HTTP_INTERNAL_SERVER_ERROR =&gt; <span class="php-quote">'INTERNAL SERVER ERROR'</span>,
-</span><span id="352" class="l"><a href="#352"> 352: </a>        self::HTTP_NOT_IMPLEMENTED =&gt; <span class="php-quote">'NOT IMPLEMENTED'</span>
-</span><span id="353" class="l"><a href="#353"> 353: </a>    ];
-</span><span id="354" class="l"><a href="#354"> 354: </a>
-</span><span id="355" class="l"><a href="#355"> 355: </a>    <span class="php-comment">/**
-</span></span><span id="356" class="l"><a href="#356"> 356: </a><span class="php-comment">     * Extend this function to apply additional checking early on in the process
-</span></span><span id="357" class="l"><a href="#357"> 357: </a><span class="php-comment">     *
-</span></span><span id="358" class="l"><a href="#358"> 358: </a><span class="php-comment">     * @access protected
-</span></span><span id="359" class="l"><a href="#359"> 359: </a><span class="php-comment">     * @return void
-</span></span><span id="360" class="l"><a href="#360"> 360: </a><span class="php-comment">     */</span>
-</span><span id="361" class="l"><a href="#361"> 361: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> early_checks()
-</span><span id="362" class="l"><a href="#362"> 362: </a>    {
-</span><span id="363" class="l"><a href="#363"> 363: </a>    }
-</span><span id="364" class="l"><a href="#364"> 364: </a>
-</span><span id="365" class="l"><a href="#365"> 365: </a>    <span class="php-comment">/**
-</span></span><span id="366" class="l"><a href="#366"> 366: </a><span class="php-comment">     * Constructor for the REST API
-</span></span><span id="367" class="l"><a href="#367"> 367: </a><span class="php-comment">     *
-</span></span><span id="368" class="l"><a href="#368"> 368: </a><span class="php-comment">     * @access public
-</span></span><span id="369" class="l"><a href="#369"> 369: </a><span class="php-comment">     * @param string $config Configuration filename minus the file extension
-</span></span><span id="370" class="l"><a href="#370"> 370: </a><span class="php-comment">     * e.g: my_rest.php is passed as 'my_rest'
-</span></span><span id="371" class="l"><a href="#371"> 371: </a><span class="php-comment">     * @return void
-</span></span><span id="372" class="l"><a href="#372"> 372: </a><span class="php-comment">     */</span>
-</span><span id="373" class="l"><a href="#373"> 373: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$config</span> = <span class="php-quote">'rest'</span>)
-</span><span id="374" class="l"><a href="#374"> 374: </a>    {
-</span><span id="375" class="l"><a href="#375"> 375: </a>        parent::__construct();
-</span><span id="376" class="l"><a href="#376"> 376: </a>
-</span><span id="377" class="l"><a href="#377"> 377: </a>        <span class="php-comment">// Disable XML Entity (security vulnerability)</span>
-</span><span id="378" class="l"><a href="#378"> 378: </a>        <span class="php-keyword2">libxml_disable_entity_loader</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="379" class="l"><a href="#379"> 379: </a>
-</span><span id="380" class="l"><a href="#380"> 380: </a>        <span class="php-comment">// Check to see if PHP is equal to or greater than 5.4.x</span>
-</span><span id="381" class="l"><a href="#381"> 381: </a>        <span class="php-keyword1">if</span> (is_php(<span class="php-quote">'5.4'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="382" class="l"><a href="#382"> 382: </a>        {
-</span><span id="383" class="l"><a href="#383"> 383: </a>            <span class="php-comment">// CodeIgniter 3 is recommended for v5.4 or above</span>
-</span><span id="384" class="l"><a href="#384"> 384: </a>            <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'Using PHP v'</span>.PHP_VERSION.<span class="php-quote">', though PHP v5.4 or greater is required'</span>);
-</span><span id="385" class="l"><a href="#385"> 385: </a>        }
+</span></span><span id="323" class="l"><a href="#323"> 323: </a><span class="php-comment">     * Whether or not to perform a CORS check and apply CORS headers to the request
+</span></span><span id="324" class="l"><a href="#324"> 324: </a><span class="php-comment">     *
+</span></span><span id="325" class="l"><a href="#325"> 325: </a><span class="php-comment">     * @var bool
+</span></span><span id="326" class="l"><a href="#326"> 326: </a><span class="php-comment">     */</span>
+</span><span id="327" class="l"><a href="#327"> 327: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$check_cors</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="328" class="l"><a href="#328"> 328: </a>
+</span><span id="329" class="l"><a href="#329"> 329: </a>    <span class="php-comment">/**
+</span></span><span id="330" class="l"><a href="#330"> 330: </a><span class="php-comment">     * Enable XSS flag
+</span></span><span id="331" class="l"><a href="#331"> 331: </a><span class="php-comment">     * Determines whether the XSS filter is always active when
+</span></span><span id="332" class="l"><a href="#332"> 332: </a><span class="php-comment">     * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered
+</span></span><span id="333" class="l"><a href="#333"> 333: </a><span class="php-comment">     * Set automatically based on config setting
+</span></span><span id="334" class="l"><a href="#334"> 334: </a><span class="php-comment">     *
+</span></span><span id="335" class="l"><a href="#335"> 335: </a><span class="php-comment">     * @var bool
+</span></span><span id="336" class="l"><a href="#336"> 336: </a><span class="php-comment">     */</span>
+</span><span id="337" class="l"><a href="#337"> 337: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_enable_xss</span> = <span class="php-keyword1">FALSE</span>;
+</span><span id="338" class="l"><a href="#338"> 338: </a>
+</span><span id="339" class="l"><a href="#339"> 339: </a>    <span class="php-comment">/**
+</span></span><span id="340" class="l"><a href="#340"> 340: </a><span class="php-comment">     * HTTP status codes and their respective description
+</span></span><span id="341" class="l"><a href="#341"> 341: </a><span class="php-comment">     * Note: Only the widely used HTTP status codes are used
+</span></span><span id="342" class="l"><a href="#342"> 342: </a><span class="php-comment">     *
+</span></span><span id="343" class="l"><a href="#343"> 343: </a><span class="php-comment">     * @var array
+</span></span><span id="344" class="l"><a href="#344"> 344: </a><span class="php-comment">     * @link http://www.restapitutorial.com/httpstatuscodes.html
+</span></span><span id="345" class="l"><a href="#345"> 345: </a><span class="php-comment">     */</span>
+</span><span id="346" class="l"><a href="#346"> 346: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$http_status_codes</span> = [
+</span><span id="347" class="l"><a href="#347"> 347: </a>        self::HTTP_OK =&gt; <span class="php-quote">'OK'</span>,
+</span><span id="348" class="l"><a href="#348"> 348: </a>        self::HTTP_CREATED =&gt; <span class="php-quote">'CREATED'</span>,
+</span><span id="349" class="l"><a href="#349"> 349: </a>        self::HTTP_NO_CONTENT =&gt; <span class="php-quote">'NO CONTENT'</span>,
+</span><span id="350" class="l"><a href="#350"> 350: </a>        self::HTTP_NOT_MODIFIED =&gt; <span class="php-quote">'NOT MODIFIED'</span>,
+</span><span id="351" class="l"><a href="#351"> 351: </a>        self::HTTP_BAD_REQUEST =&gt; <span class="php-quote">'BAD REQUEST'</span>,
+</span><span id="352" class="l"><a href="#352"> 352: </a>        self::HTTP_UNAUTHORIZED =&gt; <span class="php-quote">'UNAUTHORIZED'</span>,
+</span><span id="353" class="l"><a href="#353"> 353: </a>        self::HTTP_FORBIDDEN =&gt; <span class="php-quote">'FORBIDDEN'</span>,
+</span><span id="354" class="l"><a href="#354"> 354: </a>        self::HTTP_NOT_FOUND =&gt; <span class="php-quote">'NOT FOUND'</span>,
+</span><span id="355" class="l"><a href="#355"> 355: </a>        self::HTTP_METHOD_NOT_ALLOWED =&gt; <span class="php-quote">'METHOD NOT ALLOWED'</span>,
+</span><span id="356" class="l"><a href="#356"> 356: </a>        self::HTTP_NOT_ACCEPTABLE =&gt; <span class="php-quote">'NOT ACCEPTABLE'</span>,
+</span><span id="357" class="l"><a href="#357"> 357: </a>        self::HTTP_CONFLICT =&gt; <span class="php-quote">'CONFLICT'</span>,
+</span><span id="358" class="l"><a href="#358"> 358: </a>        self::HTTP_INTERNAL_SERVER_ERROR =&gt; <span class="php-quote">'INTERNAL SERVER ERROR'</span>,
+</span><span id="359" class="l"><a href="#359"> 359: </a>        self::HTTP_NOT_IMPLEMENTED =&gt; <span class="php-quote">'NOT IMPLEMENTED'</span>
+</span><span id="360" class="l"><a href="#360"> 360: </a>    ];
+</span><span id="361" class="l"><a href="#361"> 361: </a>
+</span><span id="362" class="l"><a href="#362"> 362: </a>    <span class="php-comment">/**
+</span></span><span id="363" class="l"><a href="#363"> 363: </a><span class="php-comment">     * Extend this function to apply additional checking early on in the process
+</span></span><span id="364" class="l"><a href="#364"> 364: </a><span class="php-comment">     *
+</span></span><span id="365" class="l"><a href="#365"> 365: </a><span class="php-comment">     * @access protected
+</span></span><span id="366" class="l"><a href="#366"> 366: </a><span class="php-comment">     * @return void
+</span></span><span id="367" class="l"><a href="#367"> 367: </a><span class="php-comment">     */</span>
+</span><span id="368" class="l"><a href="#368"> 368: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> early_checks()
+</span><span id="369" class="l"><a href="#369"> 369: </a>    {
+</span><span id="370" class="l"><a href="#370"> 370: </a>    }
+</span><span id="371" class="l"><a href="#371"> 371: </a>
+</span><span id="372" class="l"><a href="#372"> 372: </a>    <span class="php-comment">/**
+</span></span><span id="373" class="l"><a href="#373"> 373: </a><span class="php-comment">     * Constructor for the REST API
+</span></span><span id="374" class="l"><a href="#374"> 374: </a><span class="php-comment">     *
+</span></span><span id="375" class="l"><a href="#375"> 375: </a><span class="php-comment">     * @access public
+</span></span><span id="376" class="l"><a href="#376"> 376: </a><span class="php-comment">     * @param string $config Configuration filename minus the file extension
+</span></span><span id="377" class="l"><a href="#377"> 377: </a><span class="php-comment">     * e.g: my_rest.php is passed as 'my_rest'
+</span></span><span id="378" class="l"><a href="#378"> 378: </a><span class="php-comment">     * @return void
+</span></span><span id="379" class="l"><a href="#379"> 379: </a><span class="php-comment">     */</span>
+</span><span id="380" class="l"><a href="#380"> 380: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$config</span> = <span class="php-quote">'rest'</span>)
+</span><span id="381" class="l"><a href="#381"> 381: </a>    {
+</span><span id="382" class="l"><a href="#382"> 382: </a>        parent::__construct();
+</span><span id="383" class="l"><a href="#383"> 383: </a>
+</span><span id="384" class="l"><a href="#384"> 384: </a>        <span class="php-comment">// Disable XML Entity (security vulnerability)</span>
+</span><span id="385" class="l"><a href="#385"> 385: </a>        <span class="php-keyword2">libxml_disable_entity_loader</span>(<span class="php-keyword1">TRUE</span>);
 </span><span id="386" class="l"><a href="#386"> 386: </a>
-</span><span id="387" class="l"><a href="#387"> 387: </a>        <span class="php-comment">// Check to see if this is CI 3.x</span>
-</span><span id="388" class="l"><a href="#388"> 388: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">explode</span>(<span class="php-quote">'.'</span>, CI_VERSION, <span class="php-num">2</span>)[<span class="php-num">0</span>] &lt; <span class="php-num">3</span>)
+</span><span id="387" class="l"><a href="#387"> 387: </a>        <span class="php-comment">// Check to see if PHP is equal to or greater than 5.4.x</span>
+</span><span id="388" class="l"><a href="#388"> 388: </a>        <span class="php-keyword1">if</span> (is_php(<span class="php-quote">'5.4'</span>) === <span class="php-keyword1">FALSE</span>)
 </span><span id="389" class="l"><a href="#389"> 389: </a>        {
-</span><span id="390" class="l"><a href="#390"> 390: </a>            <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
-</span><span id="391" class="l"><a href="#391"> 391: </a>        }
-</span><span id="392" class="l"><a href="#392"> 392: </a>
-</span><span id="393" class="l"><a href="#393"> 393: </a>        <span class="php-comment">// Set the default value of global xss filtering. Same approach as CodeIgniter 3</span>
-</span><span id="394" class="l"><a href="#394"> 394: </a>        <span class="php-var">$this</span>-&gt;_enable_xss = (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'global_xss_filtering'</span>) === <span class="php-keyword1">TRUE</span>);
-</span><span id="395" class="l"><a href="#395"> 395: </a>
-</span><span id="396" class="l"><a href="#396"> 396: </a>        <span class="php-comment">// Don't try to parse template variables like {elapsed_time} and {memory_usage}</span>
-</span><span id="397" class="l"><a href="#397"> 397: </a>        <span class="php-comment">// when output is displayed for not damaging data accidentally</span>
-</span><span id="398" class="l"><a href="#398"> 398: </a>        <span class="php-var">$this</span>-&gt;output-&gt;parse_exec_vars = <span class="php-keyword1">FALSE</span>;
+</span><span id="390" class="l"><a href="#390"> 390: </a>            <span class="php-comment">// CodeIgniter 3 is recommended for v5.4 or above</span>
+</span><span id="391" class="l"><a href="#391"> 391: </a>            <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'Using PHP v'</span>.PHP_VERSION.<span class="php-quote">', though PHP v5.4 or greater is required'</span>);
+</span><span id="392" class="l"><a href="#392"> 392: </a>        }
+</span><span id="393" class="l"><a href="#393"> 393: </a>
+</span><span id="394" class="l"><a href="#394"> 394: </a>        <span class="php-comment">// Check to see if this is CI 3.x</span>
+</span><span id="395" class="l"><a href="#395"> 395: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">explode</span>(<span class="php-quote">'.'</span>, CI_VERSION, <span class="php-num">2</span>)[<span class="php-num">0</span>] &lt; <span class="php-num">3</span>)
+</span><span id="396" class="l"><a href="#396"> 396: </a>        {
+</span><span id="397" class="l"><a href="#397"> 397: </a>            <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
+</span><span id="398" class="l"><a href="#398"> 398: </a>        }
 </span><span id="399" class="l"><a href="#399"> 399: </a>
-</span><span id="400" class="l"><a href="#400"> 400: </a>        <span class="php-comment">// Start the timer for how long the request takes</span>
-</span><span id="401" class="l"><a href="#401"> 401: </a>        <span class="php-var">$this</span>-&gt;_start_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="400" class="l"><a href="#400"> 400: </a>        <span class="php-comment">// Set the default value of global xss filtering. Same approach as CodeIgniter 3</span>
+</span><span id="401" class="l"><a href="#401"> 401: </a>        <span class="php-var">$this</span>-&gt;_enable_xss = (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'global_xss_filtering'</span>) === <span class="php-keyword1">TRUE</span>);
 </span><span id="402" class="l"><a href="#402"> 402: </a>
-</span><span id="403" class="l"><a href="#403"> 403: </a>        <span class="php-comment">// Load the rest.php configuration file</span>
-</span><span id="404" class="l"><a href="#404"> 404: </a>        <span class="php-var">$this</span>-&gt;load-&gt;config(<span class="php-var">$config</span>);
-</span><span id="405" class="l"><a href="#405"> 405: </a>
-</span><span id="406" class="l"><a href="#406"> 406: </a>        <span class="php-comment">// At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)</span>
-</span><span id="407" class="l"><a href="#407"> 407: </a>        <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-quote">'format'</span>);
-</span><span id="408" class="l"><a href="#408"> 408: </a>
-</span><span id="409" class="l"><a href="#409"> 409: </a>        <span class="php-comment">// Determine supported output formats from configuration</span>
-</span><span id="410" class="l"><a href="#410"> 410: </a>        <span class="php-var">$supported_formats</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_supported_formats'</span>);
-</span><span id="411" class="l"><a href="#411"> 411: </a>
-</span><span id="412" class="l"><a href="#412"> 412: </a>        <span class="php-comment">// Validate the configuration setting output formats</span>
-</span><span id="413" class="l"><a href="#413"> 413: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$supported_formats</span>))
-</span><span id="414" class="l"><a href="#414"> 414: </a>        {
-</span><span id="415" class="l"><a href="#415"> 415: </a>            <span class="php-var">$supported_formats</span> = [];
-</span><span id="416" class="l"><a href="#416"> 416: </a>        }
-</span><span id="417" class="l"><a href="#417"> 417: </a>
-</span><span id="418" class="l"><a href="#418"> 418: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword2">is_array</span>(<span class="php-var">$supported_formats</span>))
-</span><span id="419" class="l"><a href="#419"> 419: </a>        {
-</span><span id="420" class="l"><a href="#420"> 420: </a>            <span class="php-var">$supported_formats</span> = [<span class="php-var">$supported_formats</span>];
-</span><span id="421" class="l"><a href="#421"> 421: </a>        }
-</span><span id="422" class="l"><a href="#422"> 422: </a>
-</span><span id="423" class="l"><a href="#423"> 423: </a>        <span class="php-comment">// Add silently the default output format if it is missing</span>
-</span><span id="424" class="l"><a href="#424"> 424: </a>        <span class="php-var">$default_format</span> = <span class="php-var">$this</span>-&gt;_get_default_output_format();
-</span><span id="425" class="l"><a href="#425"> 425: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword2">in_array</span>(<span class="php-var">$default_format</span>, <span class="php-var">$supported_formats</span>))
+</span><span id="403" class="l"><a href="#403"> 403: </a>        <span class="php-comment">// Don't try to parse template variables like {elapsed_time} and {memory_usage}</span>
+</span><span id="404" class="l"><a href="#404"> 404: </a>        <span class="php-comment">// when output is displayed for not damaging data accidentally</span>
+</span><span id="405" class="l"><a href="#405"> 405: </a>        <span class="php-var">$this</span>-&gt;output-&gt;parse_exec_vars = <span class="php-keyword1">FALSE</span>;
+</span><span id="406" class="l"><a href="#406"> 406: </a>
+</span><span id="407" class="l"><a href="#407"> 407: </a>        <span class="php-comment">// Start the timer for how long the request takes</span>
+</span><span id="408" class="l"><a href="#408"> 408: </a>        <span class="php-var">$this</span>-&gt;_start_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="409" class="l"><a href="#409"> 409: </a>
+</span><span id="410" class="l"><a href="#410"> 410: </a>        <span class="php-comment">// Load the rest.php configuration file</span>
+</span><span id="411" class="l"><a href="#411"> 411: </a>        <span class="php-var">$this</span>-&gt;load-&gt;config(<span class="php-var">$config</span>);
+</span><span id="412" class="l"><a href="#412"> 412: </a>
+</span><span id="413" class="l"><a href="#413"> 413: </a>        <span class="php-comment">// At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)</span>
+</span><span id="414" class="l"><a href="#414"> 414: </a>        <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-quote">'format'</span>);
+</span><span id="415" class="l"><a href="#415"> 415: </a>
+</span><span id="416" class="l"><a href="#416"> 416: </a>        <span class="php-comment">// Determine supported output formats from configuration</span>
+</span><span id="417" class="l"><a href="#417"> 417: </a>        <span class="php-var">$supported_formats</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_supported_formats'</span>);
+</span><span id="418" class="l"><a href="#418"> 418: </a>
+</span><span id="419" class="l"><a href="#419"> 419: </a>        <span class="php-comment">// Validate the configuration setting output formats</span>
+</span><span id="420" class="l"><a href="#420"> 420: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$supported_formats</span>))
+</span><span id="421" class="l"><a href="#421"> 421: </a>        {
+</span><span id="422" class="l"><a href="#422"> 422: </a>            <span class="php-var">$supported_formats</span> = [];
+</span><span id="423" class="l"><a href="#423"> 423: </a>        }
+</span><span id="424" class="l"><a href="#424"> 424: </a>
+</span><span id="425" class="l"><a href="#425"> 425: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword2">is_array</span>(<span class="php-var">$supported_formats</span>))
 </span><span id="426" class="l"><a href="#426"> 426: </a>        {
-</span><span id="427" class="l"><a href="#427"> 427: </a>            <span class="php-var">$supported_formats</span>[] = <span class="php-var">$default_format</span>;
+</span><span id="427" class="l"><a href="#427"> 427: </a>            <span class="php-var">$supported_formats</span> = [<span class="php-var">$supported_formats</span>];
 </span><span id="428" class="l"><a href="#428"> 428: </a>        }
 </span><span id="429" class="l"><a href="#429"> 429: </a>
-</span><span id="430" class="l"><a href="#430"> 430: </a>        <span class="php-comment">// Now update $this-&gt;_supported_formats</span>
-</span><span id="431" class="l"><a href="#431"> 431: </a>        <span class="php-var">$this</span>-&gt;_supported_formats = <span class="php-keyword2">array_intersect_key</span>(<span class="php-var">$this</span>-&gt;_supported_formats, <span class="php-keyword2">array_flip</span>(<span class="php-var">$supported_formats</span>));
-</span><span id="432" class="l"><a href="#432"> 432: </a>
-</span><span id="433" class="l"><a href="#433"> 433: </a>        <span class="php-comment">// Get the language</span>
-</span><span id="434" class="l"><a href="#434"> 434: </a>        <span class="php-var">$language</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_language'</span>);
-</span><span id="435" class="l"><a href="#435"> 435: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$language</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="436" class="l"><a href="#436"> 436: </a>        {
-</span><span id="437" class="l"><a href="#437"> 437: </a>            <span class="php-var">$language</span> = <span class="php-quote">'english'</span>;
-</span><span id="438" class="l"><a href="#438"> 438: </a>        }
+</span><span id="430" class="l"><a href="#430"> 430: </a>        <span class="php-comment">// Add silently the default output format if it is missing</span>
+</span><span id="431" class="l"><a href="#431"> 431: </a>        <span class="php-var">$default_format</span> = <span class="php-var">$this</span>-&gt;_get_default_output_format();
+</span><span id="432" class="l"><a href="#432"> 432: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword2">in_array</span>(<span class="php-var">$default_format</span>, <span class="php-var">$supported_formats</span>))
+</span><span id="433" class="l"><a href="#433"> 433: </a>        {
+</span><span id="434" class="l"><a href="#434"> 434: </a>            <span class="php-var">$supported_formats</span>[] = <span class="php-var">$default_format</span>;
+</span><span id="435" class="l"><a href="#435"> 435: </a>        }
+</span><span id="436" class="l"><a href="#436"> 436: </a>
+</span><span id="437" class="l"><a href="#437"> 437: </a>        <span class="php-comment">// Now update $this-&gt;_supported_formats</span>
+</span><span id="438" class="l"><a href="#438"> 438: </a>        <span class="php-var">$this</span>-&gt;_supported_formats = <span class="php-keyword2">array_intersect_key</span>(<span class="php-var">$this</span>-&gt;_supported_formats, <span class="php-keyword2">array_flip</span>(<span class="php-var">$supported_formats</span>));
 </span><span id="439" class="l"><a href="#439"> 439: </a>
-</span><span id="440" class="l"><a href="#440"> 440: </a>        <span class="php-comment">// Load the language file</span>
-</span><span id="441" class="l"><a href="#441"> 441: </a>        <span class="php-var">$this</span>-&gt;lang-&gt;load(<span class="php-quote">'rest_controller'</span>, <span class="php-var">$language</span>);
-</span><span id="442" class="l"><a href="#442"> 442: </a>
-</span><span id="443" class="l"><a href="#443"> 443: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
-</span><span id="444" class="l"><a href="#444"> 444: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
-</span><span id="445" class="l"><a href="#445"> 445: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
-</span><span id="446" class="l"><a href="#446"> 446: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
-</span><span id="447" class="l"><a href="#447"> 447: </a>
-</span><span id="448" class="l"><a href="#448"> 448: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
-</span><span id="449" class="l"><a href="#449"> 449: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="450" class="l"><a href="#450"> 450: </a>        {
-</span><span id="451" class="l"><a href="#451"> 451: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
-</span><span id="452" class="l"><a href="#452"> 452: </a>        }
-</span><span id="453" class="l"><a href="#453"> 453: </a>
-</span><span id="454" class="l"><a href="#454"> 454: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
-</span><span id="455" class="l"><a href="#455"> 455: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
-</span><span id="456" class="l"><a href="#456"> 456: </a>
-</span><span id="457" class="l"><a href="#457"> 457: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
-</span><span id="458" class="l"><a href="#458"> 458: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
-</span><span id="459" class="l"><a href="#459"> 459: </a>
-</span><span id="460" class="l"><a href="#460"> 460: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
-</span><span id="461" class="l"><a href="#461"> 461: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
-</span><span id="462" class="l"><a href="#462"> 462: </a>        {
-</span><span id="463" class="l"><a href="#463"> 463: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>} = [];
-</span><span id="464" class="l"><a href="#464"> 464: </a>        }
-</span><span id="465" class="l"><a href="#465"> 465: </a>
-</span><span id="466" class="l"><a href="#466"> 466: </a>        <span class="php-comment">// Set up the query parameters</span>
-</span><span id="467" class="l"><a href="#467"> 467: </a>        <span class="php-var">$this</span>-&gt;_parse_query();
-</span><span id="468" class="l"><a href="#468"> 468: </a>
-</span><span id="469" class="l"><a href="#469"> 469: </a>        <span class="php-comment">// Set up the GET variables</span>
-</span><span id="470" class="l"><a href="#470"> 470: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
-</span><span id="471" class="l"><a href="#471"> 471: </a>
-</span><span id="472" class="l"><a href="#472"> 472: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
-</span><span id="473" class="l"><a href="#473"> 473: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
-</span><span id="474" class="l"><a href="#474"> 474: </a>
-</span><span id="475" class="l"><a href="#475"> 475: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
-</span><span id="476" class="l"><a href="#476"> 476: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
-</span><span id="477" class="l"><a href="#477"> 477: </a>
-</span><span id="478" class="l"><a href="#478"> 478: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
+</span><span id="440" class="l"><a href="#440"> 440: </a>        <span class="php-comment">// Get the language</span>
+</span><span id="441" class="l"><a href="#441"> 441: </a>        <span class="php-var">$language</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_language'</span>);
+</span><span id="442" class="l"><a href="#442"> 442: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$language</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="443" class="l"><a href="#443"> 443: </a>        {
+</span><span id="444" class="l"><a href="#444"> 444: </a>            <span class="php-var">$language</span> = <span class="php-quote">'english'</span>;
+</span><span id="445" class="l"><a href="#445"> 445: </a>        }
+</span><span id="446" class="l"><a href="#446"> 446: </a>
+</span><span id="447" class="l"><a href="#447"> 447: </a>        <span class="php-comment">// Load the language file</span>
+</span><span id="448" class="l"><a href="#448"> 448: </a>        <span class="php-var">$this</span>-&gt;lang-&gt;load(<span class="php-quote">'rest_controller'</span>, <span class="php-var">$language</span>);
+</span><span id="449" class="l"><a href="#449"> 449: </a>
+</span><span id="450" class="l"><a href="#450"> 450: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
+</span><span id="451" class="l"><a href="#451"> 451: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
+</span><span id="452" class="l"><a href="#452"> 452: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
+</span><span id="453" class="l"><a href="#453"> 453: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
+</span><span id="454" class="l"><a href="#454"> 454: </a>
+</span><span id="455" class="l"><a href="#455"> 455: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
+</span><span id="456" class="l"><a href="#456"> 456: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="457" class="l"><a href="#457"> 457: </a>        {
+</span><span id="458" class="l"><a href="#458"> 458: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
+</span><span id="459" class="l"><a href="#459"> 459: </a>        }
+</span><span id="460" class="l"><a href="#460"> 460: </a>
+</span><span id="461" class="l"><a href="#461"> 461: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
+</span><span id="462" class="l"><a href="#462"> 462: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
+</span><span id="463" class="l"><a href="#463"> 463: </a>
+</span><span id="464" class="l"><a href="#464"> 464: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
+</span><span id="465" class="l"><a href="#465"> 465: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
+</span><span id="466" class="l"><a href="#466"> 466: </a>
+</span><span id="467" class="l"><a href="#467"> 467: </a>        <span class="php-comment">// Check for CORS access request</span>
+</span><span id="468" class="l"><a href="#468"> 468: </a>        <span class="php-var">$check_cors</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'check_cors'</span>);
+</span><span id="469" class="l"><a href="#469"> 469: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$check_cors</span> === <span class="php-keyword1">TRUE</span>)
+</span><span id="470" class="l"><a href="#470"> 470: </a>        {
+</span><span id="471" class="l"><a href="#471"> 471: </a>            <span class="php-var">$this</span>-&gt;_check_cors();
+</span><span id="472" class="l"><a href="#472"> 472: </a>        }
+</span><span id="473" class="l"><a href="#473"> 473: </a>
+</span><span id="474" class="l"><a href="#474"> 474: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
+</span><span id="475" class="l"><a href="#475"> 475: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
+</span><span id="476" class="l"><a href="#476"> 476: </a>        {
+</span><span id="477" class="l"><a href="#477"> 477: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>} = [];
+</span><span id="478" class="l"><a href="#478"> 478: </a>        }
 </span><span id="479" class="l"><a href="#479"> 479: </a>
-</span><span id="480" class="l"><a href="#480"> 480: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
-</span><span id="481" class="l"><a href="#481"> 481: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
-</span><span id="482" class="l"><a href="#482"> 482: </a>        {
-</span><span id="483" class="l"><a href="#483"> 483: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
-</span><span id="484" class="l"><a href="#484"> 484: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
-</span><span id="485" class="l"><a href="#485"> 485: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
-</span><span id="486" class="l"><a href="#486"> 486: </a>        }
-</span><span id="487" class="l"><a href="#487"> 487: </a>
-</span><span id="488" class="l"><a href="#488"> 488: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
-</span><span id="489" class="l"><a href="#489"> 489: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
-</span><span id="490" class="l"><a href="#490"> 490: </a>            <span class="php-var">$this</span>-&gt;_get_args,
-</span><span id="491" class="l"><a href="#491"> 491: </a>            <span class="php-var">$this</span>-&gt;_options_args,
-</span><span id="492" class="l"><a href="#492"> 492: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
-</span><span id="493" class="l"><a href="#493"> 493: </a>            <span class="php-var">$this</span>-&gt;_head_args,
-</span><span id="494" class="l"><a href="#494"> 494: </a>            <span class="php-var">$this</span>-&gt;_put_args,
-</span><span id="495" class="l"><a href="#495"> 495: </a>            <span class="php-var">$this</span>-&gt;_post_args,
-</span><span id="496" class="l"><a href="#496"> 496: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
-</span><span id="497" class="l"><a href="#497"> 497: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>}
-</span><span id="498" class="l"><a href="#498"> 498: </a>        );
-</span><span id="499" class="l"><a href="#499"> 499: </a>
-</span><span id="500" class="l"><a href="#500"> 500: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
-</span><span id="501" class="l"><a href="#501"> 501: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
-</span><span id="502" class="l"><a href="#502"> 502: </a>
-</span><span id="503" class="l"><a href="#503"> 503: </a>        <span class="php-comment">// Which language should the data be returned in?</span>
-</span><span id="504" class="l"><a href="#504"> 504: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
-</span><span id="505" class="l"><a href="#505"> 505: </a>
-</span><span id="506" class="l"><a href="#506"> 506: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
-</span><span id="507" class="l"><a href="#507"> 507: </a>        <span class="php-var">$this</span>-&gt;early_checks();
-</span><span id="508" class="l"><a href="#508"> 508: </a>
-</span><span id="509" class="l"><a href="#509"> 509: </a>        <span class="php-comment">// Load DB if its enabled</span>
-</span><span id="510" class="l"><a href="#510"> 510: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
-</span><span id="511" class="l"><a href="#511"> 511: </a>        {
-</span><span id="512" class="l"><a href="#512"> 512: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
-</span><span id="513" class="l"><a href="#513"> 513: </a>        }
-</span><span id="514" class="l"><a href="#514"> 514: </a>
-</span><span id="515" class="l"><a href="#515"> 515: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
-</span><span id="516" class="l"><a href="#516"> 516: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
-</span><span id="517" class="l"><a href="#517"> 517: </a>        {
-</span><span id="518" class="l"><a href="#518"> 518: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
-</span><span id="519" class="l"><a href="#519"> 519: </a>        }
-</span><span id="520" class="l"><a href="#520"> 520: </a>
-</span><span id="521" class="l"><a href="#521"> 521: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
-</span><span id="522" class="l"><a href="#522"> 522: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
-</span><span id="523" class="l"><a href="#523"> 523: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
-</span><span id="524" class="l"><a href="#524"> 524: </a>
-</span><span id="525" class="l"><a href="#525"> 525: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
-</span><span id="526" class="l"><a href="#526"> 526: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
-</span><span id="527" class="l"><a href="#527"> 527: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
-</span><span id="528" class="l"><a href="#528"> 528: </a>        {
-</span><span id="529" class="l"><a href="#529"> 529: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
-</span><span id="530" class="l"><a href="#530"> 530: </a>        }
-</span><span id="531" class="l"><a href="#531"> 531: </a>
-</span><span id="532" class="l"><a href="#532"> 532: </a>        <span class="php-comment">// Only allow ajax requests</span>
-</span><span id="533" class="l"><a href="#533"> 533: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
-</span><span id="534" class="l"><a href="#534"> 534: </a>        {
-</span><span id="535" class="l"><a href="#535"> 535: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="536" class="l"><a href="#536"> 536: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="537" class="l"><a href="#537"> 537: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="538" class="l"><a href="#538"> 538: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ajax_only'</span>)
-</span><span id="539" class="l"><a href="#539"> 539: </a>                ], self::HTTP_NOT_ACCEPTABLE);
-</span><span id="540" class="l"><a href="#540"> 540: </a>        }
-</span><span id="541" class="l"><a href="#541"> 541: </a>
-</span><span id="542" class="l"><a href="#542"> 542: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
-</span><span id="543" class="l"><a href="#543"> 543: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; ! (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>) || (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'allow_auth_and_keys'</span>) === <span class="php-keyword1">TRUE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
-</span><span id="544" class="l"><a href="#544"> 544: </a>        {
-</span><span id="545" class="l"><a href="#545"> 545: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="546" class="l"><a href="#546"> 546: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
-</span><span id="547" class="l"><a href="#547"> 547: </a>            {
-</span><span id="548" class="l"><a href="#548"> 548: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
-</span><span id="549" class="l"><a href="#549"> 549: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="550" class="l"><a href="#550"> 550: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="551" class="l"><a href="#551"> 551: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
-</span><span id="552" class="l"><a href="#552"> 552: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="553" class="l"><a href="#553"> 553: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="554" class="l"><a href="#554"> 554: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
-</span><span id="555" class="l"><a href="#555"> 555: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="556" class="l"><a href="#556"> 556: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="557" class="l"><a href="#557"> 557: </a>            }
-</span><span id="558" class="l"><a href="#558"> 558: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="559" class="l"><a href="#559"> 559: </a>            {
-</span><span id="560" class="l"><a href="#560"> 560: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="561" class="l"><a href="#561"> 561: </a>            }
-</span><span id="562" class="l"><a href="#562"> 562: </a>        }
-</span><span id="563" class="l"><a href="#563"> 563: </a>    }
-</span><span id="564" class="l"><a href="#564"> 564: </a>
-</span><span id="565" class="l"><a href="#565"> 565: </a>    <span class="php-comment">/**
-</span></span><span id="566" class="l"><a href="#566"> 566: </a><span class="php-comment">     * Deconstructor
-</span></span><span id="567" class="l"><a href="#567"> 567: </a><span class="php-comment">     *
-</span></span><span id="568" class="l"><a href="#568"> 568: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="569" class="l"><a href="#569"> 569: </a><span class="php-comment">     * @access public
-</span></span><span id="570" class="l"><a href="#570"> 570: </a><span class="php-comment">     * @return void
-</span></span><span id="571" class="l"><a href="#571"> 571: </a><span class="php-comment">     */</span>
-</span><span id="572" class="l"><a href="#572"> 572: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
-</span><span id="573" class="l"><a href="#573"> 573: </a>    {
-</span><span id="574" class="l"><a href="#574"> 574: </a>        <span class="php-comment">// Get the current timestamp</span>
-</span><span id="575" class="l"><a href="#575"> 575: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="576" class="l"><a href="#576"> 576: </a>
-</span><span id="577" class="l"><a href="#577"> 577: </a>        <span class="php-comment">// Log the loading time to the log table</span>
-</span><span id="578" class="l"><a href="#578"> 578: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="579" class="l"><a href="#579"> 579: </a>        {
-</span><span id="580" class="l"><a href="#580"> 580: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
-</span><span id="581" class="l"><a href="#581"> 581: </a>        }
-</span><span id="582" class="l"><a href="#582"> 582: </a>    }
-</span><span id="583" class="l"><a href="#583"> 583: </a>
-</span><span id="584" class="l"><a href="#584"> 584: </a>    <span class="php-comment">/**
-</span></span><span id="585" class="l"><a href="#585"> 585: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
-</span></span><span id="586" class="l"><a href="#586"> 586: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
-</span></span><span id="587" class="l"><a href="#587"> 587: </a><span class="php-comment">     * Controller method
-</span></span><span id="588" class="l"><a href="#588"> 588: </a><span class="php-comment">     *
-</span></span><span id="589" class="l"><a href="#589"> 589: </a><span class="php-comment">     * @access public
-</span></span><span id="590" class="l"><a href="#590"> 590: </a><span class="php-comment">     * @param  string $object_called
-</span></span><span id="591" class="l"><a href="#591"> 591: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method
-</span></span><span id="592" class="l"><a href="#592"> 592: </a><span class="php-comment">     */</span>
-</span><span id="593" class="l"><a href="#593"> 593: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span> = [])
-</span><span id="594" class="l"><a href="#594"> 594: </a>    {
-</span><span id="595" class="l"><a href="#595"> 595: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
-</span><span id="596" class="l"><a href="#596"> 596: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
-</span><span id="597" class="l"><a href="#597"> 597: </a>        {
-</span><span id="598" class="l"><a href="#598"> 598: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="599" class="l"><a href="#599"> 599: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="600" class="l"><a href="#600"> 600: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unsupported'</span>)
-</span><span id="601" class="l"><a href="#601"> 601: </a>                ], self::HTTP_FORBIDDEN);
-</span><span id="602" class="l"><a href="#602"> 602: </a>        }
-</span><span id="603" class="l"><a href="#603"> 603: </a>
-</span><span id="604" class="l"><a href="#604"> 604: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
-</span><span id="605" class="l"><a href="#605"> 605: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span>.<span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)).<span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
-</span><span id="606" class="l"><a href="#606"> 606: </a>
-</span><span id="607" class="l"><a href="#607"> 607: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span>.<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method;
-</span><span id="608" class="l"><a href="#608"> 608: </a>
-</span><span id="609" class="l"><a href="#609"> 609: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
-</span><span id="610" class="l"><a href="#610"> 610: </a>        <span class="php-var">$log_method</span> = ! (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] === <span class="php-keyword1">FALSE</span>);
-</span><span id="611" class="l"><a href="#611"> 611: </a>
-</span><span id="612" class="l"><a href="#612"> 612: </a>        <span class="php-comment">// Use keys for this method?</span>
-</span><span id="613" class="l"><a href="#613"> 613: </a>        <span class="php-var">$use_key</span> = ! (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] === <span class="php-keyword1">FALSE</span>);
-</span><span id="614" class="l"><a href="#614"> 614: </a>
-</span><span id="615" class="l"><a href="#615"> 615: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here</span>
-</span><span id="616" class="l"><a href="#616"> 616: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
-</span><span id="617" class="l"><a href="#617"> 617: </a>        {
-</span><span id="618" class="l"><a href="#618"> 618: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="619" class="l"><a href="#619"> 619: </a>            {
-</span><span id="620" class="l"><a href="#620"> 620: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="621" class="l"><a href="#621"> 621: </a>            }
+</span><span id="480" class="l"><a href="#480"> 480: </a>        <span class="php-comment">// Set up the query parameters</span>
+</span><span id="481" class="l"><a href="#481"> 481: </a>        <span class="php-var">$this</span>-&gt;_parse_query();
+</span><span id="482" class="l"><a href="#482"> 482: </a>
+</span><span id="483" class="l"><a href="#483"> 483: </a>        <span class="php-comment">// Set up the GET variables</span>
+</span><span id="484" class="l"><a href="#484"> 484: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
+</span><span id="485" class="l"><a href="#485"> 485: </a>
+</span><span id="486" class="l"><a href="#486"> 486: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
+</span><span id="487" class="l"><a href="#487"> 487: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
+</span><span id="488" class="l"><a href="#488"> 488: </a>
+</span><span id="489" class="l"><a href="#489"> 489: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
+</span><span id="490" class="l"><a href="#490"> 490: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
+</span><span id="491" class="l"><a href="#491"> 491: </a>
+</span><span id="492" class="l"><a href="#492"> 492: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
+</span><span id="493" class="l"><a href="#493"> 493: </a>
+</span><span id="494" class="l"><a href="#494"> 494: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
+</span><span id="495" class="l"><a href="#495"> 495: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
+</span><span id="496" class="l"><a href="#496"> 496: </a>        {
+</span><span id="497" class="l"><a href="#497"> 497: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
+</span><span id="498" class="l"><a href="#498"> 498: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
+</span><span id="499" class="l"><a href="#499"> 499: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
+</span><span id="500" class="l"><a href="#500"> 500: </a>        }
+</span><span id="501" class="l"><a href="#501"> 501: </a>
+</span><span id="502" class="l"><a href="#502"> 502: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
+</span><span id="503" class="l"><a href="#503"> 503: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
+</span><span id="504" class="l"><a href="#504"> 504: </a>            <span class="php-var">$this</span>-&gt;_get_args,
+</span><span id="505" class="l"><a href="#505"> 505: </a>            <span class="php-var">$this</span>-&gt;_options_args,
+</span><span id="506" class="l"><a href="#506"> 506: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
+</span><span id="507" class="l"><a href="#507"> 507: </a>            <span class="php-var">$this</span>-&gt;_head_args,
+</span><span id="508" class="l"><a href="#508"> 508: </a>            <span class="php-var">$this</span>-&gt;_put_args,
+</span><span id="509" class="l"><a href="#509"> 509: </a>            <span class="php-var">$this</span>-&gt;_post_args,
+</span><span id="510" class="l"><a href="#510"> 510: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
+</span><span id="511" class="l"><a href="#511"> 511: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>}
+</span><span id="512" class="l"><a href="#512"> 512: </a>        );
+</span><span id="513" class="l"><a href="#513"> 513: </a>
+</span><span id="514" class="l"><a href="#514"> 514: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
+</span><span id="515" class="l"><a href="#515"> 515: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
+</span><span id="516" class="l"><a href="#516"> 516: </a>
+</span><span id="517" class="l"><a href="#517"> 517: </a>        <span class="php-comment">// Which language should the data be returned in?</span>
+</span><span id="518" class="l"><a href="#518"> 518: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
+</span><span id="519" class="l"><a href="#519"> 519: </a>
+</span><span id="520" class="l"><a href="#520"> 520: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
+</span><span id="521" class="l"><a href="#521"> 521: </a>        <span class="php-var">$this</span>-&gt;early_checks();
+</span><span id="522" class="l"><a href="#522"> 522: </a>
+</span><span id="523" class="l"><a href="#523"> 523: </a>        <span class="php-comment">// Load DB if its enabled</span>
+</span><span id="524" class="l"><a href="#524"> 524: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
+</span><span id="525" class="l"><a href="#525"> 525: </a>        {
+</span><span id="526" class="l"><a href="#526"> 526: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
+</span><span id="527" class="l"><a href="#527"> 527: </a>        }
+</span><span id="528" class="l"><a href="#528"> 528: </a>
+</span><span id="529" class="l"><a href="#529"> 529: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
+</span><span id="530" class="l"><a href="#530"> 530: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
+</span><span id="531" class="l"><a href="#531"> 531: </a>        {
+</span><span id="532" class="l"><a href="#532"> 532: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
+</span><span id="533" class="l"><a href="#533"> 533: </a>        }
+</span><span id="534" class="l"><a href="#534"> 534: </a>
+</span><span id="535" class="l"><a href="#535"> 535: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
+</span><span id="536" class="l"><a href="#536"> 536: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
+</span><span id="537" class="l"><a href="#537"> 537: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
+</span><span id="538" class="l"><a href="#538"> 538: </a>
+</span><span id="539" class="l"><a href="#539"> 539: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
+</span><span id="540" class="l"><a href="#540"> 540: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
+</span><span id="541" class="l"><a href="#541"> 541: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
+</span><span id="542" class="l"><a href="#542"> 542: </a>        {
+</span><span id="543" class="l"><a href="#543"> 543: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
+</span><span id="544" class="l"><a href="#544"> 544: </a>        }
+</span><span id="545" class="l"><a href="#545"> 545: </a>
+</span><span id="546" class="l"><a href="#546"> 546: </a>        <span class="php-comment">// Only allow ajax requests</span>
+</span><span id="547" class="l"><a href="#547"> 547: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
+</span><span id="548" class="l"><a href="#548"> 548: </a>        {
+</span><span id="549" class="l"><a href="#549"> 549: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="550" class="l"><a href="#550"> 550: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="551" class="l"><a href="#551"> 551: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="552" class="l"><a href="#552"> 552: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ajax_only'</span>)
+</span><span id="553" class="l"><a href="#553"> 553: </a>                ], self::HTTP_NOT_ACCEPTABLE);
+</span><span id="554" class="l"><a href="#554"> 554: </a>        }
+</span><span id="555" class="l"><a href="#555"> 555: </a>
+</span><span id="556" class="l"><a href="#556"> 556: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
+</span><span id="557" class="l"><a href="#557"> 557: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; ! (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>) || (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'allow_auth_and_keys'</span>) === <span class="php-keyword1">TRUE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
+</span><span id="558" class="l"><a href="#558"> 558: </a>        {
+</span><span id="559" class="l"><a href="#559"> 559: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="560" class="l"><a href="#560"> 560: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
+</span><span id="561" class="l"><a href="#561"> 561: </a>            {
+</span><span id="562" class="l"><a href="#562"> 562: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
+</span><span id="563" class="l"><a href="#563"> 563: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="564" class="l"><a href="#564"> 564: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="565" class="l"><a href="#565"> 565: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
+</span><span id="566" class="l"><a href="#566"> 566: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="567" class="l"><a href="#567"> 567: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="568" class="l"><a href="#568"> 568: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
+</span><span id="569" class="l"><a href="#569"> 569: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="570" class="l"><a href="#570"> 570: </a>                    <span class="php-keyword1">break</span>;
+</span><span id="571" class="l"><a href="#571"> 571: </a>            }
+</span><span id="572" class="l"><a href="#572"> 572: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="573" class="l"><a href="#573"> 573: </a>            {
+</span><span id="574" class="l"><a href="#574"> 574: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="575" class="l"><a href="#575"> 575: </a>            }
+</span><span id="576" class="l"><a href="#576"> 576: </a>        }
+</span><span id="577" class="l"><a href="#577"> 577: </a>    }
+</span><span id="578" class="l"><a href="#578"> 578: </a>
+</span><span id="579" class="l"><a href="#579"> 579: </a>    <span class="php-comment">/**
+</span></span><span id="580" class="l"><a href="#580"> 580: </a><span class="php-comment">     * Deconstructor
+</span></span><span id="581" class="l"><a href="#581"> 581: </a><span class="php-comment">     *
+</span></span><span id="582" class="l"><a href="#582"> 582: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="583" class="l"><a href="#583"> 583: </a><span class="php-comment">     * @access public
+</span></span><span id="584" class="l"><a href="#584"> 584: </a><span class="php-comment">     * @return void
+</span></span><span id="585" class="l"><a href="#585"> 585: </a><span class="php-comment">     */</span>
+</span><span id="586" class="l"><a href="#586"> 586: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
+</span><span id="587" class="l"><a href="#587"> 587: </a>    {
+</span><span id="588" class="l"><a href="#588"> 588: </a>        <span class="php-comment">// Get the current timestamp</span>
+</span><span id="589" class="l"><a href="#589"> 589: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
+</span><span id="590" class="l"><a href="#590"> 590: </a>
+</span><span id="591" class="l"><a href="#591"> 591: </a>        <span class="php-comment">// Log the loading time to the log table</span>
+</span><span id="592" class="l"><a href="#592"> 592: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="593" class="l"><a href="#593"> 593: </a>        {
+</span><span id="594" class="l"><a href="#594"> 594: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
+</span><span id="595" class="l"><a href="#595"> 595: </a>        }
+</span><span id="596" class="l"><a href="#596"> 596: </a>    }
+</span><span id="597" class="l"><a href="#597"> 597: </a>
+</span><span id="598" class="l"><a href="#598"> 598: </a>    <span class="php-comment">/**
+</span></span><span id="599" class="l"><a href="#599"> 599: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
+</span></span><span id="600" class="l"><a href="#600"> 600: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
+</span></span><span id="601" class="l"><a href="#601"> 601: </a><span class="php-comment">     * Controller method
+</span></span><span id="602" class="l"><a href="#602"> 602: </a><span class="php-comment">     *
+</span></span><span id="603" class="l"><a href="#603"> 603: </a><span class="php-comment">     * @access public
+</span></span><span id="604" class="l"><a href="#604"> 604: </a><span class="php-comment">     * @param  string $object_called
+</span></span><span id="605" class="l"><a href="#605"> 605: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method
+</span></span><span id="606" class="l"><a href="#606"> 606: </a><span class="php-comment">     */</span>
+</span><span id="607" class="l"><a href="#607"> 607: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span> = [])
+</span><span id="608" class="l"><a href="#608"> 608: </a>    {
+</span><span id="609" class="l"><a href="#609"> 609: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
+</span><span id="610" class="l"><a href="#610"> 610: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
+</span><span id="611" class="l"><a href="#611"> 611: </a>        {
+</span><span id="612" class="l"><a href="#612"> 612: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="613" class="l"><a href="#613"> 613: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="614" class="l"><a href="#614"> 614: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unsupported'</span>)
+</span><span id="615" class="l"><a href="#615"> 615: </a>                ], self::HTTP_FORBIDDEN);
+</span><span id="616" class="l"><a href="#616"> 616: </a>        }
+</span><span id="617" class="l"><a href="#617"> 617: </a>
+</span><span id="618" class="l"><a href="#618"> 618: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
+</span><span id="619" class="l"><a href="#619"> 619: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span>.<span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)).<span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
+</span><span id="620" class="l"><a href="#620"> 620: </a>
+</span><span id="621" class="l"><a href="#621"> 621: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span>.<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method;
 </span><span id="622" class="l"><a href="#622"> 622: </a>
-</span><span id="623" class="l"><a href="#623"> 623: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="624" class="l"><a href="#624"> 624: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="625" class="l"><a href="#625"> 625: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-keyword2">sprintf</span>(<span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_invalid_api_key'</span>), <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="626" class="l"><a href="#626"> 626: </a>                ], self::HTTP_FORBIDDEN);
-</span><span id="627" class="l"><a href="#627"> 627: </a>        }
+</span><span id="623" class="l"><a href="#623"> 623: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
+</span><span id="624" class="l"><a href="#624"> 624: </a>        <span class="php-var">$log_method</span> = ! (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] === <span class="php-keyword1">FALSE</span>);
+</span><span id="625" class="l"><a href="#625"> 625: </a>
+</span><span id="626" class="l"><a href="#626"> 626: </a>        <span class="php-comment">// Use keys for this method?</span>
+</span><span id="627" class="l"><a href="#627"> 627: </a>        <span class="php-var">$use_key</span> = ! (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] === <span class="php-keyword1">FALSE</span>);
 </span><span id="628" class="l"><a href="#628"> 628: </a>
-</span><span id="629" class="l"><a href="#629"> 629: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller</span>
-</span><span id="630" class="l"><a href="#630"> 630: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
+</span><span id="629" class="l"><a href="#629"> 629: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here</span>
+</span><span id="630" class="l"><a href="#630"> 630: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
 </span><span id="631" class="l"><a href="#631"> 631: </a>        {
 </span><span id="632" class="l"><a href="#632"> 632: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
 </span><span id="633" class="l"><a href="#633"> 633: </a>            {
@@ -730,1520 +730,1580 @@ <h3>Classes</h3>
 </span><span id="636" class="l"><a href="#636"> 636: </a>
 </span><span id="637" class="l"><a href="#637"> 637: </a>            <span class="php-var">$this</span>-&gt;response([
 </span><span id="638" class="l"><a href="#638"> 638: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="639" class="l"><a href="#639"> 639: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_unauthorized'</span>)
-</span><span id="640" class="l"><a href="#640"> 640: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="639" class="l"><a href="#639"> 639: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-keyword2">sprintf</span>(<span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_invalid_api_key'</span>), <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="640" class="l"><a href="#640"> 640: </a>                ], self::HTTP_FORBIDDEN);
 </span><span id="641" class="l"><a href="#641"> 641: </a>        }
 </span><span id="642" class="l"><a href="#642"> 642: </a>
-</span><span id="643" class="l"><a href="#643"> 643: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
-</span><span id="644" class="l"><a href="#644"> 644: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="643" class="l"><a href="#643"> 643: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller</span>
+</span><span id="644" class="l"><a href="#644"> 644: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
 </span><span id="645" class="l"><a href="#645"> 645: </a>        {
-</span><span id="646" class="l"><a href="#646"> 646: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="647" class="l"><a href="#647"> 647: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="648" class="l"><a href="#648"> 648: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unknown_method'</span>)
-</span><span id="649" class="l"><a href="#649"> 649: </a>                ], self::HTTP_NOT_FOUND);
-</span><span id="650" class="l"><a href="#650"> 650: </a>        }
-</span><span id="651" class="l"><a href="#651"> 651: </a>
-</span><span id="652" class="l"><a href="#652"> 652: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
-</span><span id="653" class="l"><a href="#653"> 653: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="654" class="l"><a href="#654"> 654: </a>        {
-</span><span id="655" class="l"><a href="#655"> 655: </a>            <span class="php-comment">// Check the limit</span>
-</span><span id="656" class="l"><a href="#656"> 656: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="657" class="l"><a href="#657"> 657: </a>            {
-</span><span id="658" class="l"><a href="#658"> 658: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_time_limit'</span>)];
-</span><span id="659" class="l"><a href="#659"> 659: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
-</span><span id="660" class="l"><a href="#660"> 660: </a>            }
-</span><span id="661" class="l"><a href="#661"> 661: </a>
-</span><span id="662" class="l"><a href="#662"> 662: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
-</span><span id="663" class="l"><a href="#663"> 663: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
-</span><span id="664" class="l"><a href="#664"> 664: </a>
-</span><span id="665" class="l"><a href="#665"> 665: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
-</span><span id="666" class="l"><a href="#666"> 666: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
-</span><span id="667" class="l"><a href="#667"> 667: </a>
-</span><span id="668" class="l"><a href="#668"> 668: </a>            <span class="php-comment">// IM TELLIN!</span>
-</span><span id="669" class="l"><a href="#669"> 669: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="670" class="l"><a href="#670"> 670: </a>            {
-</span><span id="671" class="l"><a href="#671"> 671: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
-</span><span id="672" class="l"><a href="#672"> 672: </a>            }
-</span><span id="673" class="l"><a href="#673"> 673: </a>
-</span><span id="674" class="l"><a href="#674"> 674: </a>            <span class="php-comment">// They don't have good enough perms</span>
-</span><span id="675" class="l"><a href="#675"> 675: </a>            <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_permissions'</span>)];
-</span><span id="676" class="l"><a href="#676"> 676: </a>            <span class="php-var">$authorized</span> || <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
-</span><span id="677" class="l"><a href="#677"> 677: </a>        }
+</span><span id="646" class="l"><a href="#646"> 646: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="647" class="l"><a href="#647"> 647: </a>            {
+</span><span id="648" class="l"><a href="#648"> 648: </a>                <span class="php-var">$this</span>-&gt;_log_request();
+</span><span id="649" class="l"><a href="#649"> 649: </a>            }
+</span><span id="650" class="l"><a href="#650"> 650: </a>
+</span><span id="651" class="l"><a href="#651"> 651: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="652" class="l"><a href="#652"> 652: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="653" class="l"><a href="#653"> 653: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_unauthorized'</span>)
+</span><span id="654" class="l"><a href="#654"> 654: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="655" class="l"><a href="#655"> 655: </a>        }
+</span><span id="656" class="l"><a href="#656"> 656: </a>
+</span><span id="657" class="l"><a href="#657"> 657: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
+</span><span id="658" class="l"><a href="#658"> 658: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="659" class="l"><a href="#659"> 659: </a>        {
+</span><span id="660" class="l"><a href="#660"> 660: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="661" class="l"><a href="#661"> 661: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="662" class="l"><a href="#662"> 662: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unknown_method'</span>)
+</span><span id="663" class="l"><a href="#663"> 663: </a>                ], self::HTTP_NOT_FOUND);
+</span><span id="664" class="l"><a href="#664"> 664: </a>        }
+</span><span id="665" class="l"><a href="#665"> 665: </a>
+</span><span id="666" class="l"><a href="#666"> 666: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
+</span><span id="667" class="l"><a href="#667"> 667: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="668" class="l"><a href="#668"> 668: </a>        {
+</span><span id="669" class="l"><a href="#669"> 669: </a>            <span class="php-comment">// Check the limit</span>
+</span><span id="670" class="l"><a href="#670"> 670: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="671" class="l"><a href="#671"> 671: </a>            {
+</span><span id="672" class="l"><a href="#672"> 672: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_time_limit'</span>)];
+</span><span id="673" class="l"><a href="#673"> 673: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
+</span><span id="674" class="l"><a href="#674"> 674: </a>            }
+</span><span id="675" class="l"><a href="#675"> 675: </a>
+</span><span id="676" class="l"><a href="#676"> 676: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
+</span><span id="677" class="l"><a href="#677"> 677: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
 </span><span id="678" class="l"><a href="#678"> 678: </a>
-</span><span id="679" class="l"><a href="#679"> 679: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
-</span><span id="680" class="l"><a href="#680"> 680: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="681" class="l"><a href="#681"> 681: </a>        {
-</span><span id="682" class="l"><a href="#682"> 682: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
-</span><span id="683" class="l"><a href="#683"> 683: </a>        }
-</span><span id="684" class="l"><a href="#684"> 684: </a>
-</span><span id="685" class="l"><a href="#685"> 685: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
-</span><span id="686" class="l"><a href="#686"> 686: </a>        <span class="php-keyword1">try</span>
-</span><span id="687" class="l"><a href="#687"> 687: </a>        {
-</span><span id="688" class="l"><a href="#688"> 688: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
-</span><span id="689" class="l"><a href="#689"> 689: </a>        }
-</span><span id="690" class="l"><a href="#690"> 690: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
-</span><span id="691" class="l"><a href="#691"> 691: </a>        {
-</span><span id="692" class="l"><a href="#692"> 692: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
-</span><span id="693" class="l"><a href="#693"> 693: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="694" class="l"><a href="#694"> 694: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="695" class="l"><a href="#695"> 695: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
-</span><span id="696" class="l"><a href="#696"> 696: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
-</span><span id="697" class="l"><a href="#697"> 697: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
-</span><span id="698" class="l"><a href="#698"> 698: </a>                    ]
-</span><span id="699" class="l"><a href="#699"> 699: </a>                ], self::HTTP_INTERNAL_SERVER_ERROR);
-</span><span id="700" class="l"><a href="#700"> 700: </a>        }
-</span><span id="701" class="l"><a href="#701"> 701: </a>    }
-</span><span id="702" class="l"><a href="#702"> 702: </a>
-</span><span id="703" class="l"><a href="#703"> 703: </a>    <span class="php-comment">/**
-</span></span><span id="704" class="l"><a href="#704"> 704: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
-</span></span><span id="705" class="l"><a href="#705"> 705: </a><span class="php-comment">     *
-</span></span><span id="706" class="l"><a href="#706"> 706: </a><span class="php-comment">     * @access public
-</span></span><span id="707" class="l"><a href="#707"> 707: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
-</span></span><span id="708" class="l"><a href="#708"> 708: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
-</span></span><span id="709" class="l"><a href="#709"> 709: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
-</span></span><span id="710" class="l"><a href="#710"> 710: </a><span class="php-comment">     * running the script; otherwise, exit
-</span></span><span id="711" class="l"><a href="#711"> 711: </a><span class="php-comment">     */</span>
-</span><span id="712" class="l"><a href="#712"> 712: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="713" class="l"><a href="#713"> 713: </a>    {
-</span><span id="714" class="l"><a href="#714"> 714: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
-</span><span id="715" class="l"><a href="#715"> 715: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="716" class="l"><a href="#716"> 716: </a>        {
-</span><span id="717" class="l"><a href="#717"> 717: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
-</span><span id="718" class="l"><a href="#718"> 718: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
-</span><span id="719" class="l"><a href="#719"> 719: </a>        }
-</span><span id="720" class="l"><a href="#720"> 720: </a>
-</span><span id="721" class="l"><a href="#721"> 721: </a>        <span class="php-comment">// Set the output as NULL by default</span>
-</span><span id="722" class="l"><a href="#722"> 722: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="723" class="l"><a href="#723"> 723: </a>
-</span><span id="724" class="l"><a href="#724"> 724: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
-</span><span id="725" class="l"><a href="#725"> 725: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="726" class="l"><a href="#726"> 726: </a>        {
-</span><span id="727" class="l"><a href="#727"> 727: </a>            <span class="php-var">$http_code</span> = self::HTTP_NOT_FOUND;
-</span><span id="728" class="l"><a href="#728"> 728: </a>        }
-</span><span id="729" class="l"><a href="#729"> 729: </a>
-</span><span id="730" class="l"><a href="#730"> 730: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
-</span><span id="731" class="l"><a href="#731"> 731: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="732" class="l"><a href="#732"> 732: </a>        {
-</span><span id="733" class="l"><a href="#733"> 733: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
-</span><span id="734" class="l"><a href="#734"> 734: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
-</span><span id="735" class="l"><a href="#735"> 735: </a>            {
-</span><span id="736" class="l"><a href="#736"> 736: </a>                <span class="php-comment">// Set the format header</span>
-</span><span id="737" class="l"><a href="#737"> 737: </a>                <span class="php-var">$this</span>-&gt;output-&gt;set_content_type(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format], <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
-</span><span id="738" class="l"><a href="#738"> 738: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
-</span><span id="739" class="l"><a href="#739"> 739: </a>
-</span><span id="740" class="l"><a href="#740"> 740: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error</span>
-</span><span id="741" class="l"><a href="#741"> 741: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
-</span><span id="742" class="l"><a href="#742"> 742: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
-</span><span id="743" class="l"><a href="#743"> 743: </a>                {
-</span><span id="744" class="l"><a href="#744"> 744: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="745" class="l"><a href="#745"> 745: </a>                }
-</span><span id="746" class="l"><a href="#746"> 746: </a>            }
-</span><span id="747" class="l"><a href="#747"> 747: </a>            <span class="php-keyword1">else</span>
-</span><span id="748" class="l"><a href="#748"> 748: </a>            {
-</span><span id="749" class="l"><a href="#749"> 749: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
-</span><span id="750" class="l"><a href="#750"> 750: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
-</span><span id="751" class="l"><a href="#751"> 751: </a>                {
-</span><span id="752" class="l"><a href="#752"> 752: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="753" class="l"><a href="#753"> 753: </a>                }
+</span><span id="679" class="l"><a href="#679"> 679: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
+</span><span id="680" class="l"><a href="#680"> 680: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
+</span><span id="681" class="l"><a href="#681"> 681: </a>            <span class="php-comment">// IM TELLIN!</span>
+</span><span id="682" class="l"><a href="#682"> 682: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="683" class="l"><a href="#683"> 683: </a>            {
+</span><span id="684" class="l"><a href="#684"> 684: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
+</span><span id="685" class="l"><a href="#685"> 685: </a>            }
+</span><span id="686" class="l"><a href="#686"> 686: </a>            <span class="php-keyword1">if</span>(<span class="php-var">$authorized</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="687" class="l"><a href="#687"> 687: </a>            {
+</span><span id="688" class="l"><a href="#688"> 688: </a>                <span class="php-comment">// They don't have good enough perms</span>
+</span><span id="689" class="l"><a href="#689"> 689: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_permissions'</span>)];
+</span><span id="690" class="l"><a href="#690"> 690: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
+</span><span id="691" class="l"><a href="#691"> 691: </a>            }
+</span><span id="692" class="l"><a href="#692"> 692: </a>        }
+</span><span id="693" class="l"><a href="#693"> 693: </a>
+</span><span id="694" class="l"><a href="#694"> 694: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
+</span><span id="695" class="l"><a href="#695"> 695: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
+</span><span id="696" class="l"><a href="#696"> 696: </a>        {
+</span><span id="697" class="l"><a href="#697"> 697: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
+</span><span id="698" class="l"><a href="#698"> 698: </a>        }
+</span><span id="699" class="l"><a href="#699"> 699: </a>
+</span><span id="700" class="l"><a href="#700"> 700: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
+</span><span id="701" class="l"><a href="#701"> 701: </a>        <span class="php-keyword1">try</span>
+</span><span id="702" class="l"><a href="#702"> 702: </a>        {
+</span><span id="703" class="l"><a href="#703"> 703: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
+</span><span id="704" class="l"><a href="#704"> 704: </a>        }
+</span><span id="705" class="l"><a href="#705"> 705: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
+</span><span id="706" class="l"><a href="#706"> 706: </a>        {
+</span><span id="707" class="l"><a href="#707"> 707: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
+</span><span id="708" class="l"><a href="#708"> 708: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="709" class="l"><a href="#709"> 709: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="710" class="l"><a href="#710"> 710: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
+</span><span id="711" class="l"><a href="#711"> 711: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
+</span><span id="712" class="l"><a href="#712"> 712: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
+</span><span id="713" class="l"><a href="#713"> 713: </a>                    ]
+</span><span id="714" class="l"><a href="#714"> 714: </a>                ], self::HTTP_INTERNAL_SERVER_ERROR);
+</span><span id="715" class="l"><a href="#715"> 715: </a>        }
+</span><span id="716" class="l"><a href="#716"> 716: </a>    }
+</span><span id="717" class="l"><a href="#717"> 717: </a>
+</span><span id="718" class="l"><a href="#718"> 718: </a>    <span class="php-comment">/**
+</span></span><span id="719" class="l"><a href="#719"> 719: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
+</span></span><span id="720" class="l"><a href="#720"> 720: </a><span class="php-comment">     *
+</span></span><span id="721" class="l"><a href="#721"> 721: </a><span class="php-comment">     * @access public
+</span></span><span id="722" class="l"><a href="#722"> 722: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
+</span></span><span id="723" class="l"><a href="#723"> 723: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
+</span></span><span id="724" class="l"><a href="#724"> 724: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
+</span></span><span id="725" class="l"><a href="#725"> 725: </a><span class="php-comment">     * running the script; otherwise, exit
+</span></span><span id="726" class="l"><a href="#726"> 726: </a><span class="php-comment">     */</span>
+</span><span id="727" class="l"><a href="#727"> 727: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="728" class="l"><a href="#728"> 728: </a>    {
+</span><span id="729" class="l"><a href="#729"> 729: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
+</span><span id="730" class="l"><a href="#730"> 730: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="731" class="l"><a href="#731"> 731: </a>        {
+</span><span id="732" class="l"><a href="#732"> 732: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
+</span><span id="733" class="l"><a href="#733"> 733: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
+</span><span id="734" class="l"><a href="#734"> 734: </a>        }
+</span><span id="735" class="l"><a href="#735"> 735: </a>
+</span><span id="736" class="l"><a href="#736"> 736: </a>        <span class="php-comment">// Set the output as NULL by default</span>
+</span><span id="737" class="l"><a href="#737"> 737: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="738" class="l"><a href="#738"> 738: </a>
+</span><span id="739" class="l"><a href="#739"> 739: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
+</span><span id="740" class="l"><a href="#740"> 740: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="741" class="l"><a href="#741"> 741: </a>        {
+</span><span id="742" class="l"><a href="#742"> 742: </a>            <span class="php-var">$http_code</span> = self::HTTP_NOT_FOUND;
+</span><span id="743" class="l"><a href="#743"> 743: </a>        }
+</span><span id="744" class="l"><a href="#744"> 744: </a>
+</span><span id="745" class="l"><a href="#745"> 745: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
+</span><span id="746" class="l"><a href="#746"> 746: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="747" class="l"><a href="#747"> 747: </a>        {
+</span><span id="748" class="l"><a href="#748"> 748: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
+</span><span id="749" class="l"><a href="#749"> 749: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
+</span><span id="750" class="l"><a href="#750"> 750: </a>            {
+</span><span id="751" class="l"><a href="#751"> 751: </a>                <span class="php-comment">// Set the format header</span>
+</span><span id="752" class="l"><a href="#752"> 752: </a>                <span class="php-var">$this</span>-&gt;output-&gt;set_content_type(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format], <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
+</span><span id="753" class="l"><a href="#753"> 753: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
 </span><span id="754" class="l"><a href="#754"> 754: </a>
-</span><span id="755" class="l"><a href="#755"> 755: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
-</span><span id="756" class="l"><a href="#756"> 756: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
-</span><span id="757" class="l"><a href="#757"> 757: </a>            }
-</span><span id="758" class="l"><a href="#758"> 758: </a>        }
-</span><span id="759" class="l"><a href="#759"> 759: </a>
-</span><span id="760" class="l"><a href="#760"> 760: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
-</span><span id="761" class="l"><a href="#761"> 761: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
-</span><span id="762" class="l"><a href="#762"> 762: </a>        <span class="php-comment">// correct HTTP status code</span>
-</span><span id="763" class="l"><a href="#763"> 763: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = self::HTTP_OK;
-</span><span id="764" class="l"><a href="#764"> 764: </a>
-</span><span id="765" class="l"><a href="#765"> 765: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_status_header(<span class="php-var">$http_code</span>);
-</span><span id="766" class="l"><a href="#766"> 766: </a>
-</span><span id="767" class="l"><a href="#767"> 767: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
-</span><span id="768" class="l"><a href="#768"> 768: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="769" class="l"><a href="#769"> 769: </a>        {
-</span><span id="770" class="l"><a href="#770"> 770: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
-</span><span id="771" class="l"><a href="#771"> 771: </a>        }
-</span><span id="772" class="l"><a href="#772"> 772: </a>
-</span><span id="773" class="l"><a href="#773"> 773: </a>        <span class="php-comment">// Output the data</span>
-</span><span id="774" class="l"><a href="#774"> 774: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_output(<span class="php-var">$output</span>);
-</span><span id="775" class="l"><a href="#775"> 775: </a>
-</span><span id="776" class="l"><a href="#776"> 776: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="777" class="l"><a href="#777"> 777: </a>        {
-</span><span id="778" class="l"><a href="#778"> 778: </a>            <span class="php-comment">// Display the data and exit execution</span>
-</span><span id="779" class="l"><a href="#779"> 779: </a>            <span class="php-var">$this</span>-&gt;output-&gt;_display();
-</span><span id="780" class="l"><a href="#780"> 780: </a>            <span class="php-keyword1">exit</span>;
-</span><span id="781" class="l"><a href="#781"> 781: </a>        }
-</span><span id="782" class="l"><a href="#782"> 782: </a>
-</span><span id="783" class="l"><a href="#783"> 783: </a>        <span class="php-comment">// Otherwise dump the output automatically</span>
-</span><span id="784" class="l"><a href="#784"> 784: </a>    }
-</span><span id="785" class="l"><a href="#785"> 785: </a>
-</span><span id="786" class="l"><a href="#786"> 786: </a>    <span class="php-comment">/**
-</span></span><span id="787" class="l"><a href="#787"> 787: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
-</span></span><span id="788" class="l"><a href="#788"> 788: </a><span class="php-comment">     * within the buffers of the Output class. The response is sent to the client
-</span></span><span id="789" class="l"><a href="#789"> 789: </a><span class="php-comment">     * lately by the framework, after the current controller's method termination.
-</span></span><span id="790" class="l"><a href="#790"> 790: </a><span class="php-comment">     * All the hooks after the controller's method termination are executable
-</span></span><span id="791" class="l"><a href="#791"> 791: </a><span class="php-comment">     *
-</span></span><span id="792" class="l"><a href="#792"> 792: </a><span class="php-comment">     * @access public
-</span></span><span id="793" class="l"><a href="#793"> 793: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
-</span></span><span id="794" class="l"><a href="#794"> 794: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
-</span></span><span id="795" class="l"><a href="#795"> 795: </a><span class="php-comment">     */</span>
-</span><span id="796" class="l"><a href="#796"> 796: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> set_response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="797" class="l"><a href="#797"> 797: </a>    {
-</span><span id="798" class="l"><a href="#798"> 798: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$data</span>, <span class="php-var">$http_code</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="755" class="l"><a href="#755"> 755: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error</span>
+</span><span id="756" class="l"><a href="#756"> 756: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
+</span><span id="757" class="l"><a href="#757"> 757: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
+</span><span id="758" class="l"><a href="#758"> 758: </a>                {
+</span><span id="759" class="l"><a href="#759"> 759: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="760" class="l"><a href="#760"> 760: </a>                }
+</span><span id="761" class="l"><a href="#761"> 761: </a>            }
+</span><span id="762" class="l"><a href="#762"> 762: </a>            <span class="php-keyword1">else</span>
+</span><span id="763" class="l"><a href="#763"> 763: </a>            {
+</span><span id="764" class="l"><a href="#764"> 764: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
+</span><span id="765" class="l"><a href="#765"> 765: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
+</span><span id="766" class="l"><a href="#766"> 766: </a>                {
+</span><span id="767" class="l"><a href="#767"> 767: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
+</span><span id="768" class="l"><a href="#768"> 768: </a>                }
+</span><span id="769" class="l"><a href="#769"> 769: </a>
+</span><span id="770" class="l"><a href="#770"> 770: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
+</span><span id="771" class="l"><a href="#771"> 771: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
+</span><span id="772" class="l"><a href="#772"> 772: </a>            }
+</span><span id="773" class="l"><a href="#773"> 773: </a>        }
+</span><span id="774" class="l"><a href="#774"> 774: </a>
+</span><span id="775" class="l"><a href="#775"> 775: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
+</span><span id="776" class="l"><a href="#776"> 776: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
+</span><span id="777" class="l"><a href="#777"> 777: </a>        <span class="php-comment">// correct HTTP status code</span>
+</span><span id="778" class="l"><a href="#778"> 778: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = self::HTTP_OK;
+</span><span id="779" class="l"><a href="#779"> 779: </a>
+</span><span id="780" class="l"><a href="#780"> 780: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_status_header(<span class="php-var">$http_code</span>);
+</span><span id="781" class="l"><a href="#781"> 781: </a>
+</span><span id="782" class="l"><a href="#782"> 782: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
+</span><span id="783" class="l"><a href="#783"> 783: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="784" class="l"><a href="#784"> 784: </a>        {
+</span><span id="785" class="l"><a href="#785"> 785: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
+</span><span id="786" class="l"><a href="#786"> 786: </a>        }
+</span><span id="787" class="l"><a href="#787"> 787: </a>
+</span><span id="788" class="l"><a href="#788"> 788: </a>        <span class="php-comment">// Output the data</span>
+</span><span id="789" class="l"><a href="#789"> 789: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_output(<span class="php-var">$output</span>);
+</span><span id="790" class="l"><a href="#790"> 790: </a>
+</span><span id="791" class="l"><a href="#791"> 791: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="792" class="l"><a href="#792"> 792: </a>        {
+</span><span id="793" class="l"><a href="#793"> 793: </a>            <span class="php-comment">// Display the data and exit execution</span>
+</span><span id="794" class="l"><a href="#794"> 794: </a>            <span class="php-var">$this</span>-&gt;output-&gt;_display();
+</span><span id="795" class="l"><a href="#795"> 795: </a>            <span class="php-keyword1">exit</span>;
+</span><span id="796" class="l"><a href="#796"> 796: </a>        }
+</span><span id="797" class="l"><a href="#797"> 797: </a>
+</span><span id="798" class="l"><a href="#798"> 798: </a>        <span class="php-comment">// Otherwise dump the output automatically</span>
 </span><span id="799" class="l"><a href="#799"> 799: </a>    }
 </span><span id="800" class="l"><a href="#800"> 800: </a>
 </span><span id="801" class="l"><a href="#801"> 801: </a>    <span class="php-comment">/**
-</span></span><span id="802" class="l"><a href="#802"> 802: </a><span class="php-comment">     * Get the input format e.g. json or xml
-</span></span><span id="803" class="l"><a href="#803"> 803: </a><span class="php-comment">     *
-</span></span><span id="804" class="l"><a href="#804"> 804: </a><span class="php-comment">     * @access protected
-</span></span><span id="805" class="l"><a href="#805"> 805: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
-</span></span><span id="806" class="l"><a href="#806"> 806: </a><span class="php-comment">     */</span>
-</span><span id="807" class="l"><a href="#807"> 807: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
-</span><span id="808" class="l"><a href="#808"> 808: </a>    {
-</span><span id="809" class="l"><a href="#809"> 809: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
-</span><span id="810" class="l"><a href="#810"> 810: </a>        <span class="php-var">$content_type</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
-</span><span id="811" class="l"><a href="#811"> 811: </a>
-</span><span id="812" class="l"><a href="#812"> 812: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$content_type</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="813" class="l"><a href="#813"> 813: </a>        {
-</span><span id="814" class="l"><a href="#814"> 814: </a>            <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
-</span><span id="815" class="l"><a href="#815"> 815: </a>            <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
-</span><span id="816" class="l"><a href="#816"> 816: </a>            <span class="php-var">$content_type</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$content_type</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$content_type</span>)) : <span class="php-var">$content_type</span>);
-</span><span id="817" class="l"><a href="#817"> 817: </a>
-</span><span id="818" class="l"><a href="#818"> 818: </a>            <span class="php-comment">// Check all formats against the CONTENT-TYPE header</span>
-</span><span id="819" class="l"><a href="#819"> 819: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$type</span> =&gt; <span class="php-var">$mime</span>)
-</span><span id="820" class="l"><a href="#820"> 820: </a>            {
-</span><span id="821" class="l"><a href="#821"> 821: </a>                <span class="php-comment">// $type = format e.g. csv</span>
-</span><span id="822" class="l"><a href="#822"> 822: </a>                <span class="php-comment">// $mime = mime type e.g. application/csv</span>
-</span><span id="823" class="l"><a href="#823"> 823: </a>
-</span><span id="824" class="l"><a href="#824"> 824: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
-</span><span id="825" class="l"><a href="#825"> 825: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$content_type</span> === <span class="php-var">$mime</span>)
-</span><span id="826" class="l"><a href="#826"> 826: </a>                {
-</span><span id="827" class="l"><a href="#827"> 827: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$type</span>;
-</span><span id="828" class="l"><a href="#828"> 828: </a>                }
-</span><span id="829" class="l"><a href="#829"> 829: </a>            }
-</span><span id="830" class="l"><a href="#830"> 830: </a>        }
-</span><span id="831" class="l"><a href="#831"> 831: </a>
-</span><span id="832" class="l"><a href="#832"> 832: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="833" class="l"><a href="#833"> 833: </a>    }
-</span><span id="834" class="l"><a href="#834"> 834: </a>
-</span><span id="835" class="l"><a href="#835"> 835: </a>    <span class="php-comment">/**
-</span></span><span id="836" class="l"><a href="#836"> 836: </a><span class="php-comment">     * Gets the default format from the configuration. Fallbacks to 'json'
-</span></span><span id="837" class="l"><a href="#837"> 837: </a><span class="php-comment">     * if the corresponding configuration option $config['rest_default_format']
-</span></span><span id="838" class="l"><a href="#838"> 838: </a><span class="php-comment">     * is missing or is empty
-</span></span><span id="839" class="l"><a href="#839"> 839: </a><span class="php-comment">     *
-</span></span><span id="840" class="l"><a href="#840"> 840: </a><span class="php-comment">     * @access protected
-</span></span><span id="841" class="l"><a href="#841"> 841: </a><span class="php-comment">     * @return string The default supported input format
-</span></span><span id="842" class="l"><a href="#842"> 842: </a><span class="php-comment">     */</span>
-</span><span id="843" class="l"><a href="#843"> 843: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _get_default_output_format()
-</span><span id="844" class="l"><a href="#844"> 844: </a>    {
-</span><span id="845" class="l"><a href="#845"> 845: </a>        <span class="php-var">$default_format</span> = (string) <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
-</span><span id="846" class="l"><a href="#846"> 846: </a>        <span class="php-keyword1">return</span> <span class="php-var">$default_format</span> === <span class="php-quote">''</span> ? <span class="php-quote">'json'</span> : <span class="php-var">$default_format</span>;
-</span><span id="847" class="l"><a href="#847"> 847: </a>    }
-</span><span id="848" class="l"><a href="#848"> 848: </a>
-</span><span id="849" class="l"><a href="#849"> 849: </a>    <span class="php-comment">/**
-</span></span><span id="850" class="l"><a href="#850"> 850: </a><span class="php-comment">     * Detect which format should be used to output the data
-</span></span><span id="851" class="l"><a href="#851"> 851: </a><span class="php-comment">     *
-</span></span><span id="852" class="l"><a href="#852"> 852: </a><span class="php-comment">     * @access protected
-</span></span><span id="853" class="l"><a href="#853"> 853: </a><span class="php-comment">     * @return mixed|NULL|string Output format
-</span></span><span id="854" class="l"><a href="#854"> 854: </a><span class="php-comment">     */</span>
-</span><span id="855" class="l"><a href="#855"> 855: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
-</span><span id="856" class="l"><a href="#856"> 856: </a>    {
-</span><span id="857" class="l"><a href="#857"> 857: </a>        <span class="php-comment">// Concatenate formats to a regex pattern e.g. \.(csv|json|xml)</span>
-</span><span id="858" class="l"><a href="#858"> 858: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span>.<span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)).<span class="php-quote">')($|\/)/'</span>;
-</span><span id="859" class="l"><a href="#859"> 859: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="860" class="l"><a href="#860"> 860: </a>
-</span><span id="861" class="l"><a href="#861"> 861: </a>        <span class="php-comment">// Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2</span>
-</span><span id="862" class="l"><a href="#862"> 862: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
-</span><span id="863" class="l"><a href="#863"> 863: </a>        {
-</span><span id="864" class="l"><a href="#864"> 864: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
-</span><span id="865" class="l"><a href="#865"> 865: </a>        }
-</span><span id="866" class="l"><a href="#866"> 866: </a>
-</span><span id="867" class="l"><a href="#867"> 867: </a>        <span class="php-comment">// Get the format parameter named as 'format'</span>
-</span><span id="868" class="l"><a href="#868"> 868: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]))
-</span><span id="869" class="l"><a href="#869"> 869: </a>        {
-</span><span id="870" class="l"><a href="#870"> 870: </a>            <span class="php-var">$format</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]);
-</span><span id="871" class="l"><a href="#871"> 871: </a>
-</span><span id="872" class="l"><a href="#872"> 872: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]) === <span class="php-keyword1">TRUE</span>)
-</span><span id="873" class="l"><a href="#873"> 873: </a>            {
-</span><span id="874" class="l"><a href="#874"> 874: </a>                <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="875" class="l"><a href="#875"> 875: </a>            }
-</span><span id="876" class="l"><a href="#876"> 876: </a>        }
-</span><span id="877" class="l"><a href="#877"> 877: </a>
-</span><span id="878" class="l"><a href="#878"> 878: </a>        <span class="php-comment">// Get the HTTP_ACCEPT server variable</span>
-</span><span id="879" class="l"><a href="#879"> 879: </a>        <span class="php-var">$http_accept</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>);
-</span><span id="880" class="l"><a href="#880"> 880: </a>
-</span><span id="881" class="l"><a href="#881"> 881: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT server variable</span>
-</span><span id="882" class="l"><a href="#882"> 882: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$http_accept</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="883" class="l"><a href="#883"> 883: </a>        {
-</span><span id="884" class="l"><a href="#884"> 884: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="885" class="l"><a href="#885"> 885: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
-</span><span id="886" class="l"><a href="#886"> 886: </a>            {
-</span><span id="887" class="l"><a href="#887"> 887: </a>                <span class="php-comment">// Has this format been requested?</span>
-</span><span id="888" class="l"><a href="#888"> 888: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="889" class="l"><a href="#889"> 889: </a>                {
-</span><span id="890" class="l"><a href="#890"> 890: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
-</span><span id="891" class="l"><a href="#891"> 891: </a>                    {
-</span><span id="892" class="l"><a href="#892"> 892: </a>                        <span class="php-comment">// If not HTML or XML assume it's correct</span>
-</span><span id="893" class="l"><a href="#893"> 893: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="894" class="l"><a href="#894"> 894: </a>                    }
-</span><span id="895" class="l"><a href="#895"> 895: </a>                    <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="896" class="l"><a href="#896"> 896: </a>                    {
-</span><span id="897" class="l"><a href="#897"> 897: </a>                        <span class="php-comment">// HTML or XML have shown up as a match</span>
-</span><span id="898" class="l"><a href="#898"> 898: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
-</span><span id="899" class="l"><a href="#899"> 899: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="900" class="l"><a href="#900"> 900: </a>                    }
-</span><span id="901" class="l"><a href="#901"> 901: </a>                    <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="902" class="l"><a href="#902"> 902: </a>                    {
-</span><span id="903" class="l"><a href="#903"> 903: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
-</span><span id="904" class="l"><a href="#904"> 904: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="905" class="l"><a href="#905"> 905: </a>                    }
-</span><span id="906" class="l"><a href="#906"> 906: </a>                }
-</span><span id="907" class="l"><a href="#907"> 907: </a>            }
-</span><span id="908" class="l"><a href="#908"> 908: </a>        }
-</span><span id="909" class="l"><a href="#909"> 909: </a>
-</span><span id="910" class="l"><a href="#910"> 910: </a>        <span class="php-comment">// Check if the controller has a default format</span>
-</span><span id="911" class="l"><a href="#911"> 911: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
-</span><span id="912" class="l"><a href="#912"> 912: </a>        {
-</span><span id="913" class="l"><a href="#913"> 913: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
-</span><span id="914" class="l"><a href="#914"> 914: </a>        }
-</span><span id="915" class="l"><a href="#915"> 915: </a>
-</span><span id="916" class="l"><a href="#916"> 916: </a>        <span class="php-comment">// Obtain the default format from the configuration</span>
-</span><span id="917" class="l"><a href="#917"> 917: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_default_output_format();
-</span><span id="918" class="l"><a href="#918"> 918: </a>    }
-</span><span id="919" class="l"><a href="#919"> 919: </a>
-</span><span id="920" class="l"><a href="#920"> 920: </a>    <span class="php-comment">/**
-</span></span><span id="921" class="l"><a href="#921"> 921: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
-</span></span><span id="922" class="l"><a href="#922"> 922: </a><span class="php-comment">     *
-</span></span><span id="923" class="l"><a href="#923"> 923: </a><span class="php-comment">     * @access protected
-</span></span><span id="924" class="l"><a href="#924"> 924: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
-</span></span><span id="925" class="l"><a href="#925"> 925: </a><span class="php-comment">     */</span>
-</span><span id="926" class="l"><a href="#926"> 926: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
-</span><span id="927" class="l"><a href="#927"> 927: </a>    {
-</span><span id="928" class="l"><a href="#928"> 928: </a>        <span class="php-comment">// Declare a variable to store the method</span>
-</span><span id="929" class="l"><a href="#929"> 929: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
+</span></span><span id="802" class="l"><a href="#802"> 802: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
+</span></span><span id="803" class="l"><a href="#803"> 803: </a><span class="php-comment">     * within the buffers of the Output class. The response is sent to the client
+</span></span><span id="804" class="l"><a href="#804"> 804: </a><span class="php-comment">     * lately by the framework, after the current controller's method termination.
+</span></span><span id="805" class="l"><a href="#805"> 805: </a><span class="php-comment">     * All the hooks after the controller's method termination are executable
+</span></span><span id="806" class="l"><a href="#806"> 806: </a><span class="php-comment">     *
+</span></span><span id="807" class="l"><a href="#807"> 807: </a><span class="php-comment">     * @access public
+</span></span><span id="808" class="l"><a href="#808"> 808: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
+</span></span><span id="809" class="l"><a href="#809"> 809: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
+</span></span><span id="810" class="l"><a href="#810"> 810: </a><span class="php-comment">     */</span>
+</span><span id="811" class="l"><a href="#811"> 811: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> set_response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="812" class="l"><a href="#812"> 812: </a>    {
+</span><span id="813" class="l"><a href="#813"> 813: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$data</span>, <span class="php-var">$http_code</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="814" class="l"><a href="#814"> 814: </a>    }
+</span><span id="815" class="l"><a href="#815"> 815: </a>
+</span><span id="816" class="l"><a href="#816"> 816: </a>    <span class="php-comment">/**
+</span></span><span id="817" class="l"><a href="#817"> 817: </a><span class="php-comment">     * Get the input format e.g. json or xml
+</span></span><span id="818" class="l"><a href="#818"> 818: </a><span class="php-comment">     *
+</span></span><span id="819" class="l"><a href="#819"> 819: </a><span class="php-comment">     * @access protected
+</span></span><span id="820" class="l"><a href="#820"> 820: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
+</span></span><span id="821" class="l"><a href="#821"> 821: </a><span class="php-comment">     */</span>
+</span><span id="822" class="l"><a href="#822"> 822: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
+</span><span id="823" class="l"><a href="#823"> 823: </a>    {
+</span><span id="824" class="l"><a href="#824"> 824: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
+</span><span id="825" class="l"><a href="#825"> 825: </a>        <span class="php-var">$content_type</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
+</span><span id="826" class="l"><a href="#826"> 826: </a>
+</span><span id="827" class="l"><a href="#827"> 827: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$content_type</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="828" class="l"><a href="#828"> 828: </a>        {
+</span><span id="829" class="l"><a href="#829"> 829: </a>            <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
+</span><span id="830" class="l"><a href="#830"> 830: </a>            <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
+</span><span id="831" class="l"><a href="#831"> 831: </a>            <span class="php-var">$content_type</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$content_type</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$content_type</span>)) : <span class="php-var">$content_type</span>);
+</span><span id="832" class="l"><a href="#832"> 832: </a>
+</span><span id="833" class="l"><a href="#833"> 833: </a>            <span class="php-comment">// Check all formats against the CONTENT-TYPE header</span>
+</span><span id="834" class="l"><a href="#834"> 834: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$type</span> =&gt; <span class="php-var">$mime</span>)
+</span><span id="835" class="l"><a href="#835"> 835: </a>            {
+</span><span id="836" class="l"><a href="#836"> 836: </a>                <span class="php-comment">// $type = format e.g. csv</span>
+</span><span id="837" class="l"><a href="#837"> 837: </a>                <span class="php-comment">// $mime = mime type e.g. application/csv</span>
+</span><span id="838" class="l"><a href="#838"> 838: </a>
+</span><span id="839" class="l"><a href="#839"> 839: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
+</span><span id="840" class="l"><a href="#840"> 840: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$content_type</span> === <span class="php-var">$mime</span>)
+</span><span id="841" class="l"><a href="#841"> 841: </a>                {
+</span><span id="842" class="l"><a href="#842"> 842: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$type</span>;
+</span><span id="843" class="l"><a href="#843"> 843: </a>                }
+</span><span id="844" class="l"><a href="#844"> 844: </a>            }
+</span><span id="845" class="l"><a href="#845"> 845: </a>        }
+</span><span id="846" class="l"><a href="#846"> 846: </a>
+</span><span id="847" class="l"><a href="#847"> 847: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="848" class="l"><a href="#848"> 848: </a>    }
+</span><span id="849" class="l"><a href="#849"> 849: </a>
+</span><span id="850" class="l"><a href="#850"> 850: </a>    <span class="php-comment">/**
+</span></span><span id="851" class="l"><a href="#851"> 851: </a><span class="php-comment">     * Gets the default format from the configuration. Fallbacks to 'json'
+</span></span><span id="852" class="l"><a href="#852"> 852: </a><span class="php-comment">     * if the corresponding configuration option $config['rest_default_format']
+</span></span><span id="853" class="l"><a href="#853"> 853: </a><span class="php-comment">     * is missing or is empty
+</span></span><span id="854" class="l"><a href="#854"> 854: </a><span class="php-comment">     *
+</span></span><span id="855" class="l"><a href="#855"> 855: </a><span class="php-comment">     * @access protected
+</span></span><span id="856" class="l"><a href="#856"> 856: </a><span class="php-comment">     * @return string The default supported input format
+</span></span><span id="857" class="l"><a href="#857"> 857: </a><span class="php-comment">     */</span>
+</span><span id="858" class="l"><a href="#858"> 858: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _get_default_output_format()
+</span><span id="859" class="l"><a href="#859"> 859: </a>    {
+</span><span id="860" class="l"><a href="#860"> 860: </a>        <span class="php-var">$default_format</span> = (string) <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
+</span><span id="861" class="l"><a href="#861"> 861: </a>        <span class="php-keyword1">return</span> <span class="php-var">$default_format</span> === <span class="php-quote">''</span> ? <span class="php-quote">'json'</span> : <span class="php-var">$default_format</span>;
+</span><span id="862" class="l"><a href="#862"> 862: </a>    }
+</span><span id="863" class="l"><a href="#863"> 863: </a>
+</span><span id="864" class="l"><a href="#864"> 864: </a>    <span class="php-comment">/**
+</span></span><span id="865" class="l"><a href="#865"> 865: </a><span class="php-comment">     * Detect which format should be used to output the data
+</span></span><span id="866" class="l"><a href="#866"> 866: </a><span class="php-comment">     *
+</span></span><span id="867" class="l"><a href="#867"> 867: </a><span class="php-comment">     * @access protected
+</span></span><span id="868" class="l"><a href="#868"> 868: </a><span class="php-comment">     * @return mixed|NULL|string Output format
+</span></span><span id="869" class="l"><a href="#869"> 869: </a><span class="php-comment">     */</span>
+</span><span id="870" class="l"><a href="#870"> 870: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
+</span><span id="871" class="l"><a href="#871"> 871: </a>    {
+</span><span id="872" class="l"><a href="#872"> 872: </a>        <span class="php-comment">// Concatenate formats to a regex pattern e.g. \.(csv|json|xml)</span>
+</span><span id="873" class="l"><a href="#873"> 873: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span>.<span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)).<span class="php-quote">')($|\/)/'</span>;
+</span><span id="874" class="l"><a href="#874"> 874: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="875" class="l"><a href="#875"> 875: </a>
+</span><span id="876" class="l"><a href="#876"> 876: </a>        <span class="php-comment">// Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2</span>
+</span><span id="877" class="l"><a href="#877"> 877: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
+</span><span id="878" class="l"><a href="#878"> 878: </a>        {
+</span><span id="879" class="l"><a href="#879"> 879: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
+</span><span id="880" class="l"><a href="#880"> 880: </a>        }
+</span><span id="881" class="l"><a href="#881"> 881: </a>
+</span><span id="882" class="l"><a href="#882"> 882: </a>        <span class="php-comment">// Get the format parameter named as 'format'</span>
+</span><span id="883" class="l"><a href="#883"> 883: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]))
+</span><span id="884" class="l"><a href="#884"> 884: </a>        {
+</span><span id="885" class="l"><a href="#885"> 885: </a>            <span class="php-var">$format</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]);
+</span><span id="886" class="l"><a href="#886"> 886: </a>
+</span><span id="887" class="l"><a href="#887"> 887: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]) === <span class="php-keyword1">TRUE</span>)
+</span><span id="888" class="l"><a href="#888"> 888: </a>            {
+</span><span id="889" class="l"><a href="#889"> 889: </a>                <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="890" class="l"><a href="#890"> 890: </a>            }
+</span><span id="891" class="l"><a href="#891"> 891: </a>        }
+</span><span id="892" class="l"><a href="#892"> 892: </a>
+</span><span id="893" class="l"><a href="#893"> 893: </a>        <span class="php-comment">// Get the HTTP_ACCEPT server variable</span>
+</span><span id="894" class="l"><a href="#894"> 894: </a>        <span class="php-var">$http_accept</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>);
+</span><span id="895" class="l"><a href="#895"> 895: </a>
+</span><span id="896" class="l"><a href="#896"> 896: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT server variable</span>
+</span><span id="897" class="l"><a href="#897"> 897: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$http_accept</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="898" class="l"><a href="#898"> 898: </a>        {
+</span><span id="899" class="l"><a href="#899"> 899: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
+</span><span id="900" class="l"><a href="#900"> 900: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
+</span><span id="901" class="l"><a href="#901"> 901: </a>            {
+</span><span id="902" class="l"><a href="#902"> 902: </a>                <span class="php-comment">// Has this format been requested?</span>
+</span><span id="903" class="l"><a href="#903"> 903: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="904" class="l"><a href="#904"> 904: </a>                {
+</span><span id="905" class="l"><a href="#905"> 905: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
+</span><span id="906" class="l"><a href="#906"> 906: </a>                    {
+</span><span id="907" class="l"><a href="#907"> 907: </a>                        <span class="php-comment">// If not HTML or XML assume it's correct</span>
+</span><span id="908" class="l"><a href="#908"> 908: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="909" class="l"><a href="#909"> 909: </a>                    }
+</span><span id="910" class="l"><a href="#910"> 910: </a>                    <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="911" class="l"><a href="#911"> 911: </a>                    {
+</span><span id="912" class="l"><a href="#912"> 912: </a>                        <span class="php-comment">// HTML or XML have shown up as a match</span>
+</span><span id="913" class="l"><a href="#913"> 913: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
+</span><span id="914" class="l"><a href="#914"> 914: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="915" class="l"><a href="#915"> 915: </a>                    }
+</span><span id="916" class="l"><a href="#916"> 916: </a>                    <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="917" class="l"><a href="#917"> 917: </a>                    {
+</span><span id="918" class="l"><a href="#918"> 918: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
+</span><span id="919" class="l"><a href="#919"> 919: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
+</span><span id="920" class="l"><a href="#920"> 920: </a>                    }
+</span><span id="921" class="l"><a href="#921"> 921: </a>                }
+</span><span id="922" class="l"><a href="#922"> 922: </a>            }
+</span><span id="923" class="l"><a href="#923"> 923: </a>        }
+</span><span id="924" class="l"><a href="#924"> 924: </a>
+</span><span id="925" class="l"><a href="#925"> 925: </a>        <span class="php-comment">// Check if the controller has a default format</span>
+</span><span id="926" class="l"><a href="#926"> 926: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
+</span><span id="927" class="l"><a href="#927"> 927: </a>        {
+</span><span id="928" class="l"><a href="#928"> 928: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
+</span><span id="929" class="l"><a href="#929"> 929: </a>        }
 </span><span id="930" class="l"><a href="#930"> 930: </a>
-</span><span id="931" class="l"><a href="#931"> 931: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
-</span><span id="932" class="l"><a href="#932"> 932: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="933" class="l"><a href="#933"> 933: </a>        {
-</span><span id="934" class="l"><a href="#934"> 934: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
-</span><span id="935" class="l"><a href="#935"> 935: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="936" class="l"><a href="#936"> 936: </a>            {
-</span><span id="937" class="l"><a href="#937"> 937: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
-</span><span id="938" class="l"><a href="#938"> 938: </a>            }
-</span><span id="939" class="l"><a href="#939"> 939: </a>
-</span><span id="940" class="l"><a href="#940"> 940: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
-</span><span id="941" class="l"><a href="#941"> 941: </a>        }
-</span><span id="942" class="l"><a href="#942"> 942: </a>
-</span><span id="943" class="l"><a href="#943"> 943: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
-</span><span id="944" class="l"><a href="#944"> 944: </a>        {
-</span><span id="945" class="l"><a href="#945"> 945: </a>            <span class="php-comment">// Get the request method as a lowercase string</span>
-</span><span id="946" class="l"><a href="#946"> 946: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
-</span><span id="947" class="l"><a href="#947"> 947: </a>        }
-</span><span id="948" class="l"><a href="#948"> 948: </a>
-</span><span id="949" class="l"><a href="#949"> 949: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
-</span><span id="950" class="l"><a href="#950"> 950: </a>    }
-</span><span id="951" class="l"><a href="#951"> 951: </a>
-</span><span id="952" class="l"><a href="#952"> 952: </a>    <span class="php-comment">/**
-</span></span><span id="953" class="l"><a href="#953"> 953: </a><span class="php-comment">     * See if the user has provided an API key
-</span></span><span id="954" class="l"><a href="#954"> 954: </a><span class="php-comment">     *
-</span></span><span id="955" class="l"><a href="#955"> 955: </a><span class="php-comment">     * @access protected
-</span></span><span id="956" class="l"><a href="#956"> 956: </a><span class="php-comment">     * @return bool
-</span></span><span id="957" class="l"><a href="#957"> 957: </a><span class="php-comment">     */</span>
-</span><span id="958" class="l"><a href="#958"> 958: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
-</span><span id="959" class="l"><a href="#959"> 959: </a>    {
-</span><span id="960" class="l"><a href="#960"> 960: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
-</span><span id="961" class="l"><a href="#961"> 961: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
-</span><span id="962" class="l"><a href="#962"> 962: </a>
-</span><span id="963" class="l"><a href="#963"> 963: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
-</span><span id="964" class="l"><a href="#964"> 964: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
-</span><span id="965" class="l"><a href="#965"> 965: </a>
-</span><span id="966" class="l"><a href="#966"> 966: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="967" class="l"><a href="#967"> 967: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
-</span><span id="968" class="l"><a href="#968"> 968: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
-</span><span id="969" class="l"><a href="#969"> 969: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
-</span><span id="970" class="l"><a href="#970"> 970: </a>
-</span><span id="971" class="l"><a href="#971"> 971: </a>        <span class="php-comment">// Find the key from server or arguments</span>
-</span><span id="972" class="l"><a href="#972"> 972: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
-</span><span id="973" class="l"><a href="#973"> 973: </a>        {
-</span><span id="974" class="l"><a href="#974"> 974: </a>            <span class="php-keyword1">if</span> ( ! (<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
-</span><span id="975" class="l"><a href="#975"> 975: </a>            {
-</span><span id="976" class="l"><a href="#976"> 976: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="977" class="l"><a href="#977"> 977: </a>            }
-</span><span id="978" class="l"><a href="#978"> 978: </a>
-</span><span id="979" class="l"><a href="#979"> 979: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
+</span><span id="931" class="l"><a href="#931"> 931: </a>        <span class="php-comment">// Obtain the default format from the configuration</span>
+</span><span id="932" class="l"><a href="#932"> 932: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_default_output_format();
+</span><span id="933" class="l"><a href="#933"> 933: </a>    }
+</span><span id="934" class="l"><a href="#934"> 934: </a>
+</span><span id="935" class="l"><a href="#935"> 935: </a>    <span class="php-comment">/**
+</span></span><span id="936" class="l"><a href="#936"> 936: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
+</span></span><span id="937" class="l"><a href="#937"> 937: </a><span class="php-comment">     *
+</span></span><span id="938" class="l"><a href="#938"> 938: </a><span class="php-comment">     * @access protected
+</span></span><span id="939" class="l"><a href="#939"> 939: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
+</span></span><span id="940" class="l"><a href="#940"> 940: </a><span class="php-comment">     */</span>
+</span><span id="941" class="l"><a href="#941"> 941: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
+</span><span id="942" class="l"><a href="#942"> 942: </a>    {
+</span><span id="943" class="l"><a href="#943"> 943: </a>        <span class="php-comment">// Declare a variable to store the method</span>
+</span><span id="944" class="l"><a href="#944"> 944: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="945" class="l"><a href="#945"> 945: </a>
+</span><span id="946" class="l"><a href="#946"> 946: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
+</span><span id="947" class="l"><a href="#947"> 947: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="948" class="l"><a href="#948"> 948: </a>        {
+</span><span id="949" class="l"><a href="#949"> 949: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
+</span><span id="950" class="l"><a href="#950"> 950: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="951" class="l"><a href="#951"> 951: </a>            {
+</span><span id="952" class="l"><a href="#952"> 952: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
+</span><span id="953" class="l"><a href="#953"> 953: </a>            }
+</span><span id="954" class="l"><a href="#954"> 954: </a>
+</span><span id="955" class="l"><a href="#955"> 955: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
+</span><span id="956" class="l"><a href="#956"> 956: </a>        }
+</span><span id="957" class="l"><a href="#957"> 957: </a>
+</span><span id="958" class="l"><a href="#958"> 958: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
+</span><span id="959" class="l"><a href="#959"> 959: </a>        {
+</span><span id="960" class="l"><a href="#960"> 960: </a>            <span class="php-comment">// Get the request method as a lowercase string</span>
+</span><span id="961" class="l"><a href="#961"> 961: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
+</span><span id="962" class="l"><a href="#962"> 962: </a>        }
+</span><span id="963" class="l"><a href="#963"> 963: </a>
+</span><span id="964" class="l"><a href="#964"> 964: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
+</span><span id="965" class="l"><a href="#965"> 965: </a>    }
+</span><span id="966" class="l"><a href="#966"> 966: </a>
+</span><span id="967" class="l"><a href="#967"> 967: </a>    <span class="php-comment">/**
+</span></span><span id="968" class="l"><a href="#968"> 968: </a><span class="php-comment">     * See if the user has provided an API key
+</span></span><span id="969" class="l"><a href="#969"> 969: </a><span class="php-comment">     *
+</span></span><span id="970" class="l"><a href="#970"> 970: </a><span class="php-comment">     * @access protected
+</span></span><span id="971" class="l"><a href="#971"> 971: </a><span class="php-comment">     * @return bool
+</span></span><span id="972" class="l"><a href="#972"> 972: </a><span class="php-comment">     */</span>
+</span><span id="973" class="l"><a href="#973"> 973: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
+</span><span id="974" class="l"><a href="#974"> 974: </a>    {
+</span><span id="975" class="l"><a href="#975"> 975: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
+</span><span id="976" class="l"><a href="#976"> 976: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
+</span><span id="977" class="l"><a href="#977"> 977: </a>
+</span><span id="978" class="l"><a href="#978"> 978: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
+</span><span id="979" class="l"><a href="#979"> 979: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
 </span><span id="980" class="l"><a href="#980"> 980: </a>
-</span><span id="981" class="l"><a href="#981"> 981: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
-</span><span id="982" class="l"><a href="#982"> 982: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
-</span><span id="983" class="l"><a href="#983"> 983: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
-</span><span id="984" class="l"><a href="#984"> 984: </a>
-</span><span id="985" class="l"><a href="#985"> 985: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
-</span><span id="986" class="l"><a href="#986"> 986: </a>
-</span><span id="987" class="l"><a href="#987"> 987: </a>            <span class="php-comment">/*
-</span></span><span id="988" class="l"><a href="#988"> 988: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
-</span></span><span id="989" class="l"><a href="#989"> 989: </a><span class="php-comment">             * of valid ip addresses stored in the database
-</span></span><span id="990" class="l"><a href="#990"> 990: </a><span class="php-comment">             */</span>
-</span><span id="991" class="l"><a href="#991"> 991: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
-</span><span id="992" class="l"><a href="#992"> 992: </a>            {
-</span><span id="993" class="l"><a href="#993"> 993: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
-</span><span id="994" class="l"><a href="#994"> 994: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
-</span><span id="995" class="l"><a href="#995"> 995: </a>                {
-</span><span id="996" class="l"><a href="#996"> 996: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
-</span><span id="997" class="l"><a href="#997"> 997: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
-</span><span id="998" class="l"><a href="#998"> 998: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
+</span><span id="981" class="l"><a href="#981"> 981: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="982" class="l"><a href="#982"> 982: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
+</span><span id="983" class="l"><a href="#983"> 983: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
+</span><span id="984" class="l"><a href="#984"> 984: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
+</span><span id="985" class="l"><a href="#985"> 985: </a>
+</span><span id="986" class="l"><a href="#986"> 986: </a>        <span class="php-comment">// Find the key from server or arguments</span>
+</span><span id="987" class="l"><a href="#987"> 987: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
+</span><span id="988" class="l"><a href="#988"> 988: </a>        {
+</span><span id="989" class="l"><a href="#989"> 989: </a>            <span class="php-keyword1">if</span> ( ! (<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
+</span><span id="990" class="l"><a href="#990"> 990: </a>            {
+</span><span id="991" class="l"><a href="#991"> 991: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="992" class="l"><a href="#992"> 992: </a>            }
+</span><span id="993" class="l"><a href="#993"> 993: </a>
+</span><span id="994" class="l"><a href="#994"> 994: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
+</span><span id="995" class="l"><a href="#995"> 995: </a>
+</span><span id="996" class="l"><a href="#996"> 996: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
+</span><span id="997" class="l"><a href="#997"> 997: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
+</span><span id="998" class="l"><a href="#998"> 998: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
 </span><span id="999" class="l"><a href="#999"> 999: </a>
-</span><span id="1000" class="l"><a href="#1000">1000: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
-</span><span id="1001" class="l"><a href="#1001">1001: </a>                    {
-</span><span id="1002" class="l"><a href="#1002">1002: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() === <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
-</span><span id="1003" class="l"><a href="#1003">1003: </a>                        {
-</span><span id="1004" class="l"><a href="#1004">1004: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
-</span><span id="1005" class="l"><a href="#1005">1005: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
-</span><span id="1006" class="l"><a href="#1006">1006: </a>                            <span class="php-keyword1">break</span>;
-</span><span id="1007" class="l"><a href="#1007">1007: </a>                        }
-</span><span id="1008" class="l"><a href="#1008">1008: </a>                    }
-</span><span id="1009" class="l"><a href="#1009">1009: </a>
-</span><span id="1010" class="l"><a href="#1010">1010: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
-</span><span id="1011" class="l"><a href="#1011">1011: </a>                }
-</span><span id="1012" class="l"><a href="#1012">1012: </a>                <span class="php-keyword1">else</span>
-</span><span id="1013" class="l"><a href="#1013">1013: </a>                {
-</span><span id="1014" class="l"><a href="#1014">1014: </a>                    <span class="php-comment">// There should be at least one IP address for this private key</span>
-</span><span id="1015" class="l"><a href="#1015">1015: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1016" class="l"><a href="#1016">1016: </a>                }
-</span><span id="1017" class="l"><a href="#1017">1017: </a>            }
-</span><span id="1018" class="l"><a href="#1018">1018: </a>
-</span><span id="1019" class="l"><a href="#1019">1019: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1020" class="l"><a href="#1020">1020: </a>        }
-</span><span id="1021" class="l"><a href="#1021">1021: </a>
-</span><span id="1022" class="l"><a href="#1022">1022: </a>        <span class="php-comment">// No key has been sent</span>
-</span><span id="1023" class="l"><a href="#1023">1023: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1024" class="l"><a href="#1024">1024: </a>    }
-</span><span id="1025" class="l"><a href="#1025">1025: </a>
-</span><span id="1026" class="l"><a href="#1026">1026: </a>    <span class="php-comment">/**
-</span></span><span id="1027" class="l"><a href="#1027">1027: </a><span class="php-comment">     * Preferred return language
-</span></span><span id="1028" class="l"><a href="#1028">1028: </a><span class="php-comment">     *
-</span></span><span id="1029" class="l"><a href="#1029">1029: </a><span class="php-comment">     * @access protected
-</span></span><span id="1030" class="l"><a href="#1030">1030: </a><span class="php-comment">     * @return string|NULL The language code
-</span></span><span id="1031" class="l"><a href="#1031">1031: </a><span class="php-comment">     */</span>
-</span><span id="1032" class="l"><a href="#1032">1032: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
-</span><span id="1033" class="l"><a href="#1033">1033: </a>    {
-</span><span id="1034" class="l"><a href="#1034">1034: </a>        <span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>);
-</span><span id="1035" class="l"><a href="#1035">1035: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$lang</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1036" class="l"><a href="#1036">1036: </a>        {
-</span><span id="1037" class="l"><a href="#1037">1037: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="1038" class="l"><a href="#1038">1038: </a>        }
-</span><span id="1039" class="l"><a href="#1039">1039: </a>
-</span><span id="1040" class="l"><a href="#1040">1040: </a>        <span class="php-comment">// It appears more than one language has been sent using a comma delimiter</span>
-</span><span id="1041" class="l"><a href="#1041">1041: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="1042" class="l"><a href="#1042">1042: </a>        {
-</span><span id="1043" class="l"><a href="#1043">1043: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
-</span><span id="1044" class="l"><a href="#1044">1044: </a>
-</span><span id="1045" class="l"><a href="#1045">1045: </a>            <span class="php-var">$return_langs</span> = [];
-</span><span id="1046" class="l"><a href="#1046">1046: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
-</span><span id="1047" class="l"><a href="#1047">1047: </a>            {
-</span><span id="1048" class="l"><a href="#1048">1048: </a>                <span class="php-comment">// Remove weight and trim leading and trailing whitespace</span>
-</span><span id="1049" class="l"><a href="#1049">1049: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
-</span><span id="1050" class="l"><a href="#1050">1050: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
-</span><span id="1051" class="l"><a href="#1051">1051: </a>            }
-</span><span id="1052" class="l"><a href="#1052">1052: </a>
-</span><span id="1053" class="l"><a href="#1053">1053: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
-</span><span id="1054" class="l"><a href="#1054">1054: </a>        }
-</span><span id="1055" class="l"><a href="#1055">1055: </a>
-</span><span id="1056" class="l"><a href="#1056">1056: </a>        <span class="php-comment">// Otherwise simply return as a string</span>
-</span><span id="1057" class="l"><a href="#1057">1057: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
-</span><span id="1058" class="l"><a href="#1058">1058: </a>    }
+</span><span id="1000" class="l"><a href="#1000">1000: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
+</span><span id="1001" class="l"><a href="#1001">1001: </a>
+</span><span id="1002" class="l"><a href="#1002">1002: </a>            <span class="php-comment">/*
+</span></span><span id="1003" class="l"><a href="#1003">1003: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
+</span></span><span id="1004" class="l"><a href="#1004">1004: </a><span class="php-comment">             * of valid ip addresses stored in the database
+</span></span><span id="1005" class="l"><a href="#1005">1005: </a><span class="php-comment">             */</span>
+</span><span id="1006" class="l"><a href="#1006">1006: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1007" class="l"><a href="#1007">1007: </a>            {
+</span><span id="1008" class="l"><a href="#1008">1008: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
+</span><span id="1009" class="l"><a href="#1009">1009: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
+</span><span id="1010" class="l"><a href="#1010">1010: </a>                {
+</span><span id="1011" class="l"><a href="#1011">1011: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
+</span><span id="1012" class="l"><a href="#1012">1012: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
+</span><span id="1013" class="l"><a href="#1013">1013: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
+</span><span id="1014" class="l"><a href="#1014">1014: </a>
+</span><span id="1015" class="l"><a href="#1015">1015: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
+</span><span id="1016" class="l"><a href="#1016">1016: </a>                    {
+</span><span id="1017" class="l"><a href="#1017">1017: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() === <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
+</span><span id="1018" class="l"><a href="#1018">1018: </a>                        {
+</span><span id="1019" class="l"><a href="#1019">1019: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
+</span><span id="1020" class="l"><a href="#1020">1020: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
+</span><span id="1021" class="l"><a href="#1021">1021: </a>                            <span class="php-keyword1">break</span>;
+</span><span id="1022" class="l"><a href="#1022">1022: </a>                        }
+</span><span id="1023" class="l"><a href="#1023">1023: </a>                    }
+</span><span id="1024" class="l"><a href="#1024">1024: </a>
+</span><span id="1025" class="l"><a href="#1025">1025: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
+</span><span id="1026" class="l"><a href="#1026">1026: </a>                }
+</span><span id="1027" class="l"><a href="#1027">1027: </a>                <span class="php-keyword1">else</span>
+</span><span id="1028" class="l"><a href="#1028">1028: </a>                {
+</span><span id="1029" class="l"><a href="#1029">1029: </a>                    <span class="php-comment">// There should be at least one IP address for this private key</span>
+</span><span id="1030" class="l"><a href="#1030">1030: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1031" class="l"><a href="#1031">1031: </a>                }
+</span><span id="1032" class="l"><a href="#1032">1032: </a>            }
+</span><span id="1033" class="l"><a href="#1033">1033: </a>
+</span><span id="1034" class="l"><a href="#1034">1034: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1035" class="l"><a href="#1035">1035: </a>        }
+</span><span id="1036" class="l"><a href="#1036">1036: </a>
+</span><span id="1037" class="l"><a href="#1037">1037: </a>        <span class="php-comment">// No key has been sent</span>
+</span><span id="1038" class="l"><a href="#1038">1038: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1039" class="l"><a href="#1039">1039: </a>    }
+</span><span id="1040" class="l"><a href="#1040">1040: </a>
+</span><span id="1041" class="l"><a href="#1041">1041: </a>    <span class="php-comment">/**
+</span></span><span id="1042" class="l"><a href="#1042">1042: </a><span class="php-comment">     * Preferred return language
+</span></span><span id="1043" class="l"><a href="#1043">1043: </a><span class="php-comment">     *
+</span></span><span id="1044" class="l"><a href="#1044">1044: </a><span class="php-comment">     * @access protected
+</span></span><span id="1045" class="l"><a href="#1045">1045: </a><span class="php-comment">     * @return string|NULL The language code
+</span></span><span id="1046" class="l"><a href="#1046">1046: </a><span class="php-comment">     */</span>
+</span><span id="1047" class="l"><a href="#1047">1047: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
+</span><span id="1048" class="l"><a href="#1048">1048: </a>    {
+</span><span id="1049" class="l"><a href="#1049">1049: </a>        <span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>);
+</span><span id="1050" class="l"><a href="#1050">1050: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$lang</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1051" class="l"><a href="#1051">1051: </a>        {
+</span><span id="1052" class="l"><a href="#1052">1052: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
+</span><span id="1053" class="l"><a href="#1053">1053: </a>        }
+</span><span id="1054" class="l"><a href="#1054">1054: </a>
+</span><span id="1055" class="l"><a href="#1055">1055: </a>        <span class="php-comment">// It appears more than one language has been sent using a comma delimiter</span>
+</span><span id="1056" class="l"><a href="#1056">1056: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
+</span><span id="1057" class="l"><a href="#1057">1057: </a>        {
+</span><span id="1058" class="l"><a href="#1058">1058: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
 </span><span id="1059" class="l"><a href="#1059">1059: </a>
-</span><span id="1060" class="l"><a href="#1060">1060: </a>    <span class="php-comment">/**
-</span></span><span id="1061" class="l"><a href="#1061">1061: </a><span class="php-comment">     * Add the request to the log table
-</span></span><span id="1062" class="l"><a href="#1062">1062: </a><span class="php-comment">     *
-</span></span><span id="1063" class="l"><a href="#1063">1063: </a><span class="php-comment">     * @access protected
-</span></span><span id="1064" class="l"><a href="#1064">1064: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
-</span></span><span id="1065" class="l"><a href="#1065">1065: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
-</span></span><span id="1066" class="l"><a href="#1066">1066: </a><span class="php-comment">     */</span>
-</span><span id="1067" class="l"><a href="#1067">1067: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1068" class="l"><a href="#1068">1068: </a>    {
-</span><span id="1069" class="l"><a href="#1069">1069: </a>        <span class="php-comment">// Insert the request into the log table</span>
-</span><span id="1070" class="l"><a href="#1070">1070: </a>        <span class="php-var">$is_inserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1071" class="l"><a href="#1071">1071: </a>            -&gt;insert(
-</span><span id="1072" class="l"><a href="#1072">1072: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
-</span><span id="1073" class="l"><a href="#1073">1073: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
-</span><span id="1074" class="l"><a href="#1074">1074: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
-</span><span id="1075" class="l"><a href="#1075">1075: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
-</span><span id="1076" class="l"><a href="#1076">1076: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="1077" class="l"><a href="#1077">1077: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
-</span><span id="1078" class="l"><a href="#1078">1078: </a>                <span class="php-quote">'time'</span> =&gt; <span class="php-keyword2">time</span>(),
-</span><span id="1079" class="l"><a href="#1079">1079: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
-</span><span id="1080" class="l"><a href="#1080">1080: </a>            ]);
-</span><span id="1081" class="l"><a href="#1081">1081: </a>
-</span><span id="1082" class="l"><a href="#1082">1082: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
-</span><span id="1083" class="l"><a href="#1083">1083: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
-</span><span id="1084" class="l"><a href="#1084">1084: </a>
-</span><span id="1085" class="l"><a href="#1085">1085: </a>        <span class="php-keyword1">return</span> <span class="php-var">$is_inserted</span>;
-</span><span id="1086" class="l"><a href="#1086">1086: </a>    }
-</span><span id="1087" class="l"><a href="#1087">1087: </a>
-</span><span id="1088" class="l"><a href="#1088">1088: </a>    <span class="php-comment">/**
-</span></span><span id="1089" class="l"><a href="#1089">1089: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
-</span></span><span id="1090" class="l"><a href="#1090">1090: </a><span class="php-comment">     *
-</span></span><span id="1091" class="l"><a href="#1091">1091: </a><span class="php-comment">     * @access protected
-</span></span><span id="1092" class="l"><a href="#1092">1092: </a><span class="php-comment">     * @param  string $controller_method The method being called
-</span></span><span id="1093" class="l"><a href="#1093">1093: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
-</span></span><span id="1094" class="l"><a href="#1094">1094: </a><span class="php-comment">     */</span>
-</span><span id="1095" class="l"><a href="#1095">1095: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
-</span><span id="1096" class="l"><a href="#1096">1096: </a>    {
-</span><span id="1097" class="l"><a href="#1097">1097: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
-</span><span id="1098" class="l"><a href="#1098">1098: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1099" class="l"><a href="#1099">1099: </a>        {
-</span><span id="1100" class="l"><a href="#1100">1100: </a>            <span class="php-comment">// Everything is fine</span>
-</span><span id="1101" class="l"><a href="#1101">1101: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1102" class="l"><a href="#1102">1102: </a>        }
-</span><span id="1103" class="l"><a href="#1103">1103: </a>
-</span><span id="1104" class="l"><a href="#1104">1104: </a>        <span class="php-keyword1">switch</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_method'</span>))
-</span><span id="1105" class="l"><a href="#1105">1105: </a>        {
-</span><span id="1106" class="l"><a href="#1106">1106: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'API_KEY'</span>:
-</span><span id="1107" class="l"><a href="#1107">1107: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'api-key:'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>);
-</span><span id="1108" class="l"><a href="#1108">1108: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>;
-</span><span id="1109" class="l"><a href="#1109">1109: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1110" class="l"><a href="#1110">1110: </a>
-</span><span id="1111" class="l"><a href="#1111">1111: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'METHOD_NAME'</span>:
-</span><span id="1112" class="l"><a href="#1112">1112: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'method-name:'</span> . <span class="php-var">$controller_method</span>;
-</span><span id="1113" class="l"><a href="#1113">1113: </a>            <span class="php-var">$limited_method_name</span> =  <span class="php-var">$controller_method</span>;
-</span><span id="1114" class="l"><a href="#1114">1114: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1115" class="l"><a href="#1115">1115: </a>
-</span><span id="1116" class="l"><a href="#1116">1116: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'ROUTED_URL'</span>:
-</span><span id="1117" class="l"><a href="#1117">1117: </a>          <span class="php-keyword1">default</span>:
-</span><span id="1118" class="l"><a href="#1118">1118: </a>            <span class="php-var">$limited_uri</span> = <span class="php-var">$this</span>-&gt;uri-&gt;ruri_string();
-</span><span id="1119" class="l"><a href="#1119">1119: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$limited_uri</span>), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
-</span><span id="1120" class="l"><a href="#1120">1120: </a>            {
-</span><span id="1121" class="l"><a href="#1121">1121: </a>                <span class="php-var">$limited_uri</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$limited_uri</span>,<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format) - <span class="php-num">1</span>);
-</span><span id="1122" class="l"><a href="#1122">1122: </a>            }
-</span><span id="1123" class="l"><a href="#1123">1123: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'uri:'</span>.<span class="php-var">$limited_uri</span>.<span class="php-quote">':'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method; <span class="php-comment">// It's good to differentiate GET from PUT</span>
-</span><span id="1124" class="l"><a href="#1124">1124: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-var">$controller_method</span>;
-</span><span id="1125" class="l"><a href="#1125">1125: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1126" class="l"><a href="#1126">1126: </a>        }
-</span><span id="1127" class="l"><a href="#1127">1127: </a>
-</span><span id="1128" class="l"><a href="#1128">1128: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span> )
-</span><span id="1129" class="l"><a href="#1129">1129: </a>        {
-</span><span id="1130" class="l"><a href="#1130">1130: </a>            <span class="php-comment">// Everything is fine</span>
-</span><span id="1131" class="l"><a href="#1131">1131: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1132" class="l"><a href="#1132">1132: </a>        }
-</span><span id="1133" class="l"><a href="#1133">1133: </a>
-</span><span id="1134" class="l"><a href="#1134">1134: </a>        <span class="php-comment">// How many times can you get to this method in a defined time_limit (default: 1 hour)?</span>
-</span><span id="1135" class="l"><a href="#1135">1135: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>];
-</span><span id="1136" class="l"><a href="#1136">1136: </a>
-</span><span id="1137" class="l"><a href="#1137">1137: </a>        <span class="php-var">$time_limit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>] : <span class="php-num">3600</span>); <span class="php-comment">// 3600 = 60 * 60</span>
-</span><span id="1138" class="l"><a href="#1138">1138: </a>
-</span><span id="1139" class="l"><a href="#1139">1139: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
-</span><span id="1140" class="l"><a href="#1140">1140: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1141" class="l"><a href="#1141">1141: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1142" class="l"><a href="#1142">1142: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1143" class="l"><a href="#1143">1143: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
-</span><span id="1144" class="l"><a href="#1144">1144: </a>            -&gt;row();
-</span><span id="1145" class="l"><a href="#1145">1145: </a>
-</span><span id="1146" class="l"><a href="#1146">1146: </a>        <span class="php-comment">// No calls have been made for this key</span>
-</span><span id="1147" class="l"><a href="#1147">1147: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1148" class="l"><a href="#1148">1148: </a>        {
-</span><span id="1149" class="l"><a href="#1149">1149: </a>            <span class="php-comment">// Create a new row for the following key</span>
-</span><span id="1150" class="l"><a href="#1150">1150: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
-</span><span id="1151" class="l"><a href="#1151">1151: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$limited_uri</span>,
-</span><span id="1152" class="l"><a href="#1152">1152: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="1153" class="l"><a href="#1153">1153: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
-</span><span id="1154" class="l"><a href="#1154">1154: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
-</span><span id="1155" class="l"><a href="#1155">1155: </a>            ]);
-</span><span id="1156" class="l"><a href="#1156">1156: </a>        }
-</span><span id="1157" class="l"><a href="#1157">1157: </a>
-</span><span id="1158" class="l"><a href="#1158">1158: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
-</span><span id="1159" class="l"><a href="#1159">1159: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$time_limit</span>))
-</span><span id="1160" class="l"><a href="#1160">1160: </a>        {
-</span><span id="1161" class="l"><a href="#1161">1161: </a>            <span class="php-comment">// Reset the started period and count</span>
-</span><span id="1162" class="l"><a href="#1162">1162: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1163" class="l"><a href="#1163">1163: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1164" class="l"><a href="#1164">1164: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
-</span><span id="1165" class="l"><a href="#1165">1165: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
-</span><span id="1166" class="l"><a href="#1166">1166: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
-</span><span id="1167" class="l"><a href="#1167">1167: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1168" class="l"><a href="#1168">1168: </a>        }
-</span><span id="1169" class="l"><a href="#1169">1169: </a>
-</span><span id="1170" class="l"><a href="#1170">1170: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
-</span><span id="1171" class="l"><a href="#1171">1171: </a>        <span class="php-keyword1">else</span>
-</span><span id="1172" class="l"><a href="#1172">1172: </a>        {
-</span><span id="1173" class="l"><a href="#1173">1173: </a>            <span class="php-comment">// The limit has been exceeded</span>
-</span><span id="1174" class="l"><a href="#1174">1174: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
-</span><span id="1175" class="l"><a href="#1175">1175: </a>            {
-</span><span id="1176" class="l"><a href="#1176">1176: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1177" class="l"><a href="#1177">1177: </a>            }
-</span><span id="1178" class="l"><a href="#1178">1178: </a>
-</span><span id="1179" class="l"><a href="#1179">1179: </a>            <span class="php-comment">// Increase the count by one</span>
-</span><span id="1180" class="l"><a href="#1180">1180: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1181" class="l"><a href="#1181">1181: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1182" class="l"><a href="#1182">1182: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1183" class="l"><a href="#1183">1183: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
-</span><span id="1184" class="l"><a href="#1184">1184: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1185" class="l"><a href="#1185">1185: </a>        }
-</span><span id="1186" class="l"><a href="#1186">1186: </a>
-</span><span id="1187" class="l"><a href="#1187">1187: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1188" class="l"><a href="#1188">1188: </a>    }
-</span><span id="1189" class="l"><a href="#1189">1189: </a>
-</span><span id="1190" class="l"><a href="#1190">1190: </a>    <span class="php-comment">/**
-</span></span><span id="1191" class="l"><a href="#1191">1191: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method/HTTP-method being called
-</span></span><span id="1192" class="l"><a href="#1192">1192: </a><span class="php-comment">     *
-</span></span><span id="1193" class="l"><a href="#1193">1193: </a><span class="php-comment">     * @access protected
-</span></span><span id="1194" class="l"><a href="#1194">1194: </a><span class="php-comment">     * @return bool
-</span></span><span id="1195" class="l"><a href="#1195">1195: </a><span class="php-comment">     */</span>
-</span><span id="1196" class="l"><a href="#1196">1196: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
-</span><span id="1197" class="l"><a href="#1197">1197: </a>    {
-</span><span id="1198" class="l"><a href="#1198">1198: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
-</span><span id="1199" class="l"><a href="#1199">1199: </a>        <span class="php-var">$auth_override_class_method</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
-</span><span id="1200" class="l"><a href="#1200">1200: </a>
-</span><span id="1201" class="l"><a href="#1201">1201: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
-</span><span id="1202" class="l"><a href="#1202">1202: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>))
-</span><span id="1203" class="l"><a href="#1203">1203: </a>        {
-</span><span id="1204" class="l"><a href="#1204">1204: </a>            <span class="php-comment">// Check for wildcard flag for rules for classes</span>
-</span><span id="1205" class="l"><a href="#1205">1205: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>])) <span class="php-comment">// Check for class overrides</span>
-</span><span id="1206" class="l"><a href="#1206">1206: </a>            {
-</span><span id="1207" class="l"><a href="#1207">1207: </a>                <span class="php-comment">// No auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1208" class="l"><a href="#1208">1208: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'none'</span>)
-</span><span id="1209" class="l"><a href="#1209">1209: </a>                {
-</span><span id="1210" class="l"><a href="#1210">1210: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1211" class="l"><a href="#1211">1211: </a>                }
-</span><span id="1212" class="l"><a href="#1212">1212: </a>
-</span><span id="1213" class="l"><a href="#1213">1213: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1214" class="l"><a href="#1214">1214: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'basic'</span>)
-</span><span id="1215" class="l"><a href="#1215">1215: </a>                {
-</span><span id="1216" class="l"><a href="#1216">1216: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1217" class="l"><a href="#1217">1217: </a>
-</span><span id="1218" class="l"><a href="#1218">1218: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1219" class="l"><a href="#1219">1219: </a>                }
-</span><span id="1220" class="l"><a href="#1220">1220: </a>
-</span><span id="1221" class="l"><a href="#1221">1221: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1222" class="l"><a href="#1222">1222: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'digest'</span>)
-</span><span id="1223" class="l"><a href="#1223">1223: </a>                {
-</span><span id="1224" class="l"><a href="#1224">1224: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1225" class="l"><a href="#1225">1225: </a>
-</span><span id="1226" class="l"><a href="#1226">1226: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1227" class="l"><a href="#1227">1227: </a>                }
-</span><span id="1228" class="l"><a href="#1228">1228: </a>
-</span><span id="1229" class="l"><a href="#1229">1229: </a>                <span class="php-comment">// Session auth override found, check session</span>
-</span><span id="1230" class="l"><a href="#1230">1230: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'session'</span>)
-</span><span id="1231" class="l"><a href="#1231">1231: </a>                {
-</span><span id="1232" class="l"><a href="#1232">1232: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="1233" class="l"><a href="#1233">1233: </a>
-</span><span id="1234" class="l"><a href="#1234">1234: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1235" class="l"><a href="#1235">1235: </a>                }
-</span><span id="1236" class="l"><a href="#1236">1236: </a>
-</span><span id="1237" class="l"><a href="#1237">1237: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1238" class="l"><a href="#1238">1238: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1239" class="l"><a href="#1239">1239: </a>                {
-</span><span id="1240" class="l"><a href="#1240">1240: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1241" class="l"><a href="#1241">1241: </a>
-</span><span id="1242" class="l"><a href="#1242">1242: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1243" class="l"><a href="#1243">1243: </a>                }
-</span><span id="1244" class="l"><a href="#1244">1244: </a>            }
-</span><span id="1245" class="l"><a href="#1245">1245: </a>
-</span><span id="1246" class="l"><a href="#1246">1246: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
-</span><span id="1247" class="l"><a href="#1247">1247: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
-</span><span id="1248" class="l"><a href="#1248">1248: </a>            {
-</span><span id="1249" class="l"><a href="#1249">1249: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1250" class="l"><a href="#1250">1250: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'none'</span>)
-</span><span id="1251" class="l"><a href="#1251">1251: </a>                {
-</span><span id="1252" class="l"><a href="#1252">1252: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1253" class="l"><a href="#1253">1253: </a>                }
-</span><span id="1254" class="l"><a href="#1254">1254: </a>
-</span><span id="1255" class="l"><a href="#1255">1255: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1256" class="l"><a href="#1256">1256: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'basic'</span>)
-</span><span id="1257" class="l"><a href="#1257">1257: </a>                {
-</span><span id="1258" class="l"><a href="#1258">1258: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1259" class="l"><a href="#1259">1259: </a>
-</span><span id="1260" class="l"><a href="#1260">1260: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1261" class="l"><a href="#1261">1261: </a>                }
-</span><span id="1262" class="l"><a href="#1262">1262: </a>
-</span><span id="1263" class="l"><a href="#1263">1263: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1264" class="l"><a href="#1264">1264: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'digest'</span>)
-</span><span id="1265" class="l"><a href="#1265">1265: </a>                {
-</span><span id="1266" class="l"><a href="#1266">1266: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1267" class="l"><a href="#1267">1267: </a>
-</span><span id="1268" class="l"><a href="#1268">1268: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1269" class="l"><a href="#1269">1269: </a>                }
-</span><span id="1270" class="l"><a href="#1270">1270: </a>
-</span><span id="1271" class="l"><a href="#1271">1271: </a>                <span class="php-comment">// Session auth override found, check session</span>
-</span><span id="1272" class="l"><a href="#1272">1272: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'session'</span>)
-</span><span id="1273" class="l"><a href="#1273">1273: </a>                {
-</span><span id="1274" class="l"><a href="#1274">1274: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="1275" class="l"><a href="#1275">1275: </a>
-</span><span id="1276" class="l"><a href="#1276">1276: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1277" class="l"><a href="#1277">1277: </a>                }
-</span><span id="1278" class="l"><a href="#1278">1278: </a>
-</span><span id="1279" class="l"><a href="#1279">1279: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1280" class="l"><a href="#1280">1280: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1281" class="l"><a href="#1281">1281: </a>                {
-</span><span id="1282" class="l"><a href="#1282">1282: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1283" class="l"><a href="#1283">1283: </a>
-</span><span id="1284" class="l"><a href="#1284">1284: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1285" class="l"><a href="#1285">1285: </a>                }
-</span><span id="1286" class="l"><a href="#1286">1286: </a>            }
-</span><span id="1287" class="l"><a href="#1287">1287: </a>        }
-</span><span id="1288" class="l"><a href="#1288">1288: </a>
-</span><span id="1289" class="l"><a href="#1289">1289: </a>        <span class="php-comment">// Assign the class/method/HTTP-method auth type override array from the config</span>
-</span><span id="1290" class="l"><a href="#1290">1290: </a>        <span class="php-var">$auth_override_class_method_http</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method_http'</span>);
-</span><span id="1291" class="l"><a href="#1291">1291: </a>
-</span><span id="1292" class="l"><a href="#1292">1292: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
-</span><span id="1293" class="l"><a href="#1293">1293: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>))
-</span><span id="1294" class="l"><a href="#1294">1294: </a>        {
-</span><span id="1295" class="l"><a href="#1295">1295: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="1296" class="l"><a href="#1296">1296: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method]))
-</span><span id="1297" class="l"><a href="#1297">1297: </a>            {
-</span><span id="1298" class="l"><a href="#1298">1298: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1299" class="l"><a href="#1299">1299: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
-</span><span id="1300" class="l"><a href="#1300">1300: </a>                {
-</span><span id="1301" class="l"><a href="#1301">1301: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1302" class="l"><a href="#1302">1302: </a>                }
+</span><span id="1060" class="l"><a href="#1060">1060: </a>            <span class="php-var">$return_langs</span> = [];
+</span><span id="1061" class="l"><a href="#1061">1061: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
+</span><span id="1062" class="l"><a href="#1062">1062: </a>            {
+</span><span id="1063" class="l"><a href="#1063">1063: </a>                <span class="php-comment">// Remove weight and trim leading and trailing whitespace</span>
+</span><span id="1064" class="l"><a href="#1064">1064: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
+</span><span id="1065" class="l"><a href="#1065">1065: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
+</span><span id="1066" class="l"><a href="#1066">1066: </a>            }
+</span><span id="1067" class="l"><a href="#1067">1067: </a>
+</span><span id="1068" class="l"><a href="#1068">1068: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
+</span><span id="1069" class="l"><a href="#1069">1069: </a>        }
+</span><span id="1070" class="l"><a href="#1070">1070: </a>
+</span><span id="1071" class="l"><a href="#1071">1071: </a>        <span class="php-comment">// Otherwise simply return as a string</span>
+</span><span id="1072" class="l"><a href="#1072">1072: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
+</span><span id="1073" class="l"><a href="#1073">1073: </a>    }
+</span><span id="1074" class="l"><a href="#1074">1074: </a>
+</span><span id="1075" class="l"><a href="#1075">1075: </a>    <span class="php-comment">/**
+</span></span><span id="1076" class="l"><a href="#1076">1076: </a><span class="php-comment">     * Add the request to the log table
+</span></span><span id="1077" class="l"><a href="#1077">1077: </a><span class="php-comment">     *
+</span></span><span id="1078" class="l"><a href="#1078">1078: </a><span class="php-comment">     * @access protected
+</span></span><span id="1079" class="l"><a href="#1079">1079: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
+</span></span><span id="1080" class="l"><a href="#1080">1080: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
+</span></span><span id="1081" class="l"><a href="#1081">1081: </a><span class="php-comment">     */</span>
+</span><span id="1082" class="l"><a href="#1082">1082: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="1083" class="l"><a href="#1083">1083: </a>    {
+</span><span id="1084" class="l"><a href="#1084">1084: </a>        <span class="php-comment">// Insert the request into the log table</span>
+</span><span id="1085" class="l"><a href="#1085">1085: </a>        <span class="php-var">$is_inserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1086" class="l"><a href="#1086">1086: </a>            -&gt;insert(
+</span><span id="1087" class="l"><a href="#1087">1087: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
+</span><span id="1088" class="l"><a href="#1088">1088: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
+</span><span id="1089" class="l"><a href="#1089">1089: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
+</span><span id="1090" class="l"><a href="#1090">1090: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
+</span><span id="1091" class="l"><a href="#1091">1091: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="1092" class="l"><a href="#1092">1092: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
+</span><span id="1093" class="l"><a href="#1093">1093: </a>                <span class="php-quote">'time'</span> =&gt; <span class="php-keyword2">time</span>(),
+</span><span id="1094" class="l"><a href="#1094">1094: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
+</span><span id="1095" class="l"><a href="#1095">1095: </a>            ]);
+</span><span id="1096" class="l"><a href="#1096">1096: </a>
+</span><span id="1097" class="l"><a href="#1097">1097: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
+</span><span id="1098" class="l"><a href="#1098">1098: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
+</span><span id="1099" class="l"><a href="#1099">1099: </a>
+</span><span id="1100" class="l"><a href="#1100">1100: </a>        <span class="php-keyword1">return</span> <span class="php-var">$is_inserted</span>;
+</span><span id="1101" class="l"><a href="#1101">1101: </a>    }
+</span><span id="1102" class="l"><a href="#1102">1102: </a>
+</span><span id="1103" class="l"><a href="#1103">1103: </a>    <span class="php-comment">/**
+</span></span><span id="1104" class="l"><a href="#1104">1104: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
+</span></span><span id="1105" class="l"><a href="#1105">1105: </a><span class="php-comment">     *
+</span></span><span id="1106" class="l"><a href="#1106">1106: </a><span class="php-comment">     * @access protected
+</span></span><span id="1107" class="l"><a href="#1107">1107: </a><span class="php-comment">     * @param  string $controller_method The method being called
+</span></span><span id="1108" class="l"><a href="#1108">1108: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
+</span></span><span id="1109" class="l"><a href="#1109">1109: </a><span class="php-comment">     */</span>
+</span><span id="1110" class="l"><a href="#1110">1110: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
+</span><span id="1111" class="l"><a href="#1111">1111: </a>    {
+</span><span id="1112" class="l"><a href="#1112">1112: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
+</span><span id="1113" class="l"><a href="#1113">1113: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1114" class="l"><a href="#1114">1114: </a>        {
+</span><span id="1115" class="l"><a href="#1115">1115: </a>            <span class="php-comment">// Everything is fine</span>
+</span><span id="1116" class="l"><a href="#1116">1116: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1117" class="l"><a href="#1117">1117: </a>        }
+</span><span id="1118" class="l"><a href="#1118">1118: </a>
+</span><span id="1119" class="l"><a href="#1119">1119: </a>        <span class="php-keyword1">switch</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_method'</span>))
+</span><span id="1120" class="l"><a href="#1120">1120: </a>        {
+</span><span id="1121" class="l"><a href="#1121">1121: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'API_KEY'</span>:
+</span><span id="1122" class="l"><a href="#1122">1122: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'api-key:'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>);
+</span><span id="1123" class="l"><a href="#1123">1123: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>;
+</span><span id="1124" class="l"><a href="#1124">1124: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1125" class="l"><a href="#1125">1125: </a>
+</span><span id="1126" class="l"><a href="#1126">1126: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'METHOD_NAME'</span>:
+</span><span id="1127" class="l"><a href="#1127">1127: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'method-name:'</span> . <span class="php-var">$controller_method</span>;
+</span><span id="1128" class="l"><a href="#1128">1128: </a>            <span class="php-var">$limited_method_name</span> =  <span class="php-var">$controller_method</span>;
+</span><span id="1129" class="l"><a href="#1129">1129: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1130" class="l"><a href="#1130">1130: </a>
+</span><span id="1131" class="l"><a href="#1131">1131: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'ROUTED_URL'</span>:
+</span><span id="1132" class="l"><a href="#1132">1132: </a>          <span class="php-keyword1">default</span>:
+</span><span id="1133" class="l"><a href="#1133">1133: </a>            <span class="php-var">$limited_uri</span> = <span class="php-var">$this</span>-&gt;uri-&gt;ruri_string();
+</span><span id="1134" class="l"><a href="#1134">1134: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$limited_uri</span>), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
+</span><span id="1135" class="l"><a href="#1135">1135: </a>            {
+</span><span id="1136" class="l"><a href="#1136">1136: </a>                <span class="php-var">$limited_uri</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$limited_uri</span>,<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format) - <span class="php-num">1</span>);
+</span><span id="1137" class="l"><a href="#1137">1137: </a>            }
+</span><span id="1138" class="l"><a href="#1138">1138: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'uri:'</span>.<span class="php-var">$limited_uri</span>.<span class="php-quote">':'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method; <span class="php-comment">// It's good to differentiate GET from PUT</span>
+</span><span id="1139" class="l"><a href="#1139">1139: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-var">$controller_method</span>;
+</span><span id="1140" class="l"><a href="#1140">1140: </a>            <span class="php-keyword1">break</span>;
+</span><span id="1141" class="l"><a href="#1141">1141: </a>        }
+</span><span id="1142" class="l"><a href="#1142">1142: </a>
+</span><span id="1143" class="l"><a href="#1143">1143: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span> )
+</span><span id="1144" class="l"><a href="#1144">1144: </a>        {
+</span><span id="1145" class="l"><a href="#1145">1145: </a>            <span class="php-comment">// Everything is fine</span>
+</span><span id="1146" class="l"><a href="#1146">1146: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1147" class="l"><a href="#1147">1147: </a>        }
+</span><span id="1148" class="l"><a href="#1148">1148: </a>
+</span><span id="1149" class="l"><a href="#1149">1149: </a>        <span class="php-comment">// How many times can you get to this method in a defined time_limit (default: 1 hour)?</span>
+</span><span id="1150" class="l"><a href="#1150">1150: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>];
+</span><span id="1151" class="l"><a href="#1151">1151: </a>
+</span><span id="1152" class="l"><a href="#1152">1152: </a>        <span class="php-var">$time_limit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>] : <span class="php-num">3600</span>); <span class="php-comment">// 3600 = 60 * 60</span>
+</span><span id="1153" class="l"><a href="#1153">1153: </a>
+</span><span id="1154" class="l"><a href="#1154">1154: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
+</span><span id="1155" class="l"><a href="#1155">1155: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1156" class="l"><a href="#1156">1156: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1157" class="l"><a href="#1157">1157: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1158" class="l"><a href="#1158">1158: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
+</span><span id="1159" class="l"><a href="#1159">1159: </a>            -&gt;row();
+</span><span id="1160" class="l"><a href="#1160">1160: </a>
+</span><span id="1161" class="l"><a href="#1161">1161: </a>        <span class="php-comment">// No calls have been made for this key</span>
+</span><span id="1162" class="l"><a href="#1162">1162: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1163" class="l"><a href="#1163">1163: </a>        {
+</span><span id="1164" class="l"><a href="#1164">1164: </a>            <span class="php-comment">// Create a new row for the following key</span>
+</span><span id="1165" class="l"><a href="#1165">1165: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
+</span><span id="1166" class="l"><a href="#1166">1166: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$limited_uri</span>,
+</span><span id="1167" class="l"><a href="#1167">1167: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
+</span><span id="1168" class="l"><a href="#1168">1168: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
+</span><span id="1169" class="l"><a href="#1169">1169: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
+</span><span id="1170" class="l"><a href="#1170">1170: </a>            ]);
+</span><span id="1171" class="l"><a href="#1171">1171: </a>        }
+</span><span id="1172" class="l"><a href="#1172">1172: </a>
+</span><span id="1173" class="l"><a href="#1173">1173: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
+</span><span id="1174" class="l"><a href="#1174">1174: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$time_limit</span>))
+</span><span id="1175" class="l"><a href="#1175">1175: </a>        {
+</span><span id="1176" class="l"><a href="#1176">1176: </a>            <span class="php-comment">// Reset the started period and count</span>
+</span><span id="1177" class="l"><a href="#1177">1177: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1178" class="l"><a href="#1178">1178: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1179" class="l"><a href="#1179">1179: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
+</span><span id="1180" class="l"><a href="#1180">1180: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
+</span><span id="1181" class="l"><a href="#1181">1181: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
+</span><span id="1182" class="l"><a href="#1182">1182: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1183" class="l"><a href="#1183">1183: </a>        }
+</span><span id="1184" class="l"><a href="#1184">1184: </a>
+</span><span id="1185" class="l"><a href="#1185">1185: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
+</span><span id="1186" class="l"><a href="#1186">1186: </a>        <span class="php-keyword1">else</span>
+</span><span id="1187" class="l"><a href="#1187">1187: </a>        {
+</span><span id="1188" class="l"><a href="#1188">1188: </a>            <span class="php-comment">// The limit has been exceeded</span>
+</span><span id="1189" class="l"><a href="#1189">1189: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
+</span><span id="1190" class="l"><a href="#1190">1190: </a>            {
+</span><span id="1191" class="l"><a href="#1191">1191: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1192" class="l"><a href="#1192">1192: </a>            }
+</span><span id="1193" class="l"><a href="#1193">1193: </a>
+</span><span id="1194" class="l"><a href="#1194">1194: </a>            <span class="php-comment">// Increase the count by one</span>
+</span><span id="1195" class="l"><a href="#1195">1195: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="1196" class="l"><a href="#1196">1196: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
+</span><span id="1197" class="l"><a href="#1197">1197: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="1198" class="l"><a href="#1198">1198: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
+</span><span id="1199" class="l"><a href="#1199">1199: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
+</span><span id="1200" class="l"><a href="#1200">1200: </a>        }
+</span><span id="1201" class="l"><a href="#1201">1201: </a>
+</span><span id="1202" class="l"><a href="#1202">1202: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1203" class="l"><a href="#1203">1203: </a>    }
+</span><span id="1204" class="l"><a href="#1204">1204: </a>
+</span><span id="1205" class="l"><a href="#1205">1205: </a>    <span class="php-comment">/**
+</span></span><span id="1206" class="l"><a href="#1206">1206: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method/HTTP-method being called
+</span></span><span id="1207" class="l"><a href="#1207">1207: </a><span class="php-comment">     *
+</span></span><span id="1208" class="l"><a href="#1208">1208: </a><span class="php-comment">     * @access protected
+</span></span><span id="1209" class="l"><a href="#1209">1209: </a><span class="php-comment">     * @return bool
+</span></span><span id="1210" class="l"><a href="#1210">1210: </a><span class="php-comment">     */</span>
+</span><span id="1211" class="l"><a href="#1211">1211: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
+</span><span id="1212" class="l"><a href="#1212">1212: </a>    {
+</span><span id="1213" class="l"><a href="#1213">1213: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
+</span><span id="1214" class="l"><a href="#1214">1214: </a>        <span class="php-var">$auth_override_class_method</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
+</span><span id="1215" class="l"><a href="#1215">1215: </a>
+</span><span id="1216" class="l"><a href="#1216">1216: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
+</span><span id="1217" class="l"><a href="#1217">1217: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>))
+</span><span id="1218" class="l"><a href="#1218">1218: </a>        {
+</span><span id="1219" class="l"><a href="#1219">1219: </a>            <span class="php-comment">// Check for wildcard flag for rules for classes</span>
+</span><span id="1220" class="l"><a href="#1220">1220: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>])) <span class="php-comment">// Check for class overrides</span>
+</span><span id="1221" class="l"><a href="#1221">1221: </a>            {
+</span><span id="1222" class="l"><a href="#1222">1222: </a>                <span class="php-comment">// No auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1223" class="l"><a href="#1223">1223: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'none'</span>)
+</span><span id="1224" class="l"><a href="#1224">1224: </a>                {
+</span><span id="1225" class="l"><a href="#1225">1225: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1226" class="l"><a href="#1226">1226: </a>                }
+</span><span id="1227" class="l"><a href="#1227">1227: </a>
+</span><span id="1228" class="l"><a href="#1228">1228: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1229" class="l"><a href="#1229">1229: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'basic'</span>)
+</span><span id="1230" class="l"><a href="#1230">1230: </a>                {
+</span><span id="1231" class="l"><a href="#1231">1231: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1232" class="l"><a href="#1232">1232: </a>
+</span><span id="1233" class="l"><a href="#1233">1233: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1234" class="l"><a href="#1234">1234: </a>                }
+</span><span id="1235" class="l"><a href="#1235">1235: </a>
+</span><span id="1236" class="l"><a href="#1236">1236: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1237" class="l"><a href="#1237">1237: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'digest'</span>)
+</span><span id="1238" class="l"><a href="#1238">1238: </a>                {
+</span><span id="1239" class="l"><a href="#1239">1239: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1240" class="l"><a href="#1240">1240: </a>
+</span><span id="1241" class="l"><a href="#1241">1241: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1242" class="l"><a href="#1242">1242: </a>                }
+</span><span id="1243" class="l"><a href="#1243">1243: </a>
+</span><span id="1244" class="l"><a href="#1244">1244: </a>                <span class="php-comment">// Session auth override found, check session</span>
+</span><span id="1245" class="l"><a href="#1245">1245: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'session'</span>)
+</span><span id="1246" class="l"><a href="#1246">1246: </a>                {
+</span><span id="1247" class="l"><a href="#1247">1247: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="1248" class="l"><a href="#1248">1248: </a>
+</span><span id="1249" class="l"><a href="#1249">1249: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1250" class="l"><a href="#1250">1250: </a>                }
+</span><span id="1251" class="l"><a href="#1251">1251: </a>
+</span><span id="1252" class="l"><a href="#1252">1252: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1253" class="l"><a href="#1253">1253: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1254" class="l"><a href="#1254">1254: </a>                {
+</span><span id="1255" class="l"><a href="#1255">1255: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1256" class="l"><a href="#1256">1256: </a>
+</span><span id="1257" class="l"><a href="#1257">1257: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1258" class="l"><a href="#1258">1258: </a>                }
+</span><span id="1259" class="l"><a href="#1259">1259: </a>            }
+</span><span id="1260" class="l"><a href="#1260">1260: </a>
+</span><span id="1261" class="l"><a href="#1261">1261: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
+</span><span id="1262" class="l"><a href="#1262">1262: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
+</span><span id="1263" class="l"><a href="#1263">1263: </a>            {
+</span><span id="1264" class="l"><a href="#1264">1264: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1265" class="l"><a href="#1265">1265: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'none'</span>)
+</span><span id="1266" class="l"><a href="#1266">1266: </a>                {
+</span><span id="1267" class="l"><a href="#1267">1267: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1268" class="l"><a href="#1268">1268: </a>                }
+</span><span id="1269" class="l"><a href="#1269">1269: </a>
+</span><span id="1270" class="l"><a href="#1270">1270: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1271" class="l"><a href="#1271">1271: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'basic'</span>)
+</span><span id="1272" class="l"><a href="#1272">1272: </a>                {
+</span><span id="1273" class="l"><a href="#1273">1273: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1274" class="l"><a href="#1274">1274: </a>
+</span><span id="1275" class="l"><a href="#1275">1275: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1276" class="l"><a href="#1276">1276: </a>                }
+</span><span id="1277" class="l"><a href="#1277">1277: </a>
+</span><span id="1278" class="l"><a href="#1278">1278: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1279" class="l"><a href="#1279">1279: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'digest'</span>)
+</span><span id="1280" class="l"><a href="#1280">1280: </a>                {
+</span><span id="1281" class="l"><a href="#1281">1281: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1282" class="l"><a href="#1282">1282: </a>
+</span><span id="1283" class="l"><a href="#1283">1283: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1284" class="l"><a href="#1284">1284: </a>                }
+</span><span id="1285" class="l"><a href="#1285">1285: </a>
+</span><span id="1286" class="l"><a href="#1286">1286: </a>                <span class="php-comment">// Session auth override found, check session</span>
+</span><span id="1287" class="l"><a href="#1287">1287: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'session'</span>)
+</span><span id="1288" class="l"><a href="#1288">1288: </a>                {
+</span><span id="1289" class="l"><a href="#1289">1289: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="1290" class="l"><a href="#1290">1290: </a>
+</span><span id="1291" class="l"><a href="#1291">1291: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1292" class="l"><a href="#1292">1292: </a>                }
+</span><span id="1293" class="l"><a href="#1293">1293: </a>
+</span><span id="1294" class="l"><a href="#1294">1294: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1295" class="l"><a href="#1295">1295: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1296" class="l"><a href="#1296">1296: </a>                {
+</span><span id="1297" class="l"><a href="#1297">1297: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1298" class="l"><a href="#1298">1298: </a>
+</span><span id="1299" class="l"><a href="#1299">1299: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1300" class="l"><a href="#1300">1300: </a>                }
+</span><span id="1301" class="l"><a href="#1301">1301: </a>            }
+</span><span id="1302" class="l"><a href="#1302">1302: </a>        }
 </span><span id="1303" class="l"><a href="#1303">1303: </a>
-</span><span id="1304" class="l"><a href="#1304">1304: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1305" class="l"><a href="#1305">1305: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
-</span><span id="1306" class="l"><a href="#1306">1306: </a>                {
-</span><span id="1307" class="l"><a href="#1307">1307: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1308" class="l"><a href="#1308">1308: </a>
-</span><span id="1309" class="l"><a href="#1309">1309: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1310" class="l"><a href="#1310">1310: </a>                }
-</span><span id="1311" class="l"><a href="#1311">1311: </a>
-</span><span id="1312" class="l"><a href="#1312">1312: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1313" class="l"><a href="#1313">1313: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
-</span><span id="1314" class="l"><a href="#1314">1314: </a>                {
-</span><span id="1315" class="l"><a href="#1315">1315: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1316" class="l"><a href="#1316">1316: </a>
-</span><span id="1317" class="l"><a href="#1317">1317: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1318" class="l"><a href="#1318">1318: </a>                }
-</span><span id="1319" class="l"><a href="#1319">1319: </a>
-</span><span id="1320" class="l"><a href="#1320">1320: </a>                <span class="php-comment">// Session auth override found, check session</span>
-</span><span id="1321" class="l"><a href="#1321">1321: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'session'</span>)
-</span><span id="1322" class="l"><a href="#1322">1322: </a>                {
-</span><span id="1323" class="l"><a href="#1323">1323: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="1324" class="l"><a href="#1324">1324: </a>
-</span><span id="1325" class="l"><a href="#1325">1325: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1326" class="l"><a href="#1326">1326: </a>                }
-</span><span id="1327" class="l"><a href="#1327">1327: </a>
-</span><span id="1328" class="l"><a href="#1328">1328: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1329" class="l"><a href="#1329">1329: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1330" class="l"><a href="#1330">1330: </a>                {
-</span><span id="1331" class="l"><a href="#1331">1331: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1332" class="l"><a href="#1332">1332: </a>
-</span><span id="1333" class="l"><a href="#1333">1333: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1334" class="l"><a href="#1334">1334: </a>                }
-</span><span id="1335" class="l"><a href="#1335">1335: </a>            }
-</span><span id="1336" class="l"><a href="#1336">1336: </a>
-</span><span id="1337" class="l"><a href="#1337">1337: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method/HTTP-method being called</span>
-</span><span id="1338" class="l"><a href="#1338">1338: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method]))
-</span><span id="1339" class="l"><a href="#1339">1339: </a>            {
-</span><span id="1340" class="l"><a href="#1340">1340: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1341" class="l"><a href="#1341">1341: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
-</span><span id="1342" class="l"><a href="#1342">1342: </a>                {
-</span><span id="1343" class="l"><a href="#1343">1343: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1344" class="l"><a href="#1344">1344: </a>                }
-</span><span id="1345" class="l"><a href="#1345">1345: </a>
-</span><span id="1346" class="l"><a href="#1346">1346: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1347" class="l"><a href="#1347">1347: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
-</span><span id="1348" class="l"><a href="#1348">1348: </a>                {
-</span><span id="1349" class="l"><a href="#1349">1349: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1350" class="l"><a href="#1350">1350: </a>
-</span><span id="1351" class="l"><a href="#1351">1351: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1352" class="l"><a href="#1352">1352: </a>                }
-</span><span id="1353" class="l"><a href="#1353">1353: </a>
-</span><span id="1354" class="l"><a href="#1354">1354: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1355" class="l"><a href="#1355">1355: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
-</span><span id="1356" class="l"><a href="#1356">1356: </a>                {
-</span><span id="1357" class="l"><a href="#1357">1357: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1358" class="l"><a href="#1358">1358: </a>
-</span><span id="1359" class="l"><a href="#1359">1359: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1360" class="l"><a href="#1360">1360: </a>                }
-</span><span id="1361" class="l"><a href="#1361">1361: </a>
-</span><span id="1362" class="l"><a href="#1362">1362: </a>                <span class="php-comment">// Session auth override found, check session</span>
-</span><span id="1363" class="l"><a href="#1363">1363: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'session'</span>)
-</span><span id="1364" class="l"><a href="#1364">1364: </a>                {
-</span><span id="1365" class="l"><a href="#1365">1365: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="1366" class="l"><a href="#1366">1366: </a>
-</span><span id="1367" class="l"><a href="#1367">1367: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1368" class="l"><a href="#1368">1368: </a>                }
-</span><span id="1369" class="l"><a href="#1369">1369: </a>
-</span><span id="1370" class="l"><a href="#1370">1370: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1371" class="l"><a href="#1371">1371: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1372" class="l"><a href="#1372">1372: </a>                {
-</span><span id="1373" class="l"><a href="#1373">1373: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1374" class="l"><a href="#1374">1374: </a>
-</span><span id="1375" class="l"><a href="#1375">1375: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1376" class="l"><a href="#1376">1376: </a>                }
-</span><span id="1377" class="l"><a href="#1377">1377: </a>            }
-</span><span id="1378" class="l"><a href="#1378">1378: </a>        }
-</span><span id="1379" class="l"><a href="#1379">1379: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1380" class="l"><a href="#1380">1380: </a>    }
+</span><span id="1304" class="l"><a href="#1304">1304: </a>        <span class="php-comment">// Assign the class/method/HTTP-method auth type override array from the config</span>
+</span><span id="1305" class="l"><a href="#1305">1305: </a>        <span class="php-var">$auth_override_class_method_http</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method_http'</span>);
+</span><span id="1306" class="l"><a href="#1306">1306: </a>
+</span><span id="1307" class="l"><a href="#1307">1307: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
+</span><span id="1308" class="l"><a href="#1308">1308: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>))
+</span><span id="1309" class="l"><a href="#1309">1309: </a>        {
+</span><span id="1310" class="l"><a href="#1310">1310: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
+</span><span id="1311" class="l"><a href="#1311">1311: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method]))
+</span><span id="1312" class="l"><a href="#1312">1312: </a>            {
+</span><span id="1313" class="l"><a href="#1313">1313: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1314" class="l"><a href="#1314">1314: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
+</span><span id="1315" class="l"><a href="#1315">1315: </a>                {
+</span><span id="1316" class="l"><a href="#1316">1316: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1317" class="l"><a href="#1317">1317: </a>                }
+</span><span id="1318" class="l"><a href="#1318">1318: </a>
+</span><span id="1319" class="l"><a href="#1319">1319: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1320" class="l"><a href="#1320">1320: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
+</span><span id="1321" class="l"><a href="#1321">1321: </a>                {
+</span><span id="1322" class="l"><a href="#1322">1322: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1323" class="l"><a href="#1323">1323: </a>
+</span><span id="1324" class="l"><a href="#1324">1324: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1325" class="l"><a href="#1325">1325: </a>                }
+</span><span id="1326" class="l"><a href="#1326">1326: </a>
+</span><span id="1327" class="l"><a href="#1327">1327: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1328" class="l"><a href="#1328">1328: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
+</span><span id="1329" class="l"><a href="#1329">1329: </a>                {
+</span><span id="1330" class="l"><a href="#1330">1330: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1331" class="l"><a href="#1331">1331: </a>
+</span><span id="1332" class="l"><a href="#1332">1332: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1333" class="l"><a href="#1333">1333: </a>                }
+</span><span id="1334" class="l"><a href="#1334">1334: </a>
+</span><span id="1335" class="l"><a href="#1335">1335: </a>                <span class="php-comment">// Session auth override found, check session</span>
+</span><span id="1336" class="l"><a href="#1336">1336: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'session'</span>)
+</span><span id="1337" class="l"><a href="#1337">1337: </a>                {
+</span><span id="1338" class="l"><a href="#1338">1338: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
+</span><span id="1339" class="l"><a href="#1339">1339: </a>
+</span><span id="1340" class="l"><a href="#1340">1340: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1341" class="l"><a href="#1341">1341: </a>                }
+</span><span id="1342" class="l"><a href="#1342">1342: </a>
+</span><span id="1343" class="l"><a href="#1343">1343: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1344" class="l"><a href="#1344">1344: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1345" class="l"><a href="#1345">1345: </a>                {
+</span><span id="1346" class="l"><a href="#1346">1346: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1347" class="l"><a href="#1347">1347: </a>
+</span><span id="1348" class="l"><a href="#1348">1348: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1349" class="l"><a href="#1349">1349: </a>                }
+</span><span id="1350" class="l"><a href="#1350">1350: </a>            }
+</span><span id="1351" class="l"><a href="#1351">1351: </a>
+</span><span id="1352" class="l"><a href="#1352">1352: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method/HTTP-method being called</span>
+</span><span id="1353" class="l"><a href="#1353">1353: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method]))
+</span><span id="1354" class="l"><a href="#1354">1354: </a>            {
+</span><span id="1355" class="l"><a href="#1355">1355: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
+</span><span id="1356" class="l"><a href="#1356">1356: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
+</span><span id="1357" class="l"><a href="#1357">1357: </a>                {
+</span><span id="1358" class="l"><a href="#1358">1358: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1359" class="l"><a href="#1359">1359: </a>                }
+</span><span id="1360" class="l"><a href="#1360">1360: </a>
+</span><span id="1361" class="l"><a href="#1361">1361: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
+</span><span id="1362" class="l"><a href="#1362">1362: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
+</span><span id="1363" class="l"><a href="#1363">1363: </a>                {
+</span><span id="1364" class="l"><a href="#1364">1364: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
+</span><span id="1365" class="l"><a href="#1365">1365: </a>
+</span><span id="1366" class="l"><a href="#1366">1366: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1367" class="l"><a href="#1367">1367: </a>                }
+</span><span id="1368" class="l"><a href="#1368">1368: </a>
+</span><span id="1369" class="l"><a href="#1369">1369: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
+</span><span id="1370" class="l"><a href="#1370">1370: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
+</span><span id="1371" class="l"><a href="#1371">1371: </a>                {
+</span><span id="1372" class="l"><a href="#1372">1372: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
+</span><span id="1373" class="l"><a href="#1373">1373: </a>
+</span><span id="1374" class="l"><a href="#1374">1374: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1375" class="l"><a href="#1375">1375: </a>                }
+</span><span id="1376" class="l"><a href="#1376">1376: </a>
+</span><span id="1377" class="l"><a href="#1377">1377: </a>                <span class="php-comment">// Session auth override found, check session</span>
+</span><span id="1378" class="l"><a href="#1378">1378: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'session'</span>)
+</span><span id="1379" class="l"><a href="#1379">1379: </a>                {
+</span><span id="1380" class="l"><a href="#1380">1380: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
 </span><span id="1381" class="l"><a href="#1381">1381: </a>
-</span><span id="1382" class="l"><a href="#1382">1382: </a>    <span class="php-comment">/**
-</span></span><span id="1383" class="l"><a href="#1383">1383: </a><span class="php-comment">     * Parse the GET request arguments
-</span></span><span id="1384" class="l"><a href="#1384">1384: </a><span class="php-comment">     *
-</span></span><span id="1385" class="l"><a href="#1385">1385: </a><span class="php-comment">     * @access protected
-</span></span><span id="1386" class="l"><a href="#1386">1386: </a><span class="php-comment">     * @return void
-</span></span><span id="1387" class="l"><a href="#1387">1387: </a><span class="php-comment">     */</span>
-</span><span id="1388" class="l"><a href="#1388">1388: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
-</span><span id="1389" class="l"><a href="#1389">1389: </a>    {
-</span><span id="1390" class="l"><a href="#1390">1390: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
-</span><span id="1391" class="l"><a href="#1391">1391: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
-</span><span id="1392" class="l"><a href="#1392">1392: </a>    }
-</span><span id="1393" class="l"><a href="#1393">1393: </a>
-</span><span id="1394" class="l"><a href="#1394">1394: </a>    <span class="php-comment">/**
-</span></span><span id="1395" class="l"><a href="#1395">1395: </a><span class="php-comment">     * Parse the POST request arguments
-</span></span><span id="1396" class="l"><a href="#1396">1396: </a><span class="php-comment">     *
-</span></span><span id="1397" class="l"><a href="#1397">1397: </a><span class="php-comment">     * @access protected
-</span></span><span id="1398" class="l"><a href="#1398">1398: </a><span class="php-comment">     * @return void
-</span></span><span id="1399" class="l"><a href="#1399">1399: </a><span class="php-comment">     */</span>
-</span><span id="1400" class="l"><a href="#1400">1400: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
-</span><span id="1401" class="l"><a href="#1401">1401: </a>    {
-</span><span id="1402" class="l"><a href="#1402">1402: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
-</span><span id="1403" class="l"><a href="#1403">1403: </a>
-</span><span id="1404" class="l"><a href="#1404">1404: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1405" class="l"><a href="#1405">1405: </a>        {
-</span><span id="1406" class="l"><a href="#1406">1406: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1407" class="l"><a href="#1407">1407: </a>        }
-</span><span id="1408" class="l"><a href="#1408">1408: </a>    }
-</span><span id="1409" class="l"><a href="#1409">1409: </a>
-</span><span id="1410" class="l"><a href="#1410">1410: </a>    <span class="php-comment">/**
-</span></span><span id="1411" class="l"><a href="#1411">1411: </a><span class="php-comment">     * Parse the PUT request arguments
-</span></span><span id="1412" class="l"><a href="#1412">1412: </a><span class="php-comment">     *
-</span></span><span id="1413" class="l"><a href="#1413">1413: </a><span class="php-comment">     * @access protected
-</span></span><span id="1414" class="l"><a href="#1414">1414: </a><span class="php-comment">     * @return void
-</span></span><span id="1415" class="l"><a href="#1415">1415: </a><span class="php-comment">     */</span>
-</span><span id="1416" class="l"><a href="#1416">1416: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
-</span><span id="1417" class="l"><a href="#1417">1417: </a>    {
-</span><span id="1418" class="l"><a href="#1418">1418: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1419" class="l"><a href="#1419">1419: </a>        {
-</span><span id="1420" class="l"><a href="#1420">1420: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1421" class="l"><a href="#1421">1421: </a>        }
-</span><span id="1422" class="l"><a href="#1422">1422: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
-</span><span id="1423" class="l"><a href="#1423">1423: </a>        {
-</span><span id="1424" class="l"><a href="#1424">1424: </a>           <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1425" class="l"><a href="#1425">1425: </a>           <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1426" class="l"><a href="#1426">1426: </a>        }
-</span><span id="1427" class="l"><a href="#1427">1427: </a>    }
-</span><span id="1428" class="l"><a href="#1428">1428: </a>
-</span><span id="1429" class="l"><a href="#1429">1429: </a>    <span class="php-comment">/**
-</span></span><span id="1430" class="l"><a href="#1430">1430: </a><span class="php-comment">     * Parse the HEAD request arguments
-</span></span><span id="1431" class="l"><a href="#1431">1431: </a><span class="php-comment">     *
-</span></span><span id="1432" class="l"><a href="#1432">1432: </a><span class="php-comment">     * @access protected
-</span></span><span id="1433" class="l"><a href="#1433">1433: </a><span class="php-comment">     * @return void
-</span></span><span id="1434" class="l"><a href="#1434">1434: </a><span class="php-comment">     */</span>
-</span><span id="1435" class="l"><a href="#1435">1435: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
-</span><span id="1436" class="l"><a href="#1436">1436: </a>    {
-</span><span id="1437" class="l"><a href="#1437">1437: </a>        <span class="php-comment">// Parse the HEAD variables</span>
-</span><span id="1438" class="l"><a href="#1438">1438: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
-</span><span id="1439" class="l"><a href="#1439">1439: </a>
-</span><span id="1440" class="l"><a href="#1440">1440: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
-</span><span id="1441" class="l"><a href="#1441">1441: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
+</span><span id="1382" class="l"><a href="#1382">1382: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1383" class="l"><a href="#1383">1383: </a>                }
+</span><span id="1384" class="l"><a href="#1384">1384: </a>
+</span><span id="1385" class="l"><a href="#1385">1385: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
+</span><span id="1386" class="l"><a href="#1386">1386: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
+</span><span id="1387" class="l"><a href="#1387">1387: </a>                {
+</span><span id="1388" class="l"><a href="#1388">1388: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1389" class="l"><a href="#1389">1389: </a>
+</span><span id="1390" class="l"><a href="#1390">1390: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1391" class="l"><a href="#1391">1391: </a>                }
+</span><span id="1392" class="l"><a href="#1392">1392: </a>            }
+</span><span id="1393" class="l"><a href="#1393">1393: </a>        }
+</span><span id="1394" class="l"><a href="#1394">1394: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1395" class="l"><a href="#1395">1395: </a>    }
+</span><span id="1396" class="l"><a href="#1396">1396: </a>
+</span><span id="1397" class="l"><a href="#1397">1397: </a>    <span class="php-comment">/**
+</span></span><span id="1398" class="l"><a href="#1398">1398: </a><span class="php-comment">     * Parse the GET request arguments
+</span></span><span id="1399" class="l"><a href="#1399">1399: </a><span class="php-comment">     *
+</span></span><span id="1400" class="l"><a href="#1400">1400: </a><span class="php-comment">     * @access protected
+</span></span><span id="1401" class="l"><a href="#1401">1401: </a><span class="php-comment">     * @return void
+</span></span><span id="1402" class="l"><a href="#1402">1402: </a><span class="php-comment">     */</span>
+</span><span id="1403" class="l"><a href="#1403">1403: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
+</span><span id="1404" class="l"><a href="#1404">1404: </a>    {
+</span><span id="1405" class="l"><a href="#1405">1405: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
+</span><span id="1406" class="l"><a href="#1406">1406: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
+</span><span id="1407" class="l"><a href="#1407">1407: </a>    }
+</span><span id="1408" class="l"><a href="#1408">1408: </a>
+</span><span id="1409" class="l"><a href="#1409">1409: </a>    <span class="php-comment">/**
+</span></span><span id="1410" class="l"><a href="#1410">1410: </a><span class="php-comment">     * Parse the POST request arguments
+</span></span><span id="1411" class="l"><a href="#1411">1411: </a><span class="php-comment">     *
+</span></span><span id="1412" class="l"><a href="#1412">1412: </a><span class="php-comment">     * @access protected
+</span></span><span id="1413" class="l"><a href="#1413">1413: </a><span class="php-comment">     * @return void
+</span></span><span id="1414" class="l"><a href="#1414">1414: </a><span class="php-comment">     */</span>
+</span><span id="1415" class="l"><a href="#1415">1415: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
+</span><span id="1416" class="l"><a href="#1416">1416: </a>    {
+</span><span id="1417" class="l"><a href="#1417">1417: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
+</span><span id="1418" class="l"><a href="#1418">1418: </a>
+</span><span id="1419" class="l"><a href="#1419">1419: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1420" class="l"><a href="#1420">1420: </a>        {
+</span><span id="1421" class="l"><a href="#1421">1421: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1422" class="l"><a href="#1422">1422: </a>        }
+</span><span id="1423" class="l"><a href="#1423">1423: </a>    }
+</span><span id="1424" class="l"><a href="#1424">1424: </a>
+</span><span id="1425" class="l"><a href="#1425">1425: </a>    <span class="php-comment">/**
+</span></span><span id="1426" class="l"><a href="#1426">1426: </a><span class="php-comment">     * Parse the PUT request arguments
+</span></span><span id="1427" class="l"><a href="#1427">1427: </a><span class="php-comment">     *
+</span></span><span id="1428" class="l"><a href="#1428">1428: </a><span class="php-comment">     * @access protected
+</span></span><span id="1429" class="l"><a href="#1429">1429: </a><span class="php-comment">     * @return void
+</span></span><span id="1430" class="l"><a href="#1430">1430: </a><span class="php-comment">     */</span>
+</span><span id="1431" class="l"><a href="#1431">1431: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
+</span><span id="1432" class="l"><a href="#1432">1432: </a>    {
+</span><span id="1433" class="l"><a href="#1433">1433: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1434" class="l"><a href="#1434">1434: </a>        {
+</span><span id="1435" class="l"><a href="#1435">1435: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1436" class="l"><a href="#1436">1436: </a>        }
+</span><span id="1437" class="l"><a href="#1437">1437: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
+</span><span id="1438" class="l"><a href="#1438">1438: </a>        {
+</span><span id="1439" class="l"><a href="#1439">1439: </a>           <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1440" class="l"><a href="#1440">1440: </a>           <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1441" class="l"><a href="#1441">1441: </a>        }
 </span><span id="1442" class="l"><a href="#1442">1442: </a>    }
 </span><span id="1443" class="l"><a href="#1443">1443: </a>
 </span><span id="1444" class="l"><a href="#1444">1444: </a>    <span class="php-comment">/**
-</span></span><span id="1445" class="l"><a href="#1445">1445: </a><span class="php-comment">     * Parse the OPTIONS request arguments
+</span></span><span id="1445" class="l"><a href="#1445">1445: </a><span class="php-comment">     * Parse the HEAD request arguments
 </span></span><span id="1446" class="l"><a href="#1446">1446: </a><span class="php-comment">     *
 </span></span><span id="1447" class="l"><a href="#1447">1447: </a><span class="php-comment">     * @access protected
 </span></span><span id="1448" class="l"><a href="#1448">1448: </a><span class="php-comment">     * @return void
 </span></span><span id="1449" class="l"><a href="#1449">1449: </a><span class="php-comment">     */</span>
-</span><span id="1450" class="l"><a href="#1450">1450: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
+</span><span id="1450" class="l"><a href="#1450">1450: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
 </span><span id="1451" class="l"><a href="#1451">1451: </a>    {
-</span><span id="1452" class="l"><a href="#1452">1452: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
-</span><span id="1453" class="l"><a href="#1453">1453: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
+</span><span id="1452" class="l"><a href="#1452">1452: </a>        <span class="php-comment">// Parse the HEAD variables</span>
+</span><span id="1453" class="l"><a href="#1453">1453: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
 </span><span id="1454" class="l"><a href="#1454">1454: </a>
-</span><span id="1455" class="l"><a href="#1455">1455: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
-</span><span id="1456" class="l"><a href="#1456">1456: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
+</span><span id="1455" class="l"><a href="#1455">1455: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
+</span><span id="1456" class="l"><a href="#1456">1456: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
 </span><span id="1457" class="l"><a href="#1457">1457: </a>    }
 </span><span id="1458" class="l"><a href="#1458">1458: </a>
 </span><span id="1459" class="l"><a href="#1459">1459: </a>    <span class="php-comment">/**
-</span></span><span id="1460" class="l"><a href="#1460">1460: </a><span class="php-comment">     * Parse the PATCH request arguments
+</span></span><span id="1460" class="l"><a href="#1460">1460: </a><span class="php-comment">     * Parse the OPTIONS request arguments
 </span></span><span id="1461" class="l"><a href="#1461">1461: </a><span class="php-comment">     *
 </span></span><span id="1462" class="l"><a href="#1462">1462: </a><span class="php-comment">     * @access protected
 </span></span><span id="1463" class="l"><a href="#1463">1463: </a><span class="php-comment">     * @return void
 </span></span><span id="1464" class="l"><a href="#1464">1464: </a><span class="php-comment">     */</span>
-</span><span id="1465" class="l"><a href="#1465">1465: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
+</span><span id="1465" class="l"><a href="#1465">1465: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
 </span><span id="1466" class="l"><a href="#1466">1466: </a>    {
-</span><span id="1467" class="l"><a href="#1467">1467: </a>        <span class="php-comment">// It might be a HTTP body</span>
-</span><span id="1468" class="l"><a href="#1468">1468: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1469" class="l"><a href="#1469">1469: </a>        {
-</span><span id="1470" class="l"><a href="#1470">1470: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1471" class="l"><a href="#1471">1471: </a>        }
-</span><span id="1472" class="l"><a href="#1472">1472: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
-</span><span id="1473" class="l"><a href="#1473">1473: </a>        {
-</span><span id="1474" class="l"><a href="#1474">1474: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1475" class="l"><a href="#1475">1475: </a>            <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1476" class="l"><a href="#1476">1476: </a>        }
-</span><span id="1477" class="l"><a href="#1477">1477: </a>    }
-</span><span id="1478" class="l"><a href="#1478">1478: </a>
-</span><span id="1479" class="l"><a href="#1479">1479: </a>    <span class="php-comment">/**
-</span></span><span id="1480" class="l"><a href="#1480">1480: </a><span class="php-comment">     * Parse the DELETE request arguments
-</span></span><span id="1481" class="l"><a href="#1481">1481: </a><span class="php-comment">     *
-</span></span><span id="1482" class="l"><a href="#1482">1482: </a><span class="php-comment">     * @access protected
-</span></span><span id="1483" class="l"><a href="#1483">1483: </a><span class="php-comment">     * @return void
-</span></span><span id="1484" class="l"><a href="#1484">1484: </a><span class="php-comment">     */</span>
-</span><span id="1485" class="l"><a href="#1485">1485: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
-</span><span id="1486" class="l"><a href="#1486">1486: </a>    {
-</span><span id="1487" class="l"><a href="#1487">1487: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
-</span><span id="1488" class="l"><a href="#1488">1488: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
-</span><span id="1489" class="l"><a href="#1489">1489: </a>        {
-</span><span id="1490" class="l"><a href="#1490">1490: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1467" class="l"><a href="#1467">1467: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
+</span><span id="1468" class="l"><a href="#1468">1468: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
+</span><span id="1469" class="l"><a href="#1469">1469: </a>
+</span><span id="1470" class="l"><a href="#1470">1470: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
+</span><span id="1471" class="l"><a href="#1471">1471: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
+</span><span id="1472" class="l"><a href="#1472">1472: </a>    }
+</span><span id="1473" class="l"><a href="#1473">1473: </a>
+</span><span id="1474" class="l"><a href="#1474">1474: </a>    <span class="php-comment">/**
+</span></span><span id="1475" class="l"><a href="#1475">1475: </a><span class="php-comment">     * Parse the PATCH request arguments
+</span></span><span id="1476" class="l"><a href="#1476">1476: </a><span class="php-comment">     *
+</span></span><span id="1477" class="l"><a href="#1477">1477: </a><span class="php-comment">     * @access protected
+</span></span><span id="1478" class="l"><a href="#1478">1478: </a><span class="php-comment">     * @return void
+</span></span><span id="1479" class="l"><a href="#1479">1479: </a><span class="php-comment">     */</span>
+</span><span id="1480" class="l"><a href="#1480">1480: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
+</span><span id="1481" class="l"><a href="#1481">1481: </a>    {
+</span><span id="1482" class="l"><a href="#1482">1482: </a>        <span class="php-comment">// It might be a HTTP body</span>
+</span><span id="1483" class="l"><a href="#1483">1483: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
+</span><span id="1484" class="l"><a href="#1484">1484: </a>        {
+</span><span id="1485" class="l"><a href="#1485">1485: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
+</span><span id="1486" class="l"><a href="#1486">1486: </a>        }
+</span><span id="1487" class="l"><a href="#1487">1487: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
+</span><span id="1488" class="l"><a href="#1488">1488: </a>        {
+</span><span id="1489" class="l"><a href="#1489">1489: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
+</span><span id="1490" class="l"><a href="#1490">1490: </a>            <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
 </span><span id="1491" class="l"><a href="#1491">1491: </a>        }
 </span><span id="1492" class="l"><a href="#1492">1492: </a>    }
 </span><span id="1493" class="l"><a href="#1493">1493: </a>
 </span><span id="1494" class="l"><a href="#1494">1494: </a>    <span class="php-comment">/**
-</span></span><span id="1495" class="l"><a href="#1495">1495: </a><span class="php-comment">     * Parse the query parameters
+</span></span><span id="1495" class="l"><a href="#1495">1495: </a><span class="php-comment">     * Parse the DELETE request arguments
 </span></span><span id="1496" class="l"><a href="#1496">1496: </a><span class="php-comment">     *
 </span></span><span id="1497" class="l"><a href="#1497">1497: </a><span class="php-comment">     * @access protected
 </span></span><span id="1498" class="l"><a href="#1498">1498: </a><span class="php-comment">     * @return void
 </span></span><span id="1499" class="l"><a href="#1499">1499: </a><span class="php-comment">     */</span>
-</span><span id="1500" class="l"><a href="#1500">1500: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
+</span><span id="1500" class="l"><a href="#1500">1500: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
 </span><span id="1501" class="l"><a href="#1501">1501: </a>    {
-</span><span id="1502" class="l"><a href="#1502">1502: </a>        <span class="php-var">$this</span>-&gt;_query_args = <span class="php-var">$this</span>-&gt;input-&gt;get();
-</span><span id="1503" class="l"><a href="#1503">1503: </a>    }
-</span><span id="1504" class="l"><a href="#1504">1504: </a>
-</span><span id="1505" class="l"><a href="#1505">1505: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
-</span><span id="1506" class="l"><a href="#1506">1506: </a>
-</span><span id="1507" class="l"><a href="#1507">1507: </a>    <span class="php-comment">/**
-</span></span><span id="1508" class="l"><a href="#1508">1508: </a><span class="php-comment">     * Retrieve a value from a GET request
-</span></span><span id="1509" class="l"><a href="#1509">1509: </a><span class="php-comment">     *
-</span></span><span id="1510" class="l"><a href="#1510">1510: </a><span class="php-comment">     * @access public
-</span></span><span id="1511" class="l"><a href="#1511">1511: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
-</span></span><span id="1512" class="l"><a href="#1512">1512: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1513" class="l"><a href="#1513">1513: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1514" class="l"><a href="#1514">1514: </a><span class="php-comment">     * @return array|string|NULL Value from the GET request; otherwise, NULL
-</span></span><span id="1515" class="l"><a href="#1515">1515: </a><span class="php-comment">     */</span>
-</span><span id="1516" class="l"><a href="#1516">1516: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1517" class="l"><a href="#1517">1517: </a>    {
-</span><span id="1518" class="l"><a href="#1518">1518: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1519" class="l"><a href="#1519">1519: </a>        {
-</span><span id="1520" class="l"><a href="#1520">1520: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
-</span><span id="1521" class="l"><a href="#1521">1521: </a>        }
-</span><span id="1522" class="l"><a href="#1522">1522: </a>
-</span><span id="1523" class="l"><a href="#1523">1523: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1524" class="l"><a href="#1524">1524: </a>    }
-</span><span id="1525" class="l"><a href="#1525">1525: </a>
-</span><span id="1526" class="l"><a href="#1526">1526: </a>    <span class="php-comment">/**
-</span></span><span id="1527" class="l"><a href="#1527">1527: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
-</span></span><span id="1528" class="l"><a href="#1528">1528: </a><span class="php-comment">     *
-</span></span><span id="1529" class="l"><a href="#1529">1529: </a><span class="php-comment">     * @access public
-</span></span><span id="1530" class="l"><a href="#1530">1530: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
-</span></span><span id="1531" class="l"><a href="#1531">1531: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1532" class="l"><a href="#1532">1532: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1533" class="l"><a href="#1533">1533: </a><span class="php-comment">     * @return array|string|NULL Value from the OPTIONS request; otherwise, NULL
-</span></span><span id="1534" class="l"><a href="#1534">1534: </a><span class="php-comment">     */</span>
-</span><span id="1535" class="l"><a href="#1535">1535: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1536" class="l"><a href="#1536">1536: </a>    {
-</span><span id="1537" class="l"><a href="#1537">1537: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1538" class="l"><a href="#1538">1538: </a>        {
-</span><span id="1539" class="l"><a href="#1539">1539: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
-</span><span id="1540" class="l"><a href="#1540">1540: </a>        }
-</span><span id="1541" class="l"><a href="#1541">1541: </a>
-</span><span id="1542" class="l"><a href="#1542">1542: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1543" class="l"><a href="#1543">1543: </a>    }
-</span><span id="1544" class="l"><a href="#1544">1544: </a>
-</span><span id="1545" class="l"><a href="#1545">1545: </a>    <span class="php-comment">/**
-</span></span><span id="1546" class="l"><a href="#1546">1546: </a><span class="php-comment">     * Retrieve a value from a HEAD request
-</span></span><span id="1547" class="l"><a href="#1547">1547: </a><span class="php-comment">     *
-</span></span><span id="1548" class="l"><a href="#1548">1548: </a><span class="php-comment">     * @access public
-</span></span><span id="1549" class="l"><a href="#1549">1549: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
-</span></span><span id="1550" class="l"><a href="#1550">1550: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1551" class="l"><a href="#1551">1551: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1552" class="l"><a href="#1552">1552: </a><span class="php-comment">     * @return array|string|NULL Value from the HEAD request; otherwise, NULL
-</span></span><span id="1553" class="l"><a href="#1553">1553: </a><span class="php-comment">     */</span>
-</span><span id="1554" class="l"><a href="#1554">1554: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1555" class="l"><a href="#1555">1555: </a>    {
-</span><span id="1556" class="l"><a href="#1556">1556: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1557" class="l"><a href="#1557">1557: </a>        {
-</span><span id="1558" class="l"><a href="#1558">1558: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_head_args;
-</span><span id="1559" class="l"><a href="#1559">1559: </a>        }
-</span><span id="1560" class="l"><a href="#1560">1560: </a>
-</span><span id="1561" class="l"><a href="#1561">1561: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_head_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1562" class="l"><a href="#1562">1562: </a>    }
-</span><span id="1563" class="l"><a href="#1563">1563: </a>
-</span><span id="1564" class="l"><a href="#1564">1564: </a>    <span class="php-comment">/**
-</span></span><span id="1565" class="l"><a href="#1565">1565: </a><span class="php-comment">     * Retrieve a value from a POST request
-</span></span><span id="1566" class="l"><a href="#1566">1566: </a><span class="php-comment">     *
-</span></span><span id="1567" class="l"><a href="#1567">1567: </a><span class="php-comment">     * @access public
-</span></span><span id="1568" class="l"><a href="#1568">1568: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
-</span></span><span id="1569" class="l"><a href="#1569">1569: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1570" class="l"><a href="#1570">1570: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1571" class="l"><a href="#1571">1571: </a><span class="php-comment">     * @return array|string|NULL Value from the POST request; otherwise, NULL
-</span></span><span id="1572" class="l"><a href="#1572">1572: </a><span class="php-comment">     */</span>
-</span><span id="1573" class="l"><a href="#1573">1573: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1574" class="l"><a href="#1574">1574: </a>    {
-</span><span id="1575" class="l"><a href="#1575">1575: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1576" class="l"><a href="#1576">1576: </a>        {
-</span><span id="1577" class="l"><a href="#1577">1577: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
-</span><span id="1578" class="l"><a href="#1578">1578: </a>        }
-</span><span id="1579" class="l"><a href="#1579">1579: </a>
-</span><span id="1580" class="l"><a href="#1580">1580: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1581" class="l"><a href="#1581">1581: </a>    }
-</span><span id="1582" class="l"><a href="#1582">1582: </a>
-</span><span id="1583" class="l"><a href="#1583">1583: </a>    <span class="php-comment">/**
-</span></span><span id="1584" class="l"><a href="#1584">1584: </a><span class="php-comment">     * Retrieve a value from a PUT request
-</span></span><span id="1585" class="l"><a href="#1585">1585: </a><span class="php-comment">     *
-</span></span><span id="1586" class="l"><a href="#1586">1586: </a><span class="php-comment">     * @access public
-</span></span><span id="1587" class="l"><a href="#1587">1587: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
-</span></span><span id="1588" class="l"><a href="#1588">1588: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1589" class="l"><a href="#1589">1589: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1590" class="l"><a href="#1590">1590: </a><span class="php-comment">     * @return array|string|NULL Value from the PUT request; otherwise, NULL
-</span></span><span id="1591" class="l"><a href="#1591">1591: </a><span class="php-comment">     */</span>
-</span><span id="1592" class="l"><a href="#1592">1592: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1593" class="l"><a href="#1593">1593: </a>    {
-</span><span id="1594" class="l"><a href="#1594">1594: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1595" class="l"><a href="#1595">1595: </a>        {
-</span><span id="1596" class="l"><a href="#1596">1596: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
-</span><span id="1597" class="l"><a href="#1597">1597: </a>        }
-</span><span id="1598" class="l"><a href="#1598">1598: </a>
-</span><span id="1599" class="l"><a href="#1599">1599: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1600" class="l"><a href="#1600">1600: </a>    }
-</span><span id="1601" class="l"><a href="#1601">1601: </a>
-</span><span id="1602" class="l"><a href="#1602">1602: </a>    <span class="php-comment">/**
-</span></span><span id="1603" class="l"><a href="#1603">1603: </a><span class="php-comment">     * Retrieve a value from a DELETE request
-</span></span><span id="1604" class="l"><a href="#1604">1604: </a><span class="php-comment">     *
-</span></span><span id="1605" class="l"><a href="#1605">1605: </a><span class="php-comment">     * @access public
-</span></span><span id="1606" class="l"><a href="#1606">1606: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
-</span></span><span id="1607" class="l"><a href="#1607">1607: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1608" class="l"><a href="#1608">1608: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1609" class="l"><a href="#1609">1609: </a><span class="php-comment">     * @return array|string|NULL Value from the DELETE request; otherwise, NULL
-</span></span><span id="1610" class="l"><a href="#1610">1610: </a><span class="php-comment">     */</span>
-</span><span id="1611" class="l"><a href="#1611">1611: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1612" class="l"><a href="#1612">1612: </a>    {
-</span><span id="1613" class="l"><a href="#1613">1613: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1614" class="l"><a href="#1614">1614: </a>        {
-</span><span id="1615" class="l"><a href="#1615">1615: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
-</span><span id="1616" class="l"><a href="#1616">1616: </a>        }
-</span><span id="1617" class="l"><a href="#1617">1617: </a>
-</span><span id="1618" class="l"><a href="#1618">1618: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1619" class="l"><a href="#1619">1619: </a>    }
-</span><span id="1620" class="l"><a href="#1620">1620: </a>
-</span><span id="1621" class="l"><a href="#1621">1621: </a>    <span class="php-comment">/**
-</span></span><span id="1622" class="l"><a href="#1622">1622: </a><span class="php-comment">     * Retrieve a value from a PATCH request
-</span></span><span id="1623" class="l"><a href="#1623">1623: </a><span class="php-comment">     *
-</span></span><span id="1624" class="l"><a href="#1624">1624: </a><span class="php-comment">     * @access public
-</span></span><span id="1625" class="l"><a href="#1625">1625: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
-</span></span><span id="1626" class="l"><a href="#1626">1626: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1627" class="l"><a href="#1627">1627: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1628" class="l"><a href="#1628">1628: </a><span class="php-comment">     * @return array|string|NULL Value from the PATCH request; otherwise, NULL
-</span></span><span id="1629" class="l"><a href="#1629">1629: </a><span class="php-comment">     */</span>
-</span><span id="1630" class="l"><a href="#1630">1630: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1631" class="l"><a href="#1631">1631: </a>    {
-</span><span id="1632" class="l"><a href="#1632">1632: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1633" class="l"><a href="#1633">1633: </a>        {
-</span><span id="1634" class="l"><a href="#1634">1634: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
-</span><span id="1635" class="l"><a href="#1635">1635: </a>        }
-</span><span id="1636" class="l"><a href="#1636">1636: </a>
-</span><span id="1637" class="l"><a href="#1637">1637: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1638" class="l"><a href="#1638">1638: </a>    }
-</span><span id="1639" class="l"><a href="#1639">1639: </a>
-</span><span id="1640" class="l"><a href="#1640">1640: </a>    <span class="php-comment">/**
-</span></span><span id="1641" class="l"><a href="#1641">1641: </a><span class="php-comment">     * Retrieve a value from the query parameters
-</span></span><span id="1642" class="l"><a href="#1642">1642: </a><span class="php-comment">     *
-</span></span><span id="1643" class="l"><a href="#1643">1643: </a><span class="php-comment">     * @access public
-</span></span><span id="1644" class="l"><a href="#1644">1644: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
-</span></span><span id="1645" class="l"><a href="#1645">1645: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1646" class="l"><a href="#1646">1646: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1647" class="l"><a href="#1647">1647: </a><span class="php-comment">     * @return array|string|NULL Value from the query parameters; otherwise, NULL
-</span></span><span id="1648" class="l"><a href="#1648">1648: </a><span class="php-comment">     */</span>
-</span><span id="1649" class="l"><a href="#1649">1649: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1650" class="l"><a href="#1650">1650: </a>    {
-</span><span id="1651" class="l"><a href="#1651">1651: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1652" class="l"><a href="#1652">1652: </a>        {
-</span><span id="1653" class="l"><a href="#1653">1653: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
-</span><span id="1654" class="l"><a href="#1654">1654: </a>        }
-</span><span id="1655" class="l"><a href="#1655">1655: </a>
-</span><span id="1656" class="l"><a href="#1656">1656: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1657" class="l"><a href="#1657">1657: </a>    }
-</span><span id="1658" class="l"><a href="#1658">1658: </a>
-</span><span id="1659" class="l"><a href="#1659">1659: </a>    <span class="php-comment">/**
-</span></span><span id="1660" class="l"><a href="#1660">1660: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
-</span></span><span id="1661" class="l"><a href="#1661">1661: </a><span class="php-comment">     * prevented
-</span></span><span id="1662" class="l"><a href="#1662">1662: </a><span class="php-comment">     *
-</span></span><span id="1663" class="l"><a href="#1663">1663: </a><span class="php-comment">     * @access protected
-</span></span><span id="1664" class="l"><a href="#1664">1664: </a><span class="php-comment">     * @param  string $value Input data
-</span></span><span id="1665" class="l"><a href="#1665">1665: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
-</span></span><span id="1666" class="l"><a href="#1666">1666: </a><span class="php-comment">     * @return string
-</span></span><span id="1667" class="l"><a href="#1667">1667: </a><span class="php-comment">     */</span>
-</span><span id="1668" class="l"><a href="#1668">1668: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
-</span><span id="1669" class="l"><a href="#1669">1669: </a>    {
-</span><span id="1670" class="l"><a href="#1670">1670: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) || <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
-</span><span id="1671" class="l"><a href="#1671">1671: </a>
-</span><span id="1672" class="l"><a href="#1672">1672: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
-</span><span id="1673" class="l"><a href="#1673">1673: </a>    }
-</span><span id="1674" class="l"><a href="#1674">1674: </a>
-</span><span id="1675" class="l"><a href="#1675">1675: </a>    <span class="php-comment">/**
-</span></span><span id="1676" class="l"><a href="#1676">1676: </a><span class="php-comment">     * Retrieve the validation errors
+</span><span id="1502" class="l"><a href="#1502">1502: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
+</span><span id="1503" class="l"><a href="#1503">1503: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
+</span><span id="1504" class="l"><a href="#1504">1504: </a>        {
+</span><span id="1505" class="l"><a href="#1505">1505: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
+</span><span id="1506" class="l"><a href="#1506">1506: </a>        }
+</span><span id="1507" class="l"><a href="#1507">1507: </a>    }
+</span><span id="1508" class="l"><a href="#1508">1508: </a>
+</span><span id="1509" class="l"><a href="#1509">1509: </a>    <span class="php-comment">/**
+</span></span><span id="1510" class="l"><a href="#1510">1510: </a><span class="php-comment">     * Parse the query parameters
+</span></span><span id="1511" class="l"><a href="#1511">1511: </a><span class="php-comment">     *
+</span></span><span id="1512" class="l"><a href="#1512">1512: </a><span class="php-comment">     * @access protected
+</span></span><span id="1513" class="l"><a href="#1513">1513: </a><span class="php-comment">     * @return void
+</span></span><span id="1514" class="l"><a href="#1514">1514: </a><span class="php-comment">     */</span>
+</span><span id="1515" class="l"><a href="#1515">1515: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
+</span><span id="1516" class="l"><a href="#1516">1516: </a>    {
+</span><span id="1517" class="l"><a href="#1517">1517: </a>        <span class="php-var">$this</span>-&gt;_query_args = <span class="php-var">$this</span>-&gt;input-&gt;get();
+</span><span id="1518" class="l"><a href="#1518">1518: </a>    }
+</span><span id="1519" class="l"><a href="#1519">1519: </a>
+</span><span id="1520" class="l"><a href="#1520">1520: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
+</span><span id="1521" class="l"><a href="#1521">1521: </a>
+</span><span id="1522" class="l"><a href="#1522">1522: </a>    <span class="php-comment">/**
+</span></span><span id="1523" class="l"><a href="#1523">1523: </a><span class="php-comment">     * Retrieve a value from a GET request
+</span></span><span id="1524" class="l"><a href="#1524">1524: </a><span class="php-comment">     *
+</span></span><span id="1525" class="l"><a href="#1525">1525: </a><span class="php-comment">     * @access public
+</span></span><span id="1526" class="l"><a href="#1526">1526: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
+</span></span><span id="1527" class="l"><a href="#1527">1527: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1528" class="l"><a href="#1528">1528: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1529" class="l"><a href="#1529">1529: </a><span class="php-comment">     * @return array|string|NULL Value from the GET request; otherwise, NULL
+</span></span><span id="1530" class="l"><a href="#1530">1530: </a><span class="php-comment">     */</span>
+</span><span id="1531" class="l"><a href="#1531">1531: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1532" class="l"><a href="#1532">1532: </a>    {
+</span><span id="1533" class="l"><a href="#1533">1533: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1534" class="l"><a href="#1534">1534: </a>        {
+</span><span id="1535" class="l"><a href="#1535">1535: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
+</span><span id="1536" class="l"><a href="#1536">1536: </a>        }
+</span><span id="1537" class="l"><a href="#1537">1537: </a>
+</span><span id="1538" class="l"><a href="#1538">1538: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1539" class="l"><a href="#1539">1539: </a>    }
+</span><span id="1540" class="l"><a href="#1540">1540: </a>
+</span><span id="1541" class="l"><a href="#1541">1541: </a>    <span class="php-comment">/**
+</span></span><span id="1542" class="l"><a href="#1542">1542: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
+</span></span><span id="1543" class="l"><a href="#1543">1543: </a><span class="php-comment">     *
+</span></span><span id="1544" class="l"><a href="#1544">1544: </a><span class="php-comment">     * @access public
+</span></span><span id="1545" class="l"><a href="#1545">1545: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
+</span></span><span id="1546" class="l"><a href="#1546">1546: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1547" class="l"><a href="#1547">1547: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1548" class="l"><a href="#1548">1548: </a><span class="php-comment">     * @return array|string|NULL Value from the OPTIONS request; otherwise, NULL
+</span></span><span id="1549" class="l"><a href="#1549">1549: </a><span class="php-comment">     */</span>
+</span><span id="1550" class="l"><a href="#1550">1550: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1551" class="l"><a href="#1551">1551: </a>    {
+</span><span id="1552" class="l"><a href="#1552">1552: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1553" class="l"><a href="#1553">1553: </a>        {
+</span><span id="1554" class="l"><a href="#1554">1554: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
+</span><span id="1555" class="l"><a href="#1555">1555: </a>        }
+</span><span id="1556" class="l"><a href="#1556">1556: </a>
+</span><span id="1557" class="l"><a href="#1557">1557: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1558" class="l"><a href="#1558">1558: </a>    }
+</span><span id="1559" class="l"><a href="#1559">1559: </a>
+</span><span id="1560" class="l"><a href="#1560">1560: </a>    <span class="php-comment">/**
+</span></span><span id="1561" class="l"><a href="#1561">1561: </a><span class="php-comment">     * Retrieve a value from a HEAD request
+</span></span><span id="1562" class="l"><a href="#1562">1562: </a><span class="php-comment">     *
+</span></span><span id="1563" class="l"><a href="#1563">1563: </a><span class="php-comment">     * @access public
+</span></span><span id="1564" class="l"><a href="#1564">1564: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
+</span></span><span id="1565" class="l"><a href="#1565">1565: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1566" class="l"><a href="#1566">1566: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1567" class="l"><a href="#1567">1567: </a><span class="php-comment">     * @return array|string|NULL Value from the HEAD request; otherwise, NULL
+</span></span><span id="1568" class="l"><a href="#1568">1568: </a><span class="php-comment">     */</span>
+</span><span id="1569" class="l"><a href="#1569">1569: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1570" class="l"><a href="#1570">1570: </a>    {
+</span><span id="1571" class="l"><a href="#1571">1571: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1572" class="l"><a href="#1572">1572: </a>        {
+</span><span id="1573" class="l"><a href="#1573">1573: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_head_args;
+</span><span id="1574" class="l"><a href="#1574">1574: </a>        }
+</span><span id="1575" class="l"><a href="#1575">1575: </a>
+</span><span id="1576" class="l"><a href="#1576">1576: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_head_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1577" class="l"><a href="#1577">1577: </a>    }
+</span><span id="1578" class="l"><a href="#1578">1578: </a>
+</span><span id="1579" class="l"><a href="#1579">1579: </a>    <span class="php-comment">/**
+</span></span><span id="1580" class="l"><a href="#1580">1580: </a><span class="php-comment">     * Retrieve a value from a POST request
+</span></span><span id="1581" class="l"><a href="#1581">1581: </a><span class="php-comment">     *
+</span></span><span id="1582" class="l"><a href="#1582">1582: </a><span class="php-comment">     * @access public
+</span></span><span id="1583" class="l"><a href="#1583">1583: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
+</span></span><span id="1584" class="l"><a href="#1584">1584: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1585" class="l"><a href="#1585">1585: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1586" class="l"><a href="#1586">1586: </a><span class="php-comment">     * @return array|string|NULL Value from the POST request; otherwise, NULL
+</span></span><span id="1587" class="l"><a href="#1587">1587: </a><span class="php-comment">     */</span>
+</span><span id="1588" class="l"><a href="#1588">1588: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1589" class="l"><a href="#1589">1589: </a>    {
+</span><span id="1590" class="l"><a href="#1590">1590: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1591" class="l"><a href="#1591">1591: </a>        {
+</span><span id="1592" class="l"><a href="#1592">1592: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
+</span><span id="1593" class="l"><a href="#1593">1593: </a>        }
+</span><span id="1594" class="l"><a href="#1594">1594: </a>
+</span><span id="1595" class="l"><a href="#1595">1595: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1596" class="l"><a href="#1596">1596: </a>    }
+</span><span id="1597" class="l"><a href="#1597">1597: </a>
+</span><span id="1598" class="l"><a href="#1598">1598: </a>    <span class="php-comment">/**
+</span></span><span id="1599" class="l"><a href="#1599">1599: </a><span class="php-comment">     * Retrieve a value from a PUT request
+</span></span><span id="1600" class="l"><a href="#1600">1600: </a><span class="php-comment">     *
+</span></span><span id="1601" class="l"><a href="#1601">1601: </a><span class="php-comment">     * @access public
+</span></span><span id="1602" class="l"><a href="#1602">1602: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
+</span></span><span id="1603" class="l"><a href="#1603">1603: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1604" class="l"><a href="#1604">1604: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1605" class="l"><a href="#1605">1605: </a><span class="php-comment">     * @return array|string|NULL Value from the PUT request; otherwise, NULL
+</span></span><span id="1606" class="l"><a href="#1606">1606: </a><span class="php-comment">     */</span>
+</span><span id="1607" class="l"><a href="#1607">1607: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1608" class="l"><a href="#1608">1608: </a>    {
+</span><span id="1609" class="l"><a href="#1609">1609: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1610" class="l"><a href="#1610">1610: </a>        {
+</span><span id="1611" class="l"><a href="#1611">1611: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
+</span><span id="1612" class="l"><a href="#1612">1612: </a>        }
+</span><span id="1613" class="l"><a href="#1613">1613: </a>
+</span><span id="1614" class="l"><a href="#1614">1614: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1615" class="l"><a href="#1615">1615: </a>    }
+</span><span id="1616" class="l"><a href="#1616">1616: </a>
+</span><span id="1617" class="l"><a href="#1617">1617: </a>    <span class="php-comment">/**
+</span></span><span id="1618" class="l"><a href="#1618">1618: </a><span class="php-comment">     * Retrieve a value from a DELETE request
+</span></span><span id="1619" class="l"><a href="#1619">1619: </a><span class="php-comment">     *
+</span></span><span id="1620" class="l"><a href="#1620">1620: </a><span class="php-comment">     * @access public
+</span></span><span id="1621" class="l"><a href="#1621">1621: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
+</span></span><span id="1622" class="l"><a href="#1622">1622: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1623" class="l"><a href="#1623">1623: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1624" class="l"><a href="#1624">1624: </a><span class="php-comment">     * @return array|string|NULL Value from the DELETE request; otherwise, NULL
+</span></span><span id="1625" class="l"><a href="#1625">1625: </a><span class="php-comment">     */</span>
+</span><span id="1626" class="l"><a href="#1626">1626: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1627" class="l"><a href="#1627">1627: </a>    {
+</span><span id="1628" class="l"><a href="#1628">1628: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1629" class="l"><a href="#1629">1629: </a>        {
+</span><span id="1630" class="l"><a href="#1630">1630: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
+</span><span id="1631" class="l"><a href="#1631">1631: </a>        }
+</span><span id="1632" class="l"><a href="#1632">1632: </a>
+</span><span id="1633" class="l"><a href="#1633">1633: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1634" class="l"><a href="#1634">1634: </a>    }
+</span><span id="1635" class="l"><a href="#1635">1635: </a>
+</span><span id="1636" class="l"><a href="#1636">1636: </a>    <span class="php-comment">/**
+</span></span><span id="1637" class="l"><a href="#1637">1637: </a><span class="php-comment">     * Retrieve a value from a PATCH request
+</span></span><span id="1638" class="l"><a href="#1638">1638: </a><span class="php-comment">     *
+</span></span><span id="1639" class="l"><a href="#1639">1639: </a><span class="php-comment">     * @access public
+</span></span><span id="1640" class="l"><a href="#1640">1640: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
+</span></span><span id="1641" class="l"><a href="#1641">1641: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1642" class="l"><a href="#1642">1642: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1643" class="l"><a href="#1643">1643: </a><span class="php-comment">     * @return array|string|NULL Value from the PATCH request; otherwise, NULL
+</span></span><span id="1644" class="l"><a href="#1644">1644: </a><span class="php-comment">     */</span>
+</span><span id="1645" class="l"><a href="#1645">1645: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1646" class="l"><a href="#1646">1646: </a>    {
+</span><span id="1647" class="l"><a href="#1647">1647: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1648" class="l"><a href="#1648">1648: </a>        {
+</span><span id="1649" class="l"><a href="#1649">1649: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
+</span><span id="1650" class="l"><a href="#1650">1650: </a>        }
+</span><span id="1651" class="l"><a href="#1651">1651: </a>
+</span><span id="1652" class="l"><a href="#1652">1652: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1653" class="l"><a href="#1653">1653: </a>    }
+</span><span id="1654" class="l"><a href="#1654">1654: </a>
+</span><span id="1655" class="l"><a href="#1655">1655: </a>    <span class="php-comment">/**
+</span></span><span id="1656" class="l"><a href="#1656">1656: </a><span class="php-comment">     * Retrieve a value from the query parameters
+</span></span><span id="1657" class="l"><a href="#1657">1657: </a><span class="php-comment">     *
+</span></span><span id="1658" class="l"><a href="#1658">1658: </a><span class="php-comment">     * @access public
+</span></span><span id="1659" class="l"><a href="#1659">1659: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
+</span></span><span id="1660" class="l"><a href="#1660">1660: </a><span class="php-comment">     * If NULL an array of arguments is returned
+</span></span><span id="1661" class="l"><a href="#1661">1661: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
+</span></span><span id="1662" class="l"><a href="#1662">1662: </a><span class="php-comment">     * @return array|string|NULL Value from the query parameters; otherwise, NULL
+</span></span><span id="1663" class="l"><a href="#1663">1663: </a><span class="php-comment">     */</span>
+</span><span id="1664" class="l"><a href="#1664">1664: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1665" class="l"><a href="#1665">1665: </a>    {
+</span><span id="1666" class="l"><a href="#1666">1666: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1667" class="l"><a href="#1667">1667: </a>        {
+</span><span id="1668" class="l"><a href="#1668">1668: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
+</span><span id="1669" class="l"><a href="#1669">1669: </a>        }
+</span><span id="1670" class="l"><a href="#1670">1670: </a>
+</span><span id="1671" class="l"><a href="#1671">1671: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
+</span><span id="1672" class="l"><a href="#1672">1672: </a>    }
+</span><span id="1673" class="l"><a href="#1673">1673: </a>
+</span><span id="1674" class="l"><a href="#1674">1674: </a>    <span class="php-comment">/**
+</span></span><span id="1675" class="l"><a href="#1675">1675: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
+</span></span><span id="1676" class="l"><a href="#1676">1676: </a><span class="php-comment">     * prevented
 </span></span><span id="1677" class="l"><a href="#1677">1677: </a><span class="php-comment">     *
-</span></span><span id="1678" class="l"><a href="#1678">1678: </a><span class="php-comment">     * @access public
-</span></span><span id="1679" class="l"><a href="#1679">1679: </a><span class="php-comment">     * @return array
-</span></span><span id="1680" class="l"><a href="#1680">1680: </a><span class="php-comment">     */</span>
-</span><span id="1681" class="l"><a href="#1681">1681: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
-</span><span id="1682" class="l"><a href="#1682">1682: </a>    {
-</span><span id="1683" class="l"><a href="#1683">1683: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
-</span><span id="1684" class="l"><a href="#1684">1684: </a>
-</span><span id="1685" class="l"><a href="#1685">1685: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
-</span><span id="1686" class="l"><a href="#1686">1686: </a>    }
-</span><span id="1687" class="l"><a href="#1687">1687: </a>
-</span><span id="1688" class="l"><a href="#1688">1688: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
+</span></span><span id="1678" class="l"><a href="#1678">1678: </a><span class="php-comment">     * @access protected
+</span></span><span id="1679" class="l"><a href="#1679">1679: </a><span class="php-comment">     * @param  string $value Input data
+</span></span><span id="1680" class="l"><a href="#1680">1680: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
+</span></span><span id="1681" class="l"><a href="#1681">1681: </a><span class="php-comment">     * @return string
+</span></span><span id="1682" class="l"><a href="#1682">1682: </a><span class="php-comment">     */</span>
+</span><span id="1683" class="l"><a href="#1683">1683: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
+</span><span id="1684" class="l"><a href="#1684">1684: </a>    {
+</span><span id="1685" class="l"><a href="#1685">1685: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) || <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
+</span><span id="1686" class="l"><a href="#1686">1686: </a>
+</span><span id="1687" class="l"><a href="#1687">1687: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
+</span><span id="1688" class="l"><a href="#1688">1688: </a>    }
 </span><span id="1689" class="l"><a href="#1689">1689: </a>
 </span><span id="1690" class="l"><a href="#1690">1690: </a>    <span class="php-comment">/**
-</span></span><span id="1691" class="l"><a href="#1691">1691: </a><span class="php-comment">     * Perform LDAP Authentication
+</span></span><span id="1691" class="l"><a href="#1691">1691: </a><span class="php-comment">     * Retrieve the validation errors
 </span></span><span id="1692" class="l"><a href="#1692">1692: </a><span class="php-comment">     *
-</span></span><span id="1693" class="l"><a href="#1693">1693: </a><span class="php-comment">     * @access protected
-</span></span><span id="1694" class="l"><a href="#1694">1694: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1695" class="l"><a href="#1695">1695: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1696" class="l"><a href="#1696">1696: </a><span class="php-comment">     * @return bool
-</span></span><span id="1697" class="l"><a href="#1697">1697: </a><span class="php-comment">     */</span>
-</span><span id="1698" class="l"><a href="#1698">1698: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1699" class="l"><a href="#1699">1699: </a>    {
-</span><span id="1700" class="l"><a href="#1700">1700: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1701" class="l"><a href="#1701">1701: </a>        {
-</span><span id="1702" class="l"><a href="#1702">1702: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
-</span><span id="1703" class="l"><a href="#1703">1703: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1704" class="l"><a href="#1704">1704: </a>        }
-</span><span id="1705" class="l"><a href="#1705">1705: </a>
-</span><span id="1706" class="l"><a href="#1706">1706: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading configuration'</span>);
-</span><span id="1707" class="l"><a href="#1707">1707: </a>
-</span><span id="1708" class="l"><a href="#1708">1708: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="1709" class="l"><a href="#1709">1709: </a>
-</span><span id="1710" class="l"><a href="#1710">1710: </a>        <span class="php-var">$ldap</span> = [
-</span><span id="1711" class="l"><a href="#1711">1711: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1712" class="l"><a href="#1712">1712: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1713" class="l"><a href="#1713">1713: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1714" class="l"><a href="#1714">1714: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1715" class="l"><a href="#1715">1715: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1716" class="l"><a href="#1716">1716: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1717" class="l"><a href="#1717">1717: </a>        ];
-</span><span id="1718" class="l"><a href="#1718">1718: </a>
-</span><span id="1719" class="l"><a href="#1719">1719: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
+</span></span><span id="1693" class="l"><a href="#1693">1693: </a><span class="php-comment">     * @access public
+</span></span><span id="1694" class="l"><a href="#1694">1694: </a><span class="php-comment">     * @return array
+</span></span><span id="1695" class="l"><a href="#1695">1695: </a><span class="php-comment">     */</span>
+</span><span id="1696" class="l"><a href="#1696">1696: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
+</span><span id="1697" class="l"><a href="#1697">1697: </a>    {
+</span><span id="1698" class="l"><a href="#1698">1698: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
+</span><span id="1699" class="l"><a href="#1699">1699: </a>
+</span><span id="1700" class="l"><a href="#1700">1700: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
+</span><span id="1701" class="l"><a href="#1701">1701: </a>    }
+</span><span id="1702" class="l"><a href="#1702">1702: </a>
+</span><span id="1703" class="l"><a href="#1703">1703: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
+</span><span id="1704" class="l"><a href="#1704">1704: </a>
+</span><span id="1705" class="l"><a href="#1705">1705: </a>    <span class="php-comment">/**
+</span></span><span id="1706" class="l"><a href="#1706">1706: </a><span class="php-comment">     * Perform LDAP Authentication
+</span></span><span id="1707" class="l"><a href="#1707">1707: </a><span class="php-comment">     *
+</span></span><span id="1708" class="l"><a href="#1708">1708: </a><span class="php-comment">     * @access protected
+</span></span><span id="1709" class="l"><a href="#1709">1709: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1710" class="l"><a href="#1710">1710: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1711" class="l"><a href="#1711">1711: </a><span class="php-comment">     * @return bool
+</span></span><span id="1712" class="l"><a href="#1712">1712: </a><span class="php-comment">     */</span>
+</span><span id="1713" class="l"><a href="#1713">1713: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1714" class="l"><a href="#1714">1714: </a>    {
+</span><span id="1715" class="l"><a href="#1715">1715: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
+</span><span id="1716" class="l"><a href="#1716">1716: </a>        {
+</span><span id="1717" class="l"><a href="#1717">1717: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
+</span><span id="1718" class="l"><a href="#1718">1718: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1719" class="l"><a href="#1719">1719: </a>        }
 </span><span id="1720" class="l"><a href="#1720">1720: </a>
-</span><span id="1721" class="l"><a href="#1721">1721: </a>        <span class="php-comment">// Connect to the ldap server</span>
-</span><span id="1722" class="l"><a href="#1722">1722: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
-</span><span id="1723" class="l"><a href="#1723">1723: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
-</span><span id="1724" class="l"><a href="#1724">1724: </a>        {
-</span><span id="1725" class="l"><a href="#1725">1725: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span>.<span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>].<span class="php-quote">' seconds'</span>);
-</span><span id="1726" class="l"><a href="#1726">1726: </a>
-</span><span id="1727" class="l"><a href="#1727">1727: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
-</span><span id="1728" class="l"><a href="#1728">1728: </a>
-</span><span id="1729" class="l"><a href="#1729">1729: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span>.<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>].<span class="php-quote">' with dn '</span>.<span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
-</span><span id="1730" class="l"><a href="#1730">1730: </a>
-</span><span id="1731" class="l"><a href="#1731">1731: </a>            <span class="php-comment">// Binding to the ldap server</span>
-</span><span id="1732" class="l"><a href="#1732">1732: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
+</span><span id="1721" class="l"><a href="#1721">1721: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading configuration'</span>);
+</span><span id="1722" class="l"><a href="#1722">1722: </a>
+</span><span id="1723" class="l"><a href="#1723">1723: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
+</span><span id="1724" class="l"><a href="#1724">1724: </a>
+</span><span id="1725" class="l"><a href="#1725">1725: </a>        <span class="php-var">$ldap</span> = [
+</span><span id="1726" class="l"><a href="#1726">1726: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1727" class="l"><a href="#1727">1727: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1728" class="l"><a href="#1728">1728: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1729" class="l"><a href="#1729">1729: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1730" class="l"><a href="#1730">1730: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1731" class="l"><a href="#1731">1731: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
+</span><span id="1732" class="l"><a href="#1732">1732: </a>        ];
 </span><span id="1733" class="l"><a href="#1733">1733: </a>
-</span><span id="1734" class="l"><a href="#1734">1734: </a>            <span class="php-comment">// Verify the binding</span>
-</span><span id="1735" class="l"><a href="#1735">1735: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1736" class="l"><a href="#1736">1736: </a>            {
-</span><span id="1737" class="l"><a href="#1737">1737: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind was unsuccessful'</span>);
-</span><span id="1738" class="l"><a href="#1738">1738: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1739" class="l"><a href="#1739">1739: </a>            }
-</span><span id="1740" class="l"><a href="#1740">1740: </a>
-</span><span id="1741" class="l"><a href="#1741">1741: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
-</span><span id="1742" class="l"><a href="#1742">1742: </a>        }
+</span><span id="1734" class="l"><a href="#1734">1734: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
+</span><span id="1735" class="l"><a href="#1735">1735: </a>
+</span><span id="1736" class="l"><a href="#1736">1736: </a>        <span class="php-comment">// Connect to the ldap server</span>
+</span><span id="1737" class="l"><a href="#1737">1737: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
+</span><span id="1738" class="l"><a href="#1738">1738: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
+</span><span id="1739" class="l"><a href="#1739">1739: </a>        {
+</span><span id="1740" class="l"><a href="#1740">1740: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span>.<span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>].<span class="php-quote">' seconds'</span>);
+</span><span id="1741" class="l"><a href="#1741">1741: </a>
+</span><span id="1742" class="l"><a href="#1742">1742: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
 </span><span id="1743" class="l"><a href="#1743">1743: </a>
-</span><span id="1744" class="l"><a href="#1744">1744: </a>        <span class="php-comment">// Search for user</span>
-</span><span id="1745" class="l"><a href="#1745">1745: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1746" class="l"><a href="#1746">1746: </a>        {
-</span><span id="1747" class="l"><a href="#1747">1747: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span>.<span class="php-var">$username</span>.<span class="php-quote">' not found in search'</span>);
-</span><span id="1748" class="l"><a href="#1748">1748: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1749" class="l"><a href="#1749">1749: </a>        }
-</span><span id="1750" class="l"><a href="#1750">1750: </a>
-</span><span id="1751" class="l"><a href="#1751">1751: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
-</span><span id="1752" class="l"><a href="#1752">1752: </a>        {
-</span><span id="1753" class="l"><a href="#1753">1753: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username '</span>.<span class="php-var">$username</span>.<span class="php-quote">'found more than once'</span>);
-</span><span id="1754" class="l"><a href="#1754">1754: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1755" class="l"><a href="#1755">1755: </a>        }
-</span><span id="1756" class="l"><a href="#1756">1756: </a>
-</span><span id="1757" class="l"><a href="#1757">1757: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1758" class="l"><a href="#1758">1758: </a>        {
-</span><span id="1759" class="l"><a href="#1759">1759: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, entry of search result could not be fetched'</span>);
-</span><span id="1760" class="l"><a href="#1760">1760: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1761" class="l"><a href="#1761">1761: </a>        }
-</span><span id="1762" class="l"><a href="#1762">1762: </a>
-</span><span id="1763" class="l"><a href="#1763">1763: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1764" class="l"><a href="#1764">1764: </a>        {
-</span><span id="1765" class="l"><a href="#1765">1765: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, user-dn could not be fetched'</span>);
-</span><span id="1766" class="l"><a href="#1766">1766: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1767" class="l"><a href="#1767">1767: </a>        }
-</span><span id="1768" class="l"><a href="#1768">1768: </a>
-</span><span id="1769" class="l"><a href="#1769">1769: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
-</span><span id="1770" class="l"><a href="#1770">1770: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1771" class="l"><a href="#1771">1771: </a>        {
-</span><span id="1772" class="l"><a href="#1772">1772: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
-</span><span id="1773" class="l"><a href="#1773">1773: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1774" class="l"><a href="#1774">1774: </a>        }
-</span><span id="1775" class="l"><a href="#1775">1775: </a>
-</span><span id="1776" class="l"><a href="#1776">1776: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span>.<span class="php-var">$user_dn</span>.<span class="php-quote">' authenticated successfully'</span>);
+</span><span id="1744" class="l"><a href="#1744">1744: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span>.<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>].<span class="php-quote">' with dn '</span>.<span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
+</span><span id="1745" class="l"><a href="#1745">1745: </a>
+</span><span id="1746" class="l"><a href="#1746">1746: </a>            <span class="php-comment">// Binding to the ldap server</span>
+</span><span id="1747" class="l"><a href="#1747">1747: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
+</span><span id="1748" class="l"><a href="#1748">1748: </a>
+</span><span id="1749" class="l"><a href="#1749">1749: </a>            <span class="php-comment">// Verify the binding</span>
+</span><span id="1750" class="l"><a href="#1750">1750: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1751" class="l"><a href="#1751">1751: </a>            {
+</span><span id="1752" class="l"><a href="#1752">1752: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind was unsuccessful'</span>);
+</span><span id="1753" class="l"><a href="#1753">1753: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1754" class="l"><a href="#1754">1754: </a>            }
+</span><span id="1755" class="l"><a href="#1755">1755: </a>
+</span><span id="1756" class="l"><a href="#1756">1756: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
+</span><span id="1757" class="l"><a href="#1757">1757: </a>        }
+</span><span id="1758" class="l"><a href="#1758">1758: </a>
+</span><span id="1759" class="l"><a href="#1759">1759: </a>        <span class="php-comment">// Search for user</span>
+</span><span id="1760" class="l"><a href="#1760">1760: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1761" class="l"><a href="#1761">1761: </a>        {
+</span><span id="1762" class="l"><a href="#1762">1762: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span>.<span class="php-var">$username</span>.<span class="php-quote">' not found in search'</span>);
+</span><span id="1763" class="l"><a href="#1763">1763: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1764" class="l"><a href="#1764">1764: </a>        }
+</span><span id="1765" class="l"><a href="#1765">1765: </a>
+</span><span id="1766" class="l"><a href="#1766">1766: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
+</span><span id="1767" class="l"><a href="#1767">1767: </a>        {
+</span><span id="1768" class="l"><a href="#1768">1768: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username '</span>.<span class="php-var">$username</span>.<span class="php-quote">'found more than once'</span>);
+</span><span id="1769" class="l"><a href="#1769">1769: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1770" class="l"><a href="#1770">1770: </a>        }
+</span><span id="1771" class="l"><a href="#1771">1771: </a>
+</span><span id="1772" class="l"><a href="#1772">1772: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1773" class="l"><a href="#1773">1773: </a>        {
+</span><span id="1774" class="l"><a href="#1774">1774: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, entry of search result could not be fetched'</span>);
+</span><span id="1775" class="l"><a href="#1775">1775: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1776" class="l"><a href="#1776">1776: </a>        }
 </span><span id="1777" class="l"><a href="#1777">1777: </a>
-</span><span id="1778" class="l"><a href="#1778">1778: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
-</span><span id="1779" class="l"><a href="#1779">1779: </a>
-</span><span id="1780" class="l"><a href="#1780">1780: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
-</span><span id="1781" class="l"><a href="#1781">1781: </a>
-</span><span id="1782" class="l"><a href="#1782">1782: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1783" class="l"><a href="#1783">1783: </a>    }
-</span><span id="1784" class="l"><a href="#1784">1784: </a>
-</span><span id="1785" class="l"><a href="#1785">1785: </a>    <span class="php-comment">/**
-</span></span><span id="1786" class="l"><a href="#1786">1786: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
-</span></span><span id="1787" class="l"><a href="#1787">1787: </a><span class="php-comment">     *
-</span></span><span id="1788" class="l"><a href="#1788">1788: </a><span class="php-comment">     * @access protected
-</span></span><span id="1789" class="l"><a href="#1789">1789: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1790" class="l"><a href="#1790">1790: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1791" class="l"><a href="#1791">1791: </a><span class="php-comment">     * @return bool
-</span></span><span id="1792" class="l"><a href="#1792">1792: </a><span class="php-comment">     */</span>
-</span><span id="1793" class="l"><a href="#1793">1793: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1794" class="l"><a href="#1794">1794: </a>    {
-</span><span id="1795" class="l"><a href="#1795">1795: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1796" class="l"><a href="#1796">1796: </a>        {
-</span><span id="1797" class="l"><a href="#1797">1797: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: Failure, empty username'</span>);
-</span><span id="1798" class="l"><a href="#1798">1798: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1799" class="l"><a href="#1799">1799: </a>        }
-</span><span id="1800" class="l"><a href="#1800">1800: </a>
-</span><span id="1801" class="l"><a href="#1801">1801: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
-</span><span id="1802" class="l"><a href="#1802">1802: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
-</span><span id="1803" class="l"><a href="#1803">1803: </a>
-</span><span id="1804" class="l"><a href="#1804">1804: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
-</span><span id="1805" class="l"><a href="#1805">1805: </a>        {
-</span><span id="1806" class="l"><a href="#1806">1806: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_class'</span>);
-</span><span id="1807" class="l"><a href="#1807">1807: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1808" class="l"><a href="#1808">1808: </a>        }
-</span><span id="1809" class="l"><a href="#1809">1809: </a>
-</span><span id="1810" class="l"><a href="#1810">1810: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
+</span><span id="1778" class="l"><a href="#1778">1778: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1779" class="l"><a href="#1779">1779: </a>        {
+</span><span id="1780" class="l"><a href="#1780">1780: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, user-dn could not be fetched'</span>);
+</span><span id="1781" class="l"><a href="#1781">1781: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1782" class="l"><a href="#1782">1782: </a>        }
+</span><span id="1783" class="l"><a href="#1783">1783: </a>
+</span><span id="1784" class="l"><a href="#1784">1784: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
+</span><span id="1785" class="l"><a href="#1785">1785: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1786" class="l"><a href="#1786">1786: </a>        {
+</span><span id="1787" class="l"><a href="#1787">1787: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
+</span><span id="1788" class="l"><a href="#1788">1788: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1789" class="l"><a href="#1789">1789: </a>        }
+</span><span id="1790" class="l"><a href="#1790">1790: </a>
+</span><span id="1791" class="l"><a href="#1791">1791: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span>.<span class="php-var">$user_dn</span>.<span class="php-quote">' authenticated successfully'</span>);
+</span><span id="1792" class="l"><a href="#1792">1792: </a>
+</span><span id="1793" class="l"><a href="#1793">1793: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
+</span><span id="1794" class="l"><a href="#1794">1794: </a>
+</span><span id="1795" class="l"><a href="#1795">1795: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
+</span><span id="1796" class="l"><a href="#1796">1796: </a>
+</span><span id="1797" class="l"><a href="#1797">1797: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1798" class="l"><a href="#1798">1798: </a>    }
+</span><span id="1799" class="l"><a href="#1799">1799: </a>
+</span><span id="1800" class="l"><a href="#1800">1800: </a>    <span class="php-comment">/**
+</span></span><span id="1801" class="l"><a href="#1801">1801: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
+</span></span><span id="1802" class="l"><a href="#1802">1802: </a><span class="php-comment">     *
+</span></span><span id="1803" class="l"><a href="#1803">1803: </a><span class="php-comment">     * @access protected
+</span></span><span id="1804" class="l"><a href="#1804">1804: </a><span class="php-comment">     * @param  string $username The username to validate
+</span></span><span id="1805" class="l"><a href="#1805">1805: </a><span class="php-comment">     * @param  string $password The password to validate
+</span></span><span id="1806" class="l"><a href="#1806">1806: </a><span class="php-comment">     * @return bool
+</span></span><span id="1807" class="l"><a href="#1807">1807: </a><span class="php-comment">     */</span>
+</span><span id="1808" class="l"><a href="#1808">1808: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
+</span><span id="1809" class="l"><a href="#1809">1809: </a>    {
+</span><span id="1810" class="l"><a href="#1810">1810: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
 </span><span id="1811" class="l"><a href="#1811">1811: </a>        {
-</span><span id="1812" class="l"><a href="#1812">1812: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_function'</span>);
+</span><span id="1812" class="l"><a href="#1812">1812: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: Failure, empty username'</span>);
 </span><span id="1813" class="l"><a href="#1813">1813: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
 </span><span id="1814" class="l"><a href="#1814">1814: </a>        }
 </span><span id="1815" class="l"><a href="#1815">1815: </a>
-</span><span id="1816" class="l"><a href="#1816">1816: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1817" class="l"><a href="#1817">1817: </a>        {
-</span><span id="1818" class="l"><a href="#1818">1818: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
-</span><span id="1819" class="l"><a href="#1819">1819: </a>        }
-</span><span id="1820" class="l"><a href="#1820">1820: </a>
-</span><span id="1821" class="l"><a href="#1821">1821: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1822" class="l"><a href="#1822">1822: </a>    }
-</span><span id="1823" class="l"><a href="#1823">1823: </a>
-</span><span id="1824" class="l"><a href="#1824">1824: </a>    <span class="php-comment">/**
-</span></span><span id="1825" class="l"><a href="#1825">1825: </a><span class="php-comment">     * Check if the user is logged in
-</span></span><span id="1826" class="l"><a href="#1826">1826: </a><span class="php-comment">     *
-</span></span><span id="1827" class="l"><a href="#1827">1827: </a><span class="php-comment">     * @access protected
-</span></span><span id="1828" class="l"><a href="#1828">1828: </a><span class="php-comment">     * @param  string $username The user's name
-</span></span><span id="1829" class="l"><a href="#1829">1829: </a><span class="php-comment">     * @param  bool|string $password The user's password
-</span></span><span id="1830" class="l"><a href="#1830">1830: </a><span class="php-comment">     * @return bool
-</span></span><span id="1831" class="l"><a href="#1831">1831: </a><span class="php-comment">     */</span>
-</span><span id="1832" class="l"><a href="#1832">1832: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1833" class="l"><a href="#1833">1833: </a>    {
-</span><span id="1834" class="l"><a href="#1834">1834: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1835" class="l"><a href="#1835">1835: </a>        {
-</span><span id="1836" class="l"><a href="#1836">1836: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1837" class="l"><a href="#1837">1837: </a>        }
+</span><span id="1816" class="l"><a href="#1816">1816: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
+</span><span id="1817" class="l"><a href="#1817">1817: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
+</span><span id="1818" class="l"><a href="#1818">1818: </a>
+</span><span id="1819" class="l"><a href="#1819">1819: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
+</span><span id="1820" class="l"><a href="#1820">1820: </a>        {
+</span><span id="1821" class="l"><a href="#1821">1821: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_class'</span>);
+</span><span id="1822" class="l"><a href="#1822">1822: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1823" class="l"><a href="#1823">1823: </a>        }
+</span><span id="1824" class="l"><a href="#1824">1824: </a>
+</span><span id="1825" class="l"><a href="#1825">1825: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
+</span><span id="1826" class="l"><a href="#1826">1826: </a>        {
+</span><span id="1827" class="l"><a href="#1827">1827: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_function'</span>);
+</span><span id="1828" class="l"><a href="#1828">1828: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1829" class="l"><a href="#1829">1829: </a>        }
+</span><span id="1830" class="l"><a href="#1830">1830: </a>
+</span><span id="1831" class="l"><a href="#1831">1831: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1832" class="l"><a href="#1832">1832: </a>        {
+</span><span id="1833" class="l"><a href="#1833">1833: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
+</span><span id="1834" class="l"><a href="#1834">1834: </a>        }
+</span><span id="1835" class="l"><a href="#1835">1835: </a>
+</span><span id="1836" class="l"><a href="#1836">1836: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1837" class="l"><a href="#1837">1837: </a>    }
 </span><span id="1838" class="l"><a href="#1838">1838: </a>
-</span><span id="1839" class="l"><a href="#1839">1839: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
-</span><span id="1840" class="l"><a href="#1840">1840: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="1841" class="l"><a href="#1841">1841: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
-</span><span id="1842" class="l"><a href="#1842">1842: </a>
-</span><span id="1843" class="l"><a href="#1843">1843: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
-</span><span id="1844" class="l"><a href="#1844">1844: </a>        {
-</span><span id="1845" class="l"><a href="#1845">1845: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
-</span><span id="1846" class="l"><a href="#1846">1846: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span>.<span class="php-quote">':'</span>.<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>).<span class="php-quote">':'</span>.(<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
-</span><span id="1847" class="l"><a href="#1847">1847: </a>        }
-</span><span id="1848" class="l"><a href="#1848">1848: </a>
-</span><span id="1849" class="l"><a href="#1849">1849: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1839" class="l"><a href="#1839">1839: </a>    <span class="php-comment">/**
+</span></span><span id="1840" class="l"><a href="#1840">1840: </a><span class="php-comment">     * Check if the user is logged in
+</span></span><span id="1841" class="l"><a href="#1841">1841: </a><span class="php-comment">     *
+</span></span><span id="1842" class="l"><a href="#1842">1842: </a><span class="php-comment">     * @access protected
+</span></span><span id="1843" class="l"><a href="#1843">1843: </a><span class="php-comment">     * @param  string $username The user's name
+</span></span><span id="1844" class="l"><a href="#1844">1844: </a><span class="php-comment">     * @param  bool|string $password The user's password
+</span></span><span id="1845" class="l"><a href="#1845">1845: </a><span class="php-comment">     * @return bool
+</span></span><span id="1846" class="l"><a href="#1846">1846: </a><span class="php-comment">     */</span>
+</span><span id="1847" class="l"><a href="#1847">1847: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
+</span><span id="1848" class="l"><a href="#1848">1848: </a>    {
+</span><span id="1849" class="l"><a href="#1849">1849: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
 </span><span id="1850" class="l"><a href="#1850">1850: </a>        {
 </span><span id="1851" class="l"><a href="#1851">1851: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
 </span><span id="1852" class="l"><a href="#1852">1852: </a>        }
 </span><span id="1853" class="l"><a href="#1853">1853: </a>
-</span><span id="1854" class="l"><a href="#1854">1854: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
-</span><span id="1855" class="l"><a href="#1855">1855: </a>        {
-</span><span id="1856" class="l"><a href="#1856">1856: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1854" class="l"><a href="#1854">1854: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
+</span><span id="1855" class="l"><a href="#1855">1855: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
+</span><span id="1856" class="l"><a href="#1856">1856: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
 </span><span id="1857" class="l"><a href="#1857">1857: </a>
-</span><span id="1858" class="l"><a href="#1858">1858: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1859" class="l"><a href="#1859">1859: </a>        }
-</span><span id="1860" class="l"><a href="#1860">1860: </a>
-</span><span id="1861" class="l"><a href="#1861">1861: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
-</span><span id="1862" class="l"><a href="#1862">1862: </a>        {
-</span><span id="1863" class="l"><a href="#1863">1863: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
-</span><span id="1864" class="l"><a href="#1864">1864: </a>
-</span><span id="1865" class="l"><a href="#1865">1865: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1866" class="l"><a href="#1866">1866: </a>        }
-</span><span id="1867" class="l"><a href="#1867">1867: </a>
-</span><span id="1868" class="l"><a href="#1868">1868: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1869" class="l"><a href="#1869">1869: </a>        {
-</span><span id="1870" class="l"><a href="#1870">1870: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1871" class="l"><a href="#1871">1871: </a>        }
+</span><span id="1858" class="l"><a href="#1858">1858: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
+</span><span id="1859" class="l"><a href="#1859">1859: </a>        {
+</span><span id="1860" class="l"><a href="#1860">1860: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
+</span><span id="1861" class="l"><a href="#1861">1861: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span>.<span class="php-quote">':'</span>.<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>).<span class="php-quote">':'</span>.(<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
+</span><span id="1862" class="l"><a href="#1862">1862: </a>        }
+</span><span id="1863" class="l"><a href="#1863">1863: </a>
+</span><span id="1864" class="l"><a href="#1864">1864: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1865" class="l"><a href="#1865">1865: </a>        {
+</span><span id="1866" class="l"><a href="#1866">1866: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1867" class="l"><a href="#1867">1867: </a>        }
+</span><span id="1868" class="l"><a href="#1868">1868: </a>
+</span><span id="1869" class="l"><a href="#1869">1869: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
+</span><span id="1870" class="l"><a href="#1870">1870: </a>        {
+</span><span id="1871" class="l"><a href="#1871">1871: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
 </span><span id="1872" class="l"><a href="#1872">1872: </a>
-</span><span id="1873" class="l"><a href="#1873">1873: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
-</span><span id="1874" class="l"><a href="#1874">1874: </a>        {
-</span><span id="1875" class="l"><a href="#1875">1875: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1876" class="l"><a href="#1876">1876: </a>        }
-</span><span id="1877" class="l"><a href="#1877">1877: </a>
-</span><span id="1878" class="l"><a href="#1878">1878: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1879" class="l"><a href="#1879">1879: </a>    }
-</span><span id="1880" class="l"><a href="#1880">1880: </a>
-</span><span id="1881" class="l"><a href="#1881">1881: </a>    <span class="php-comment">/**
-</span></span><span id="1882" class="l"><a href="#1882">1882: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
-</span></span><span id="1883" class="l"><a href="#1883">1883: </a><span class="php-comment">     *
-</span></span><span id="1884" class="l"><a href="#1884">1884: </a><span class="php-comment">     * @access protected
-</span></span><span id="1885" class="l"><a href="#1885">1885: </a><span class="php-comment">     * @return void
-</span></span><span id="1886" class="l"><a href="#1886">1886: </a><span class="php-comment">     */</span>
-</span><span id="1887" class="l"><a href="#1887">1887: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
-</span><span id="1888" class="l"><a href="#1888">1888: </a>    {
-</span><span id="1889" class="l"><a href="#1889">1889: </a>        <span class="php-comment">// Get the auth_source config item</span>
-</span><span id="1890" class="l"><a href="#1890">1890: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
-</span><span id="1891" class="l"><a href="#1891">1891: </a>
-</span><span id="1892" class="l"><a href="#1892">1892: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
-</span><span id="1893" class="l"><a href="#1893">1893: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
-</span><span id="1894" class="l"><a href="#1894">1894: </a>        {
-</span><span id="1895" class="l"><a href="#1895">1895: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1896" class="l"><a href="#1896">1896: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1897" class="l"><a href="#1897">1897: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1898" class="l"><a href="#1898">1898: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unauthorized'</span>)
-</span><span id="1899" class="l"><a href="#1899">1899: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="1900" class="l"><a href="#1900">1900: </a>        }
-</span><span id="1901" class="l"><a href="#1901">1901: </a>    }
-</span><span id="1902" class="l"><a href="#1902">1902: </a>
-</span><span id="1903" class="l"><a href="#1903">1903: </a>    <span class="php-comment">/**
-</span></span><span id="1904" class="l"><a href="#1904">1904: </a><span class="php-comment">     * Prepares for basic authentication
-</span></span><span id="1905" class="l"><a href="#1905">1905: </a><span class="php-comment">     *
-</span></span><span id="1906" class="l"><a href="#1906">1906: </a><span class="php-comment">     * @access protected
-</span></span><span id="1907" class="l"><a href="#1907">1907: </a><span class="php-comment">     * @return void
-</span></span><span id="1908" class="l"><a href="#1908">1908: </a><span class="php-comment">     */</span>
-</span><span id="1909" class="l"><a href="#1909">1909: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
-</span><span id="1910" class="l"><a href="#1910">1910: </a>    {
-</span><span id="1911" class="l"><a href="#1911">1911: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1912" class="l"><a href="#1912">1912: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
-</span><span id="1913" class="l"><a href="#1913">1913: </a>        {
-</span><span id="1914" class="l"><a href="#1914">1914: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1873" class="l"><a href="#1873">1873: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1874" class="l"><a href="#1874">1874: </a>        }
+</span><span id="1875" class="l"><a href="#1875">1875: </a>
+</span><span id="1876" class="l"><a href="#1876">1876: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
+</span><span id="1877" class="l"><a href="#1877">1877: </a>        {
+</span><span id="1878" class="l"><a href="#1878">1878: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
+</span><span id="1879" class="l"><a href="#1879">1879: </a>
+</span><span id="1880" class="l"><a href="#1880">1880: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
+</span><span id="1881" class="l"><a href="#1881">1881: </a>        }
+</span><span id="1882" class="l"><a href="#1882">1882: </a>
+</span><span id="1883" class="l"><a href="#1883">1883: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="1884" class="l"><a href="#1884">1884: </a>        {
+</span><span id="1885" class="l"><a href="#1885">1885: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1886" class="l"><a href="#1886">1886: </a>        }
+</span><span id="1887" class="l"><a href="#1887">1887: </a>
+</span><span id="1888" class="l"><a href="#1888">1888: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
+</span><span id="1889" class="l"><a href="#1889">1889: </a>        {
+</span><span id="1890" class="l"><a href="#1890">1890: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
+</span><span id="1891" class="l"><a href="#1891">1891: </a>        }
+</span><span id="1892" class="l"><a href="#1892">1892: </a>
+</span><span id="1893" class="l"><a href="#1893">1893: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="1894" class="l"><a href="#1894">1894: </a>    }
+</span><span id="1895" class="l"><a href="#1895">1895: </a>
+</span><span id="1896" class="l"><a href="#1896">1896: </a>    <span class="php-comment">/**
+</span></span><span id="1897" class="l"><a href="#1897">1897: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
+</span></span><span id="1898" class="l"><a href="#1898">1898: </a><span class="php-comment">     *
+</span></span><span id="1899" class="l"><a href="#1899">1899: </a><span class="php-comment">     * @access protected
+</span></span><span id="1900" class="l"><a href="#1900">1900: </a><span class="php-comment">     * @return void
+</span></span><span id="1901" class="l"><a href="#1901">1901: </a><span class="php-comment">     */</span>
+</span><span id="1902" class="l"><a href="#1902">1902: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
+</span><span id="1903" class="l"><a href="#1903">1903: </a>    {
+</span><span id="1904" class="l"><a href="#1904">1904: </a>        <span class="php-comment">// Get the auth_source config item</span>
+</span><span id="1905" class="l"><a href="#1905">1905: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
+</span><span id="1906" class="l"><a href="#1906">1906: </a>
+</span><span id="1907" class="l"><a href="#1907">1907: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
+</span><span id="1908" class="l"><a href="#1908">1908: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
+</span><span id="1909" class="l"><a href="#1909">1909: </a>        {
+</span><span id="1910" class="l"><a href="#1910">1910: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="1911" class="l"><a href="#1911">1911: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="1912" class="l"><a href="#1912">1912: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="1913" class="l"><a href="#1913">1913: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unauthorized'</span>)
+</span><span id="1914" class="l"><a href="#1914">1914: </a>                ], self::HTTP_UNAUTHORIZED);
 </span><span id="1915" class="l"><a href="#1915">1915: </a>        }
-</span><span id="1916" class="l"><a href="#1916">1916: </a>
-</span><span id="1917" class="l"><a href="#1917">1917: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
-</span><span id="1918" class="l"><a href="#1918">1918: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
-</span><span id="1919" class="l"><a href="#1919">1919: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
-</span><span id="1920" class="l"><a href="#1920">1920: </a>
-</span><span id="1921" class="l"><a href="#1921">1921: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1922" class="l"><a href="#1922">1922: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1923" class="l"><a href="#1923">1923: </a>        {
-</span><span id="1924" class="l"><a href="#1924">1924: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
-</span><span id="1925" class="l"><a href="#1925">1925: </a>        }
-</span><span id="1926" class="l"><a href="#1926">1926: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1927" class="l"><a href="#1927">1927: </a>        {
-</span><span id="1928" class="l"><a href="#1928">1928: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
-</span><span id="1929" class="l"><a href="#1929">1929: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
-</span><span id="1930" class="l"><a href="#1930">1930: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
-</span><span id="1931" class="l"><a href="#1931">1931: </a>            {
-</span><span id="1932" class="l"><a href="#1932">1932: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
-</span><span id="1933" class="l"><a href="#1933">1933: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
-</span><span id="1934" class="l"><a href="#1934">1934: </a>            }
-</span><span id="1935" class="l"><a href="#1935">1935: </a>        }
-</span><span id="1936" class="l"><a href="#1936">1936: </a>
-</span><span id="1937" class="l"><a href="#1937">1937: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
-</span><span id="1938" class="l"><a href="#1938">1938: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1939" class="l"><a href="#1939">1939: </a>        {
-</span><span id="1940" class="l"><a href="#1940">1940: </a>            <span class="php-var">$this</span>-&gt;_force_login();
-</span><span id="1941" class="l"><a href="#1941">1941: </a>        }
-</span><span id="1942" class="l"><a href="#1942">1942: </a>    }
-</span><span id="1943" class="l"><a href="#1943">1943: </a>
-</span><span id="1944" class="l"><a href="#1944">1944: </a>    <span class="php-comment">/**
-</span></span><span id="1945" class="l"><a href="#1945">1945: </a><span class="php-comment">     * Prepares for digest authentication
-</span></span><span id="1946" class="l"><a href="#1946">1946: </a><span class="php-comment">     *
-</span></span><span id="1947" class="l"><a href="#1947">1947: </a><span class="php-comment">     * @access protected
-</span></span><span id="1948" class="l"><a href="#1948">1948: </a><span class="php-comment">     * @return void
-</span></span><span id="1949" class="l"><a href="#1949">1949: </a><span class="php-comment">     */</span>
-</span><span id="1950" class="l"><a href="#1950">1950: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
-</span><span id="1951" class="l"><a href="#1951">1951: </a>    {
-</span><span id="1952" class="l"><a href="#1952">1952: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1953" class="l"><a href="#1953">1953: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1916" class="l"><a href="#1916">1916: </a>    }
+</span><span id="1917" class="l"><a href="#1917">1917: </a>
+</span><span id="1918" class="l"><a href="#1918">1918: </a>    <span class="php-comment">/**
+</span></span><span id="1919" class="l"><a href="#1919">1919: </a><span class="php-comment">     * Prepares for basic authentication
+</span></span><span id="1920" class="l"><a href="#1920">1920: </a><span class="php-comment">     *
+</span></span><span id="1921" class="l"><a href="#1921">1921: </a><span class="php-comment">     * @access protected
+</span></span><span id="1922" class="l"><a href="#1922">1922: </a><span class="php-comment">     * @return void
+</span></span><span id="1923" class="l"><a href="#1923">1923: </a><span class="php-comment">     */</span>
+</span><span id="1924" class="l"><a href="#1924">1924: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
+</span><span id="1925" class="l"><a href="#1925">1925: </a>    {
+</span><span id="1926" class="l"><a href="#1926">1926: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1927" class="l"><a href="#1927">1927: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1928" class="l"><a href="#1928">1928: </a>        {
+</span><span id="1929" class="l"><a href="#1929">1929: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1930" class="l"><a href="#1930">1930: </a>        }
+</span><span id="1931" class="l"><a href="#1931">1931: </a>
+</span><span id="1932" class="l"><a href="#1932">1932: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
+</span><span id="1933" class="l"><a href="#1933">1933: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
+</span><span id="1934" class="l"><a href="#1934">1934: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
+</span><span id="1935" class="l"><a href="#1935">1935: </a>
+</span><span id="1936" class="l"><a href="#1936">1936: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
+</span><span id="1937" class="l"><a href="#1937">1937: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1938" class="l"><a href="#1938">1938: </a>        {
+</span><span id="1939" class="l"><a href="#1939">1939: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
+</span><span id="1940" class="l"><a href="#1940">1940: </a>        }
+</span><span id="1941" class="l"><a href="#1941">1941: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
+</span><span id="1942" class="l"><a href="#1942">1942: </a>        {
+</span><span id="1943" class="l"><a href="#1943">1943: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
+</span><span id="1944" class="l"><a href="#1944">1944: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
+</span><span id="1945" class="l"><a href="#1945">1945: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
+</span><span id="1946" class="l"><a href="#1946">1946: </a>            {
+</span><span id="1947" class="l"><a href="#1947">1947: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
+</span><span id="1948" class="l"><a href="#1948">1948: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
+</span><span id="1949" class="l"><a href="#1949">1949: </a>            }
+</span><span id="1950" class="l"><a href="#1950">1950: </a>        }
+</span><span id="1951" class="l"><a href="#1951">1951: </a>
+</span><span id="1952" class="l"><a href="#1952">1952: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
+</span><span id="1953" class="l"><a href="#1953">1953: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
 </span><span id="1954" class="l"><a href="#1954">1954: </a>        {
-</span><span id="1955" class="l"><a href="#1955">1955: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1955" class="l"><a href="#1955">1955: </a>            <span class="php-var">$this</span>-&gt;_force_login();
 </span><span id="1956" class="l"><a href="#1956">1956: </a>        }
-</span><span id="1957" class="l"><a href="#1957">1957: </a>
-</span><span id="1958" class="l"><a href="#1958">1958: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
-</span><span id="1959" class="l"><a href="#1959">1959: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
-</span><span id="1960" class="l"><a href="#1960">1960: </a>        <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
-</span><span id="1961" class="l"><a href="#1961">1961: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$digest_string</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1962" class="l"><a href="#1962">1962: </a>        {
-</span><span id="1963" class="l"><a href="#1963">1963: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
-</span><span id="1964" class="l"><a href="#1964">1964: </a>        }
-</span><span id="1965" class="l"><a href="#1965">1965: </a>
-</span><span id="1966" class="l"><a href="#1966">1966: </a>        <span class="php-var">$unique_id</span> = <span class="php-keyword2">uniqid</span>();
-</span><span id="1967" class="l"><a href="#1967">1967: </a>
-</span><span id="1968" class="l"><a href="#1968">1968: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
-</span><span id="1969" class="l"><a href="#1969">1969: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
-</span><span id="1970" class="l"><a href="#1970">1970: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
-</span><span id="1971" class="l"><a href="#1971">1971: </a>        {
-</span><span id="1972" class="l"><a href="#1972">1972: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
-</span><span id="1973" class="l"><a href="#1973">1973: </a>        }
-</span><span id="1974" class="l"><a href="#1974">1974: </a>
-</span><span id="1975" class="l"><a href="#1975">1975: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
-</span><span id="1976" class="l"><a href="#1976">1976: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="1977" class="l"><a href="#1977">1977: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
-</span><span id="1978" class="l"><a href="#1978">1978: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
-</span><span id="1979" class="l"><a href="#1979">1979: </a>
-</span><span id="1980" class="l"><a href="#1980">1980: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username see rest.php::auth_library_function config</span>
-</span><span id="1981" class="l"><a href="#1981">1981: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
-</span><span id="1982" class="l"><a href="#1982">1982: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$username</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1983" class="l"><a href="#1983">1983: </a>        {
-</span><span id="1984" class="l"><a href="#1984">1984: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
-</span><span id="1985" class="l"><a href="#1985">1985: </a>        }
-</span><span id="1986" class="l"><a href="#1986">1986: </a>
-</span><span id="1987" class="l"><a href="#1987">1987: </a>        <span class="php-var">$md5</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method).<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
-</span><span id="1988" class="l"><a href="#1988">1988: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$username</span>.<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>].<span class="php-quote">':'</span>.<span class="php-var">$md5</span>);
+</span><span id="1957" class="l"><a href="#1957">1957: </a>    }
+</span><span id="1958" class="l"><a href="#1958">1958: </a>
+</span><span id="1959" class="l"><a href="#1959">1959: </a>    <span class="php-comment">/**
+</span></span><span id="1960" class="l"><a href="#1960">1960: </a><span class="php-comment">     * Prepares for digest authentication
+</span></span><span id="1961" class="l"><a href="#1961">1961: </a><span class="php-comment">     *
+</span></span><span id="1962" class="l"><a href="#1962">1962: </a><span class="php-comment">     * @access protected
+</span></span><span id="1963" class="l"><a href="#1963">1963: </a><span class="php-comment">     * @return void
+</span></span><span id="1964" class="l"><a href="#1964">1964: </a><span class="php-comment">     */</span>
+</span><span id="1965" class="l"><a href="#1965">1965: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
+</span><span id="1966" class="l"><a href="#1966">1966: </a>    {
+</span><span id="1967" class="l"><a href="#1967">1967: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
+</span><span id="1968" class="l"><a href="#1968">1968: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
+</span><span id="1969" class="l"><a href="#1969">1969: </a>        {
+</span><span id="1970" class="l"><a href="#1970">1970: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
+</span><span id="1971" class="l"><a href="#1971">1971: </a>        }
+</span><span id="1972" class="l"><a href="#1972">1972: </a>
+</span><span id="1973" class="l"><a href="#1973">1973: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
+</span><span id="1974" class="l"><a href="#1974">1974: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
+</span><span id="1975" class="l"><a href="#1975">1975: </a>        <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
+</span><span id="1976" class="l"><a href="#1976">1976: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$digest_string</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="1977" class="l"><a href="#1977">1977: </a>        {
+</span><span id="1978" class="l"><a href="#1978">1978: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
+</span><span id="1979" class="l"><a href="#1979">1979: </a>        }
+</span><span id="1980" class="l"><a href="#1980">1980: </a>
+</span><span id="1981" class="l"><a href="#1981">1981: </a>        <span class="php-var">$unique_id</span> = <span class="php-keyword2">uniqid</span>();
+</span><span id="1982" class="l"><a href="#1982">1982: </a>
+</span><span id="1983" class="l"><a href="#1983">1983: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
+</span><span id="1984" class="l"><a href="#1984">1984: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
+</span><span id="1985" class="l"><a href="#1985">1985: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
+</span><span id="1986" class="l"><a href="#1986">1986: </a>        {
+</span><span id="1987" class="l"><a href="#1987">1987: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
+</span><span id="1988" class="l"><a href="#1988">1988: </a>        }
 </span><span id="1989" class="l"><a href="#1989">1989: </a>
-</span><span id="1990" class="l"><a href="#1990">1990: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
-</span><span id="1991" class="l"><a href="#1991">1991: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
-</span><span id="1992" class="l"><a href="#1992">1992: </a>        {
-</span><span id="1993" class="l"><a href="#1993">1993: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1994" class="l"><a href="#1994">1994: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1995" class="l"><a href="#1995">1995: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1996" class="l"><a href="#1996">1996: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_invalid_credentials'</span>)
-</span><span id="1997" class="l"><a href="#1997">1997: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="1998" class="l"><a href="#1998">1998: </a>        }
-</span><span id="1999" class="l"><a href="#1999">1999: </a>    }
-</span><span id="2000" class="l"><a href="#2000">2000: </a>
-</span><span id="2001" class="l"><a href="#2001">2001: </a>    <span class="php-comment">/**
-</span></span><span id="2002" class="l"><a href="#2002">2002: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
-</span></span><span id="2003" class="l"><a href="#2003">2003: </a><span class="php-comment">     *
-</span></span><span id="2004" class="l"><a href="#2004">2004: </a><span class="php-comment">     * @access protected
-</span></span><span id="2005" class="l"><a href="#2005">2005: </a><span class="php-comment">     * @return void
-</span></span><span id="2006" class="l"><a href="#2006">2006: </a><span class="php-comment">     */</span>
-</span><span id="2007" class="l"><a href="#2007">2007: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
-</span><span id="2008" class="l"><a href="#2008">2008: </a>    {
-</span><span id="2009" class="l"><a href="#2009">2009: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
-</span><span id="2010" class="l"><a href="#2010">2010: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
-</span><span id="2011" class="l"><a href="#2011">2011: </a>
-</span><span id="2012" class="l"><a href="#2012">2012: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
-</span><span id="2013" class="l"><a href="#2013">2013: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
-</span><span id="2014" class="l"><a href="#2014">2014: </a>        {
-</span><span id="2015" class="l"><a href="#2015">2015: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="2016" class="l"><a href="#2016">2016: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="2017" class="l"><a href="#2017">2017: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="2018" class="l"><a href="#2018">2018: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ip_denied'</span>)
-</span><span id="2019" class="l"><a href="#2019">2019: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="2020" class="l"><a href="#2020">2020: </a>        }
-</span><span id="2021" class="l"><a href="#2021">2021: </a>    }
-</span><span id="2022" class="l"><a href="#2022">2022: </a>
-</span><span id="2023" class="l"><a href="#2023">2023: </a>    <span class="php-comment">/**
-</span></span><span id="2024" class="l"><a href="#2024">2024: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
-</span></span><span id="2025" class="l"><a href="#2025">2025: </a><span class="php-comment">     *
-</span></span><span id="2026" class="l"><a href="#2026">2026: </a><span class="php-comment">     * @access protected
-</span></span><span id="2027" class="l"><a href="#2027">2027: </a><span class="php-comment">     * @return void
-</span></span><span id="2028" class="l"><a href="#2028">2028: </a><span class="php-comment">     */</span>
-</span><span id="2029" class="l"><a href="#2029">2029: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
-</span><span id="2030" class="l"><a href="#2030">2030: </a>    {
-</span><span id="2031" class="l"><a href="#2031">2031: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
-</span><span id="2032" class="l"><a href="#2032">2032: </a>
-</span><span id="2033" class="l"><a href="#2033">2033: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
-</span><span id="2034" class="l"><a href="#2034">2034: </a>
-</span><span id="2035" class="l"><a href="#2035">2035: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$ip</span>)
-</span><span id="2036" class="l"><a href="#2036">2036: </a>        {
-</span><span id="2037" class="l"><a href="#2037">2037: </a>            <span class="php-comment">// As $ip is a reference, trim leading and trailing whitespace, then store the new value</span>
-</span><span id="2038" class="l"><a href="#2038">2038: </a>            <span class="php-comment">// using the reference</span>
-</span><span id="2039" class="l"><a href="#2039">2039: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
-</span><span id="2040" class="l"><a href="#2040">2040: </a>        }
-</span><span id="2041" class="l"><a href="#2041">2041: </a>
-</span><span id="2042" class="l"><a href="#2042">2042: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="2043" class="l"><a href="#2043">2043: </a>        {
-</span><span id="2044" class="l"><a href="#2044">2044: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="2045" class="l"><a href="#2045">2045: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="2046" class="l"><a href="#2046">2046: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ip_unauthorized'</span>)
-</span><span id="2047" class="l"><a href="#2047">2047: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="2048" class="l"><a href="#2048">2048: </a>        }
-</span><span id="2049" class="l"><a href="#2049">2049: </a>    }
-</span><span id="2050" class="l"><a href="#2050">2050: </a>
-</span><span id="2051" class="l"><a href="#2051">2051: </a>    <span class="php-comment">/**
-</span></span><span id="2052" class="l"><a href="#2052">2052: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
-</span></span><span id="2053" class="l"><a href="#2053">2053: </a><span class="php-comment">     *
-</span></span><span id="2054" class="l"><a href="#2054">2054: </a><span class="php-comment">     * @access protected
-</span></span><span id="2055" class="l"><a href="#2055">2055: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
-</span></span><span id="2056" class="l"><a href="#2056">2056: </a><span class="php-comment">     * each time
-</span></span><span id="2057" class="l"><a href="#2057">2057: </a><span class="php-comment">     * @return void
-</span></span><span id="2058" class="l"><a href="#2058">2058: </a><span class="php-comment">     */</span>
-</span><span id="2059" class="l"><a href="#2059">2059: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
-</span><span id="2060" class="l"><a href="#2060">2060: </a>    {
-</span><span id="2061" class="l"><a href="#2061">2061: </a>        <span class="php-var">$rest_auth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
-</span><span id="2062" class="l"><a href="#2062">2062: </a>        <span class="php-var">$rest_realm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
-</span><span id="2063" class="l"><a href="#2063">2063: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'basic'</span>)
-</span><span id="2064" class="l"><a href="#2064">2064: </a>        {
-</span><span id="2065" class="l"><a href="#2065">2065: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
-</span><span id="2066" class="l"><a href="#2066">2066: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span>.<span class="php-var">$rest_realm</span>.<span class="php-quote">'&quot;'</span>);
-</span><span id="2067" class="l"><a href="#2067">2067: </a>        }
-</span><span id="2068" class="l"><a href="#2068">2068: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'digest'</span>)
-</span><span id="2069" class="l"><a href="#2069">2069: </a>        {
-</span><span id="2070" class="l"><a href="#2070">2070: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
-</span><span id="2071" class="l"><a href="#2071">2071: </a>            <span class="php-keyword2">header</span>(
-</span><span id="2072" class="l"><a href="#2072">2072: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span>.<span class="php-var">$rest_realm</span>
-</span><span id="2073" class="l"><a href="#2073">2073: </a>                .<span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span>.<span class="php-var">$nonce</span>
-</span><span id="2074" class="l"><a href="#2074">2074: </a>                .<span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$rest_realm</span>).<span class="php-quote">'&quot;'</span>);
-</span><span id="2075" class="l"><a href="#2075">2075: </a>        }
-</span><span id="2076" class="l"><a href="#2076">2076: </a>
-</span><span id="2077" class="l"><a href="#2077">2077: </a>        <span class="php-comment">// Display an error response</span>
-</span><span id="2078" class="l"><a href="#2078">2078: </a>        <span class="php-var">$this</span>-&gt;response([
-</span><span id="2079" class="l"><a href="#2079">2079: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="2080" class="l"><a href="#2080">2080: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unauthorized'</span>)
-</span><span id="2081" class="l"><a href="#2081">2081: </a>            ], self::HTTP_UNAUTHORIZED);
-</span><span id="2082" class="l"><a href="#2082">2082: </a>    }
-</span><span id="2083" class="l"><a href="#2083">2083: </a>
-</span><span id="2084" class="l"><a href="#2084">2084: </a>    <span class="php-comment">/**
-</span></span><span id="2085" class="l"><a href="#2085">2085: </a><span class="php-comment">     * Updates the log table with the total access time
-</span></span><span id="2086" class="l"><a href="#2086">2086: </a><span class="php-comment">     *
-</span></span><span id="2087" class="l"><a href="#2087">2087: </a><span class="php-comment">     * @access protected
-</span></span><span id="2088" class="l"><a href="#2088">2088: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="2089" class="l"><a href="#2089">2089: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="2090" class="l"><a href="#2090">2090: </a><span class="php-comment">     */</span>
-</span><span id="2091" class="l"><a href="#2091">2091: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
-</span><span id="2092" class="l"><a href="#2092">2092: </a>    {
-</span><span id="2093" class="l"><a href="#2093">2093: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
-</span><span id="2094" class="l"><a href="#2094">2094: </a>
-</span><span id="2095" class="l"><a href="#2095">2095: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
-</span><span id="2096" class="l"><a href="#2096">2096: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="2097" class="l"><a href="#2097">2097: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="2098" class="l"><a href="#2098">2098: </a>            ]);
-</span><span id="2099" class="l"><a href="#2099">2099: </a>    }
-</span><span id="2100" class="l"><a href="#2100">2100: </a>
-</span><span id="2101" class="l"><a href="#2101">2101: </a>    <span class="php-comment">/**
-</span></span><span id="2102" class="l"><a href="#2102">2102: </a><span class="php-comment">     * Updates the log table with HTTP response code
-</span></span><span id="2103" class="l"><a href="#2103">2103: </a><span class="php-comment">     *
-</span></span><span id="2104" class="l"><a href="#2104">2104: </a><span class="php-comment">     * @access protected
-</span></span><span id="2105" class="l"><a href="#2105">2105: </a><span class="php-comment">     * @author Justin Chen
-</span></span><span id="2106" class="l"><a href="#2106">2106: </a><span class="php-comment">     * @param $http_code int HTTP status code
-</span></span><span id="2107" class="l"><a href="#2107">2107: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="2108" class="l"><a href="#2108">2108: </a><span class="php-comment">     */</span>
-</span><span id="2109" class="l"><a href="#2109">2109: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
-</span><span id="2110" class="l"><a href="#2110">2110: </a>    {
-</span><span id="2111" class="l"><a href="#2111">2111: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
-</span><span id="2112" class="l"><a href="#2112">2112: </a>
-</span><span id="2113" class="l"><a href="#2113">2113: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
-</span><span id="2114" class="l"><a href="#2114">2114: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="2115" class="l"><a href="#2115">2115: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="2116" class="l"><a href="#2116">2116: </a>        ]);
-</span><span id="2117" class="l"><a href="#2117">2117: </a>    }
-</span><span id="2118" class="l"><a href="#2118">2118: </a>
-</span><span id="2119" class="l"><a href="#2119">2119: </a>    <span class="php-comment">/**
-</span></span><span id="2120" class="l"><a href="#2120">2120: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
-</span></span><span id="2121" class="l"><a href="#2121">2121: </a><span class="php-comment">     *
-</span></span><span id="2122" class="l"><a href="#2122">2122: </a><span class="php-comment">     * @access protected
-</span></span><span id="2123" class="l"><a href="#2123">2123: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
-</span></span><span id="2124" class="l"><a href="#2124">2124: </a><span class="php-comment">     */</span>
-</span><span id="2125" class="l"><a href="#2125">2125: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
-</span><span id="2126" class="l"><a href="#2126">2126: </a>    {
-</span><span id="2127" class="l"><a href="#2127">2127: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
-</span><span id="2128" class="l"><a href="#2128">2128: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="2129" class="l"><a href="#2129">2129: </a>        {
-</span><span id="2130" class="l"><a href="#2130">2130: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="2131" class="l"><a href="#2131">2131: </a>        }
-</span><span id="2132" class="l"><a href="#2132">2132: </a>
-</span><span id="2133" class="l"><a href="#2133">2133: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
-</span><span id="2134" class="l"><a href="#2134">2134: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
-</span><span id="2135" class="l"><a href="#2135">2135: </a>            <span class="php-quote">'/'</span>, [
-</span><span id="2136" class="l"><a href="#2136">2136: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
-</span><span id="2137" class="l"><a href="#2137">2137: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
-</span><span id="2138" class="l"><a href="#2138">2138: </a>        ]);
-</span><span id="2139" class="l"><a href="#2139">2139: </a>
-</span><span id="2140" class="l"><a href="#2140">2140: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
-</span><span id="2141" class="l"><a href="#2141">2141: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
-</span><span id="2142" class="l"><a href="#2142">2142: </a>
-</span><span id="2143" class="l"><a href="#2143">2143: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
-</span><span id="2144" class="l"><a href="#2144">2144: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="2145" class="l"><a href="#2145">2145: </a>            -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="2146" class="l"><a href="#2146">2146: </a>            -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
-</span><span id="2147" class="l"><a href="#2147">2147: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
-</span><span id="2148" class="l"><a href="#2148">2148: </a>            -&gt;num_rows() &gt; <span class="php-num">0</span>;
-</span><span id="2149" class="l"><a href="#2149">2149: </a>    }
-</span><span id="2150" class="l"><a href="#2150">2150: </a>
-</span><span id="2151" class="l"><a href="#2151">2151: </a>}
-</span><span id="2152" class="l"><a href="#2152">2152: </a></span></code></pre>
+</span><span id="1990" class="l"><a href="#1990">1990: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
+</span><span id="1991" class="l"><a href="#1991">1991: </a>        <span class="php-var">$matches</span> = [];
+</span><span id="1992" class="l"><a href="#1992">1992: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
+</span><span id="1993" class="l"><a href="#1993">1993: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
+</span><span id="1994" class="l"><a href="#1994">1994: </a>
+</span><span id="1995" class="l"><a href="#1995">1995: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username see rest.php::auth_library_function config</span>
+</span><span id="1996" class="l"><a href="#1996">1996: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
+</span><span id="1997" class="l"><a href="#1997">1997: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$username</span> === <span class="php-keyword1">FALSE</span>)
+</span><span id="1998" class="l"><a href="#1998">1998: </a>        {
+</span><span id="1999" class="l"><a href="#1999">1999: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
+</span><span id="2000" class="l"><a href="#2000">2000: </a>        }
+</span><span id="2001" class="l"><a href="#2001">2001: </a>
+</span><span id="2002" class="l"><a href="#2002">2002: </a>        <span class="php-var">$md5</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method).<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
+</span><span id="2003" class="l"><a href="#2003">2003: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$username</span>.<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>].<span class="php-quote">':'</span>.<span class="php-var">$md5</span>);
+</span><span id="2004" class="l"><a href="#2004">2004: </a>
+</span><span id="2005" class="l"><a href="#2005">2005: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
+</span><span id="2006" class="l"><a href="#2006">2006: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
+</span><span id="2007" class="l"><a href="#2007">2007: </a>        {
+</span><span id="2008" class="l"><a href="#2008">2008: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="2009" class="l"><a href="#2009">2009: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="2010" class="l"><a href="#2010">2010: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="2011" class="l"><a href="#2011">2011: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_invalid_credentials'</span>)
+</span><span id="2012" class="l"><a href="#2012">2012: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="2013" class="l"><a href="#2013">2013: </a>        }
+</span><span id="2014" class="l"><a href="#2014">2014: </a>    }
+</span><span id="2015" class="l"><a href="#2015">2015: </a>
+</span><span id="2016" class="l"><a href="#2016">2016: </a>    <span class="php-comment">/**
+</span></span><span id="2017" class="l"><a href="#2017">2017: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
+</span></span><span id="2018" class="l"><a href="#2018">2018: </a><span class="php-comment">     *
+</span></span><span id="2019" class="l"><a href="#2019">2019: </a><span class="php-comment">     * @access protected
+</span></span><span id="2020" class="l"><a href="#2020">2020: </a><span class="php-comment">     * @return void
+</span></span><span id="2021" class="l"><a href="#2021">2021: </a><span class="php-comment">     */</span>
+</span><span id="2022" class="l"><a href="#2022">2022: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
+</span><span id="2023" class="l"><a href="#2023">2023: </a>    {
+</span><span id="2024" class="l"><a href="#2024">2024: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
+</span><span id="2025" class="l"><a href="#2025">2025: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
+</span><span id="2026" class="l"><a href="#2026">2026: </a>
+</span><span id="2027" class="l"><a href="#2027">2027: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
+</span><span id="2028" class="l"><a href="#2028">2028: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
+</span><span id="2029" class="l"><a href="#2029">2029: </a>        {
+</span><span id="2030" class="l"><a href="#2030">2030: </a>            <span class="php-comment">// Display an error response</span>
+</span><span id="2031" class="l"><a href="#2031">2031: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="2032" class="l"><a href="#2032">2032: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="2033" class="l"><a href="#2033">2033: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ip_denied'</span>)
+</span><span id="2034" class="l"><a href="#2034">2034: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="2035" class="l"><a href="#2035">2035: </a>        }
+</span><span id="2036" class="l"><a href="#2036">2036: </a>    }
+</span><span id="2037" class="l"><a href="#2037">2037: </a>
+</span><span id="2038" class="l"><a href="#2038">2038: </a>    <span class="php-comment">/**
+</span></span><span id="2039" class="l"><a href="#2039">2039: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
+</span></span><span id="2040" class="l"><a href="#2040">2040: </a><span class="php-comment">     *
+</span></span><span id="2041" class="l"><a href="#2041">2041: </a><span class="php-comment">     * @access protected
+</span></span><span id="2042" class="l"><a href="#2042">2042: </a><span class="php-comment">     * @return void
+</span></span><span id="2043" class="l"><a href="#2043">2043: </a><span class="php-comment">     */</span>
+</span><span id="2044" class="l"><a href="#2044">2044: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
+</span><span id="2045" class="l"><a href="#2045">2045: </a>    {
+</span><span id="2046" class="l"><a href="#2046">2046: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
+</span><span id="2047" class="l"><a href="#2047">2047: </a>
+</span><span id="2048" class="l"><a href="#2048">2048: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
+</span><span id="2049" class="l"><a href="#2049">2049: </a>
+</span><span id="2050" class="l"><a href="#2050">2050: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$ip</span>)
+</span><span id="2051" class="l"><a href="#2051">2051: </a>        {
+</span><span id="2052" class="l"><a href="#2052">2052: </a>            <span class="php-comment">// As $ip is a reference, trim leading and trailing whitespace, then store the new value</span>
+</span><span id="2053" class="l"><a href="#2053">2053: </a>            <span class="php-comment">// using the reference</span>
+</span><span id="2054" class="l"><a href="#2054">2054: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
+</span><span id="2055" class="l"><a href="#2055">2055: </a>        }
+</span><span id="2056" class="l"><a href="#2056">2056: </a>
+</span><span id="2057" class="l"><a href="#2057">2057: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="2058" class="l"><a href="#2058">2058: </a>        {
+</span><span id="2059" class="l"><a href="#2059">2059: </a>            <span class="php-var">$this</span>-&gt;response([
+</span><span id="2060" class="l"><a href="#2060">2060: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="2061" class="l"><a href="#2061">2061: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ip_unauthorized'</span>)
+</span><span id="2062" class="l"><a href="#2062">2062: </a>                ], self::HTTP_UNAUTHORIZED);
+</span><span id="2063" class="l"><a href="#2063">2063: </a>        }
+</span><span id="2064" class="l"><a href="#2064">2064: </a>    }
+</span><span id="2065" class="l"><a href="#2065">2065: </a>
+</span><span id="2066" class="l"><a href="#2066">2066: </a>    <span class="php-comment">/**
+</span></span><span id="2067" class="l"><a href="#2067">2067: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
+</span></span><span id="2068" class="l"><a href="#2068">2068: </a><span class="php-comment">     *
+</span></span><span id="2069" class="l"><a href="#2069">2069: </a><span class="php-comment">     * @access protected
+</span></span><span id="2070" class="l"><a href="#2070">2070: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
+</span></span><span id="2071" class="l"><a href="#2071">2071: </a><span class="php-comment">     * each time
+</span></span><span id="2072" class="l"><a href="#2072">2072: </a><span class="php-comment">     * @return void
+</span></span><span id="2073" class="l"><a href="#2073">2073: </a><span class="php-comment">     */</span>
+</span><span id="2074" class="l"><a href="#2074">2074: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
+</span><span id="2075" class="l"><a href="#2075">2075: </a>    {
+</span><span id="2076" class="l"><a href="#2076">2076: </a>        <span class="php-var">$rest_auth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
+</span><span id="2077" class="l"><a href="#2077">2077: </a>        <span class="php-var">$rest_realm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
+</span><span id="2078" class="l"><a href="#2078">2078: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'basic'</span>)
+</span><span id="2079" class="l"><a href="#2079">2079: </a>        {
+</span><span id="2080" class="l"><a href="#2080">2080: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
+</span><span id="2081" class="l"><a href="#2081">2081: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span>.<span class="php-var">$rest_realm</span>.<span class="php-quote">'&quot;'</span>);
+</span><span id="2082" class="l"><a href="#2082">2082: </a>        }
+</span><span id="2083" class="l"><a href="#2083">2083: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'digest'</span>)
+</span><span id="2084" class="l"><a href="#2084">2084: </a>        {
+</span><span id="2085" class="l"><a href="#2085">2085: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
+</span><span id="2086" class="l"><a href="#2086">2086: </a>            <span class="php-keyword2">header</span>(
+</span><span id="2087" class="l"><a href="#2087">2087: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span>.<span class="php-var">$rest_realm</span>
+</span><span id="2088" class="l"><a href="#2088">2088: </a>                .<span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span>.<span class="php-var">$nonce</span>
+</span><span id="2089" class="l"><a href="#2089">2089: </a>                .<span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$rest_realm</span>).<span class="php-quote">'&quot;'</span>);
+</span><span id="2090" class="l"><a href="#2090">2090: </a>        }
+</span><span id="2091" class="l"><a href="#2091">2091: </a>
+</span><span id="2092" class="l"><a href="#2092">2092: </a>        <span class="php-comment">// Display an error response</span>
+</span><span id="2093" class="l"><a href="#2093">2093: </a>        <span class="php-var">$this</span>-&gt;response([
+</span><span id="2094" class="l"><a href="#2094">2094: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
+</span><span id="2095" class="l"><a href="#2095">2095: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unauthorized'</span>)
+</span><span id="2096" class="l"><a href="#2096">2096: </a>            ], self::HTTP_UNAUTHORIZED);
+</span><span id="2097" class="l"><a href="#2097">2097: </a>    }
+</span><span id="2098" class="l"><a href="#2098">2098: </a>
+</span><span id="2099" class="l"><a href="#2099">2099: </a>    <span class="php-comment">/**
+</span></span><span id="2100" class="l"><a href="#2100">2100: </a><span class="php-comment">     * Updates the log table with the total access time
+</span></span><span id="2101" class="l"><a href="#2101">2101: </a><span class="php-comment">     *
+</span></span><span id="2102" class="l"><a href="#2102">2102: </a><span class="php-comment">     * @access protected
+</span></span><span id="2103" class="l"><a href="#2103">2103: </a><span class="php-comment">     * @author Chris Kacerguis
+</span></span><span id="2104" class="l"><a href="#2104">2104: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="2105" class="l"><a href="#2105">2105: </a><span class="php-comment">     */</span>
+</span><span id="2106" class="l"><a href="#2106">2106: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
+</span><span id="2107" class="l"><a href="#2107">2107: </a>    {
+</span><span id="2108" class="l"><a href="#2108">2108: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
+</span><span id="2109" class="l"><a href="#2109">2109: </a>
+</span><span id="2110" class="l"><a href="#2110">2110: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
+</span><span id="2111" class="l"><a href="#2111">2111: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="2112" class="l"><a href="#2112">2112: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="2113" class="l"><a href="#2113">2113: </a>            ]);
+</span><span id="2114" class="l"><a href="#2114">2114: </a>    }
+</span><span id="2115" class="l"><a href="#2115">2115: </a>
+</span><span id="2116" class="l"><a href="#2116">2116: </a>    <span class="php-comment">/**
+</span></span><span id="2117" class="l"><a href="#2117">2117: </a><span class="php-comment">     * Updates the log table with HTTP response code
+</span></span><span id="2118" class="l"><a href="#2118">2118: </a><span class="php-comment">     *
+</span></span><span id="2119" class="l"><a href="#2119">2119: </a><span class="php-comment">     * @access protected
+</span></span><span id="2120" class="l"><a href="#2120">2120: </a><span class="php-comment">     * @author Justin Chen
+</span></span><span id="2121" class="l"><a href="#2121">2121: </a><span class="php-comment">     * @param $http_code int HTTP status code
+</span></span><span id="2122" class="l"><a href="#2122">2122: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
+</span></span><span id="2123" class="l"><a href="#2123">2123: </a><span class="php-comment">     */</span>
+</span><span id="2124" class="l"><a href="#2124">2124: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
+</span><span id="2125" class="l"><a href="#2125">2125: </a>    {
+</span><span id="2126" class="l"><a href="#2126">2126: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
+</span><span id="2127" class="l"><a href="#2127">2127: </a>
+</span><span id="2128" class="l"><a href="#2128">2128: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
+</span><span id="2129" class="l"><a href="#2129">2129: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
+</span><span id="2130" class="l"><a href="#2130">2130: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
+</span><span id="2131" class="l"><a href="#2131">2131: </a>        ]);
+</span><span id="2132" class="l"><a href="#2132">2132: </a>    }
+</span><span id="2133" class="l"><a href="#2133">2133: </a>
+</span><span id="2134" class="l"><a href="#2134">2134: </a>    <span class="php-comment">/**
+</span></span><span id="2135" class="l"><a href="#2135">2135: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
+</span></span><span id="2136" class="l"><a href="#2136">2136: </a><span class="php-comment">     *
+</span></span><span id="2137" class="l"><a href="#2137">2137: </a><span class="php-comment">     * @access protected
+</span></span><span id="2138" class="l"><a href="#2138">2138: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
+</span></span><span id="2139" class="l"><a href="#2139">2139: </a><span class="php-comment">     */</span>
+</span><span id="2140" class="l"><a href="#2140">2140: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
+</span><span id="2141" class="l"><a href="#2141">2141: </a>    {
+</span><span id="2142" class="l"><a href="#2142">2142: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
+</span><span id="2143" class="l"><a href="#2143">2143: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
+</span><span id="2144" class="l"><a href="#2144">2144: </a>        {
+</span><span id="2145" class="l"><a href="#2145">2145: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
+</span><span id="2146" class="l"><a href="#2146">2146: </a>        }
+</span><span id="2147" class="l"><a href="#2147">2147: </a>
+</span><span id="2148" class="l"><a href="#2148">2148: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
+</span><span id="2149" class="l"><a href="#2149">2149: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
+</span><span id="2150" class="l"><a href="#2150">2150: </a>            <span class="php-quote">'/'</span>, [
+</span><span id="2151" class="l"><a href="#2151">2151: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
+</span><span id="2152" class="l"><a href="#2152">2152: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
+</span><span id="2153" class="l"><a href="#2153">2153: </a>        ]);
+</span><span id="2154" class="l"><a href="#2154">2154: </a>
+</span><span id="2155" class="l"><a href="#2155">2155: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
+</span><span id="2156" class="l"><a href="#2156">2156: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
+</span><span id="2157" class="l"><a href="#2157">2157: </a>
+</span><span id="2158" class="l"><a href="#2158">2158: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
+</span><span id="2159" class="l"><a href="#2159">2159: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
+</span><span id="2160" class="l"><a href="#2160">2160: </a>            -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
+</span><span id="2161" class="l"><a href="#2161">2161: </a>            -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
+</span><span id="2162" class="l"><a href="#2162">2162: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
+</span><span id="2163" class="l"><a href="#2163">2163: </a>            -&gt;num_rows() &gt; <span class="php-num">0</span>;
+</span><span id="2164" class="l"><a href="#2164">2164: </a>    }
+</span><span id="2165" class="l"><a href="#2165">2165: </a>
+</span><span id="2166" class="l"><a href="#2166">2166: </a>    <span class="php-comment">/**
+</span></span><span id="2167" class="l"><a href="#2167">2167: </a><span class="php-comment">     * Checks allowed domains, and adds appropriate headers for HTTP access control (CORS)
+</span></span><span id="2168" class="l"><a href="#2168">2168: </a><span class="php-comment">     *
+</span></span><span id="2169" class="l"><a href="#2169">2169: </a><span class="php-comment">     * @access protected
+</span></span><span id="2170" class="l"><a href="#2170">2170: </a><span class="php-comment">     * @return void
+</span></span><span id="2171" class="l"><a href="#2171">2171: </a><span class="php-comment">     */</span>
+</span><span id="2172" class="l"><a href="#2172">2172: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_cors()
+</span><span id="2173" class="l"><a href="#2173">2173: </a>    {
+</span><span id="2174" class="l"><a href="#2174">2174: </a>        <span class="php-comment">// Convert the config items into strings</span>
+</span><span id="2175" class="l"><a href="#2175">2175: </a>        <span class="php-var">$allowed_headers</span> = <span class="php-keyword2">implode</span>(<span class="php-quote">' ,'</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'allowed_cors_headers'</span>));
+</span><span id="2176" class="l"><a href="#2176">2176: </a>        <span class="php-var">$allowed_methods</span> = <span class="php-keyword2">implode</span>(<span class="php-quote">' ,'</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'allowed_cors_methods'</span>));
+</span><span id="2177" class="l"><a href="#2177">2177: </a>
+</span><span id="2178" class="l"><a href="#2178">2178: </a>        <span class="php-comment">// If we want to allow any domain to access the API</span>
+</span><span id="2179" class="l"><a href="#2179">2179: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'allow_any_cors_domain'</span>) === <span class="php-keyword1">TRUE</span>)
+</span><span id="2180" class="l"><a href="#2180">2180: </a>        {
+</span><span id="2181" class="l"><a href="#2181">2181: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'Access-Control-Allow-Origin: *'</span>);
+</span><span id="2182" class="l"><a href="#2182">2182: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'Access-Control-Allow-Headers: '</span>.<span class="php-var">$allowed_headers</span>);
+</span><span id="2183" class="l"><a href="#2183">2183: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'Access-Control-Allow-Methods: '</span>.<span class="php-var">$allowed_methods</span>);
+</span><span id="2184" class="l"><a href="#2184">2184: </a>        }
+</span><span id="2185" class="l"><a href="#2185">2185: </a>        <span class="php-keyword1">else</span>
+</span><span id="2186" class="l"><a href="#2186">2186: </a>        {
+</span><span id="2187" class="l"><a href="#2187">2187: </a>            <span class="php-comment">// We're going to allow only certain domains access</span>
+</span><span id="2188" class="l"><a href="#2188">2188: </a>            <span class="php-comment">// Store the HTTP Origin header</span>
+</span><span id="2189" class="l"><a href="#2189">2189: </a>            <span class="php-var">$origin</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ORIGIN'</span>);
+</span><span id="2190" class="l"><a href="#2190">2190: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$origin</span> === <span class="php-keyword1">NULL</span>)
+</span><span id="2191" class="l"><a href="#2191">2191: </a>            {
+</span><span id="2192" class="l"><a href="#2192">2192: </a>                <span class="php-var">$origin</span> = <span class="php-quote">''</span>;
+</span><span id="2193" class="l"><a href="#2193">2193: </a>            }
+</span><span id="2194" class="l"><a href="#2194">2194: </a>
+</span><span id="2195" class="l"><a href="#2195">2195: </a>            <span class="php-comment">// If the origin domain is in the allowed_cors_origins list, then add the Access Control headers</span>
+</span><span id="2196" class="l"><a href="#2196">2196: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$origin</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'allowed_cors_origins'</span>)))
+</span><span id="2197" class="l"><a href="#2197">2197: </a>            {
+</span><span id="2198" class="l"><a href="#2198">2198: </a>                <span class="php-keyword2">header</span>(<span class="php-quote">'Access-Control-Allow-Origin: '</span>.<span class="php-var">$origin</span>);
+</span><span id="2199" class="l"><a href="#2199">2199: </a>                <span class="php-keyword2">header</span>(<span class="php-quote">'Access-Control-Allow-Headers: '</span>.<span class="php-var">$allowed_headers</span>);
+</span><span id="2200" class="l"><a href="#2200">2200: </a>                <span class="php-keyword2">header</span>(<span class="php-quote">'Access-Control-Allow-Methods: '</span>.<span class="php-var">$allowed_methods</span>);
+</span><span id="2201" class="l"><a href="#2201">2201: </a>            }
+</span><span id="2202" class="l"><a href="#2202">2202: </a>        }
+</span><span id="2203" class="l"><a href="#2203">2203: </a>
+</span><span id="2204" class="l"><a href="#2204">2204: </a>        <span class="php-comment">// If the request HTTP method is 'OPTIONS', kill the response and send it to the client</span>
+</span><span id="2205" class="l"><a href="#2205">2205: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'options'</span>)
+</span><span id="2206" class="l"><a href="#2206">2206: </a>        {
+</span><span id="2207" class="l"><a href="#2207">2207: </a>            <span class="php-keyword1">exit</span>;
+</span><span id="2208" class="l"><a href="#2208">2208: </a>        }
+</span><span id="2209" class="l"><a href="#2209">2209: </a>    }
+</span><span id="2210" class="l"><a href="#2210">2210: </a>
+</span><span id="2211" class="l"><a href="#2211">2211: </a>}
+</span><span id="2212" class="l"><a href="#2212">2212: </a></span></code></pre>
 
 	<div id="footer">
 		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>

From 0f40ccad8e9cfbb7ec9bf95ce5ee20d551ff0621 Mon Sep 17 00:00:00 2001
From: Luke <luk3b@users.noreply.github.com>
Date: Sun, 3 Apr 2016 17:54:58 +0200
Subject: [PATCH 203/354] Initial creation

---
 .../language/german/rest_controller_lang.php    | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 application/language/german/rest_controller_lang.php

diff --git a/application/language/german/rest_controller_lang.php b/application/language/german/rest_controller_lang.php
new file mode 100644
index 00000000..012d0363
--- /dev/null
+++ b/application/language/german/rest_controller_lang.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * German language
+ */
+
+$lang['text_rest_invalid_api_key'] = 'Ungültiger API Schlüssel %s'; // %s is the REST API key | %s ist der REST API Schlüssel
+$lang['text_rest_invalid_credentials'] = 'Ungültige Zugangsdaten';
+$lang['text_rest_ip_denied'] = 'IP abgelehnt';
+$lang['text_rest_ip_unauthorized'] = 'IP nicht autorisiert';
+$lang['text_rest_unauthorized'] = 'Nicht autorisiert';
+$lang['text_rest_ajax_only'] = 'Nur AJAX-Anfragen zulässig';
+$lang['text_rest_api_key_unauthorized'] = 'Dieser API Schlüssel hat keinen Zugriff auf den angeforderten Controller';
+$lang['text_rest_api_key_permissions'] = 'Dieser API Schlüssel besitzt die erforderlichen Rechte nicht';
+$lang['text_rest_api_key_time_limit'] = 'Dieser API Schlüssel ist abgelaufen';
+$lang['text_rest_unknown_method'] = 'Unbekannte Methode';
+$lang['text_rest_unsupported'] = 'Protokoll nicht unterstützt';

From d08c8ee3927edfcb2a6d4ac009eef7ef660829a3 Mon Sep 17 00:00:00 2001
From: Luke <luk3b@users.noreply.github.com>
Date: Sun, 3 Apr 2016 17:55:14 +0200
Subject: [PATCH 204/354] Create index.html

---
 application/language/german/index.html | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 application/language/german/index.html

diff --git a/application/language/german/index.html b/application/language/german/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/language/german/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>

From 28c5fbd10836b0397f4f8c655add759e82cad8b1 Mon Sep 17 00:00:00 2001
From: Tamas Gajdo <tamas.gajdo@reea.net>
Date: Wed, 6 Apr 2016 11:48:12 +0300
Subject: [PATCH 205/354] In case of json put request parsed body in order to
 get the parameters.

---
 application/libraries/REST_Controller.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 0c7c552f..22d31110 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1432,6 +1432,9 @@ protected function _parse_put()
         if ($this->request->format)
         {
             $this->request->body = $this->input->raw_input_stream;
+            if ($this->request->format === 'json') {
+                $this->_put_args = json_decode($this->input->raw_input_stream);                
+            }
         }
         else if ($this->input->method() === 'put')
         {

From e2a407d2183cf292afcfa65af3008c935682629f Mon Sep 17 00:00:00 2001
From: Tamas Gajdo <tamas.gajdo@reea.net>
Date: Wed, 6 Apr 2016 12:52:45 +0300
Subject: [PATCH 206/354] Added the bracket to new line.

---
 application/libraries/REST_Controller.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 22d31110..99cb6939 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1432,8 +1432,9 @@ protected function _parse_put()
         if ($this->request->format)
         {
             $this->request->body = $this->input->raw_input_stream;
-            if ($this->request->format === 'json') {
-                $this->_put_args = json_decode($this->input->raw_input_stream);                
+            if ($this->request->format === 'json')
+            {
+                $this->_put_args = json_decode($this->input->raw_input_stream);
             }
         }
         else if ($this->input->method() === 'put')

From 05213fed6aa7d06c2db48fa45a91efcaa49d51fa Mon Sep 17 00:00:00 2001
From: Mike Feng <s8811042@gmail.com>
Date: Thu, 7 Apr 2016 11:16:37 +0800
Subject: [PATCH 207/354] Add traditional chinese language support.

---
 .../language/traditional-chinese/index.html     | 11 +++++++++++
 .../rest_controller_lang.php                    | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 application/language/traditional-chinese/index.html
 create mode 100644 application/language/traditional-chinese/rest_controller_lang.php

diff --git a/application/language/traditional-chinese/index.html b/application/language/traditional-chinese/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/language/traditional-chinese/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/traditional-chinese/rest_controller_lang.php b/application/language/traditional-chinese/rest_controller_lang.php
new file mode 100644
index 00000000..f388c446
--- /dev/null
+++ b/application/language/traditional-chinese/rest_controller_lang.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * Traditional Chinese language
+ */
+
+$lang['text_rest_invalid_api_key'] = '無效的 API 金鑰 %s'; // %s is the REST API key
+$lang['text_rest_invalid_credentials'] = '無效的憑證';
+$lang['text_rest_ip_denied'] = 'IP 位置被拒絕';
+$lang['text_rest_ip_unauthorized'] = 'IP 位置未認證';
+$lang['text_rest_unauthorized'] = '未認證';
+$lang['text_rest_ajax_only'] = '只有 AJAX 類型請求被允許';
+$lang['text_rest_api_key_unauthorized'] = '這個 API 金鑰沒有辦法存取指定的 controller';
+$lang['text_rest_api_key_permissions'] = '這個 API 金鑰沒有具備足夠權限';
+$lang['text_rest_api_key_time_limit'] = '這個 API 金鑰已經超過有效期限';
+$lang['text_rest_unknown_method'] = '未知的方法';
+$lang['text_rest_unsupported'] = '不支援的通訊協定';

From ac1897200e08ef5a056b9f9e1bdafb1e4f3e2856 Mon Sep 17 00:00:00 2001
From: daycry <daycry9@gmail.com>
Date: Tue, 12 Apr 2016 17:09:58 +0200
Subject: [PATCH 208/354] Update REST_Controller.php

To get header variables
---
 application/libraries/REST_Controller.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 0c7c552f..0be77d51 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -498,6 +498,9 @@ public function __construct($config = 'rest')
             $this->{'_' . $this->request->method . '_args'} = $this->request->body;
         }
 
+        //get header vars
+        $this->_head_args = $this->input->request_headers();
+
         // Merge both for one mega-args variable
         $this->_args = array_merge(
             $this->_get_args,

From 710107849247a45b8eccdd042d880dcf84e23033 Mon Sep 17 00:00:00 2001
From: Andrew Millington <sephsterisat@gmail.com>
Date: Thu, 14 Apr 2016 17:29:36 +0100
Subject: [PATCH 209/354] Removing the need to check
 zend.ze1_compatibility_mode as this was removed removed in PHP 5.3

---
 application/libraries/Format.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 0d3bf773..500e374d 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -178,12 +178,6 @@ public function to_xml($data = NULL, $structure = NULL, $basenode = 'xml')
             $data = $this->_data;
         }
 
-        // turn off compatibility mode as simple xml throws a wobbly if you don't.
-        if (ini_get('zend.ze1_compatibility_mode') == 1)
-        {
-            ini_set('zend.ze1_compatibility_mode', 0);
-        }
-
         if ($structure === NULL)
         {
             $structure = simplexml_load_string("<?xml version='1.0' encoding='utf-8'?><$basenode />");

From dee9eeed329352299b0504d0c831a1e63bfaa58f Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Mon, 18 Apr 2016 01:09:03 +0300
Subject: [PATCH 210/354] Fixed parenthesis

---
 application/libraries/REST_Controller.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 36882cfb..3849fbcf 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -557,7 +557,9 @@ public function __construct($config = 'rest')
         }
 
         // When there is no specific override for the current class/method, use the default auth value set in the config
-        if ($this->auth_override === FALSE && ! ($this->config->item('rest_enable_keys') && $this->_allow === TRUE) || ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE))
+        if ($this->auth_override === FALSE &&
+            (! ($this->config->item('rest_enable_keys') && $this->_allow === TRUE) ||
+            ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE)))
         {
             $rest_auth = strtolower($this->config->item('rest_auth'));
             switch ($rest_auth)

From b9ba4fccebc255cbd87a3b2a8a79272b2f217528 Mon Sep 17 00:00:00 2001
From: Todor Todorov <todstoychev@gmail.com>
Date: Thu, 5 May 2016 14:39:21 +0300
Subject: [PATCH 211/354] Response code changed

I think that is better to use 405 as response code in this case. That's because the reason for this error is that the method is not found/allowed.
It will be good to have separate cases if method is not declared in the controller and when the HTTP method does not match the expected one.
I also purpose to use exclamation mark in the if instead of ```method_exists($this, $controller_method) === FALSE```. It is shorter and since (method_exits())[http://php.net/manual/en/function.method-exists.php] returns boolean, I do not see a problem to do it ;).
---
 application/libraries/REST_Controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 3849fbcf..b10ff1f1 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -660,12 +660,12 @@ public function _remap($object_called, $arguments = [])
         }
 
         // Sure it exists, but can they do anything with it?
-        if (method_exists($this, $controller_method) === FALSE)
+        if (!method_exists($this, $controller_method))
         {
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
                     $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unknown_method')
-                ], self::HTTP_NOT_FOUND);
+                ], self::HTTP_METHOD_NOT_ALLOWED);
         }
 
         // Doing key related stuff? Can only do it if they have a key right?

From 8a24b888b596a9452d20fb27f49964d3f120edfc Mon Sep 17 00:00:00 2001
From: Liviu Roman <lyvyuvt@gmail.com>
Date: Sat, 28 May 2016 09:30:31 +0300
Subject: [PATCH 212/354] Romanian language

---
 application/language/romanian/index.html        | 11 +++++++++++
 .../language/romanian/rest_controller_lang.php  | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 application/language/romanian/index.html
 create mode 100644 application/language/romanian/rest_controller_lang.php

diff --git a/application/language/romanian/index.html b/application/language/romanian/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/language/romanian/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/romanian/rest_controller_lang.php b/application/language/romanian/rest_controller_lang.php
new file mode 100644
index 00000000..c7b94478
--- /dev/null
+++ b/application/language/romanian/rest_controller_lang.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * Romanian language
+ */
+
+$lang['text_rest_invalid_api_key'] = 'Cheie API invalidă %s'; // %s is the REST API key
+$lang['text_rest_invalid_credentials'] = 'Acreditări invalide';
+$lang['text_rest_ip_denied'] = 'IP respins';
+$lang['text_rest_ip_unauthorized'] = 'IP neautorizat';
+$lang['text_rest_unauthorized'] = 'Neautorizat';
+$lang['text_rest_ajax_only'] = 'Doar cererile AJAX sunt acceptate';
+$lang['text_rest_api_key_unauthorized'] = 'Această cheie API nu are acees la controller-ul solicitat';
+$lang['text_rest_api_key_permissions'] = 'Această cheie API nu are suficiente permisiuni';
+$lang['text_rest_api_key_time_limit'] = 'Această cheie API a atins limita de timp pentru această metodă';
+$lang['text_rest_unknown_method'] = 'Metodă necunoscută';
+$lang['text_rest_unsupported'] = 'Protocol neacceptat';

From f978f4ce7b184cd78a4697f330c423e9de2adffb Mon Sep 17 00:00:00 2001
From: Goran <tpojka@gmail.com>
Date: Sun, 29 May 2016 01:31:54 +0200
Subject: [PATCH 213/354] Added Serbian translation.

---
 application/language/serbian/index.html         | 11 +++++++++++
 .../language/serbian/rest_controller_lang.php   | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 application/language/serbian/index.html
 create mode 100644 application/language/serbian/rest_controller_lang.php

diff --git a/application/language/serbian/index.html b/application/language/serbian/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/language/serbian/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/serbian/rest_controller_lang.php b/application/language/serbian/rest_controller_lang.php
new file mode 100644
index 00000000..4b392365
--- /dev/null
+++ b/application/language/serbian/rest_controller_lang.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * English language
+ */
+
+$lang['text_rest_invalid_api_key'] = 'Nepravilan API klju&#269; %s'; // %s is the REST API key
+$lang['text_rest_invalid_credentials'] = 'Nepravilni ulazni podaci';
+$lang['text_rest_ip_denied'] = 'IP odbijen';
+$lang['text_rest_ip_unauthorized'] = 'IP neautorizovan';
+$lang['text_rest_unauthorized'] = 'Neautorizovano';
+$lang['text_rest_ajax_only'] = 'Jedino AJAX zahtevi su dozvoljeni';
+$lang['text_rest_api_key_unauthorized'] = 'Ovaj API klju&#269; nema dostup zahtevanom kontroleru';
+$lang['text_rest_api_key_permissions'] = 'Ovaj API klju&#269; nema dovoljan stepen dozvole';
+$lang['text_rest_api_key_time_limit'] = 'Ovaj API klju&#269; je prekora&#269;io vremenski limit za dati metod';
+$lang['text_rest_unknown_method'] = 'Nepoznat metod';
+$lang['text_rest_unsupported'] = 'Nepodr&#382;an protokol';

From 550d76a1a7c98769d2a781f64201db4a649e13e2 Mon Sep 17 00:00:00 2001
From: Goran <tpojka@gmail.com>
Date: Sun, 29 May 2016 01:49:14 +0200
Subject: [PATCH 214/354] Better translation

---
 application/language/serbian/rest_controller_lang.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/language/serbian/rest_controller_lang.php b/application/language/serbian/rest_controller_lang.php
index 4b392365..50ba7521 100644
--- a/application/language/serbian/rest_controller_lang.php
+++ b/application/language/serbian/rest_controller_lang.php
@@ -1,16 +1,16 @@
 <?php
 
 /*
- * English language
+ * Serbian language
  */
 
-$lang['text_rest_invalid_api_key'] = 'Nepravilan API klju&#269; %s'; // %s is the REST API key
-$lang['text_rest_invalid_credentials'] = 'Nepravilni ulazni podaci';
+$lang['text_rest_invalid_api_key'] = 'Nepravilan API klju&#269; %s'; // %s je REST API ključ
+$lang['text_rest_invalid_credentials'] = 'Neodgovaraju&#263;i ulazni podaci';
 $lang['text_rest_ip_denied'] = 'IP odbijen';
 $lang['text_rest_ip_unauthorized'] = 'IP neautorizovan';
 $lang['text_rest_unauthorized'] = 'Neautorizovano';
 $lang['text_rest_ajax_only'] = 'Jedino AJAX zahtevi su dozvoljeni';
-$lang['text_rest_api_key_unauthorized'] = 'Ovaj API klju&#269; nema dostup zahtevanom kontroleru';
+$lang['text_rest_api_key_unauthorized'] = 'Ovaj API klju&#269; nema dozvolu zahtevanog kontrolera';
 $lang['text_rest_api_key_permissions'] = 'Ovaj API klju&#269; nema dovoljan stepen dozvole';
 $lang['text_rest_api_key_time_limit'] = 'Ovaj API klju&#269; je prekora&#269;io vremenski limit za dati metod';
 $lang['text_rest_unknown_method'] = 'Nepoznat metod';

From 2c0bf94a687fb9dd50829549ab01db487b2b16f8 Mon Sep 17 00:00:00 2001
From: Goran <tpojka@gmail.com>
Date: Sun, 29 May 2016 01:58:51 +0200
Subject: [PATCH 215/354] Serbian language added.

---
 application/language/serbian/rest_controller_lang.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/language/serbian/rest_controller_lang.php b/application/language/serbian/rest_controller_lang.php
index 50ba7521..4b6b749f 100644
--- a/application/language/serbian/rest_controller_lang.php
+++ b/application/language/serbian/rest_controller_lang.php
@@ -5,13 +5,13 @@
  */
 
 $lang['text_rest_invalid_api_key'] = 'Nepravilan API klju&#269; %s'; // %s je REST API ključ
-$lang['text_rest_invalid_credentials'] = 'Neodgovaraju&#263;i ulazni podaci';
+$lang['text_rest_invalid_credentials'] = 'Neodgovaraju&#263;i korisni&#269;ki ulazni podaci';
 $lang['text_rest_ip_denied'] = 'IP odbijen';
 $lang['text_rest_ip_unauthorized'] = 'IP neautorizovan';
 $lang['text_rest_unauthorized'] = 'Neautorizovano';
 $lang['text_rest_ajax_only'] = 'Jedino AJAX zahtevi su dozvoljeni';
-$lang['text_rest_api_key_unauthorized'] = 'Ovaj API klju&#269; nema dozvolu zahtevanog kontrolera';
-$lang['text_rest_api_key_permissions'] = 'Ovaj API klju&#269; nema dovoljan stepen dozvole';
+$lang['text_rest_api_key_unauthorized'] = 'Ovaj API klju&#269; nema ovla&#353;&#263;enje za zahtevani kontroler';
+$lang['text_rest_api_key_permissions'] = 'Ovaj API klju&#269; nema dozvoljen stepen ovla&#353;&#263;enja';
 $lang['text_rest_api_key_time_limit'] = 'Ovaj API klju&#269; je prekora&#269;io vremenski limit za dati metod';
 $lang['text_rest_unknown_method'] = 'Nepoznat metod';
 $lang['text_rest_unsupported'] = 'Nepodr&#382;an protokol';

From f02b14695def06681f272834980cbe3fb79cce00 Mon Sep 17 00:00:00 2001
From: Goran <tpojka@gmail.com>
Date: Sun, 29 May 2016 02:16:34 +0200
Subject: [PATCH 216/354] Serbian latin and cyrillic added.

---
 application/language/serbian_cyr/index.html     | 11 +++++++++++
 .../serbian_cyr/rest_controller_lang.php        | 17 +++++++++++++++++
 application/language/serbian_lat/index.html     | 11 +++++++++++
 .../serbian_lat/rest_controller_lang.php        | 17 +++++++++++++++++
 4 files changed, 56 insertions(+)
 create mode 100644 application/language/serbian_cyr/index.html
 create mode 100644 application/language/serbian_cyr/rest_controller_lang.php
 create mode 100644 application/language/serbian_lat/index.html
 create mode 100644 application/language/serbian_lat/rest_controller_lang.php

diff --git a/application/language/serbian_cyr/index.html b/application/language/serbian_cyr/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/language/serbian_cyr/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/serbian_cyr/rest_controller_lang.php b/application/language/serbian_cyr/rest_controller_lang.php
new file mode 100644
index 00000000..e2164214
--- /dev/null
+++ b/application/language/serbian_cyr/rest_controller_lang.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * Serbian language
+ */
+
+$lang['text_rest_invalid_api_key'] = 'Неправилан *API* кључ %s'; // %s је *REST API* кључ
+$lang['text_rest_invalid_credentials'] = 'Неодговарајући кориснички улазни подаци';
+$lang['text_rest_ip_denied'] = '*IP* одбијен';
+$lang['text_rest_ip_unauthorized'] = '*IP* неауторизован';
+$lang['text_rest_unauthorized'] = 'Неауторизовано';
+$lang['text_rest_ajax_only'] = 'Једино *AJAX* захтеви су дозвољени';
+$lang['text_rest_api_key_unauthorized'] = 'Овај *API* кључ нема овлашћења за захтевани контролер';
+$lang['text_rest_api_key_permissions'] = 'Овај *API* кључ нема дозвољен степен овлашћења';
+$lang['text_rest_api_key_time_limit'] = 'Овај *API* кључ је прекорачио временски лимит за дати метод';
+$lang['text_rest_unknown_method'] = 'Непознат метод';
+$lang['text_rest_unsupported'] = 'Неподржан протокол';
diff --git a/application/language/serbian_lat/index.html b/application/language/serbian_lat/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/language/serbian_lat/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/serbian_lat/rest_controller_lang.php b/application/language/serbian_lat/rest_controller_lang.php
new file mode 100644
index 00000000..4b6b749f
--- /dev/null
+++ b/application/language/serbian_lat/rest_controller_lang.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * Serbian language
+ */
+
+$lang['text_rest_invalid_api_key'] = 'Nepravilan API klju&#269; %s'; // %s je REST API ključ
+$lang['text_rest_invalid_credentials'] = 'Neodgovaraju&#263;i korisni&#269;ki ulazni podaci';
+$lang['text_rest_ip_denied'] = 'IP odbijen';
+$lang['text_rest_ip_unauthorized'] = 'IP neautorizovan';
+$lang['text_rest_unauthorized'] = 'Neautorizovano';
+$lang['text_rest_ajax_only'] = 'Jedino AJAX zahtevi su dozvoljeni';
+$lang['text_rest_api_key_unauthorized'] = 'Ovaj API klju&#269; nema ovla&#353;&#263;enje za zahtevani kontroler';
+$lang['text_rest_api_key_permissions'] = 'Ovaj API klju&#269; nema dozvoljen stepen ovla&#353;&#263;enja';
+$lang['text_rest_api_key_time_limit'] = 'Ovaj API klju&#269; je prekora&#269;io vremenski limit za dati metod';
+$lang['text_rest_unknown_method'] = 'Nepoznat metod';
+$lang['text_rest_unsupported'] = 'Nepodr&#382;an protokol';

From e078aee308e51cf7475cb8490a4fa5fbd7a6a489 Mon Sep 17 00:00:00 2001
From: Goran <tpojka@gmail.com>
Date: Sun, 29 May 2016 02:52:42 +0200
Subject: [PATCH 217/354] Rewriten.

---
 application/language/serbian/index.html         | 11 -----------
 .../language/serbian/rest_controller_lang.php   | 17 -----------------
 2 files changed, 28 deletions(-)
 delete mode 100644 application/language/serbian/index.html
 delete mode 100644 application/language/serbian/rest_controller_lang.php

diff --git a/application/language/serbian/index.html b/application/language/serbian/index.html
deleted file mode 100644
index b702fbc3..00000000
--- a/application/language/serbian/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>
diff --git a/application/language/serbian/rest_controller_lang.php b/application/language/serbian/rest_controller_lang.php
deleted file mode 100644
index 4b6b749f..00000000
--- a/application/language/serbian/rest_controller_lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/*
- * Serbian language
- */
-
-$lang['text_rest_invalid_api_key'] = 'Nepravilan API klju&#269; %s'; // %s je REST API ključ
-$lang['text_rest_invalid_credentials'] = 'Neodgovaraju&#263;i korisni&#269;ki ulazni podaci';
-$lang['text_rest_ip_denied'] = 'IP odbijen';
-$lang['text_rest_ip_unauthorized'] = 'IP neautorizovan';
-$lang['text_rest_unauthorized'] = 'Neautorizovano';
-$lang['text_rest_ajax_only'] = 'Jedino AJAX zahtevi su dozvoljeni';
-$lang['text_rest_api_key_unauthorized'] = 'Ovaj API klju&#269; nema ovla&#353;&#263;enje za zahtevani kontroler';
-$lang['text_rest_api_key_permissions'] = 'Ovaj API klju&#269; nema dozvoljen stepen ovla&#353;&#263;enja';
-$lang['text_rest_api_key_time_limit'] = 'Ovaj API klju&#269; je prekora&#269;io vremenski limit za dati metod';
-$lang['text_rest_unknown_method'] = 'Nepoznat metod';
-$lang['text_rest_unsupported'] = 'Nepodr&#382;an protokol';

From d0cdf6ef89ddf8f8a76c5e5fa23edab26da69e1e Mon Sep 17 00:00:00 2001
From: sibenye <sibenye@gmail.com>
Date: Sat, 18 Jun 2016 13:02:11 -0400
Subject: [PATCH 218/354] For cases where you want a particular api-key to have
 access to all controllers, it is better to have a flag to indicate that
 instead of having a row for each controller.

---
 application/config/rest.php               |  1 +
 application/libraries/REST_Controller.php | 10 ++++++++++
 2 files changed, 11 insertions(+)

diff --git a/application/config/rest.php b/application/config/rest.php
index 68511c9c..dcb5f752 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -417,6 +417,7 @@
 |   CREATE TABLE `access` (
 |       `id` INT(11) unsigned NOT NULL AUTO_INCREMENT,
 |       `key` VARCHAR(40) NOT NULL DEFAULT '',
+|		`all_access` TINYINT(1) NOT NULL DEFAULT '0',
 |       `controller` VARCHAR(50) NOT NULL DEFAULT '',
 |       `date_created` DATETIME DEFAULT NULL,
 |       `date_modified` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index b10ff1f1..de598a31 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -2153,6 +2153,16 @@ protected function _check_access()
         {
             return TRUE;
         }
+        
+        //check if the key has all_access
+        $accessRow = $this->rest->db
+            ->where('key', $this->rest->key)
+            ->get($this->config->item('rest_access_table'))->row_array();
+        
+        if (!empty($accessRow) && !empty($accessRow['all_access']))
+        {
+        	return TRUE;
+        }
 
         // Fetch controller based on path and controller name
         $controller = implode(

From 3df76e2f6a1801da91957df3d639f2391a58ee7a Mon Sep 17 00:00:00 2001
From: sibenye <sibenye@gmail.com>
Date: Sat, 18 Jun 2016 13:07:14 -0400
Subject: [PATCH 219/354] fixed spacing

---
 application/config/rest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/config/rest.php b/application/config/rest.php
index dcb5f752..a159144e 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -417,7 +417,7 @@
 |   CREATE TABLE `access` (
 |       `id` INT(11) unsigned NOT NULL AUTO_INCREMENT,
 |       `key` VARCHAR(40) NOT NULL DEFAULT '',
-|		`all_access` TINYINT(1) NOT NULL DEFAULT '0',
+|       `all_access` TINYINT(1) NOT NULL DEFAULT '0',
 |       `controller` VARCHAR(50) NOT NULL DEFAULT '',
 |       `date_created` DATETIME DEFAULT NULL,
 |       `date_modified` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,

From 2c469df41f3b99faa5df25d7eb8a70a895481de0 Mon Sep 17 00:00:00 2001
From: Vainl <vainl@qq.com>
Date: Sun, 19 Jun 2016 22:48:55 +0800
Subject: [PATCH 220/354] add Simple Chinese language

---
 application/language/simple-chinese/index.html  | 11 +++++++++++
 .../simple-chinese/rest_controller_lang.php     | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 application/language/simple-chinese/index.html
 create mode 100644 application/language/simple-chinese/rest_controller_lang.php

diff --git a/application/language/simple-chinese/index.html b/application/language/simple-chinese/index.html
new file mode 100644
index 00000000..69df4e1d
--- /dev/null
+++ b/application/language/simple-chinese/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/simple-chinese/rest_controller_lang.php b/application/language/simple-chinese/rest_controller_lang.php
new file mode 100644
index 00000000..f7f19fb1
--- /dev/null
+++ b/application/language/simple-chinese/rest_controller_lang.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * Simple Chinese language
+ */
+
+$lang['text_rest_invalid_api_key'] = '无效的 API key %s'; // %s is the REST API key
+$lang['text_rest_invalid_credentials'] = '无效的凭证';
+$lang['text_rest_ip_denied'] = 'IP 地址被拒绝';
+$lang['text_rest_ip_unauthorized'] = 'IP 地址未认证';
+$lang['text_rest_unauthorized'] = '未认证';
+$lang['text_rest_ajax_only'] = '只允许 AJAX 类型的请求';
+$lang['text_rest_api_key_unauthorized'] = '此 API key无法存取指定的 controller';
+$lang['text_rest_api_key_permissions'] = '此 API key没有足够的权限';
+$lang['text_rest_api_key_time_limit'] = '此 API key已经超过有效期限';
+$lang['text_rest_unknown_method'] = '未知的方法';
+$lang['text_rest_unsupported'] = '不支持的请求方法';

From c4e38859884e632eac03f8fbad1805cf8838cf48 Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Wed, 22 Jun 2016 01:54:27 +0300
Subject: [PATCH 221/354] Renaming a language folder: simple-chinese ->
 simplified-chinese

---
 .../language/{simple-chinese => simplified-chinese}/index.html    | 0
 .../rest_controller_lang.php                                      | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename application/language/{simple-chinese => simplified-chinese}/index.html (100%)
 rename application/language/{simple-chinese => simplified-chinese}/rest_controller_lang.php (100%)

diff --git a/application/language/simple-chinese/index.html b/application/language/simplified-chinese/index.html
similarity index 100%
rename from application/language/simple-chinese/index.html
rename to application/language/simplified-chinese/index.html
diff --git a/application/language/simple-chinese/rest_controller_lang.php b/application/language/simplified-chinese/rest_controller_lang.php
similarity index 100%
rename from application/language/simple-chinese/rest_controller_lang.php
rename to application/language/simplified-chinese/rest_controller_lang.php

From e6dffb50f7e81d1203902d51956a64568c644985 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@ChrisMBP.local>
Date: Tue, 21 Jun 2016 20:27:06 -0500
Subject: [PATCH 222/354] added codeclimate.yml file, and exclude the
 docuentation dir

---
 .codeclimate.yml | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .codeclimate.yml

diff --git a/.codeclimate.yml b/.codeclimate.yml
new file mode 100644
index 00000000..88d62965
--- /dev/null
+++ b/.codeclimate.yml
@@ -0,0 +1,2 @@
+exclude_paths:
+- documentation/*
\ No newline at end of file

From 9d85c1027063b58ac5847288ca388fab52a0c6e6 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@ChrisMBP.local>
Date: Tue, 21 Jun 2016 20:37:55 -0500
Subject: [PATCH 223/354] moved preflight checks to their own method

---
 application/libraries/REST_Controller.php | 39 ++++++++++++++---------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index de598a31..299b9e69 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -381,21 +381,7 @@ public function __construct($config = 'rest')
     {
         parent::__construct();
 
-        // Disable XML Entity (security vulnerability)
-        libxml_disable_entity_loader(TRUE);
-
-        // Check to see if PHP is equal to or greater than 5.4.x
-        if (is_php('5.4') === FALSE)
-        {
-            // CodeIgniter 3 is recommended for v5.4 or above
-            throw new Exception('Using PHP v'.PHP_VERSION.', though PHP v5.4 or greater is required');
-        }
-
-        // Check to see if this is CI 3.x
-        if (explode('.', CI_VERSION, 2)[0] < 3)
-        {
-            throw new Exception('REST Server requires CodeIgniter 3.x');
-        }
+        $this->preflight_checks();
 
         // Set the default value of global xss filtering. Same approach as CodeIgniter 3
         $this->_enable_xss = ($this->config->item('global_xss_filtering') === TRUE);
@@ -600,6 +586,29 @@ public function __destruct()
         }
     }
 
+    /**
+     * Checks to see if we have everything we need to run this library.
+     *
+     * @author Chris Kacerguis
+     * @access protected
+     * @return Exception
+     */
+    protected function preflight_checks()
+    {
+        // Check to see if PHP is equal to or greater than 5.4.x
+        if (is_php('5.4') === FALSE)
+        {
+            // CodeIgniter 3 is recommended for v5.4 or above
+            throw new Exception('Using PHP v'.PHP_VERSION.', though PHP v5.4 or greater is required');
+        }
+
+        // Check to see if this is CI 3.x
+        if (explode('.', CI_VERSION, 2)[0] < 3)
+        {
+            throw new Exception('REST Server requires CodeIgniter 3.x');
+        }
+    }
+
     /**
      * Requests are not made to methods directly, the request will be for
      * an "object". This simply maps the object and method to the correct

From 0093d9d191b023d52fd2345ff479a3353bdac379 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@ChrisMBP.local>
Date: Tue, 21 Jun 2016 20:40:45 -0500
Subject: [PATCH 224/354] exclude the docs dir typo fixed for codeclimate

---
 .codeclimate.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 88d62965..1c63d83f 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,2 +1,2 @@
 exclude_paths:
-- documentation/*
\ No newline at end of file
+- "documentation/"
\ No newline at end of file

From 79c6ad20f51ef2d19f90449196e37a7c0d23d372 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@gmail.com>
Date: Tue, 21 Jun 2016 20:44:55 -0500
Subject: [PATCH 225/354] exclude languages

---
 .codeclimate.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 1c63d83f..b1059fca 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -1,2 +1,3 @@
 exclude_paths:
-- "documentation/"
\ No newline at end of file
+- "documentation/"
+- "application/language/"
\ No newline at end of file

From 5b06fd97c29ee8d6a61dc5ebfd6c8429a7cef61b Mon Sep 17 00:00:00 2001
From: Philip Berndroth <p.berndroth@philuweb.de>
Date: Mon, 27 Jun 2016 20:36:14 +0200
Subject: [PATCH 226/354] fix json_encode for integer values

without the parameter JSON_NUMERIC_CHECK the json_encode function is ignoring the integer values from a array or database and then the integer values are serialized into a string.
---
 application/libraries/Format.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 0b6a496d..2132b649 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -403,14 +403,14 @@ public function to_json($data = NULL)
 
         if (empty($callback) === TRUE)
         {
-            return json_encode($data);
+            return json_encode($data, JSON_NUMERIC_CHECK);
         }
 
         // We only honour a jsonp callback which are valid javascript identifiers
         elseif (preg_match('/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i', $callback))
         {
             // Return the data as encoded json with a callback
-            return $callback.'('.json_encode($data).');';
+            return $callback.'('.json_encode($data, JSON_NUMERIC_CHECK).');';
         }
 
         // An invalid jsonp callback function provided.

From 74a280a4401a80f3ca4f64595e98995d8aca58d2 Mon Sep 17 00:00:00 2001
From: softwarespot <softwarespotapps@gmail.com>
Date: Sun, 10 Jul 2016 07:30:20 +0300
Subject: [PATCH 227/354] Minor style guide fixes

---
 application/libraries/Format.php          |  1 -
 application/libraries/REST_Controller.php | 30 +++++++++++------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 2132b649..00129b28 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -521,5 +521,4 @@ protected function _from_php($data)
     {
         return trim($data);
     }
-
 }
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 299b9e69..d0b354c0 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -589,7 +589,6 @@ public function __destruct()
     /**
      * Checks to see if we have everything we need to run this library.
      *
-     * @author Chris Kacerguis
      * @access protected
      * @return Exception
      */
@@ -615,8 +614,8 @@ protected function preflight_checks()
      * Controller method
      *
      * @access public
-     * @param  string $object_called
-     * @param  array $arguments The arguments passed to the controller method
+     * @param string $object_called
+     * @param array $arguments The arguments passed to the controller method
      */
     public function _remap($object_called, $arguments = [])
     {
@@ -669,7 +668,7 @@ public function _remap($object_called, $arguments = [])
         }
 
         // Sure it exists, but can they do anything with it?
-        if (!method_exists($this, $controller_method))
+        if (! method_exists($this, $controller_method))
         {
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,
@@ -1118,7 +1117,7 @@ protected function _log_request($authorized = FALSE)
      * Check if the requests to a controller method exceed a limit
      *
      * @access protected
-     * @param  string $controller_method The method being called
+     * @param string $controller_method The method being called
      * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
      */
     protected function _check_limit($controller_method)
@@ -1694,8 +1693,8 @@ public function query($key = NULL, $xss_clean = NULL)
      * prevented
      *
      * @access protected
-     * @param  string $value Input data
-     * @param  bool $xss_clean Whether to apply XSS filtering
+     * @param string $value Input data
+     * @param bool $xss_clean Whether to apply XSS filtering
      * @return string
      */
     protected function _xss_clean($value, $xss_clean)
@@ -1724,8 +1723,8 @@ public function validation_errors()
      * Perform LDAP Authentication
      *
      * @access protected
-     * @param  string $username The username to validate
-     * @param  string $password The password to validate
+     * @param string $username The username to validate
+     * @param string $password The password to validate
      * @return bool
      */
     protected function _perform_ldap_auth($username = '', $password = NULL)
@@ -1819,8 +1818,8 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
      * Perform Library Authentication - Override this function to change the way the library is called
      *
      * @access protected
-     * @param  string $username The username to validate
-     * @param  string $password The password to validate
+     * @param string $username The username to validate
+     * @param string $password The password to validate
      * @return bool
      */
     protected function _perform_library_auth($username = '', $password = NULL)
@@ -1858,8 +1857,8 @@ protected function _perform_library_auth($username = '', $password = NULL)
      * Check if the user is logged in
      *
      * @access protected
-     * @param  string $username The user's name
-     * @param  bool|string $password The user's password
+     * @param string $username The user's name
+     * @param bool|string $password The user's password
      * @return bool
      */
     protected function _check_login($username = NULL, $password = FALSE)
@@ -2162,12 +2161,12 @@ protected function _check_access()
         {
             return TRUE;
         }
-        
+
         //check if the key has all_access
         $accessRow = $this->rest->db
             ->where('key', $this->rest->key)
             ->get($this->config->item('rest_access_table'))->row_array();
-        
+
         if (!empty($accessRow) && !empty($accessRow['all_access']))
         {
         	return TRUE;
@@ -2235,5 +2234,4 @@ protected function _check_cors()
             exit;
         }
     }
-
 }

From 091849652295e44e9a969835d716d983f4b3a45e Mon Sep 17 00:00:00 2001
From: teabrg <teacupbrg@gmail.com>
Date: Mon, 18 Jul 2016 09:11:36 +0200
Subject: [PATCH 228/354] Check if API KEY submitted is activated

Quickly deactivate API KEY's from accessing your API in case you do not wish to always go to database, change keys, etc
---
 application/libraries/REST_Controller.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 299b9e69..d6174f8e 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1000,7 +1000,13 @@ 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($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row()))
+            //if you have a field to check if the API KEY provided by the user is activated or not 
+            //(in case you quickly want to deactivate specific users)
+            // you can also perform an extra check for this
+            
+            $existsactive = $this->db->query("SELECT api_key_activated FROM api_keys WHERE api_key = '".$key."' ");
+            $isactive = $existsactive->result();
+            if ( ! ($row = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row() ) || $isactive[0]->activated == 'no' )
             {
                 return FALSE;
             }

From e911a7b5112f815fae14a8f3128a9091ffa57713 Mon Sep 17 00:00:00 2001
From: teabrg <teacupbrg@gmail.com>
Date: Mon, 18 Jul 2016 09:23:07 +0200
Subject: [PATCH 229/354] Update REST_Controller.php

---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index d6174f8e..ed1d283f 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1006,7 +1006,7 @@ protected function _detect_api_key()
             
             $existsactive = $this->db->query("SELECT api_key_activated FROM api_keys WHERE api_key = '".$key."' ");
             $isactive = $existsactive->result();
-            if ( ! ($row = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row() ) || $isactive[0]->activated == 'no' )
+            if ( ! ($row = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row() ) || $isactive[0]->api_key_activated == 'no' )
             {
                 return FALSE;
             }

From 3677830638f74e2e42554b9e5d9addd4b69d6848 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@Chriss-iMac.local>
Date: Sat, 30 Jul 2016 12:51:04 -0500
Subject: [PATCH 230/354] added inital composer file

---
 composer.json | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 composer.json

diff --git a/composer.json b/composer.json
new file mode 100644
index 00000000..a4d014d7
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,16 @@
+{
+	"description": "REST Server for the CodeIgniter framework",
+	"name": "chriskacerguis/codeigniter-restserver",
+	"type": "project",
+	"homepage": "https://github.com/chriskacerguis/codeigniter-restserver",
+    "authors": [
+		{
+			"name": "Chris Kacerguis",
+			"role": "Developer"
+		}
+	],
+	"license": "MIT",
+	"support": {
+		"source": "https://github.com/chriskacerguis/codeigniter-restserver"
+	}
+}
\ No newline at end of file

From 32c46b6dffc7fb09fc928f4d13732f7a93abba80 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@Chriss-iMac.local>
Date: Sat, 30 Jul 2016 15:35:27 -0500
Subject: [PATCH 231/354] added .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000..496ee2ca
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
\ No newline at end of file

From 60242fd1e877c2e98f2ca9ed2c1fe850f1cb1c51 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@Chriss-iMac.local>
Date: Sat, 30 Jul 2016 15:38:49 -0500
Subject: [PATCH 232/354] added important note about 4.0.0

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 59214003..b33b448a 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,12 @@ config file and one controller.
 
 _Note: for 1.7.x support download v2.2 from Downloads tab_
 
+## Important Update on 4.0.0
+
+Please note that version 4.0.0 is in the works, and is considered a breaking change (per SemVer).  As CI 3.1.0 now has native support for Composer, this library will be moving to be composer based.
+
+Take a look at the "development" branch to see what's up.
+
 ## Installation
 
 Drag and drop the **application/libraries/Format.php** and **application/libraries/REST_Controller.php** files into your application's directories. To use `require_once` it at the top of your controllers to load it into the scope. Additionally, copy the **rest.php** file from **application/config** in your application's configuration directory.

From dc290963aaeb14d31f0617b934e5d8a1e396d220 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@Chriss-iMac.local>
Date: Thu, 18 Aug 2016 10:23:17 -0500
Subject: [PATCH 233/354] added vendor to .gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 496ee2ca..47f36f65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-.DS_Store
\ No newline at end of file
+.DS_Store
+vendor
\ No newline at end of file

From 5aaef2cbd0bb2ddc82bcb961be4b435dbb077cf2 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@Chriss-iMac.local>
Date: Thu, 18 Aug 2016 10:26:04 -0500
Subject: [PATCH 234/354] remove JSON_NUMERIC_CHECK

---
 application/libraries/Format.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 00129b28..d078298c 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -403,14 +403,14 @@ public function to_json($data = NULL)
 
         if (empty($callback) === TRUE)
         {
-            return json_encode($data, JSON_NUMERIC_CHECK);
+            return json_encode($data);
         }
 
         // We only honour a jsonp callback which are valid javascript identifiers
         elseif (preg_match('/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i', $callback))
         {
             // Return the data as encoded json with a callback
-            return $callback.'('.json_encode($data, JSON_NUMERIC_CHECK).');';
+            return $callback.'('.json_encode($data).');';
         }
 
         // An invalid jsonp callback function provided.

From 3f3c0fec16d515c4211b4a0a62fb121bfeab0e9f Mon Sep 17 00:00:00 2001
From: teabrg <teacupbrg@gmail.com>
Date: Tue, 23 Aug 2016 09:29:11 +0200
Subject: [PATCH 235/354] Redo using Query Builder

---
 application/libraries/REST_Controller.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index ed1d283f..be693779 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1005,6 +1005,9 @@ protected function _detect_api_key()
             // you can also perform an extra check for this
             
             $existsactive = $this->db->query("SELECT api_key_activated FROM api_keys WHERE api_key = '".$key."' ");
+            // Using the Query builder method. This will only work if you have a column named activated in the api_key table.
+            //If you also want to add this as a config item replace the get('activated') with $this->config->item('rest_key_activated_column').
+            $existsactive = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get('activated')->result();
             $isactive = $existsactive->result();
             if ( ! ($row = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row() ) || $isactive[0]->api_key_activated == 'no' )
             {

From 59110a62ecb550c852926757ec81e45ea26fb217 Mon Sep 17 00:00:00 2001
From: Jay Paul Torres Bandas <jptb86@gmail.com>
Date: Sun, 4 Sep 2016 08:31:29 -0500
Subject: [PATCH 236/354] Spanish Lang - Fix (#692)

---
 application/language/spanish/rest_controller_lang.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/language/spanish/rest_controller_lang.php b/application/language/spanish/rest_controller_lang.php
index 962376c7..b6dea8fb 100644
--- a/application/language/spanish/rest_controller_lang.php
+++ b/application/language/spanish/rest_controller_lang.php
@@ -10,8 +10,8 @@
 $lang['text_rest_ip_unauthorized'] = 'IP no autorizada';
 $lang['text_rest_unauthorized'] = 'Acceso no autorizado';
 $lang['text_rest_ajax_only'] = 'Solo peticiones ajax permitidas';
-$lang['text_rest_api_key_unauthorized'] = 'This API key does not have access to the requested controller';
-$lang['text_rest_api_key_permissions'] = 'This API key does not have enough permissions';
-$lang['text_rest_api_key_time_limit'] = 'This API key has reached the time limit for this method';
-$lang['text_rest_unknown_method'] = 'metodo desconocido';
+$lang['text_rest_api_key_unauthorized'] = 'Esta clave de API no tiene acceso al controlador solicitado';
+$lang['text_rest_api_key_permissions'] = 'Esta clave de API no tiene suficientes permisos';
+$lang['text_rest_api_key_time_limit'] = 'Esta clave de API ha alcanzado el límite de tiempo para este método';
+$lang['text_rest_unknown_method'] = 'método desconocido';
 $lang['text_rest_unsupported'] = 'Protocolo no soportado';

From 565ab5332c118be2f743fc71f009570419e533bc Mon Sep 17 00:00:00 2001
From: Eray Akartuna <erayakartuna@users.noreply.github.com>
Date: Thu, 8 Sep 2016 02:41:46 +0300
Subject: [PATCH 237/354] Turkish Language (#695)

---
 application/language/turkish/index.html         | 11 +++++++++++
 .../language/turkish/rest_controller_lang.php   | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 application/language/turkish/index.html
 create mode 100644 application/language/turkish/rest_controller_lang.php

diff --git a/application/language/turkish/index.html b/application/language/turkish/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/language/turkish/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/turkish/rest_controller_lang.php b/application/language/turkish/rest_controller_lang.php
new file mode 100644
index 00000000..2efcd2c8
--- /dev/null
+++ b/application/language/turkish/rest_controller_lang.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * Turkish language
+ */
+
+$lang['text_rest_invalid_api_key'] = 'Geçersiz API anahtarı %s'; // %s is the REST API key
+$lang['text_rest_invalid_credentials'] = 'Geçersiz kimlik';
+$lang['text_rest_ip_denied'] = 'IP reddedildi';
+$lang['text_rest_ip_unauthorized'] = 'Yetkisiz IP';
+$lang['text_rest_unauthorized'] = 'İzinsiz';
+$lang['text_rest_ajax_only'] = 'Sadece AJAX isteklerine izin verildi';
+$lang['text_rest_api_key_unauthorized'] = 'Ulaşılmak istenilen controllera API anahtarının erişim yetkisi bulunmamaktadır';
+$lang['text_rest_api_key_permissions'] = 'Bu API anahtarının yeterli yetkisi bulunmamaktadır';
+$lang['text_rest_api_key_time_limit'] = 'API anahtarı bu metod için zaman sınırına ulaştı.';
+$lang['text_rest_unknown_method'] = 'Bilinmeyen metod';
+$lang['text_rest_unsupported'] = 'Desteklenmeyen protokol';

From ba60df13483c78a96a20973558dd8dfda613d493 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@gmail.com>
Date: Thu, 8 Sep 2016 08:07:34 -0500
Subject: [PATCH 238/354] removed code that was causing issues due to hard
 codes and non-config options.

---
 application/libraries/REST_Controller.php | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 0fb76fec..d0b354c0 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -999,16 +999,7 @@ 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 you have a field to check if the API KEY provided by the user is activated or not 
-            //(in case you quickly want to deactivate specific users)
-            // you can also perform an extra check for this
-            
-            $existsactive = $this->db->query("SELECT api_key_activated FROM api_keys WHERE api_key = '".$key."' ");
-            // Using the Query builder method. This will only work if you have a column named activated in the api_key table.
-            //If you also want to add this as a config item replace the get('activated') with $this->config->item('rest_key_activated_column').
-            $existsactive = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get('activated')->result();
-            $isactive = $existsactive->result();
-            if ( ! ($row = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row() ) || $isactive[0]->api_key_activated == 'no' )
+            if ( ! ($row = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row()))
             {
                 return FALSE;
             }

From 079ea94915e558a868879f29e71f51c5e2f6dd84 Mon Sep 17 00:00:00 2001
From: teabrg <teacupbrg@gmail.com>
Date: Thu, 8 Sep 2016 15:08:34 +0200
Subject: [PATCH 239/354] Greek Language Translation (#696)

---
 .../language/greek/rest_controller_lang.php     | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 application/language/greek/rest_controller_lang.php

diff --git a/application/language/greek/rest_controller_lang.php b/application/language/greek/rest_controller_lang.php
new file mode 100644
index 00000000..319333b2
--- /dev/null
+++ b/application/language/greek/rest_controller_lang.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * Greek language
+ */
+
+$lang['text_rest_invalid_api_key'] = 'Λάθος API key %s'; // %s είναι το REST API key
+$lang['text_rest_invalid_credentials'] = 'Μή έγκυρα διαπιστευτήρια';
+$lang['text_rest_ip_denied'] = 'Άρνηση πρόσβασης της διεύθηνσης IP';
+$lang['text_rest_ip_unauthorized'] = 'Μη εξουσιοδοτημένη διεύθυνση IP';
+$lang['text_rest_unauthorized'] = 'Άρνηση Πρόσβασης. Μη εξουσιοδοτημένο';
+$lang['text_rest_ajax_only'] = 'Μόνο AJAX requests επιτρέπονται';
+$lang['text_rest_api_key_unauthorized'] = 'Αυτό το API key δεν έχει πρόσβαση στον συγκεκριμένο controller';
+$lang['text_rest_api_key_permissions'] = 'Αυτό το API key δεν έχει αρκετά δικαιώματα';
+$lang['text_rest_api_key_time_limit'] = 'Αυτό το API key έχει φτάσει στο μέγιστο όριο requests για την συγκεκριμένη μέθοδο';
+$lang['text_rest_unknown_method'] = 'Άγνωστη μέθοδος';
+$lang['text_rest_unsupported'] = 'Το συγκεκριμένο πρωτόκολλο δεν υποστηρίζεται';

From 51a0ffa81d1867ceb6492721bf3633049893ba77 Mon Sep 17 00:00:00 2001
From: TGoC <florincm@ymail.com>
Date: Sat, 10 Sep 2016 21:34:49 +0100
Subject: [PATCH 240/354] fix rate limiting (#702)

---
 application/libraries/REST_Controller.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index d0b354c0..81be0a22 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1133,12 +1133,10 @@ protected function _check_limit($controller_method)
         {
           case 'API_KEY':
             $limited_uri = 'api-key:' . (isset($this->rest->key) ? $this->rest->key : '');
-            $limited_method_name = isset($this->rest->key) ? $this->rest->key : '';
             break;
 
           case 'METHOD_NAME':
             $limited_uri = 'method-name:' . $controller_method;
-            $limited_method_name =  $controller_method;
             break;
 
           case 'ROUTED_URL':
@@ -1149,20 +1147,19 @@ protected function _check_limit($controller_method)
                 $limited_uri = substr($limited_uri,0, -strlen($this->response->format) - 1);
             }
             $limited_uri = 'uri:'.$limited_uri.':'.$this->request->method; // It's good to differentiate GET from PUT
-            $limited_method_name = $controller_method;
             break;
         }
 
-        if (isset($this->methods[$limited_method_name]['limit']) === FALSE )
+        if (isset($this->methods[$controller_method]['limit']) === FALSE )
         {
             // Everything is fine
             return TRUE;
         }
 
         // How many times can you get to this method in a defined time_limit (default: 1 hour)?
-        $limit = $this->methods[$limited_method_name]['limit'];
+        $limit = $this->methods[$controller_method]['limit'];
 
-        $time_limit = (isset($this->methods[$limited_method_name]['time']) ? $this->methods[$limited_method_name]['time'] : 3600); // 3600 = 60 * 60
+        $time_limit = (isset($this->methods[$controller_method]['time']) ? $this->methods[$controller_method]['time'] : 3600); // 3600 = 60 * 60
 
         // Get data about a keys' usage and limit to one row
         $result = $this->rest->db

From 4b45c72cb751222eed601f3385209c050c41a0e8 Mon Sep 17 00:00:00 2001
From: TGoC <florincm@ymail.com>
Date: Sat, 10 Sep 2016 21:35:04 +0100
Subject: [PATCH 241/354] typo - example rate limit (#703)

---
 application/controllers/api/Example.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 2cfecaaf..2f8f9e7a 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -25,9 +25,9 @@ function __construct()
 
         // Configure limits on our controller methods
         // Ensure you have created the 'limits' table and enabled 'limits' within application/config/rest.php
-        $this->methods['user_get']['limit'] = 500; // 500 requests per hour per user/key
-        $this->methods['user_post']['limit'] = 100; // 100 requests per hour per user/key
-        $this->methods['user_delete']['limit'] = 50; // 50 requests per hour per user/key
+        $this->methods['users_get']['limit'] = 500; // 500 requests per hour per user/key
+        $this->methods['users_post']['limit'] = 100; // 100 requests per hour per user/key
+        $this->methods['users_delete']['limit'] = 50; // 50 requests per hour per user/key
     }
 
     public function users_get()

From 706f3b8375a0f6d1c65224dc112429f02037a572 Mon Sep 17 00:00:00 2001
From: Eray Akartuna <erayakartuna@users.noreply.github.com>
Date: Thu, 29 Sep 2016 05:39:04 +0300
Subject: [PATCH 242/354] Limit request by ip address - without rest key (#711)

---
 application/config/rest.php                   |  1 +
 .../bulgarian/rest_controller_lang.php        |  1 +
 .../language/english/rest_controller_lang.php |  1 +
 .../language/french/rest_controller_lang.php  |  1 +
 .../language/german/rest_controller_lang.php  |  1 +
 .../language/greek/rest_controller_lang.php   |  1 +
 .../rest_controller_lang.php                  |  1 +
 .../romanian/rest_controller_lang.php         |  1 +
 .../serbian_cyr/rest_controller_lang.php      |  1 +
 .../serbian_lat/rest_controller_lang.php      |  1 +
 .../rest_controller_lang.php                  |  1 +
 .../language/spanish/rest_controller_lang.php |  1 +
 .../rest_controller_lang.php                  |  1 +
 .../language/turkish/rest_controller_lang.php |  1 +
 application/libraries/REST_Controller.php     | 24 +++++++++++++++----
 15 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/application/config/rest.php b/application/config/rest.php
index a159144e..95ddc5cf 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -334,6 +334,7 @@
 | Specify the method used to limit the API calls
 |
 | Available methods are :
+| $config['rest_limits_method'] = 'IP_ADDRESS'; // Put a limit per ip address
 | $config['rest_limits_method'] = 'API_KEY'; // Put a limit per api key
 | $config['rest_limits_method'] = 'METHOD_NAME'; // Put a limit on method calls
 | $config['rest_limits_method'] = 'ROUTED_URL';  // Put a limit on the routed URL
diff --git a/application/language/bulgarian/rest_controller_lang.php b/application/language/bulgarian/rest_controller_lang.php
index 6145307d..1dec8515 100644
--- a/application/language/bulgarian/rest_controller_lang.php
+++ b/application/language/bulgarian/rest_controller_lang.php
@@ -13,5 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'API ключът не е оторизиран зо достъп до заявения контролер';
 $lang['text_rest_api_key_permissions'] = 'API ключът няма достатъчно права';
 $lang['text_rest_api_key_time_limit'] = 'API ключът е изполван с превишаване на времевия лимит за този метод';
+$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
 $lang['text_rest_unknown_method'] = 'Неизвестен метод';
 $lang['text_rest_unsupported'] = 'Неподдържан протокол';
diff --git a/application/language/english/rest_controller_lang.php b/application/language/english/rest_controller_lang.php
index 1c665bdc..06bf4b96 100644
--- a/application/language/english/rest_controller_lang.php
+++ b/application/language/english/rest_controller_lang.php
@@ -13,5 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'This API key does not have access to the requested controller';
 $lang['text_rest_api_key_permissions'] = 'This API key does not have enough permissions';
 $lang['text_rest_api_key_time_limit'] = 'This API key has reached the time limit for this method';
+$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';
 $lang['text_rest_unknown_method'] = 'Unknown method';
 $lang['text_rest_unsupported'] = 'Unsupported protocol';
diff --git a/application/language/french/rest_controller_lang.php b/application/language/french/rest_controller_lang.php
index fb5727f5..f8c0d13f 100644
--- a/application/language/french/rest_controller_lang.php
+++ b/application/language/french/rest_controller_lang.php
@@ -13,5 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Cette clef d\'API n\'a pas accès au contrôleur demandé';
 $lang['text_rest_api_key_permissions'] = 'Cette clef d\'API n\'a pas les permissions requises';
 $lang['text_rest_api_key_time_limit'] = 'Cette clef d\'API a atteint sa limite de temps pour cette méthode';
+$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
 $lang['text_rest_unknown_method'] = 'Méthode inconnue';
 $lang['text_rest_unsupported'] = 'Protocole non-supporté';
diff --git a/application/language/german/rest_controller_lang.php b/application/language/german/rest_controller_lang.php
index 012d0363..4230c3cd 100644
--- a/application/language/german/rest_controller_lang.php
+++ b/application/language/german/rest_controller_lang.php
@@ -13,5 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Dieser API Schlüssel hat keinen Zugriff auf den angeforderten Controller';
 $lang['text_rest_api_key_permissions'] = 'Dieser API Schlüssel besitzt die erforderlichen Rechte nicht';
 $lang['text_rest_api_key_time_limit'] = 'Dieser API Schlüssel ist abgelaufen';
+$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
 $lang['text_rest_unknown_method'] = 'Unbekannte Methode';
 $lang['text_rest_unsupported'] = 'Protokoll nicht unterstützt';
diff --git a/application/language/greek/rest_controller_lang.php b/application/language/greek/rest_controller_lang.php
index 319333b2..f85b0673 100644
--- a/application/language/greek/rest_controller_lang.php
+++ b/application/language/greek/rest_controller_lang.php
@@ -13,5 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Αυτό το API key δεν έχει πρόσβαση στον συγκεκριμένο controller';
 $lang['text_rest_api_key_permissions'] = 'Αυτό το API key δεν έχει αρκετά δικαιώματα';
 $lang['text_rest_api_key_time_limit'] = 'Αυτό το API key έχει φτάσει στο μέγιστο όριο requests για την συγκεκριμένη μέθοδο';
+$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
 $lang['text_rest_unknown_method'] = 'Άγνωστη μέθοδος';
 $lang['text_rest_unsupported'] = 'Το συγκεκριμένο πρωτόκολλο δεν υποστηρίζεται';
diff --git a/application/language/portuguese-brazilian/rest_controller_lang.php b/application/language/portuguese-brazilian/rest_controller_lang.php
index 04bbf6e3..84dc9e0e 100644
--- a/application/language/portuguese-brazilian/rest_controller_lang.php
+++ b/application/language/portuguese-brazilian/rest_controller_lang.php
@@ -13,5 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Esta chave da API não tem acesso ao controller solicitado';
 $lang['text_rest_api_key_permissions'] = 'Esta chave da API não tem permissões suficientes';
 $lang['text_rest_api_key_time_limit'] = 'Esta chave da API já atingiu o tempo limite para este método';
+$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
 $lang['text_rest_unknown_method'] = 'Método desconhecido';
 $lang['text_rest_unsupported'] = 'Sem suporte para este protocolo';
diff --git a/application/language/romanian/rest_controller_lang.php b/application/language/romanian/rest_controller_lang.php
index c7b94478..f151d527 100644
--- a/application/language/romanian/rest_controller_lang.php
+++ b/application/language/romanian/rest_controller_lang.php
@@ -13,5 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Această cheie API nu are acees la controller-ul solicitat';
 $lang['text_rest_api_key_permissions'] = 'Această cheie API nu are suficiente permisiuni';
 $lang['text_rest_api_key_time_limit'] = 'Această cheie API a atins limita de timp pentru această metodă';
+$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
 $lang['text_rest_unknown_method'] = 'Metodă necunoscută';
 $lang['text_rest_unsupported'] = 'Protocol neacceptat';
diff --git a/application/language/serbian_cyr/rest_controller_lang.php b/application/language/serbian_cyr/rest_controller_lang.php
index e2164214..4d249c49 100644
--- a/application/language/serbian_cyr/rest_controller_lang.php
+++ b/application/language/serbian_cyr/rest_controller_lang.php
@@ -13,5 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Овај *API* кључ нема овлашћења за захтевани контролер';
 $lang['text_rest_api_key_permissions'] = 'Овај *API* кључ нема дозвољен степен овлашћења';
 $lang['text_rest_api_key_time_limit'] = 'Овај *API* кључ је прекорачио временски лимит за дати метод';
+$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
 $lang['text_rest_unknown_method'] = 'Непознат метод';
 $lang['text_rest_unsupported'] = 'Неподржан протокол';
diff --git a/application/language/serbian_lat/rest_controller_lang.php b/application/language/serbian_lat/rest_controller_lang.php
index 4b6b749f..057ab930 100644
--- a/application/language/serbian_lat/rest_controller_lang.php
+++ b/application/language/serbian_lat/rest_controller_lang.php
@@ -13,5 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Ovaj API klju&#269; nema ovla&#353;&#263;enje za zahtevani kontroler';
 $lang['text_rest_api_key_permissions'] = 'Ovaj API klju&#269; nema dozvoljen stepen ovla&#353;&#263;enja';
 $lang['text_rest_api_key_time_limit'] = 'Ovaj API klju&#269; je prekora&#269;io vremenski limit za dati metod';
+$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
 $lang['text_rest_unknown_method'] = 'Nepoznat metod';
 $lang['text_rest_unsupported'] = 'Nepodr&#382;an protokol';
diff --git a/application/language/simplified-chinese/rest_controller_lang.php b/application/language/simplified-chinese/rest_controller_lang.php
index f7f19fb1..f32e9e7d 100644
--- a/application/language/simplified-chinese/rest_controller_lang.php
+++ b/application/language/simplified-chinese/rest_controller_lang.php
@@ -13,5 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = '此 API key无法存取指定的 controller';
 $lang['text_rest_api_key_permissions'] = '此 API key没有足够的权限';
 $lang['text_rest_api_key_time_limit'] = '此 API key已经超过有效期限';
+$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
 $lang['text_rest_unknown_method'] = '未知的方法';
 $lang['text_rest_unsupported'] = '不支持的请求方法';
diff --git a/application/language/spanish/rest_controller_lang.php b/application/language/spanish/rest_controller_lang.php
index b6dea8fb..2ca81056 100644
--- a/application/language/spanish/rest_controller_lang.php
+++ b/application/language/spanish/rest_controller_lang.php
@@ -13,5 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Esta clave de API no tiene acceso al controlador solicitado';
 $lang['text_rest_api_key_permissions'] = 'Esta clave de API no tiene suficientes permisos';
 $lang['text_rest_api_key_time_limit'] = 'Esta clave de API ha alcanzado el límite de tiempo para este método';
+$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
 $lang['text_rest_unknown_method'] = 'método desconocido';
 $lang['text_rest_unsupported'] = 'Protocolo no soportado';
diff --git a/application/language/traditional-chinese/rest_controller_lang.php b/application/language/traditional-chinese/rest_controller_lang.php
index f388c446..b1f80caf 100644
--- a/application/language/traditional-chinese/rest_controller_lang.php
+++ b/application/language/traditional-chinese/rest_controller_lang.php
@@ -13,5 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = '這個 API 金鑰沒有辦法存取指定的 controller';
 $lang['text_rest_api_key_permissions'] = '這個 API 金鑰沒有具備足夠權限';
 $lang['text_rest_api_key_time_limit'] = '這個 API 金鑰已經超過有效期限';
+$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
 $lang['text_rest_unknown_method'] = '未知的方法';
 $lang['text_rest_unsupported'] = '不支援的通訊協定';
diff --git a/application/language/turkish/rest_controller_lang.php b/application/language/turkish/rest_controller_lang.php
index 2efcd2c8..589b28cc 100644
--- a/application/language/turkish/rest_controller_lang.php
+++ b/application/language/turkish/rest_controller_lang.php
@@ -13,5 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Ulaşılmak istenilen controllera API anahtarının erişim yetkisi bulunmamaktadır';
 $lang['text_rest_api_key_permissions'] = 'Bu API anahtarının yeterli yetkisi bulunmamaktadır';
 $lang['text_rest_api_key_time_limit'] = 'API anahtarı bu metod için zaman sınırına ulaştı.';
+$lang['text_rest_ip_address_time_limit'] = 'IP adresi bu metod için zaman sınırına ulaştı.';
 $lang['text_rest_unknown_method'] = 'Bilinmeyen metod';
 $lang['text_rest_unsupported'] = 'Desteklenmeyen protokol';
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 81be0a22..45ceb5ed 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -704,6 +704,13 @@ public function _remap($object_called, $arguments = [])
             }
         }
 
+        //check request limit by ip without login
+        elseif ($this->config->item('rest_limits_method') == "IP_ADDRESS" && $this->config->item('rest_enable_limits') && $this->_check_limit($controller_method) === FALSE)
+        {
+            $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_address_time_limit')];
+            $this->response($response, self::HTTP_UNAUTHORIZED);
+        }
+
         // No key stuff, but record that stuff is happening
         elseif ($this->config->item('rest_enable_logging') && $log_method)
         {
@@ -1129,10 +1136,17 @@ protected function _check_limit($controller_method)
             return TRUE;
         }
 
+        $api_key = isset($this->rest->key) ? $this->rest->key : '';
+
         switch ($this->config->item('rest_limits_method'))
         {
+          case 'IP_ADDRESS':
+            $limited_uri = 'ip-address:' .$this->input->ip_address();
+            $api_key = $this->input->ip_address();
+            break;
+
           case 'API_KEY':
-            $limited_uri = 'api-key:' . (isset($this->rest->key) ? $this->rest->key : '');
+            $limited_uri = 'api-key:' . $api_key;
             break;
 
           case 'METHOD_NAME':
@@ -1164,7 +1178,7 @@ protected function _check_limit($controller_method)
         // Get data about a keys' usage and limit to one row
         $result = $this->rest->db
             ->where('uri', $limited_uri)
-            ->where('api_key', $this->rest->key)
+            ->where('api_key', $api_key)
             ->get($this->config->item('rest_limits_table'))
             ->row();
 
@@ -1174,7 +1188,7 @@ protected function _check_limit($controller_method)
             // Create a new row for the following key
             $this->rest->db->insert($this->config->item('rest_limits_table'), [
                 'uri' => $limited_uri,
-                'api_key' => isset($this->rest->key) ? $this->rest->key : '',
+                'api_key' =>$api_key,
                 'count' => 1,
                 'hour_started' => time()
             ]);
@@ -1186,7 +1200,7 @@ protected function _check_limit($controller_method)
             // Reset the started period and count
             $this->rest->db
                 ->where('uri', $limited_uri)
-                ->where('api_key', isset($this->rest->key) ? $this->rest->key : '')
+                ->where('api_key', $api_key)
                 ->set('hour_started', time())
                 ->set('count', 1)
                 ->update($this->config->item('rest_limits_table'));
@@ -1204,7 +1218,7 @@ protected function _check_limit($controller_method)
             // Increase the count by one
             $this->rest->db
                 ->where('uri', $limited_uri)
-                ->where('api_key', $this->rest->key)
+                ->where('api_key', $api_key)
                 ->set('count', 'count + 1', FALSE)
                 ->update($this->config->item('rest_limits_table'));
         }

From 929b0f5ef68a52e4bc639da662af24c629aae74a Mon Sep 17 00:00:00 2001
From: Ties Kuypers <ties@expertees.nl>
Date: Wed, 26 Oct 2016 15:51:57 +0200
Subject: [PATCH 243/354] added dutch translation (#721)

* Added dutch language

* Create index.html
---
 application/language/dutch/index.html            | 11 +++++++++++
 .../language/dutch/rest_controller_lang.php      | 16 ++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 application/language/dutch/index.html
 create mode 100644 application/language/dutch/rest_controller_lang.php

diff --git a/application/language/dutch/index.html b/application/language/dutch/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/language/dutch/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/dutch/rest_controller_lang.php b/application/language/dutch/rest_controller_lang.php
new file mode 100644
index 00000000..182ca61c
--- /dev/null
+++ b/application/language/dutch/rest_controller_lang.php
@@ -0,0 +1,16 @@
+<?php
+/*
+ * Dutch language
+ */
+$lang['text_rest_invalid_api_key'] 		 = 'Ongeldige API sleutel %s'; // %s is the REST API key
+$lang['text_rest_invalid_credentials']   = 'Ongeldige gegevens';
+$lang['text_rest_ip_denied'] 			 = 'IP-adres geweigerd';
+$lang['text_rest_ip_unauthorized'] 		 = 'IP-adres niet toegestaan';
+$lang['text_rest_unauthorized'] 		 = 'Niet toegestaan';
+$lang['text_rest_ajax_only'] 			 = 'Alleen AJAX requests zijn toegestaan';
+$lang['text_rest_api_key_unauthorized']  = 'De API sleutel heeft geen toegang tot de gevraagde informatie';
+$lang['text_rest_api_key_permissions']   = 'De API sleutel heeft niet genoeg bevoegdheden';
+$lang['text_rest_api_key_time_limit'] 	 = 'De API sleutel heeft de tijdslimiet bereikt';
+$lang['text_rest_ip_address_time_limit'] = 'Het IP-adres heeft de tijdslimiet bereikt';
+$lang['text_rest_unknown_method'] 	     = 'Onbekende actie';
+$lang['text_rest_unsupported'] 			 = 'Protocol wordt niet ondersteund';

From 942990385d3828ef6d9126ebc06ac003a9e3713a Mon Sep 17 00:00:00 2001
From: Ivan Tcholakov <ivantcholakov@gmail.com>
Date: Wed, 26 Oct 2016 16:52:42 +0300
Subject: [PATCH 244/354] Bulgarian language update. (#719)

Signed-off-by:Ivan Tcholakov <ivantcholakov@gmail.com>
---
 application/language/bulgarian/rest_controller_lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/language/bulgarian/rest_controller_lang.php b/application/language/bulgarian/rest_controller_lang.php
index 1dec8515..4ba134d8 100644
--- a/application/language/bulgarian/rest_controller_lang.php
+++ b/application/language/bulgarian/rest_controller_lang.php
@@ -13,6 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'API ключът не е оторизиран зо достъп до заявения контролер';
 $lang['text_rest_api_key_permissions'] = 'API ключът няма достатъчно права';
 $lang['text_rest_api_key_time_limit'] = 'API ключът е изполван с превишаване на времевия лимит за този метод';
-$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
+$lang['text_rest_ip_address_time_limit'] = 'За текущия IP адрес е превишен времевия лимит за изпълнение на метода';
 $lang['text_rest_unknown_method'] = 'Неизвестен метод';
 $lang['text_rest_unsupported'] = 'Неподдържан протокол';

From 73eaa18822473acadcc65ca8ffb10c7b60f54de9 Mon Sep 17 00:00:00 2001
From: Barayuda Gautama <gautama@barayuda.web.id>
Date: Wed, 23 Nov 2016 00:08:54 +0800
Subject: [PATCH 245/354] Add Indonesian language (#723)

---
 application/language/indonesia/index.html      | 11 +++++++++++
 .../indonesia/rest_controller_lang.php         | 18 ++++++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 application/language/indonesia/index.html
 create mode 100644 application/language/indonesia/rest_controller_lang.php

diff --git a/application/language/indonesia/index.html b/application/language/indonesia/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/language/indonesia/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/indonesia/rest_controller_lang.php b/application/language/indonesia/rest_controller_lang.php
new file mode 100644
index 00000000..771c6835
--- /dev/null
+++ b/application/language/indonesia/rest_controller_lang.php
@@ -0,0 +1,18 @@
+<?php
+
+/*
+ * English language
+ */
+
+$lang['text_rest_invalid_api_key'] = 'Kunci API %s , tidak valid'; // %s is the REST API key
+$lang['text_rest_invalid_credentials'] = 'Hak kredensial tidak valid';
+$lang['text_rest_ip_denied'] = 'IP ditolak';
+$lang['text_rest_ip_unauthorized'] = 'IP tidak diberi kuasa';
+$lang['text_rest_unauthorized'] = 'Tidak diberi kuasa';
+$lang['text_rest_ajax_only'] = 'Hanya AJAX requests yang diperbolehkan';
+$lang['text_rest_api_key_unauthorized'] = 'Kunci API ini tidak memiliki akses ke Controller yang diminta';
+$lang['text_rest_api_key_permissions'] = 'Kunci API ini tidak memiliki izin akses yang cukup';
+$lang['text_rest_api_key_time_limit'] = 'Kunci API ini telah mencapai batas waktu untuk mengakses metode ini';
+$lang['text_rest_ip_address_time_limit'] = 'Alamat API ini telah mencapai batas waktu untuk mengakses metode ini';
+$lang['text_rest_unknown_method'] = 'Metode yang tidak ketahui';
+$lang['text_rest_unsupported'] = 'Protokol tidak mendukung';

From 15a08e7c19df92ab15763aa03e79ddda0545e2ec Mon Sep 17 00:00:00 2001
From: Amit Moryossef <amitmoryossef@gmail.com>
Date: Tue, 22 Nov 2016 18:09:56 +0200
Subject: [PATCH 246/354] Code smell, PHP Doc problems, Index methods, and
 global exception handler (#726)

* Fixed throws statement

* Removed unnecessary return doc

* Fixed wrong return value

* Fixed parameter types in PHP DOC

* Removed paths inspection in the project

* Added index methods support! Finally

* Handle all exceptions showings in one place. not 2

* Added changes to the change log
---
 .gitignore                                |  3 ++-
 CHANGELOG.md                              |  4 ++++
 application/controllers/api/Example.php   |  1 +
 application/controllers/api/Key.php       |  1 +
 application/libraries/Format.php          | 10 +++++-----
 application/libraries/REST_Controller.php | 17 ++++++++---------
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index 47f36f65..a761a8b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
-vendor
\ No newline at end of file
+vendor
+.idea
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index dfdadc58..e22c03ed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog:
 ===========
 
+### UNRELEASED
+* Added support for CodeIgniter controller's index methods (index_GET, index_POST...)
+* Added exceptions handling when the method could not be found
+
 ### 2.7.2
 
 * Added $this->query() in which query parameters can now be obtained regardless of whether a GET request is sent or not
diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 2f8f9e7a..b571e74d 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -3,6 +3,7 @@
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 // This can be removed if you use __autoload() in config.php OR use Modular Extensions
+/** @noinspection PhpIncludeInspection */
 require APPPATH . '/libraries/REST_Controller.php';
 
 /**
diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
index 0fa67172..35d7c0f7 100644
--- a/application/controllers/api/Key.php
+++ b/application/controllers/api/Key.php
@@ -3,6 +3,7 @@
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 // This can be removed if you use __autoload() in config.php OR use Modular Extensions
+/** @noinspection PhpIncludeInspection */
 require APPPATH . '/libraries/REST_Controller.php';
 
 /**
diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index d078298c..a6e2cf98 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -461,8 +461,8 @@ public function to_php($data = NULL)
     // INTERNAL FUNCTIONS
 
     /**
-     * @param $data XML string
-     * @return SimpleXMLElement XML element object; otherwise, empty array
+     * @param string $data XML string
+     * @return array XML element object; otherwise, empty array
      */
     protected function _from_xml($data)
     {
@@ -496,7 +496,7 @@ protected function _from_csv($data, $delimiter = ',', $enclosure = '"')
     }
 
     /**
-     * @param $data Encoded json string
+     * @param string $data Encoded json string
      * @return mixed Decoded json string with leading and trailing whitespace removed
      */
     protected function _from_json($data)
@@ -505,7 +505,7 @@ protected function _from_json($data)
     }
 
     /**
-     * @param string Data to unserialized
+     * @param string $data Data to unserialize
      * @return mixed Unserialized data
      */
     protected function _from_serialize($data)
@@ -514,7 +514,7 @@ protected function _from_serialize($data)
     }
 
     /**
-     * @param $data Data to trim leading and trailing whitespace
+     * @param string $data Data to trim leading and trailing whitespace
      * @return string Data with leading and trailing whitespace removed
      */
     protected function _from_php($data)
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 45ceb5ed..17f81375 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -375,7 +375,6 @@ protected function early_checks()
      * @access public
      * @param string $config Configuration filename minus the file extension
      * e.g: my_rest.php is passed as 'my_rest'
-     * @return void
      */
     public function __construct($config = 'rest')
     {
@@ -590,7 +589,7 @@ public function __destruct()
      * Checks to see if we have everything we need to run this library.
      *
      * @access protected
-     * @return Exception
+     * @@throws Exception
      */
     protected function preflight_checks()
     {
@@ -632,6 +631,11 @@ public function _remap($object_called, $arguments = [])
         $object_called = preg_replace('/^(.*)\.(?:'.implode('|', array_keys($this->_supported_formats)).')$/', '$1', $object_called);
 
         $controller_method = $object_called.'_'.$this->request->method;
+	    // Does this method exist? If not, try executing an index method
+	    if (!method_exists($this, $controller_method)) {
+		    $controller_method = "index_" . $this->request->method;
+		    array_unshift($arguments, $object_called);
+	    }
 
         // Do we want to log this method (if allowed by config)?
         $log_method = ! (isset($this->methods[$controller_method]['log']) && $this->methods[$controller_method]['log'] === FALSE);
@@ -725,13 +729,8 @@ public function _remap($object_called, $arguments = [])
         catch (Exception $ex)
         {
             // If the method doesn't exist, then the error will be caught and an error response shown
-            $this->response([
-                    $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => [
-                        'classname' => get_class($ex),
-                        'message' => $ex->getMessage()
-                    ]
-                ], self::HTTP_INTERNAL_SERVER_ERROR);
+	        $_error = &load_class('Exceptions', 'core');
+	        $_error->show_exception($ex);
         }
     }
 

From dfb0a4f5802cbc8bc4e55f09a6cfca877fa125a3 Mon Sep 17 00:00:00 2001
From: SC <simone.cainero@gmail.com>
Date: Tue, 22 Nov 2016 17:10:56 +0100
Subject: [PATCH 247/354] Add italian language (#733)

* added italian translation

* Create index.html
---
 application/language/italian/index.html          | 11 +++++++++++
 .../language/italian/rest_controller_lang.php    | 16 ++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 application/language/italian/index.html
 create mode 100644 application/language/italian/rest_controller_lang.php

diff --git a/application/language/italian/index.html b/application/language/italian/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/language/italian/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/italian/rest_controller_lang.php b/application/language/italian/rest_controller_lang.php
new file mode 100644
index 00000000..783f16ab
--- /dev/null
+++ b/application/language/italian/rest_controller_lang.php
@@ -0,0 +1,16 @@
+<?php
+/*
+ * Italian language
+ */
+$lang['text_rest_invalid_api_key'] = 'API key %s non valida'; // %s is the REST API key
+$lang['text_rest_invalid_credentials'] = 'Credenziali non valide';
+$lang['text_rest_ip_denied'] = 'IP non consentito';
+$lang['text_rest_ip_unauthorized'] = 'IP non autorizzato';
+$lang['text_rest_unauthorized'] = 'Non autorizzato';
+$lang['text_rest_ajax_only'] = 'Sono ammesse solo richieste AJAX';
+$lang['text_rest_api_key_unauthorized'] = 'Questa API key non ha accesso al controller richiesto';
+$lang['text_rest_api_key_permissions'] = 'Questa API key non dispone di autorizzazioni sufficienti';
+$lang['text_rest_api_key_time_limit'] = 'Questa API key ha raggiunto il limite di tempo per questo metodo';
+$lang['text_rest_ip_address_time_limit'] = 'Questo indirizzo IP ha raggiunto il limite di tempo per questo metodo';
+$lang['text_rest_unknown_method'] = 'Metodo sconosciuto';
+$lang['text_rest_unsupported'] = 'Protocollo non supportato';

From 053ab87a050d717b4ab8134287cd9831908de09b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ziegenham=20Andr=C3=A1s?=
 <AndrasZiegenham@users.noreply.github.com>
Date: Tue, 22 Nov 2016 17:11:15 +0100
Subject: [PATCH 248/354] response continue fix (#722)

---
 application/libraries/REST_Controller.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 17f81375..d7a691da 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -745,6 +745,7 @@ public function _remap($object_called, $arguments = [])
      */
     public function response($data = NULL, $http_code = NULL, $continue = FALSE)
     {
+		ob_start();
         // If the HTTP status is not NULL, then cast as an integer
         if ($http_code !== NULL)
         {
@@ -813,6 +814,10 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
             $this->output->_display();
             exit;
         }
+		else
+		{
+			ob_end_flush();
+		}
 
         // Otherwise dump the output automatically
     }

From d19dc77f03521c7a725a4555407e1e4e7a85f6e1 Mon Sep 17 00:00:00 2001
From: Ian Lin <catxii@gmail.com>
Date: Wed, 23 Nov 2016 00:11:35 +0800
Subject: [PATCH 249/354] fix cross site to option request error (#720)

cross site request first can use option http method.
but use `keys` authentication, authentication can fail
---
 application/libraries/REST_Controller.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index d7a691da..1f0374a0 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -650,6 +650,11 @@ public function _remap($object_called, $arguments = [])
             {
                 $this->_log_request();
             }
+            
+            // fix cross site to option request error 
+            if($this->request->method == 'options') {
+                exit;
+            }
 
             $this->response([
                     $this->config->item('rest_status_field_name') => FALSE,

From d8a6cbb1d8991859f89dc57222afaacb1de7e082 Mon Sep 17 00:00:00 2001
From: Amit Moryossef <amitmoryossef@gmail.com>
Date: Wed, 21 Dec 2016 16:26:17 +0200
Subject: [PATCH 250/354] All around cleaning (#734)

* Fixed throws statement

* Removed unnecessary return doc

* Fixed wrong return value

* Fixed parameter types in PHP DOC

* Removed paths inspection in the project

* Added index methods support! Finally

* Handle all exceptions showings in one place. not 2

* Added changes to the change log

* Fixed properties PHPDoc

* English spelling fixes
---
 CHANGELOG.md                              |  6 +++---
 README.md                                 |  6 +++---
 application/config/rest.php               | 20 ++++++++++----------
 application/controllers/api/Example.php   |  2 +-
 application/libraries/REST_Controller.php | 18 +++++++++---------
 5 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e22c03ed..ce83aeda 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,7 +38,7 @@ Changelog:
 * 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
+* Small bug-fix 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.
@@ -55,11 +55,11 @@ Changelog:
 * Support for Backbone.emulateHTTP improved.
 * Combine both URI segment and GET params instead of using one or the other
 * Separate each piece of the WWW-Authenticate header for digest requests with a comma.
-* Added IP whitelist option.
+* Added IP white-list option.
 
 ### 2.5
 
-* Instead of just seeing item, item, item, the singular version of the basenode will be used if possible. [Example](http://d.pr/RS46).
+* Instead of just seeing item, item, item, the singular version of the base-node will be used if possible. [Example](http://d.pr/RS46).
 * Re-factored to use the Format library, which will soon be merged with CodeIgniter.
 * Fixed Limit bug (limit of 5 would allow 6 requests).
 * Added logging for invalid API key requests.
diff --git a/README.md b/README.md
index b33b448a..4b212f4e 100644
--- a/README.md
+++ b/README.md
@@ -150,9 +150,9 @@ Enabling digest auth is similarly easy. Configure your desired logins in the con
 
 If you're tying this library into an AJAX endpoint where clients authenticate using PHP sessions then you may not like either of the digest nor basic authentication methods. In that case, you can tell the REST Library what PHP session variable to check for. If the variable exists, then the user is authorized. It will be up to your application to set that variable. You can define the variable in ``$config['auth_source']``.  Then tell the library to use a php session variable by setting ``$config['rest_auth']`` to ``session``.
 
-All three methods of authentication can be secured further by using an IP whitelist. If you enable `$config['rest_ip_whitelist_enabled']` in your config file, you can then set a list of allowed IPs.
+All three methods of authentication can be secured further by using an IP white-list. If you enable `$config['rest_ip_whitelist_enabled']` in your config file, you can then set a list of allowed IPs.
 
-Any client connecting to your API will be checked against the whitelisted IP array. If they're on the list, they'll be allowed access. If not, sorry, no can do hombre. The whitelist is a comma-separated string:
+Any client connecting to your API will be checked against the white-listed IP array. If they're on the list, they'll be allowed access. If not, sorry, no can do hombre. The whitelist is a comma-separated string:
 
 ```php
 $config['rest_ip_whitelist'] = '123.456.789.0, 987.654.32.1';
@@ -196,7 +196,7 @@ $ curl -X POST -H "X-API-KEY: some_key_here" http://example.com/books
 ## Contributions
 
 This project was originally written by Phil Sturgeon, however his involvement has shifted
-as he is no longer using it.  As of 2013/11/20 further developement and support will be done by Chris Kacerguis.
+as he is no longer using it.  As of 2013/11/20 further development and support will be done by Chris Kacerguis.
 
 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.
diff --git a/application/config/rest.php b/application/config/rest.php
index 95ddc5cf..f49b751d 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -104,8 +104,8 @@
 | Set to specify the REST API requires to be logged in
 |
 | FALSE     No login required
-| 'basic'   Unsecure login
-| 'digest'  More secure login
+| 'basic'   Unsecured login
+| 'digest'  More secured login
 | 'session' Check for a PHP session variable. See 'auth_source' to set the
 |           authorization key
 |
@@ -189,7 +189,7 @@
 
 /*
 |--------------------------------------------------------------------------
-| Override auth types for specfic 'class/method/HTTP method'
+| Override auth types for specific 'class/method/HTTP method'
 |--------------------------------------------------------------------------
 |
 | example:
@@ -214,24 +214,24 @@
 
 /*
 |--------------------------------------------------------------------------
-| Global IP Whitelisting
+| Global IP White-listing
 |--------------------------------------------------------------------------
 |
-| Limit connections to your REST server to whitelisted IP addresses
+| Limit connections to your REST server to White-listed IP addresses
 |
 | Usage:
 | 1. Set to TRUE and select an auth option for extreme security (client's IP
-|    address must be in whitelist and they must also log in)
-| 2. Set to TRUE with auth set to FALSE to allow whitelisted IPs access with no login
-| 3. Set to FALSE but set 'auth_override_class_method' to 'whitelist' to
-|    restrict certain methods to IPs in your whitelist
+|    address must be in white-list and they must also log in)
+| 2. Set to TRUE with auth set to FALSE to allow White-listed IPs access with no login
+| 3. Set to FALSE but set 'auth_override_class_method' to 'white-list' to
+|    restrict certain methods to IPs in your white-list
 |
 */
 $config['rest_ip_whitelist_enabled'] = FALSE;
 
 /*
 |--------------------------------------------------------------------------
-| REST IP Whitelist
+| REST IP White-list
 |--------------------------------------------------------------------------
 |
 | Limit connections to your REST server with a comma separated
diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index b571e74d..7aef773a 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -73,7 +73,7 @@ public function users_get()
             $this->response(NULL, REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
-        // Get the user from the array, using the id as key for retreival.
+        // Get the user from the array, using the id as key for retrieval.
         // Usually a model is to be used for this.
 
         $user = NULL;
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 1f0374a0..1c0fb179 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -285,16 +285,16 @@ abstract class REST_Controller extends CI_Controller {
     /**
      * The start of the response time from the server
      *
-     * @var string
+     * @var number
      */
-    protected $_start_rtime = '';
+    protected $_start_rtime;
 
     /**
      * The end of the response time from the server
      *
-     * @var string
+     * @var number
      */
-    protected $_end_rtime = '';
+    protected $_end_rtime;
 
     /**
      * List all supported methods, the first will be the default format
@@ -567,7 +567,7 @@ public function __construct($config = 'rest')
     }
 
     /**
-     * Deconstructor
+     * De-constructor
      *
      * @author Chris Kacerguis
      * @access public
@@ -778,7 +778,7 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
                 $output = $this->format->factory($data)->{'to_' . $this->response->format}();
 
                 // An array must be parsed as a string, so as not to cause an array to string error
-                // Json is the most appropriate form for such a datatype
+                // Json is the most appropriate form for such a data type
                 if ($this->response->format === 'array')
                 {
                     $output = $this->format->factory($output)->{'to_json'}();
@@ -1473,7 +1473,7 @@ protected function _parse_put()
         }
         else if ($this->input->method() === 'put')
         {
-           // If no filetype is provided, then there are probably just arguments
+           // If no file type is provided, then there are probably just arguments
            $this->_put_args = $this->input->input_stream();
         }
     }
@@ -1523,7 +1523,7 @@ protected function _parse_patch()
         }
         else if ($this->input->method() === 'patch')
         {
-            // If no filetype is provided, then there are probably just arguments
+            // If no file type is provided, then there are probably just arguments
             $this->_patch_args = $this->input->input_stream();
         }
     }
@@ -1941,7 +1941,7 @@ protected function _check_php_session()
         // Get the auth_source config item
         $key = $this->config->item('auth_source');
 
-        // If falsy, then the user isn't logged in
+        // If false, then the user isn't logged in
         if ( ! $this->session->userdata($key))
         {
             // Display an error response

From e1cbdc1848b07b66a1328fdba2e4b39c5df80426 Mon Sep 17 00:00:00 2001
From: kiss7001 <kiss7001@gmail.com>
Date: Wed, 21 Dec 2016 23:26:55 +0900
Subject: [PATCH 251/354] bug fix (#735)

---
 application/controllers/api/Key.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
index 35d7c0f7..547334b6 100644
--- a/application/controllers/api/Key.php
+++ b/application/controllers/api/Key.php
@@ -233,7 +233,7 @@ private function _generate_key()
 
     private function _get_key($key)
     {
-        return $this->db
+        return $this->rest->db
             ->where(config_item('rest_key_column'), $key)
             ->get(config_item('rest_keys_table'))
             ->row();
@@ -241,7 +241,7 @@ private function _get_key($key)
 
     private function _key_exists($key)
     {
-        return $this->db
+        return $this->rest->db
             ->where(config_item('rest_key_column'), $key)
             ->count_all_results(config_item('rest_keys_table')) > 0;
     }
@@ -251,21 +251,21 @@ private function _insert_key($key, $data)
         $data[config_item('rest_key_column')] = $key;
         $data['date_created'] = function_exists('now') ? now() : time();
 
-        return $this->db
+        return $this->rest->db
             ->set($data)
             ->insert(config_item('rest_keys_table'));
     }
 
     private function _update_key($key, $data)
     {
-        return $this->db
+        return $this->rest->db
             ->where(config_item('rest_key_column'), $key)
             ->update(config_item('rest_keys_table'), $data);
     }
 
     private function _delete_key($key)
     {
-        return $this->db
+        return $this->rest->db
             ->where(config_item('rest_key_column'), $key)
             ->delete(config_item('rest_keys_table'));
     }

From 7e1c22c3b2601ca03a885dd34365ef8b7e7fb1b3 Mon Sep 17 00:00:00 2001
From: Ian Lin <catxii@gmail.com>
Date: Wed, 21 Dec 2016 22:29:44 +0800
Subject: [PATCH 252/354] Fix parse method return arguments null (#744)

* fix cross site to option request error

cross site request first can use option http method.
but use `keys` authentication, authentication can fail

* Fix Parse error

Fix parse method return arguments null
---
 application/libraries/REST_Controller.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 1c0fb179..bc9e750f 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -475,6 +475,12 @@ public function __construct($config = 'rest')
         $this->request->body = NULL;
 
         $this->{'_parse_' . $this->request->method}();
+        
+        // Fix parse method return arguments null
+        if($this->{'_'.$this->request->method.'_args'} === null)
+        {
+            $this->{'_'.$this->request->method.'_args'} = [];
+        }
 
         // Now we know all about our request, let's try and parse the body if it exists
         if ($this->request->format && $this->request->body)

From a36e4728114a53d4639dc8a5da27da11b3c43249 Mon Sep 17 00:00:00 2001
From: lweb20 <lweb20@hotmail.com>
Date: Mon, 26 Dec 2016 20:35:16 -0500
Subject: [PATCH 253/354] Add config to handle or not exceptions (#739)

---
 application/config/rest.php               | 10 ++++++++++
 application/libraries/REST_Controller.php |  6 +++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/application/config/rest.php b/application/config/rest.php
index f49b751d..deafeeb7 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -229,6 +229,16 @@
 */
 $config['rest_ip_whitelist_enabled'] = FALSE;
 
+/*
+|--------------------------------------------------------------------------
+| REST Handle Exceptions
+|--------------------------------------------------------------------------
+|
+| Handle exceptions caused by the controller
+|
+*/
+$config['rest_handle_exceptions'] = TRUE;
+
 /*
 |--------------------------------------------------------------------------
 | REST IP White-list
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index bc9e750f..442046a1 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -595,7 +595,7 @@ public function __destruct()
      * Checks to see if we have everything we need to run this library.
      *
      * @access protected
-     * @@throws Exception
+     * @throws Exception
      */
     protected function preflight_checks()
     {
@@ -739,6 +739,10 @@ public function _remap($object_called, $arguments = [])
         }
         catch (Exception $ex)
         {
+            if ($this->config->item('rest_handle_exceptions') === FALSE) {
+                throw $ex;
+            }
+
             // If the method doesn't exist, then the error will be caught and an error response shown
 	        $_error = &load_class('Exceptions', 'core');
 	        $_error->show_exception($ex);

From 5aef7b41bb08de33bcd892cc2d6e1276a5338722 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@gmail.com>
Date: Mon, 26 Dec 2016 19:40:44 -0600
Subject: [PATCH 254/354] added gitter badge

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 4b212f4e..8943a5ce 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # CodeIgniter Rest Server
 
+[![Gitter chat](https://badges.gitter.im/chriskacerguis/codeigniter-restserver.png)](https://gitter.im/codeigniter-restserver/Lobby)
+
 A fully RESTful server implementation for CodeIgniter using one library, one
 config file and one controller.
 

From 859eb0156ca92ca55adf3baf09968b34bb8016cd Mon Sep 17 00:00:00 2001
From: Himphen Hui <himphen@gmail.com>
Date: Sat, 24 Jun 2017 07:51:13 +0800
Subject: [PATCH 255/354] Update rest_controller_lang.php (#799)

---
 .../language/traditional-chinese/rest_controller_lang.php       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/language/traditional-chinese/rest_controller_lang.php b/application/language/traditional-chinese/rest_controller_lang.php
index b1f80caf..a8450f2b 100644
--- a/application/language/traditional-chinese/rest_controller_lang.php
+++ b/application/language/traditional-chinese/rest_controller_lang.php
@@ -13,6 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = '這個 API 金鑰沒有辦法存取指定的 controller';
 $lang['text_rest_api_key_permissions'] = '這個 API 金鑰沒有具備足夠權限';
 $lang['text_rest_api_key_time_limit'] = '這個 API 金鑰已經超過有效期限';
-$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
+$lang['text_rest_ip_address_time_limit'] = '這個 IP 位置的流量已經超過上限';
 $lang['text_rest_unknown_method'] = '未知的方法';
 $lang['text_rest_unsupported'] = '不支援的通訊協定';

From a5eda57900ac5fc37a2691e42d4b6147af95fa1c Mon Sep 17 00:00:00 2001
From: Reinhard <dervos@users.noreply.github.com>
Date: Sat, 24 Jun 2017 01:51:38 +0200
Subject: [PATCH 256/354] Insert comma's and then a space. (#800)

Inserting a space first and then a comma seems wrong to me. Was this intended?
---
 application/libraries/REST_Controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 442046a1..d5c2b4f0 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -2229,8 +2229,8 @@ protected function _check_access()
     protected function _check_cors()
     {
         // Convert the config items into strings
-        $allowed_headers = implode(' ,', $this->config->item('allowed_cors_headers'));
-        $allowed_methods = implode(' ,', $this->config->item('allowed_cors_methods'));
+        $allowed_headers = implode(', ', $this->config->item('allowed_cors_headers'));
+        $allowed_methods = implode(', ', $this->config->item('allowed_cors_methods'));
 
         // If we want to allow any domain to access the API
         if ($this->config->item('allow_any_cors_domain') === TRUE)

From 4443857630df2dc1c284e5d3c8e0967d9a004061 Mon Sep 17 00:00:00 2001
From: Goran Grbic <tpojka@gmail.com>
Date: Sat, 24 Jun 2017 01:52:04 +0200
Subject: [PATCH 257/354] Additional translation set (#808)

* Additional translation set

* APPPATH const variable already finishes with trailing slash
---
 application/controllers/api/Example.php                   | 2 +-
 application/language/serbian_cyr/rest_controller_lang.php | 2 +-
 application/language/serbian_lat/rest_controller_lang.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 7aef773a..eb2f9069 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -4,7 +4,7 @@
 
 // This can be removed if you use __autoload() in config.php OR use Modular Extensions
 /** @noinspection PhpIncludeInspection */
-require APPPATH . '/libraries/REST_Controller.php';
+require APPPATH . 'libraries/REST_Controller.php';
 
 /**
  * This is an example of a few basic user interaction methods you could use
diff --git a/application/language/serbian_cyr/rest_controller_lang.php b/application/language/serbian_cyr/rest_controller_lang.php
index 4d249c49..e83ff4db 100644
--- a/application/language/serbian_cyr/rest_controller_lang.php
+++ b/application/language/serbian_cyr/rest_controller_lang.php
@@ -13,6 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Овај *API* кључ нема овлашћења за захтевани контролер';
 $lang['text_rest_api_key_permissions'] = 'Овај *API* кључ нема дозвољен степен овлашћења';
 $lang['text_rest_api_key_time_limit'] = 'Овај *API* кључ је прекорачио временски лимит за дати метод';
-$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
+$lang['text_rest_ip_address_time_limit'] = 'Ова *IP* адреса је прекорачила временски лимит за дати метод';//todo translate
 $lang['text_rest_unknown_method'] = 'Непознат метод';
 $lang['text_rest_unsupported'] = 'Неподржан протокол';
diff --git a/application/language/serbian_lat/rest_controller_lang.php b/application/language/serbian_lat/rest_controller_lang.php
index 057ab930..6046788d 100644
--- a/application/language/serbian_lat/rest_controller_lang.php
+++ b/application/language/serbian_lat/rest_controller_lang.php
@@ -13,6 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Ovaj API klju&#269; nema ovla&#353;&#263;enje za zahtevani kontroler';
 $lang['text_rest_api_key_permissions'] = 'Ovaj API klju&#269; nema dozvoljen stepen ovla&#353;&#263;enja';
 $lang['text_rest_api_key_time_limit'] = 'Ovaj API klju&#269; je prekora&#269;io vremenski limit za dati metod';
-$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
+$lang['text_rest_ip_address_time_limit'] = 'Ova IP adresa je prekora&#269;ila vremenski limit za dati metod';
 $lang['text_rest_unknown_method'] = 'Nepoznat metod';
 $lang['text_rest_unsupported'] = 'Nepodr&#382;an protokol';

From b0229a15c5caabcf485c10304fa99dde6c3e0055 Mon Sep 17 00:00:00 2001
From: Jonghwi <zziller03@gmail.com>
Date: Sat, 24 Jun 2017 08:53:11 +0900
Subject: [PATCH 258/354] Korean language support (#812)

* Added Korean language translation
* Create default index.html
---
 application/language/korean/index.html           | 11 +++++++++++
 .../language/korean/rest_controller_lang.php     | 16 ++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 application/language/korean/index.html
 create mode 100644 application/language/korean/rest_controller_lang.php

diff --git a/application/language/korean/index.html b/application/language/korean/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/language/korean/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/language/korean/rest_controller_lang.php b/application/language/korean/rest_controller_lang.php
new file mode 100644
index 00000000..df6f9b46
--- /dev/null
+++ b/application/language/korean/rest_controller_lang.php
@@ -0,0 +1,16 @@
+<?php
+/*
+ * Korean language
+ */
+$lang['text_rest_invalid_api_key'] = '유효하지 않은 API 키 : %s'; // %s is the REST API key
+$lang['text_rest_invalid_credentials'] = '잘못된 자격 증명';
+$lang['text_rest_ip_denied'] = '허용되지 않은 IP';
+$lang['text_rest_ip_unauthorized'] = '권한이 없는 IP';
+$lang['text_rest_unauthorized'] = '권한이 없음';
+$lang['text_rest_ajax_only'] = 'Ajax 요청만 허용됩니다.';
+$lang['text_rest_api_key_unauthorized'] = '해당 API 키는 요청된 컨트롤러에 접근되지 않습니다.';
+$lang['text_rest_api_key_permissions'] = '해당 API 키는 권한이 없습니다.';
+$lang['text_rest_api_key_time_limit'] = '해당 API 키는 메서드의 시간 제한에 도달했습니다.';
+$lang['text_rest_ip_address_time_limit'] = '해당 IP 주소는 메서드의 시간 제한에 도달했습니다.';
+$lang['text_rest_unknown_method'] = '알 수 없는 메서드입니다.';
+$lang['text_rest_unsupported'] = '지원하지 않는 프로토콜입니다.';
\ No newline at end of file

From 514fce4f22dfc8fb284b72f4b5cae62bf484f1da Mon Sep 17 00:00:00 2001
From: MasonFI <joonas_manninen@hotmail.com>
Date: Sun, 23 Jul 2017 17:56:35 +0300
Subject: [PATCH 259/354] Added encode conversion to to_csv-function so that
 special characters are shown correctly in MS Excel. (#818)

---
 application/libraries/Format.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index a6e2cf98..b1405302 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -378,6 +378,9 @@ public function to_csv($data = NULL, $delimiter = ',', $enclosure = '"')
 
         // Close the handle
         fclose($handle);
+        
+        // Convert UTF-8 encoding to UTF-16LE which is supported by MS Excel
+        $csv = mb_convert_encoding($csv, 'UTF-16LE', 'UTF-8');
 
         return $csv;
     }

From db3eef81fb36a1457bcce79e7a57c6b37c5403be Mon Sep 17 00:00:00 2001
From: Natan Felles <natanfelles@gmail.com>
Date: Thu, 6 Jul 2017 18:42:20 -0300
Subject: [PATCH 260/354] Translated text_rest_ip_address_time_limit

---
 .../language/portuguese-brazilian/rest_controller_lang.php      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/language/portuguese-brazilian/rest_controller_lang.php b/application/language/portuguese-brazilian/rest_controller_lang.php
index 84dc9e0e..10c164c6 100644
--- a/application/language/portuguese-brazilian/rest_controller_lang.php
+++ b/application/language/portuguese-brazilian/rest_controller_lang.php
@@ -13,6 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Esta chave da API não tem acesso ao controller solicitado';
 $lang['text_rest_api_key_permissions'] = 'Esta chave da API não tem permissões suficientes';
 $lang['text_rest_api_key_time_limit'] = 'Esta chave da API já atingiu o tempo limite para este método';
-$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
+$lang['text_rest_ip_address_time_limit'] = 'Este Endereço IP atingiu o limite de tempo para este método';
 $lang['text_rest_unknown_method'] = 'Método desconhecido';
 $lang['text_rest_unsupported'] = 'Sem suporte para este protocolo';

From a2a9868a35bfec272144fd78bebe783180372603 Mon Sep 17 00:00:00 2001
From: Natan Felles <natanfelles@users.noreply.github.com>
Date: Sun, 23 Jul 2017 11:58:03 -0300
Subject: [PATCH 261/354] Migrations (#820)

* Translated text_rest_ip_address_time_limit

* Add startup Migrations and DB Helper

* Revert "Translated text_rest_ip_address_time_limit"

This reverts commit fa1617def0d3b918fb23d2a60c748754aa4ab863.

* Add startup Migrations and DB Helper

* Update users table migration
---
 application/helpers/db_helper.php             | 69 +++++++++++++++++
 application/helpers/index.html                | 11 +++
 .../20170706025420_create_table_users.php     | 69 +++++++++++++++++
 .../20170706030520_create_table_api_keys.php  | 69 +++++++++++++++++
 .../20170706031435_create_table_api_logs.php  | 75 +++++++++++++++++++
 ...20170706032133_create_table_api_access.php | 62 +++++++++++++++
 ...20170706032825_create_table_api_limits.php | 57 ++++++++++++++
 application/migrations/index.html             | 11 +++
 8 files changed, 423 insertions(+)
 create mode 100755 application/helpers/db_helper.php
 create mode 100644 application/helpers/index.html
 create mode 100644 application/migrations/20170706025420_create_table_users.php
 create mode 100644 application/migrations/20170706030520_create_table_api_keys.php
 create mode 100644 application/migrations/20170706031435_create_table_api_logs.php
 create mode 100644 application/migrations/20170706032133_create_table_api_access.php
 create mode 100644 application/migrations/20170706032825_create_table_api_limits.php
 create mode 100644 application/migrations/index.html

diff --git a/application/helpers/db_helper.php b/application/helpers/db_helper.php
new file mode 100755
index 00000000..9a007a46
--- /dev/null
+++ b/application/helpers/db_helper.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @author   Natan Felles <natanfelles@gmail.com>
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+if ( ! function_exists('add_foreign_key'))
+{
+	/**
+	 * @param string $table       Table name
+	 * @param string $foreign_key Collumn name having the Foreign Key
+	 * @param string $references  Table and column reference. Ex: users(id)
+	 * @param string $on_delete   RESTRICT, NO ACTION, CASCADE, SET NULL, SET DEFAULT
+	 * @param string $on_update   RESTRICT, NO ACTION, CASCADE, SET NULL, SET DEFAULT
+	 *
+	 * @return string SQL command
+	 */
+	function add_foreign_key($table, $foreign_key, $references, $on_delete = 'RESTRICT', $on_update = 'RESTRICT')
+	{
+		$references = explode('(', str_replace(')', '', str_replace('`', '', $references)));
+
+		return "ALTER TABLE `{$table}` ADD CONSTRAINT `{$table}_{$foreign_key}_fk` FOREIGN KEY (`{$foreign_key}`) REFERENCES `{$references[0]}`(`{$references[1]}`) ON DELETE {$on_delete} ON UPDATE {$on_update}";
+	}
+}
+
+if ( ! function_exists('drop_foreign_key'))
+{
+	/**
+	 * @param string $table       Table name
+	 * @param string $foreign_key Collumn name having the Foreign Key
+	 *
+	 * @return string SQL command
+	 */
+	function drop_foreign_key($table, $foreign_key)
+	{
+		return "ALTER TABLE `{$table}` DROP FOREIGN KEY `{$table}_{$foreign_key}_fk`";
+	}
+}
+
+if ( ! function_exists('add_trigger'))
+{
+	/**
+	 * @param string $trigger_name Trigger name
+	 * @param string $table        Table name
+	 * @param string $statement    Command to run
+	 * @param string $time         BEFORE or AFTER
+	 * @param string $event        INSERT, UPDATE or DELETE
+	 * @param string $type         FOR EACH ROW [FOLLOWS|PRECEDES]
+	 *
+	 * @return string SQL Command
+	 */
+	function add_trigger($trigger_name, $table, $statement, $time = 'BEFORE', $event = 'INSERT', $type = 'FOR EACH ROW')
+	{
+		return 'DELIMITER ;;' . PHP_EOL . "CREATE TRIGGER `{$trigger_name}` {$time} {$event} ON `{$table}` {$type}" . PHP_EOL . 'BEGIN' . PHP_EOL . $statement . PHP_EOL . 'END;' . PHP_EOL . 'DELIMITER ;;';
+	}
+}
+
+if ( ! function_exists('drop_trigger'))
+{
+	/**
+	 * @param string $trigger_name Trigger name
+	 *
+	 * @return string SQL Command
+	 */
+	function drop_trigger($trigger_name)
+	{
+		return "DROP TRIGGER {$trigger_name};";
+	}
+}
diff --git a/application/helpers/index.html b/application/helpers/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/helpers/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>
diff --git a/application/migrations/20170706025420_create_table_users.php b/application/migrations/20170706025420_create_table_users.php
new file mode 100644
index 00000000..aaeccb69
--- /dev/null
+++ b/application/migrations/20170706025420_create_table_users.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @author   Natan Felles <natanfelles@gmail.com>
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/**
+ * Class Migration_create_table_users
+ *
+ * @property CI_DB_forge         $dbforge
+ * @property CI_DB_query_builder $db
+ */
+class Migration_create_table_users extends CI_Migration {
+
+
+	protected $table = 'users';
+
+
+	public function up()
+	{
+		$fields = array(
+			'id'         => [
+				'type'           => 'INT(11)',
+				'auto_increment' => TRUE,
+				'unsigned'       => TRUE,
+			],
+			'email'      => [
+				'type'   => 'VARCHAR(255)',
+				'unique' => TRUE,
+			],
+			'password'   => [
+				'type' => 'VARCHAR(64)',
+			],
+			'firstname'  => [
+				'type' => 'VARCHAR(32)',
+			],
+			'lastname'   => [
+				'type' => 'VARCHAR(32)',
+			],
+			'created_at' => [
+				'type' => 'DATETIME',
+			],
+		);
+		$this->dbforge->add_field($fields);
+		$this->dbforge->add_key('id', TRUE);
+		$this->dbforge->create_table($this->table, TRUE);
+
+		/*for ($i = 1; $i <= 100; $i++)
+		{
+			$this->db->insert($this->table, [
+				'email'      => "user-{$i}@mail.com",
+				'password'   => password_hash('codeigniter', PASSWORD_DEFAULT),
+				'firstname'  => "Firstname {$i}",
+				'lastname'   => "Lastname {$i}",
+				'created_at' => date('Y-' . rand(1, 12) . '-' . rand(1, 28) . ' H:i:s'),
+			]);
+		}*/
+	}
+
+
+	public function down()
+	{
+		if ($this->db->table_exists($this->table))
+		{
+			$this->dbforge->drop_table($this->table);
+		}
+	}
+
+}
diff --git a/application/migrations/20170706030520_create_table_api_keys.php b/application/migrations/20170706030520_create_table_api_keys.php
new file mode 100644
index 00000000..d579614d
--- /dev/null
+++ b/application/migrations/20170706030520_create_table_api_keys.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * @author   Natan Felles <natanfelles@gmail.com>
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/**
+ * Class Migration_create_table_api_keys
+ *
+ * @property CI_DB_forge         $dbforge
+ * @property CI_DB_query_builder $db
+ */
+class Migration_create_table_api_keys extends CI_Migration {
+
+
+	public function up()
+	{
+		$table = config_item('rest_keys_table');
+		$fields = array(
+			'id'                           => [
+				'type'           => 'INT(11)',
+				'auto_increment' => TRUE,
+				'unsigned'       => TRUE,
+			],
+			'user_id'                      => [
+				'type'     => 'INT(11)',
+				'unsigned' => TRUE,
+			],
+			config_item('rest_key_column') => [
+				'type'   => 'VARCHAR(' . config_item('rest_key_length') . ')',
+				'unique' => TRUE,
+			],
+			'level'                        => [
+				'type' => 'INT(2)',
+			],
+			'ignore_limits'                => [
+				'type'    => 'TINYINT(1)',
+				'default' => 0,
+			],
+			'is_private_key'               => [
+				'type'    => 'TINYINT(1)',
+				'default' => 0,
+			],
+			'ip_addresses'                 => [
+				'type' => 'TEXT',
+				'null' => TRUE,
+			],
+			'date_created'                 => [
+				'type' => 'INT(11)',
+			],
+		);
+		$this->dbforge->add_field($fields);
+		$this->dbforge->add_key('id', TRUE);
+		$this->dbforge->create_table($table);
+		$this->db->query(add_foreign_key($table, 'user_id', 'users(id)', 'CASCADE', 'CASCADE'));
+	}
+
+
+	public function down()
+	{
+		$table = config_item('rest_key_column');
+		if ($this->db->table_exists($table))
+		{
+			$this->db->query(drop_foreign_key($table, 'user_id'));
+			$this->dbforge->drop_table($table);
+		}
+	}
+
+}
diff --git a/application/migrations/20170706031435_create_table_api_logs.php b/application/migrations/20170706031435_create_table_api_logs.php
new file mode 100644
index 00000000..bb52b866
--- /dev/null
+++ b/application/migrations/20170706031435_create_table_api_logs.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * @author   Natan Felles <natanfelles@gmail.com>
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/**
+ * Class Migration_create_table_api_logs
+ *
+ * @property CI_DB_forge         $dbforge
+ * @property CI_DB_query_builder $db
+ */
+class Migration_create_table_api_logs extends CI_Migration {
+
+
+	public function up()
+	{
+		$table = config_item('rest_logs_table');
+		$fields = array(
+			'id'            => [
+				'type'           => 'INT(11)',
+				'auto_increment' => TRUE,
+				'unsigned'       => TRUE,
+			],
+			'api_key'       => [
+				'type' => 'VARCHAR(' . config_item('rest_key_length') . ')',
+			],
+			'uri'           => [
+				'type' => 'VARCHAR(255)',
+			],
+			'method'        => [
+				'type' => 'ENUM("get","post","options","put","patch","delete")',
+			],
+			'params'        => [
+				'type' => 'TEXT',
+				'null' => TRUE,
+			],
+			'ip_address'    => [
+				'type' => 'VARCHAR(45)',
+			],
+			'time'          => [
+				'type' => 'INT(11)',
+			],
+			'rtime'         => [
+				'type' => 'FLOAT',
+				'null' => TRUE,
+			],
+			'authorized'    => [
+				'type' => 'VARCHAR(1)',
+			],
+			'response_code' => [
+				'type'    => 'SMALLINT(3)',
+				'null'    => TRUE,
+				'default' => 0,
+			],
+		);
+		$this->dbforge->add_field($fields);
+		$this->dbforge->add_key('id', TRUE);
+		$this->dbforge->create_table($table);
+		/*$this->db->query(add_foreign_key($table, 'api_key',
+			config_item('rest_keys_table') . '(' . config_item('rest_key_column') . ')', 'CASCADE', 'CASCADE'));*/
+	}
+
+
+	public function down()
+	{
+		$table = config_item('rest_logs_table');
+		if ($this->db->table_exists($table))
+		{
+			// $this->db->query(drop_foreign_key($table, 'api_key'));
+			$this->dbforge->drop_table($table);
+		}
+	}
+
+}
diff --git a/application/migrations/20170706032133_create_table_api_access.php b/application/migrations/20170706032133_create_table_api_access.php
new file mode 100644
index 00000000..ac863756
--- /dev/null
+++ b/application/migrations/20170706032133_create_table_api_access.php
@@ -0,0 +1,62 @@
+<?php
+/**
+ * @author   Natan Felles <natanfelles@gmail.com>
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/**
+ * Class Migration_create_table_api_access
+ *
+ * @property CI_DB_forge         $dbforge
+ * @property CI_DB_query_builder $db
+ */
+class Migration_create_table_api_access extends CI_Migration {
+
+
+	public function up()
+	{
+		$table = config_item('rest_access_table');
+		$fields = array(
+			'id'            => [
+				'type'           => 'INT(11)',
+				'auto_increment' => TRUE,
+				'unsigned'       => TRUE,
+			],
+			'key'           => [
+				'type' => 'VARCHAR(' . config_item('rest_key_length') . ')',
+			],
+			'all_access'    => [
+				'type'    => 'TINYINT(1)',
+				'default' => 0,
+			],
+			'controller'    => [
+				'type' => 'VARCHAR(50)',
+			],
+			'date_created'  => [
+				'type' => 'DATETIME',
+				'null' => TRUE,
+			],
+			'date_modified' => [
+				'type' => 'TIMESTAMP',
+			],
+		);
+		$this->dbforge->add_field($fields);
+		$this->dbforge->add_key('id', TRUE);
+		$this->dbforge->add_key('controller');
+		$this->dbforge->create_table($table);
+		$this->db->query(add_foreign_key($table, 'key',
+			config_item('rest_keys_table') . '(' . config_item('rest_key_column') . ')', 'CASCADE', 'CASCADE'));
+	}
+
+
+	public function down()
+	{
+		$table = config_item('rest_access_table');
+		if ($this->db->table_exists($table))
+		{
+			$this->db->query(drop_foreign_key($table, 'key'));
+			$this->dbforge->drop_table($table);
+		}
+	}
+
+}
diff --git a/application/migrations/20170706032825_create_table_api_limits.php b/application/migrations/20170706032825_create_table_api_limits.php
new file mode 100644
index 00000000..fdbff1ff
--- /dev/null
+++ b/application/migrations/20170706032825_create_table_api_limits.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * @author   Natan Felles <natanfelles@gmail.com>
+ */
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/**
+ * Class Migration_create_table_api_limits
+ *
+ * @property CI_DB_forge         $dbforge
+ * @property CI_DB_query_builder $db
+ */
+class Migration_create_table_api_limits extends CI_Migration {
+
+
+	public function up()
+	{
+		$table = config_item('rest_limits_table');
+		$fields = array(
+			'id'           => [
+				'type'           => 'INT(11)',
+				'auto_increment' => TRUE,
+				'unsigned'       => TRUE,
+			],
+			'api_key'      => [
+				'type' => 'VARCHAR(' . config_item('rest_key_length') . ')',
+			],
+			'uri'          => [
+				'type' => 'VARCHAR(255)',
+			],
+			'count'        => [
+				'type' => 'INT(10)',
+			],
+			'hour_started' => [
+				'type' => 'INT(11)',
+			],
+		);
+		$this->dbforge->add_field($fields);
+		$this->dbforge->add_key('id', TRUE);
+		$this->dbforge->add_key('uri');
+		$this->dbforge->create_table($table);
+		$this->db->query(add_foreign_key($table, 'api_key',
+			config_item('rest_keys_table') . '(' . config_item('rest_key_column') . ')', 'CASCADE', 'CASCADE'));
+	}
+
+
+	public function down()
+	{
+		$table = config_item('rest_limits_table');
+		if ($this->db->table_exists($table))
+		{
+			$this->db->query(drop_foreign_key($table, 'api_key'));
+			$this->dbforge->drop_table($table);
+		}
+	}
+
+}
diff --git a/application/migrations/index.html b/application/migrations/index.html
new file mode 100644
index 00000000..b702fbc3
--- /dev/null
+++ b/application/migrations/index.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>403 Forbidden</title>
+</head>
+<body>
+
+<p>Directory access is forbidden.</p>
+
+</body>
+</html>

From 944c1f3c9065cab08bb385b0d4b91daa4e789079 Mon Sep 17 00:00:00 2001
From: Adrian Bean <adrian@beanit.co.uk>
Date: Wed, 9 Aug 2017 17:01:41 +0100
Subject: [PATCH 262/354] Force validation  (#809)

* Update rest.php

* Update REST_Controller.php

Update to force the use of both the api key and the basic authentication when the config value is set in rest.php
This resolves the issue of the basic auth always being valid on every request.
---
 application/config/rest.php               |  1 +
 application/libraries/REST_Controller.php | 42 +++++++++++++++++------
 2 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/application/config/rest.php b/application/config/rest.php
index deafeeb7..cdb92bf4 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -138,6 +138,7 @@
 |
 */
 $config['allow_auth_and_keys'] = TRUE;
+$config['strict_api_and_auth'] = TRUE; // force the use of both api and auth before a valid api request is made
 
 /*
 |--------------------------------------------------------------------------
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index d5c2b4f0..449bb747 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -335,6 +335,8 @@ abstract class REST_Controller extends CI_Controller {
      * @var bool
      */
     protected $_enable_xss = FALSE;
+    
+    private $is_valid_request = TRUE;
 
     /**
      * HTTP status codes and their respective description
@@ -631,17 +633,19 @@ public function _remap($object_called, $arguments = [])
                     $this->config->item('rest_status_field_name') => FALSE,
                     $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unsupported')
                 ], self::HTTP_FORBIDDEN);
+
+            $this->is_valid_request = false;
         }
 
         // Remove the supported format from the function name e.g. index.json => index
         $object_called = preg_replace('/^(.*)\.(?:'.implode('|', array_keys($this->_supported_formats)).')$/', '$1', $object_called);
 
         $controller_method = $object_called.'_'.$this->request->method;
-	    // Does this method exist? If not, try executing an index method
-	    if (!method_exists($this, $controller_method)) {
-		    $controller_method = "index_" . $this->request->method;
-		    array_unshift($arguments, $object_called);
-	    }
+            // Does this method exist? If not, try executing an index method
+            if (!method_exists($this, $controller_method)) {
+                    $controller_method = "index_" . $this->request->method;
+                    array_unshift($arguments, $object_called);
+            }
 
         // Do we want to log this method (if allowed by config)?
         $log_method = ! (isset($this->methods[$controller_method]['log']) && $this->methods[$controller_method]['log'] === FALSE);
@@ -656,8 +660,8 @@ public function _remap($object_called, $arguments = [])
             {
                 $this->_log_request();
             }
-            
-            // fix cross site to option request error 
+
+            // fix cross site to option request error
             if($this->request->method == 'options') {
                 exit;
             }
@@ -666,6 +670,8 @@ public function _remap($object_called, $arguments = [])
                     $this->config->item('rest_status_field_name') => FALSE,
                     $this->config->item('rest_message_field_name') => sprintf($this->lang->line('text_rest_invalid_api_key'), $this->rest->key)
                 ], self::HTTP_FORBIDDEN);
+
+            $this->is_valid_request = false;
         }
 
         // Check to see if this key has access to the requested controller
@@ -680,6 +686,8 @@ public function _remap($object_called, $arguments = [])
                     $this->config->item('rest_status_field_name') => FALSE,
                     $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_unauthorized')
                 ], self::HTTP_UNAUTHORIZED);
+
+            $this->is_valid_request = false;
         }
 
         // Sure it exists, but can they do anything with it?
@@ -689,6 +697,8 @@ public function _remap($object_called, $arguments = [])
                     $this->config->item('rest_status_field_name') => FALSE,
                     $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unknown_method')
                 ], self::HTTP_METHOD_NOT_ALLOWED);
+
+            $this->is_valid_request = false;
         }
 
         // Doing key related stuff? Can only do it if they have a key right?
@@ -699,6 +709,8 @@ public function _remap($object_called, $arguments = [])
             {
                 $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_time_limit')];
                 $this->response($response, self::HTTP_UNAUTHORIZED);
+
+                $this->is_valid_request = false;
             }
 
             // If no level is set use 0, they probably aren't using permissions
@@ -716,6 +728,8 @@ public function _remap($object_called, $arguments = [])
                 // They don't have good enough perms
                 $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_permissions')];
                 $this->response($response, self::HTTP_UNAUTHORIZED);
+
+                $this->is_valid_request = false;
             }
         }
 
@@ -724,6 +738,8 @@ public function _remap($object_called, $arguments = [])
         {
             $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_address_time_limit')];
             $this->response($response, self::HTTP_UNAUTHORIZED);
+
+            $this->is_valid_request = false;
         }
 
         // No key stuff, but record that stuff is happening
@@ -735,7 +751,9 @@ public function _remap($object_called, $arguments = [])
         // Call the controller method and passed arguments
         try
         {
-            call_user_func_array([$this, $controller_method], $arguments);
+            if ($this->is_valid_request) {
+                call_user_func_array([$this, $controller_method], $arguments);
+            }
         }
         catch (Exception $ex)
         {
@@ -744,8 +762,8 @@ public function _remap($object_called, $arguments = [])
             }
 
             // If the method doesn't exist, then the error will be caught and an error response shown
-	        $_error = &load_class('Exceptions', 'core');
-	        $_error->show_exception($ex);
+                $_error = &load_class('Exceptions', 'core');
+                $_error->show_exception($ex);
         }
     }
 
@@ -2136,6 +2154,10 @@ protected function _force_login($nonce = '')
                 .'", opaque="' . md5($rest_realm).'"');
         }
 
+        if ($this->config->item('strict_api_and_auth') === true) {
+            $this->is_valid_request = false;
+        }
+
         // Display an error response
         $this->response([
                 $this->config->item('rest_status_field_name') => FALSE,

From cf49abe06096d46c971266ef5c7f3626c39400b6 Mon Sep 17 00:00:00 2001
From: Hanisch-IT <kontakt@hanisch-it.de>
Date: Fri, 15 Sep 2017 17:38:02 +0200
Subject: [PATCH 263/354] Codeigniter Composer Ready (#832)

* First steps for composer ready. Try to load Config/Language from this library if not existing in CI project

* Add backward compatibility for Format

* Add backward compatibility for Format

* Add backward compatibility for Format

* Update Readme
Remove namespace for backward capability

* Update Readme

* Update readme
- add language / config section
---
 README.md                                 |  24 ++-
 application/libraries/Format.php          |   2 +-
 application/libraries/REST_Controller.php | 211 +++++++++++++---------
 composer.json                             |  14 +-
 4 files changed, 159 insertions(+), 92 deletions(-)

diff --git a/README.md b/README.md
index 8943a5ce..5a9423d2 100644
--- a/README.md
+++ b/README.md
@@ -18,9 +18,19 @@ Please note that version 4.0.0 is in the works, and is considered a breaking cha
 
 Take a look at the "development" branch to see what's up.
 
-## Installation
+## Installation & loading
 
-Drag and drop the **application/libraries/Format.php** and **application/libraries/REST_Controller.php** files into your application's directories. To use `require_once` it at the top of your controllers to load it into the scope. Additionally, copy the **rest.php** file from **application/config** in your application's configuration directory.
+CodeIgniter Rest Server is available on [Packagist](https://packagist.org/packages/hanischit/kraken-api) (using semantic versioning), and installation via composer is the recommended way to install Kraken-api. Just add this line to your `composer.json` file:
+
+```json
+"chriskacerguis/codeigniter-restserver": "^3.0"
+```
+
+or run
+
+```sh
+composer require chriskacerguis/codeigniter-restserver
+```
 
 ## Handling Requests
 
@@ -118,6 +128,16 @@ If you don't specify a response code, and the data you respond with `== FALSE` (
 $this->response([]); // HTTP 404 Not Found
 ```
 
+## Configuration
+
+You can overwrite all default configurations by creating a rest.php file in your config folder with your configs. 
+All given configurations will overwrite the default ones.
+
+## Language
+
+You can overwrite all default language files. Just add a rest_controller_lang.php to your language and overwrite the what you want.
+
+
 ## Multilingual Support
 
 If your application uses language files to support multiple locales, `REST_Controller` will automatically parse the HTTP `Accept-Language` header and provide the language(s) in your actions. This information can be found in the `$this->response->lang` object:
diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index b1405302..4b5ad3e6 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -378,7 +378,7 @@ public function to_csv($data = NULL, $delimiter = ',', $enclosure = '"')
 
         // Close the handle
         fclose($handle);
-        
+
         // Convert UTF-8 encoding to UTF-16LE which is supported by MS Excel
         $csv = mb_convert_encoding($csv, 'UTF-16LE', 'UTF-8');
 
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 449bb747..7a1566aa 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -302,15 +302,15 @@ abstract class REST_Controller extends CI_Controller {
      * @var array
      */
     protected $_supported_formats = [
-            'json' => 'application/json',
-            'array' => 'application/json',
-            'csv' => 'application/csv',
-            'html' => 'text/html',
-            'jsonp' => 'application/javascript',
-            'php' => 'text/plain',
-            'serialized' => 'application/vnd.php.serialized',
-            'xml' => 'application/xml'
-        ];
+        'json' => 'application/json',
+        'array' => 'application/json',
+        'csv' => 'application/csv',
+        'html' => 'text/html',
+        'jsonp' => 'application/javascript',
+        'php' => 'text/plain',
+        'serialized' => 'application/vnd.php.serialized',
+        'xml' => 'application/xml'
+    ];
 
     /**
      * Information about the current API user
@@ -335,7 +335,7 @@ abstract class REST_Controller extends CI_Controller {
      * @var bool
      */
     protected $_enable_xss = FALSE;
-    
+
     private $is_valid_request = TRUE;
 
     /**
@@ -361,6 +361,15 @@ abstract class REST_Controller extends CI_Controller {
         self::HTTP_NOT_IMPLEMENTED => 'NOT IMPLEMENTED'
     ];
 
+    /**
+     * @var Format
+     */
+    private $format;
+    /**
+     * @var bool
+     */
+    private $auth_override;
+
     /**
      * Extend this function to apply additional checking early on in the process
      *
@@ -395,10 +404,18 @@ public function __construct($config = 'rest')
         $this->_start_rtime = microtime(TRUE);
 
         // Load the rest.php configuration file
-        $this->load->config($config);
+        $this->get_local_config($config);
 
         // At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)
-        $this->load->library('format');
+        if(class_exists('Format'))
+        {
+            $this->format = new Format();
+        }
+        else
+        {
+             $this->load->library('format');
+        }
+
 
         // Determine supported output formats from configuration
         $supported_formats = $this->config->item('rest_supported_formats');
@@ -432,7 +449,7 @@ public function __construct($config = 'rest')
         }
 
         // Load the language file
-        $this->lang->load('rest_controller', $language);
+        $this->lang->load('rest_controller', $language, FALSE, TRUE, __DIR__.'/../');
 
         // Initialise the response, request and rest objects
         $this->request = new stdClass();
@@ -477,7 +494,7 @@ public function __construct($config = 'rest')
         $this->request->body = NULL;
 
         $this->{'_parse_' . $this->request->method}();
-        
+
         // Fix parse method return arguments null
         if($this->{'_'.$this->request->method.'_args'} === null)
         {
@@ -544,15 +561,15 @@ public function __construct($config = 'rest')
         {
             // Display an error response
             $this->response([
-                    $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ajax_only')
-                ], self::HTTP_NOT_ACCEPTABLE);
+                $this->config->item('rest_status_field_name') => FALSE,
+                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ajax_only')
+            ], self::HTTP_NOT_ACCEPTABLE);
         }
 
         // When there is no specific override for the current class/method, use the default auth value set in the config
         if ($this->auth_override === FALSE &&
             (! ($this->config->item('rest_enable_keys') && $this->_allow === TRUE) ||
-            ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE)))
+                ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE)))
         {
             $rest_auth = strtolower($this->config->item('rest_auth'));
             switch ($rest_auth)
@@ -574,6 +591,25 @@ public function __construct($config = 'rest')
         }
     }
 
+    /**
+     * @param $config_file
+     */
+    private function get_local_config($config_file)
+    {
+        if(file_exists(__DIR__."/../config/".$config_file.".php"))
+        {
+            $config = array();
+            include(__DIR__ . "/../config/" . $config_file . ".php");
+
+            foreach($config AS $key => $value)
+            {
+                $this->config->set_item($key, $value);
+            }
+        }
+
+        $this->load->config($config_file, FALSE, TRUE);
+    }
+
     /**
      * De-constructor
      *
@@ -623,6 +659,7 @@ protected function preflight_checks()
      * @access public
      * @param string $object_called
      * @param array $arguments The arguments passed to the controller method
+     * @throws Exception
      */
     public function _remap($object_called, $arguments = [])
     {
@@ -630,9 +667,9 @@ public function _remap($object_called, $arguments = [])
         if ($this->config->item('force_https') && $this->request->ssl === FALSE)
         {
             $this->response([
-                    $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unsupported')
-                ], self::HTTP_FORBIDDEN);
+                $this->config->item('rest_status_field_name') => FALSE,
+                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unsupported')
+            ], self::HTTP_FORBIDDEN);
 
             $this->is_valid_request = false;
         }
@@ -641,11 +678,11 @@ public function _remap($object_called, $arguments = [])
         $object_called = preg_replace('/^(.*)\.(?:'.implode('|', array_keys($this->_supported_formats)).')$/', '$1', $object_called);
 
         $controller_method = $object_called.'_'.$this->request->method;
-            // Does this method exist? If not, try executing an index method
-            if (!method_exists($this, $controller_method)) {
-                    $controller_method = "index_" . $this->request->method;
-                    array_unshift($arguments, $object_called);
-            }
+        // Does this method exist? If not, try executing an index method
+        if (!method_exists($this, $controller_method)) {
+            $controller_method = "index_" . $this->request->method;
+            array_unshift($arguments, $object_called);
+        }
 
         // Do we want to log this method (if allowed by config)?
         $log_method = ! (isset($this->methods[$controller_method]['log']) && $this->methods[$controller_method]['log'] === FALSE);
@@ -667,9 +704,9 @@ public function _remap($object_called, $arguments = [])
             }
 
             $this->response([
-                    $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => sprintf($this->lang->line('text_rest_invalid_api_key'), $this->rest->key)
-                ], self::HTTP_FORBIDDEN);
+                $this->config->item('rest_status_field_name') => FALSE,
+                $this->config->item('rest_message_field_name') => sprintf($this->lang->line('text_rest_invalid_api_key'), $this->rest->key)
+            ], self::HTTP_FORBIDDEN);
 
             $this->is_valid_request = false;
         }
@@ -683,9 +720,9 @@ public function _remap($object_called, $arguments = [])
             }
 
             $this->response([
-                    $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_unauthorized')
-                ], self::HTTP_UNAUTHORIZED);
+                $this->config->item('rest_status_field_name') => FALSE,
+                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_unauthorized')
+            ], self::HTTP_UNAUTHORIZED);
 
             $this->is_valid_request = false;
         }
@@ -694,9 +731,9 @@ public function _remap($object_called, $arguments = [])
         if (! method_exists($this, $controller_method))
         {
             $this->response([
-                    $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unknown_method')
-                ], self::HTTP_METHOD_NOT_ALLOWED);
+                $this->config->item('rest_status_field_name') => FALSE,
+                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unknown_method')
+            ], self::HTTP_METHOD_NOT_ALLOWED);
 
             $this->is_valid_request = false;
         }
@@ -762,8 +799,8 @@ public function _remap($object_called, $arguments = [])
             }
 
             // If the method doesn't exist, then the error will be caught and an error response shown
-                $_error = &load_class('Exceptions', 'core');
-                $_error->show_exception($ex);
+            $_error = &load_class('Exceptions', 'core');
+            $_error->show_exception($ex);
         }
     }
 
@@ -778,7 +815,7 @@ public function _remap($object_called, $arguments = [])
      */
     public function response($data = NULL, $http_code = NULL, $continue = FALSE)
     {
-		ob_start();
+        ob_start();
         // If the HTTP status is not NULL, then cast as an integer
         if ($http_code !== NULL)
         {
@@ -847,10 +884,10 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
             $this->output->_display();
             exit;
         }
-		else
-		{
-			ob_end_flush();
-		}
+        else
+        {
+            ob_end_flush();
+        }
 
         // Otherwise dump the output automatically
     }
@@ -1099,7 +1136,7 @@ protected function _detect_api_key()
      * Preferred return language
      *
      * @access protected
-     * @return string|NULL The language code
+     * @return string|NULL|array The language code
      */
     protected function _detect_lang()
     {
@@ -1177,28 +1214,28 @@ protected function _check_limit($controller_method)
 
         switch ($this->config->item('rest_limits_method'))
         {
-          case 'IP_ADDRESS':
-            $limited_uri = 'ip-address:' .$this->input->ip_address();
-            $api_key = $this->input->ip_address();
-            break;
+            case 'IP_ADDRESS':
+                $limited_uri = 'ip-address:' .$this->input->ip_address();
+                $api_key = $this->input->ip_address();
+                break;
 
-          case 'API_KEY':
-            $limited_uri = 'api-key:' . $api_key;
-            break;
+            case 'API_KEY':
+                $limited_uri = 'api-key:' . $api_key;
+                break;
 
-          case 'METHOD_NAME':
-            $limited_uri = 'method-name:' . $controller_method;
-            break;
+            case 'METHOD_NAME':
+                $limited_uri = 'method-name:' . $controller_method;
+                break;
 
-          case 'ROUTED_URL':
-          default:
-            $limited_uri = $this->uri->ruri_string();
-            if (strpos(strrev($limited_uri), strrev($this->response->format)) === 0)
-            {
-                $limited_uri = substr($limited_uri,0, -strlen($this->response->format) - 1);
-            }
-            $limited_uri = 'uri:'.$limited_uri.':'.$this->request->method; // It's good to differentiate GET from PUT
-            break;
+            case 'ROUTED_URL':
+            default:
+                $limited_uri = $this->uri->ruri_string();
+                if (strpos(strrev($limited_uri), strrev($this->response->format)) === 0)
+                {
+                    $limited_uri = substr($limited_uri,0, -strlen($this->response->format) - 1);
+                }
+                $limited_uri = 'uri:'.$limited_uri.':'.$this->request->method; // It's good to differentiate GET from PUT
+                break;
         }
 
         if (isset($this->methods[$controller_method]['limit']) === FALSE )
@@ -1501,8 +1538,8 @@ protected function _parse_put()
         }
         else if ($this->input->method() === 'put')
         {
-           // If no file type is provided, then there are probably just arguments
-           $this->_put_args = $this->input->input_stream();
+            // If no file type is provided, then there are probably just arguments
+            $this->_put_args = $this->input->input_stream();
         }
     }
 
@@ -1974,9 +2011,9 @@ protected function _check_php_session()
         {
             // Display an error response
             $this->response([
-                    $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized')
-                ], self::HTTP_UNAUTHORIZED);
+                $this->config->item('rest_status_field_name') => FALSE,
+                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized')
+            ], self::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -2072,9 +2109,9 @@ protected function _prepare_digest_auth()
         {
             // Display an error response
             $this->response([
-                    $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_invalid_credentials')
-                ], self::HTTP_UNAUTHORIZED);
+                $this->config->item('rest_status_field_name') => FALSE,
+                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_invalid_credentials')
+            ], self::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -2094,9 +2131,9 @@ protected function _check_blacklist_auth()
         {
             // Display an error response
             $this->response([
-                    $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_denied')
-                ], self::HTTP_UNAUTHORIZED);
+                $this->config->item('rest_status_field_name') => FALSE,
+                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_denied')
+            ], self::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -2122,9 +2159,9 @@ protected function _check_whitelist_auth()
         if (in_array($this->input->ip_address(), $whitelist) === FALSE)
         {
             $this->response([
-                    $this->config->item('rest_status_field_name') => FALSE,
-                    $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_unauthorized')
-                ], self::HTTP_UNAUTHORIZED);
+                $this->config->item('rest_status_field_name') => FALSE,
+                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_unauthorized')
+            ], self::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -2160,9 +2197,9 @@ protected function _force_login($nonce = '')
 
         // Display an error response
         $this->response([
-                $this->config->item('rest_status_field_name') => FALSE,
-                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized')
-            ], self::HTTP_UNAUTHORIZED);
+            $this->config->item('rest_status_field_name') => FALSE,
+            $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized')
+        ], self::HTTP_UNAUTHORIZED);
     }
 
     /**
@@ -2177,9 +2214,9 @@ protected function _log_access_time()
         $payload['rtime'] = $this->_end_rtime - $this->_start_rtime;
 
         return $this->rest->db->update(
-                $this->config->item('rest_logs_table'), $payload, [
-                'id' => $this->_insert_id
-            ]);
+            $this->config->item('rest_logs_table'), $payload, [
+            'id' => $this->_insert_id
+        ]);
     }
 
     /**
@@ -2221,7 +2258,7 @@ protected function _check_access()
 
         if (!empty($accessRow) && !empty($accessRow['all_access']))
         {
-        	return TRUE;
+            return TRUE;
         }
 
         // Fetch controller based on path and controller name
@@ -2236,10 +2273,10 @@ protected function _check_access()
 
         // Query the access table and get the number of results
         return $this->rest->db
-            ->where('key', $this->rest->key)
-            ->where('controller', $controller)
-            ->get($this->config->item('rest_access_table'))
-            ->num_rows() > 0;
+                ->where('key', $this->rest->key)
+                ->where('controller', $controller)
+                ->get($this->config->item('rest_access_table'))
+                ->num_rows() > 0;
     }
 
     /**
diff --git a/composer.json b/composer.json
index a4d014d7..a4b9f670 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
 {
 	"description": "REST Server for the CodeIgniter framework",
 	"name": "chriskacerguis/codeigniter-restserver",
-	"type": "project",
+	"type": "library",
 	"homepage": "https://github.com/chriskacerguis/codeigniter-restserver",
-    "authors": [
+	"authors": [
 		{
 			"name": "Chris Kacerguis",
 			"role": "Developer"
@@ -12,5 +12,15 @@
 	"license": "MIT",
 	"support": {
 		"source": "https://github.com/chriskacerguis/codeigniter-restserver"
+	},
+	"require": {
+		"php": ">=5.4.0",
+		"codeigniter/framework": "^3.0.4"
+	},
+	"autoload": {
+		"classmap": [
+			"application/libraries/Format.php",
+			"application/libraries/REST_Controller.php"
+		]
 	}
 }
\ No newline at end of file

From 27f26f093d37ab02ea420c0fbb2784cfa24dfbc4 Mon Sep 17 00:00:00 2001
From: Hanisch-IT <kontakt@hanisch-it.de>
Date: Sat, 23 Sep 2017 03:11:53 +0200
Subject: [PATCH 264/354] Bugfix (#842)

- Fix: format initialization without composer
- Fix: Readme
---
 README.md                                 | 2 +-
 application/libraries/REST_Controller.php | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5a9423d2..c8cf8c0a 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Take a look at the "development" branch to see what's up.
 
 ## Installation & loading
 
-CodeIgniter Rest Server is available on [Packagist](https://packagist.org/packages/hanischit/kraken-api) (using semantic versioning), and installation via composer is the recommended way to install Kraken-api. Just add this line to your `composer.json` file:
+CodeIgniter Rest Server is available on [Packagist](https://packagist.org/packages/chriskacerguis/codeigniter-restserver) (using semantic versioning), and installation via composer is the recommended way to install Codeigniter Rest Server. Just add this line to your `composer.json` file:
 
 ```json
 "chriskacerguis/codeigniter-restserver": "^3.0"
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 7a1566aa..e9a3023d 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -413,7 +413,8 @@ public function __construct($config = 'rest')
         }
         else
         {
-             $this->load->library('format');
+            $this->load->library('Format', NULL, 'libraryFormat');
+            $this->format = $this->libraryFormat;
         }
 
 

From d3e39dbfd4d29d81e018396da0e5ea72ebd7face Mon Sep 17 00:00:00 2001
From: ganlei <769323213@qq.com>
Date: Fri, 22 Sep 2017 20:16:15 -0500
Subject: [PATCH 265/354] Fix: A Database Error Occurred when update logs
 (_log_access_time and _log_response_code) (#830)

---
 application/libraries/REST_Controller.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index e9a3023d..c797ab11 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -2212,6 +2212,10 @@ protected function _force_login($nonce = '')
      */
     protected function _log_access_time()
     {
+        if($this->_insert_id == ''){
+            return false;
+        }
+
         $payload['rtime'] = $this->_end_rtime - $this->_start_rtime;
 
         return $this->rest->db->update(
@@ -2230,6 +2234,10 @@ protected function _log_access_time()
      */
     protected function _log_response_code($http_code)
     {
+        if($this->_insert_id == ''){
+            return false;
+        }
+
         $payload['response_code'] = $http_code;
 
         return $this->rest->db->update(

From 870a288f6570e4652d9b04909fe57b19e9f2de0e Mon Sep 17 00:00:00 2001
From: Hanisch-IT <kontakt@hanisch-it.de>
Date: Sat, 23 Sep 2017 18:44:17 +0200
Subject: [PATCH 266/354] Bugfix/#844 ldap configuration (#847)

* Bugfix
- Fix: format initialization without composer
- Fix: Readme

* Bugfix: Make LDAP available
- Created missing config ldap.php
- Correct loading of config (remove .php)
---
 application/config/ldap.php               | 15 +++++++++++++++
 application/libraries/REST_Controller.php |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 application/config/ldap.php

diff --git a/application/config/ldap.php b/application/config/ldap.php
new file mode 100644
index 00000000..e4165550
--- /dev/null
+++ b/application/config/ldap.php
@@ -0,0 +1,15 @@
+<?php
+$config['binduser'] = 'cn=Authentication,ou=Services,dc=example,dc=org';
+$config['basedn'] = 'dc=example,dc=org';
+$config['bindpw'] = 'E984asdy2';
+/*
+ * The host name parameter can be a space separated list of host names.
+ * This means that the LDAP code will talk to a backup server if the main server is not operational.
+ * There will be a delay while the code times out trying to talk to the main server but things will still work.
+*/
+$config['server'] = 'ldapserver1.example.org ldapserver2.example.org';
+$config['port'] = NULL;
+/*
+ * Controls the LDAP_OPT_NETWORK_TIMEOUT option, this is how long the code will attempt to talk to the primary server if it is unreachable.
+ */
+$config['timeout'] = 5;
\ No newline at end of file
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index c797ab11..bbb3dbc4 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1823,7 +1823,7 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
 
         log_message('debug', 'LDAP Auth: Loading configuration');
 
-        $this->config->load('ldap.php', TRUE);
+        $this->config->load('ldap', TRUE);
 
         $ldap = [
             'timeout' => $this->config->item('timeout', 'ldap'),

From 3a5ba0dffdebd24cc215ef714b72208c88304203 Mon Sep 17 00:00:00 2001
From: Hanisch-IT <kontakt@hanisch-it.de>
Date: Sat, 23 Sep 2017 18:44:55 +0200
Subject: [PATCH 267/354] Bugfix/#837 add http authorization (#848)

* Bugfix
- Fix: format initialization without composer
- Fix: Readme

* Make HTTP_AUTHORIZATION possible
- To hold backward compatibility HTTP_AUTHORIZATION and HTTP_AUTHANTICATION are possible
---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index bbb3dbc4..87a126ed 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -2034,7 +2034,7 @@ protected function _prepare_basic_auth()
 
         // Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist
         $username = $this->input->server('PHP_AUTH_USER');
-        $http_auth = $this->input->server('HTTP_AUTHENTICATION');
+        $http_auth = $this->input->server('HTTP_AUTHENTICATION') ?: $this->input->server('HTTP_AUTHORIZATION');
 
         $password = NULL;
         if ($username !== NULL)

From 3cee80acab45804efca300a4f2030eb69b9a945b Mon Sep 17 00:00:00 2001
From: Hanisch-IT <kontakt@hanisch-it.de>
Date: Mon, 25 Sep 2017 01:13:48 +0200
Subject: [PATCH 268/354] Issue #849 Adding AUTHORS.md (#850)

---
 AUTHORS.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 AUTHORS.md

diff --git a/AUTHORS.md b/AUTHORS.md
new file mode 100644
index 00000000..0a41747e
--- /dev/null
+++ b/AUTHORS.md
@@ -0,0 +1,9 @@
+# The Core Team
+
+* [Chris Kacerguis](//github.com/chriskacerguis)
+
+### Special Thanks To
+
+* [Fabian Hanisch](//github.com/Hanisch-IT)
+
+*For a list of people who have contributed to the codebase, see [GitHub's list of contributors](https://github.com/chriskacerguis/codeigniter-restserver/graphs/contributors).*
\ No newline at end of file

From 3ec22ef11722b41653f21e4444af13ec13639b9f Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@users.noreply.github.com>
Date: Sun, 24 Sep 2017 18:15:15 -0500
Subject: [PATCH 269/354] added comment and Phil's name

---
 AUTHORS.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 0a41747e..4d281fc1 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -1,9 +1,10 @@
 # The Core Team
 
 * [Chris Kacerguis](//github.com/chriskacerguis)
+* [Phil Sturgeon] (https://github.com/philsturgeon)
 
 ### Special Thanks To
 
 * [Fabian Hanisch](//github.com/Hanisch-IT)
 
-*For a list of people who have contributed to the codebase, see [GitHub's list of contributors](https://github.com/chriskacerguis/codeigniter-restserver/graphs/contributors).*
\ No newline at end of file
+*For a list of people who have contributed to the codebase, see [GitHub's list of contributors](https://github.com/chriskacerguis/codeigniter-restserver/graphs/contributors).  Anyone who has contributed please do a PR and add to this file.*

From 3ba8186d941e3ae36c1e9fd484bd74bc36aa3855 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@users.noreply.github.com>
Date: Sun, 24 Sep 2017 18:15:34 -0500
Subject: [PATCH 270/354] fix typo

---
 AUTHORS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 4d281fc1..ee3551f6 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -1,7 +1,7 @@
 # The Core Team
 
 * [Chris Kacerguis](//github.com/chriskacerguis)
-* [Phil Sturgeon] (https://github.com/philsturgeon)
+* [Phil Sturgeon](//github.com/philsturgeon)
 
 ### Special Thanks To
 

From 544f30b62a65ff81bc397c5077cd37b24102fff1 Mon Sep 17 00:00:00 2001
From: Zeeshan <zgmunshi@gmail.com>
Date: Wed, 4 Oct 2017 17:02:58 +0530
Subject: [PATCH 271/354] Profiling feature added to master (#855)

* Config,hook & default profiler parameters

Config,hook & default profiler parameters

* Added hook for profiler

Added hook for profiler

* check added for profiling enabled/disabled

check added for profiling enabled/disabled

* Rename file config.php to config.php.sample

Rename file config.php to config.php.sample

* Added profiling settings to readme

Added profiling settings to readme
---
 README.md                                 |  13 +
 application/config/config.php.sample      | 482 ++++++++++++++++++++++
 application/config/hooks.php              |  21 +
 application/config/profiler.php           |  26 ++
 application/hooks/hooks.profiler.php      |  18 +
 application/libraries/REST_Controller.php | 157 +++----
 6 files changed, 642 insertions(+), 75 deletions(-)
 create mode 100644 application/config/config.php.sample
 create mode 100644 application/config/hooks.php
 create mode 100644 application/config/profiler.php
 create mode 100644 application/hooks/hooks.profiler.php

diff --git a/README.md b/README.md
index c8cf8c0a..5eb82281 100644
--- a/README.md
+++ b/README.md
@@ -210,6 +210,19 @@ By default, the HTTP will be `X-API-KEY`. This can be configured in **config/res
 ```bash
 $ curl -X POST -H "X-API-KEY: some_key_here" http://example.com/books
 ```
+## Profiling
+Codeigniter Profiler feature has been added to the library, so that you can use the power of CI profiler in your project just by setting config parameter to enable profile through out your application
+Turn it on in your **config/config.php** file:
+
+```php
+TRUE to turn profile ON, FALSE to turn it off
+$config['enable_profiling'] = FALSE;
+```
+Also you need to enable `hooks` in your config.php that looks like this
+```php
+$config['enable_hooks'] = TRUE;
+```
+Also you can refer to **config/config.php.sample** 
 
 ## Other Documentation / Tutorials
 
diff --git a/application/config/config.php.sample b/application/config/config.php.sample
new file mode 100644
index 00000000..77411ce1
--- /dev/null
+++ b/application/config/config.php.sample
@@ -0,0 +1,482 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+|--------------------------------------------------------------------------
+| Base Site URL
+|--------------------------------------------------------------------------
+|
+| URL to your CodeIgniter root. Typically this will be your base URL,
+| WITH a trailing slash:
+|
+|	http://example.com/
+|
+| WARNING: You MUST set this value!
+|
+| If it is not set, then CodeIgniter will try guess the protocol and path
+| your installation, but due to security concerns the hostname will be set
+| to $_SERVER['SERVER_ADDR'] if available, or localhost otherwise.
+| The auto-detection mechanism exists only for convenience during
+| development and MUST NOT be used in production!
+|
+| If you need to allow multiple domains, remember that this file is still
+| a PHP script and you can easily do that on your own.
+|
+*/
+$config['base_url'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| Index File
+|--------------------------------------------------------------------------
+|
+| Typically this will be your index.php file, unless you've renamed it to
+| something else. If you are using mod_rewrite to remove the page set this
+| variable so that it is blank.
+|
+*/
+$config['index_page'] = 'index.php';
+
+/*
+|--------------------------------------------------------------------------
+| URI PROTOCOL
+|--------------------------------------------------------------------------
+|
+| This item determines which server global should be used to retrieve the
+| URI string.  The default setting of 'REQUEST_URI' works for most servers.
+| If your links do not seem to work, try one of the other delicious flavors:
+|
+| 'REQUEST_URI'    Uses $_SERVER['REQUEST_URI']
+| 'QUERY_STRING'   Uses $_SERVER['QUERY_STRING']
+| 'PATH_INFO'      Uses $_SERVER['PATH_INFO']
+|
+| WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
+*/
+$config['uri_protocol']	= 'REQUEST_URI';
+
+/*
+|--------------------------------------------------------------------------
+| URL suffix
+|--------------------------------------------------------------------------
+|
+| This option allows you to add a suffix to all URLs generated by CodeIgniter.
+| For more information please see the user guide:
+|
+| https://codeigniter.com/user_guide/general/urls.html
+|
+| Note: This option is ignored for CLI requests.
+*/
+$config['url_suffix'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| Default Language
+|--------------------------------------------------------------------------
+|
+| This determines which set of language files should be used. Make sure
+| there is an available translation if you intend to use something other
+| than english.
+|
+*/
+$config['language']	= 'english';
+
+/*
+|--------------------------------------------------------------------------
+| Default Character Set
+|--------------------------------------------------------------------------
+|
+| This determines which character set is used by default in various methods
+| that require a character set to be provided.
+|
+| See http://php.net/htmlspecialchars for a list of supported charsets.
+|
+*/
+$config['charset'] = 'UTF-8';
+
+/*
+|--------------------------------------------------------------------------
+| Enable/Disable System Hooks
+|--------------------------------------------------------------------------
+|
+| If you would like to use the 'hooks' feature you must enable it by
+| setting this variable to TRUE (boolean).  See the user guide for details.
+|
+*/
+$config['enable_hooks'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Enable/Disable System Profling
+|--------------------------------------------------------------------------
+|
+| If you would like to use the 'profiling' feature you must enable it by
+| setting this variable to TRUE (boolean).
+|
+*/
+$config['enable_profiling'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Class Extension Prefix
+|--------------------------------------------------------------------------
+|
+| This item allows you to set the filename/classname prefix when extending
+| native libraries.  For more information please see the user guide:
+|
+| https://codeigniter.com/user_guide/general/core_classes.html
+| https://codeigniter.com/user_guide/general/creating_libraries.html
+|
+*/
+$config['subclass_prefix'] = 'MY_';
+
+/*
+|--------------------------------------------------------------------------
+| Composer auto-loading
+|--------------------------------------------------------------------------
+|
+| Enabling this setting will tell CodeIgniter to look for a Composer
+| package auto-loader script in application/vendor/autoload.php.
+|
+|	$config['composer_autoload'] = TRUE;
+|
+| Or if you have your vendor/ directory located somewhere else, you
+| can opt to set a specific path as well:
+|
+|	$config['composer_autoload'] = '/path/to/vendor/autoload.php';
+|
+| For more information about Composer, please visit http://getcomposer.org/
+|
+| Note: This will NOT disable or override the CodeIgniter-specific
+|	autoloading (application/config/autoload.php)
+*/
+$config['composer_autoload'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Allowed URL Characters
+|--------------------------------------------------------------------------
+|
+| This lets you specify which characters are permitted within your URLs.
+| When someone tries to submit a URL with disallowed characters they will
+| get a warning message.
+|
+| As a security measure you are STRONGLY encouraged to restrict URLs to
+| as few characters as possible.  By default only these are allowed: a-z 0-9~%.:_-
+|
+| Leave blank to allow all characters -- but only if you are insane.
+|
+| The configured value is actually a regular expression character group
+| and it will be executed as: ! preg_match('/^[<permitted_uri_chars>]+$/i
+|
+| DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
+|
+| Note: This option is ignored for CLI requests.
+|
+*/
+$config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-';
+
+/*
+|--------------------------------------------------------------------------
+| Enable Query Strings
+|--------------------------------------------------------------------------
+|
+| By default CodeIgniter uses search-engine friendly segment based URLs:
+| example.com/who/what/where/
+|
+| You can optionally enable standard query string based URLs:
+| example.com?who=me&what=something&where=here
+|
+| Options are: TRUE or FALSE (boolean)
+|
+| The other items let you set the query string 'words' that will
+| invoke your controllers and its functions:
+| example.com/index.php?c=controller&m=function
+|
+| Please note that some of the helpers won't work as expected when
+| this feature is enabled, since CodeIgniter is designed primarily to
+| use segment based URLs.
+|
+*/
+$config['enable_query_strings'] = FALSE;
+$config['controller_trigger'] = 'c';
+$config['function_trigger'] = 'm';
+$config['directory_trigger'] = 'd';
+
+/*
+|--------------------------------------------------------------------------
+| Error Logging Threshold
+|--------------------------------------------------------------------------
+|
+| You can enable error logging by setting a threshold over zero. The
+| threshold determines what gets logged. Threshold options are:
+|
+|	0 = Disables logging, Error logging TURNED OFF
+|	1 = Error Messages (including PHP errors)
+|	2 = Debug Messages
+|	3 = Informational Messages
+|	4 = All Messages
+|
+| You can also pass an array with threshold levels to show individual error types
+|
+| 	array(2) = Debug Messages, without Error Messages
+|
+| For a live site you'll usually only enable Errors (1) to be logged otherwise
+| your log files will fill up very fast.
+|
+*/
+$config['log_threshold'] = 0;
+
+/*
+|--------------------------------------------------------------------------
+| Error Logging Directory Path
+|--------------------------------------------------------------------------
+|
+| Leave this BLANK unless you would like to set something other than the default
+| application/logs/ directory. Use a full server path.
+|
+*/
+$config['log_path'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| Log File Extension
+|--------------------------------------------------------------------------
+|
+| The default filename extension for log files. The default 'php' allows for
+| protecting the log files via basic scripting, when they are to be stored
+| under a publicly accessible directory.
+|
+| Note: Leaving it blank will default to 'php'.
+|
+*/
+$config['log_file_extension'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| Log File Permissions
+|--------------------------------------------------------------------------
+|
+| The file system permissions to be applied on newly created log files.
+|
+| IMPORTANT: This MUST be an integer (no quotes) and you MUST use octal
+|            integer notation (i.e. 0700, 0644, etc.)
+*/
+$config['log_file_permissions'] = 0644;
+
+/*
+|--------------------------------------------------------------------------
+| Date Format for Logs
+|--------------------------------------------------------------------------
+|
+| Each item that is logged has an associated date. You can use PHP date
+| codes to set your own date formatting
+|
+*/
+$config['log_date_format'] = 'Y-m-d H:i:s';
+
+/*
+|--------------------------------------------------------------------------
+| Error Views Directory Path
+|--------------------------------------------------------------------------
+|
+| Leave this BLANK unless you would like to set something other than the default
+| application/views/errors/ directory.  Use a full server path.
+|
+*/
+$config['error_views_path'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| Cache Directory Path
+|--------------------------------------------------------------------------
+|
+| Leave this BLANK unless you would like to set something other than the default
+| application/cache/ directory.  Use a full server path.
+|
+*/
+$config['cache_path'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| Cache Include Query String
+|--------------------------------------------------------------------------
+|
+| Whether to take the URL query string into consideration when generating
+| output cache files. Valid options are:
+|
+|	FALSE      = Disabled
+|	TRUE       = Enabled, take all query parameters into account.
+|	             Please be aware that this may result in numerous cache
+|	             files generated for the same page over and over again.
+|	array('q') = Enabled, but only take into account the specified list
+|	             of query parameters.
+|
+*/
+$config['cache_query_string'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Encryption Key
+|--------------------------------------------------------------------------
+|
+| If you use the Encryption class, you must set an encryption key.
+| See the user guide for more info.
+|
+| https://codeigniter.com/user_guide/libraries/encryption.html
+|
+*/
+$config['encryption_key'] = '';
+
+/*
+|--------------------------------------------------------------------------
+| Session Variables
+|--------------------------------------------------------------------------
+|
+| 'sess_driver'
+|
+|	The storage driver to use: files, database, redis, memcached
+|
+| 'sess_cookie_name'
+|
+|	The session cookie name, must contain only [0-9a-z_-] characters
+|
+| 'sess_expiration'
+|
+|	The number of SECONDS you want the session to last.
+|	Setting to 0 (zero) means expire when the browser is closed.
+|
+| 'sess_save_path'
+|
+|	The location to save sessions to, driver dependent.
+|
+|	For the 'files' driver, it's a path to a writable directory.
+|	WARNING: Only absolute paths are supported!
+|
+|	For the 'database' driver, it's a table name.
+|	Please read up the manual for the format with other session drivers.
+|
+|	IMPORTANT: You are REQUIRED to set a valid save path!
+|
+| 'sess_match_ip'
+|
+|	Whether to match the user's IP address when reading the session data.
+|
+|	WARNING: If you're using the database driver, don't forget to update
+|	         your session table's PRIMARY KEY when changing this setting.
+|
+| 'sess_time_to_update'
+|
+|	How many seconds between CI regenerating the session ID.
+|
+| 'sess_regenerate_destroy'
+|
+|	Whether to destroy session data associated with the old session ID
+|	when auto-regenerating the session ID. When set to FALSE, the data
+|	will be later deleted by the garbage collector.
+|
+| Other session cookie settings are shared with the rest of the application,
+| except for 'cookie_prefix' and 'cookie_httponly', which are ignored here.
+|
+*/
+$config['sess_driver'] = 'files';
+$config['sess_cookie_name'] = 'ci_session';
+$config['sess_expiration'] = 7200;
+$config['sess_save_path'] = NULL;
+$config['sess_match_ip'] = FALSE;
+$config['sess_time_to_update'] = 300;
+$config['sess_regenerate_destroy'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Cookie Related Variables
+|--------------------------------------------------------------------------
+|
+| 'cookie_prefix'   = Set a cookie name prefix if you need to avoid collisions
+| 'cookie_domain'   = Set to .your-domain.com for site-wide cookies
+| 'cookie_path'     = Typically will be a forward slash
+| 'cookie_secure'   = Cookie will only be set if a secure HTTPS connection exists.
+| 'cookie_httponly' = Cookie will only be accessible via HTTP(S) (no javascript)
+|
+| Note: These settings (with the exception of 'cookie_prefix' and
+|       'cookie_httponly') will also affect sessions.
+|
+*/
+$config['cookie_prefix']	= '';
+$config['cookie_domain']	= '';
+$config['cookie_path']		= '/';
+$config['cookie_secure']	= FALSE;
+$config['cookie_httponly'] 	= FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Cross Site Request Forgery
+|--------------------------------------------------------------------------
+| Enables a CSRF cookie token to be set. When set to TRUE, token will be
+| checked on a submitted form. If you are accepting user data, it is strongly
+| recommended CSRF protection be enabled.
+|
+| 'csrf_token_name' = The token name
+| 'csrf_cookie_name' = The cookie name
+| 'csrf_expire' = The number in seconds the token should expire.
+| 'csrf_regenerate' = Regenerate token on every submission
+| 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
+*/
+$config['csrf_protection'] = FALSE;
+$config['csrf_token_name'] = 'csrf_test_name';
+$config['csrf_cookie_name'] = 'csrf_cookie_name';
+$config['csrf_expire'] = 7200;
+$config['csrf_regenerate'] = TRUE;
+$config['csrf_exclude_uris'] = array();
+
+/*
+|--------------------------------------------------------------------------
+| Output Compression
+|--------------------------------------------------------------------------
+|
+| Enables Gzip output compression for faster page loads.  When enabled,
+| the output class will test whether your server supports Gzip.
+| Even if it does, however, not all browsers support compression
+| so enable only if you are reasonably sure your visitors can handle it.
+|
+| Only used if zlib.output_compression is turned off in your php.ini.
+| Please do not use it together with httpd-level output compression.
+|
+| VERY IMPORTANT:  If you are getting a blank page when compression is enabled it
+| means you are prematurely outputting something to your browser. It could
+| even be a line of whitespace at the end of one of your scripts.  For
+| compression to work, nothing can be sent before the output buffer is called
+| by the output class.  Do not 'echo' any values with compression enabled.
+|
+*/
+$config['compress_output'] = FALSE;
+
+/*
+|--------------------------------------------------------------------------
+| Master Time Reference
+|--------------------------------------------------------------------------
+|
+| Options are 'local' or any PHP supported timezone. This preference tells
+| the system whether to use your server's local time as the master 'now'
+| reference, or convert it to the configured one timezone. See the 'date
+| helper' page of the user guide for information regarding date handling.
+|
+*/
+$config['time_reference'] = 'local';
+
+/*
+|--------------------------------------------------------------------------
+| Reverse Proxy IPs
+|--------------------------------------------------------------------------
+|
+| If your server is behind a reverse proxy, you must whitelist the proxy
+| IP addresses from which CodeIgniter should trust headers such as
+| HTTP_X_FORWARDED_FOR and HTTP_CLIENT_IP in order to properly identify
+| the visitor's IP address.
+|
+| You can use both an array or a comma-separated list of proxy addresses,
+| as well as specifying whole subnets. Here are a few examples:
+|
+| Comma-separated:	'10.0.1.200,192.168.5.0/24'
+| Array:		array('10.0.1.200', '192.168.5.0/24')
+*/
+$config['proxy_ips'] = '';
diff --git a/application/config/hooks.php b/application/config/hooks.php
new file mode 100644
index 00000000..7268904b
--- /dev/null
+++ b/application/config/hooks.php
@@ -0,0 +1,21 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+| -------------------------------------------------------------------------
+| Hooks
+| -------------------------------------------------------------------------
+| This file lets you define "hooks" to extend CI without hacking the core
+| files.  Please see the user guide for info:
+|
+|	http://codeigniter.com/user_guide/general/hooks.html
+|
+*/
+// hook for enable/disable profiling
+$hook['post_controller_constructor'][] = array(
+	'class'    => 'ProfilerEnabler',
+	'function' => 'enableProfiler',
+	'filename' => 'hooks.profiler.php',
+	'filepath' => 'hooks',
+	'params'   => array()
+);
\ No newline at end of file
diff --git a/application/config/profiler.php b/application/config/profiler.php
new file mode 100644
index 00000000..ce026a7e
--- /dev/null
+++ b/application/config/profiler.php
@@ -0,0 +1,26 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+| -------------------------------------------------------------------------
+| Profiler Sections
+| -------------------------------------------------------------------------
+| This file lets you determine whether or not various sections of Profiler
+| data are displayed when the Profiler is enabled.
+| Please see the user guide for info:
+|
+|	http://codeigniter.com/user_guide/general/profiling.html
+|
+*/
+$config['benchmarks']           = TRUE;
+$config['config']               = TRUE;
+$config['controller_info']      = TRUE;
+$config['get']                  = TRUE;
+$config['http_headers']         = TRUE;
+$config['memory_usage']         = TRUE;
+$config['post']                 = TRUE;
+$config['queries']              = TRUE;
+$config['eloquent']             = FALSE;
+$config['uri_string']           = TRUE;
+$config['view_data']            = TRUE;
+$config['query_toggle_count']   = 1000;
\ No newline at end of file
diff --git a/application/hooks/hooks.profiler.php b/application/hooks/hooks.profiler.php
new file mode 100644
index 00000000..c376fdb8
--- /dev/null
+++ b/application/hooks/hooks.profiler.php
@@ -0,0 +1,18 @@
+<?php
+/*
+ * Class for enabling profiler through out the application
+ *
+ * @package        	CodeIgniter
+ * @subpackage    	Libraries
+ * @category    	Libraries
+ * @author        	Zeeshan M
+ */
+class ProfilerEnabler
+{
+	// enable or disable profiling based on config values
+	function enableProfiler(){		
+		$CI = &get_instance();
+		$CI->output->enable_profiler( config_item('enable_profiling') );		
+	}
+}
+?>
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 87a126ed..b6055c6b 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -816,81 +816,88 @@ public function _remap($object_called, $arguments = [])
      */
     public function response($data = NULL, $http_code = NULL, $continue = FALSE)
     {
-        ob_start();
-        // If the HTTP status is not NULL, then cast as an integer
-        if ($http_code !== NULL)
-        {
-            // So as to be safe later on in the process
-            $http_code = (int) $http_code;
-        }
-
-        // Set the output as NULL by default
-        $output = NULL;
-
-        // If data is NULL and no HTTP status code provided, then display, error and exit
-        if ($data === NULL && $http_code === NULL)
-        {
-            $http_code = self::HTTP_NOT_FOUND;
-        }
-
-        // If data is not NULL and a HTTP status code provided, then continue
-        elseif ($data !== NULL)
-        {
-            // If the format method exists, call and return the output in that format
-            if (method_exists($this->format, 'to_' . $this->response->format))
-            {
-                // Set the format header
-                $this->output->set_content_type($this->_supported_formats[$this->response->format], strtolower($this->config->item('charset')));
-                $output = $this->format->factory($data)->{'to_' . $this->response->format}();
-
-                // An array must be parsed as a string, so as not to cause an array to string error
-                // Json is the most appropriate form for such a data type
-                if ($this->response->format === 'array')
-                {
-                    $output = $this->format->factory($output)->{'to_json'}();
-                }
-            }
-            else
-            {
-                // If an array or object, then parse as a json, so as to be a 'string'
-                if (is_array($data) || is_object($data))
-                {
-                    $data = $this->format->factory($data)->{'to_json'}();
-                }
-
-                // Format is not supported, so output the raw data as a string
-                $output = $data;
-            }
-        }
-
-        // If not greater than zero, then set the HTTP status code as 200 by default
-        // Though perhaps 500 should be set instead, for the developer not passing a
-        // correct HTTP status code
-        $http_code > 0 || $http_code = self::HTTP_OK;
-
-        $this->output->set_status_header($http_code);
-
-        // JC: Log response code only if rest logging enabled
-        if ($this->config->item('rest_enable_logging') === TRUE)
-        {
-            $this->_log_response_code($http_code);
-        }
-
-        // Output the data
-        $this->output->set_output($output);
-
-        if ($continue === FALSE)
-        {
-            // Display the data and exit execution
-            $this->output->_display();
-            exit;
-        }
-        else
-        {
-            ob_end_flush();
-        }
-
-        // Otherwise dump the output automatically
+        //if profiling enabled then print profiling data
+		$isProfilingEnabled = $this->config->item('enable_profiling');
+		if(!$isProfilingEnabled){
+        	ob_start();
+        	// If the HTTP status is not NULL, then cast as an integer
+        	if ($http_code !== NULL)
+        	{
+            	// So as to be safe later on in the process
+            	$http_code = (int) $http_code;
+        	}
+
+        	// Set the output as NULL by default
+        	$output = NULL;
+
+        	// If data is NULL and no HTTP status code provided, then display, error and exit
+        	if ($data === NULL && $http_code === NULL)
+        	{
+            	$http_code = self::HTTP_NOT_FOUND;
+        	}
+
+        	// If data is not NULL and a HTTP status code provided, then continue
+        	elseif ($data !== NULL)
+        	{
+            	// If the format method exists, call and return the output in that format
+            	if (method_exists($this->format, 'to_' . $this->response->format))
+            	{
+                	// Set the format header
+                	$this->output->set_content_type($this->_supported_formats[$this->response->format], strtolower($this->config->item('charset')));
+                	$output = $this->format->factory($data)->{'to_' . $this->response->format}();
+
+                	// An array must be parsed as a string, so as not to cause an array to string error
+                	// Json is the most appropriate form for such a data type
+                	if ($this->response->format === 'array')
+                	{
+                    	$output = $this->format->factory($output)->{'to_json'}();
+                	}
+            	}
+            	else
+            	{
+                	// If an array or object, then parse as a json, so as to be a 'string'
+                	if (is_array($data) || is_object($data))
+                	{
+                    	$data = $this->format->factory($data)->{'to_json'}();
+                	}
+
+                	// Format is not supported, so output the raw data as a string
+                	$output = $data;
+            	}
+        	}
+
+        	// If not greater than zero, then set the HTTP status code as 200 by default
+        	// Though perhaps 500 should be set instead, for the developer not passing a
+        	// correct HTTP status code
+        	$http_code > 0 || $http_code = self::HTTP_OK;
+
+        	$this->output->set_status_header($http_code);
+
+        	// JC: Log response code only if rest logging enabled
+        	if ($this->config->item('rest_enable_logging') === TRUE)
+        	{
+            	$this->_log_response_code($http_code);
+        	}
+
+        	// Output the data
+        	$this->output->set_output($output);
+
+        	if ($continue === FALSE)
+        	{
+            	// Display the data and exit execution
+            	$this->output->_display();
+            	exit;
+        	}
+        	else
+        	{
+            	ob_end_flush();
+        	}
+
+        	// Otherwise dump the output automatically
+		}
+		else{
+			echo json_encode($data);
+		}
     }
 
     /**

From cffc5904c625a22638852d53405096120b03898c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BAlio=20Sebasti=C3=A3o?= <j38600@gmail.com>
Date: Fri, 6 Oct 2017 15:58:45 +0100
Subject: [PATCH 272/354] special chars encoding (#858)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Special chars, such as "ç" and "ã", that are abundant in my language (portuguese) were being transformed into strange things. with this change, they're showing up just right...
---
 application/libraries/Format.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 4b5ad3e6..60a83a35 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -406,21 +406,21 @@ public function to_json($data = NULL)
 
         if (empty($callback) === TRUE)
         {
-            return json_encode($data);
+            return json_encode($data, JSON_UNESCAPED_UNICODE);
         }
 
         // We only honour a jsonp callback which are valid javascript identifiers
         elseif (preg_match('/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i', $callback))
         {
             // Return the data as encoded json with a callback
-            return $callback.'('.json_encode($data).');';
+            return $callback.'('.json_encode($data, JSON_UNESCAPED_UNICODE).');';
         }
 
         // An invalid jsonp callback function provided.
         // Though I don't believe this should be hardcoded here
         $data['warning'] = 'INVALID JSONP CALLBACK: '.$callback;
 
-        return json_encode($data);
+        return json_encode($data, JSON_UNESCAPED_UNICODE);
     }
 
     /**

From 60fcb7d08d6e30ad82218cd18e7f1b688b83b706 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@users.noreply.github.com>
Date: Fri, 17 Nov 2017 20:48:15 -0600
Subject: [PATCH 273/354] added sponsor to readme

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index 5eb82281..49ffec65 100644
--- a/README.md
+++ b/README.md
@@ -237,3 +237,9 @@ Pull Requests are the best way to fix bugs or add features. I know loads of you
 contribute if you have improvements to be made and I'll keep releasing versions over time.
 
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://raw.githubusercontent.com/chriskacerguis/codeigniter-restserver/master/LICENSE)
+
+## Sponsor
+
+<a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/x5iG9vGhiu6Mb29mcC1SmhnF/chriskacerguis/codeigniter-restserver'>
+  <img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/x5iG9vGhiu6Mb29mcC1SmhnF/chriskacerguis/codeigniter-restserver.svg' />
+</a>

From 96b921db16f3a51fe782dbf4533fa17741687886 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@users.noreply.github.com>
Date: Sat, 25 Nov 2017 10:56:44 -0600
Subject: [PATCH 274/354] remove sponsors

---
 README.md | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/README.md b/README.md
index 49ffec65..5eb82281 100644
--- a/README.md
+++ b/README.md
@@ -237,9 +237,3 @@ Pull Requests are the best way to fix bugs or add features. I know loads of you
 contribute if you have improvements to be made and I'll keep releasing versions over time.
 
 [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://raw.githubusercontent.com/chriskacerguis/codeigniter-restserver/master/LICENSE)
-
-## Sponsor
-
-<a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/x5iG9vGhiu6Mb29mcC1SmhnF/chriskacerguis/codeigniter-restserver'>
-  <img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/x5iG9vGhiu6Mb29mcC1SmhnF/chriskacerguis/codeigniter-restserver.svg' />
-</a>

From 9791010d18d324638a36026c226f76a291068e38 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@users.noreply.github.com>
Date: Sat, 25 Nov 2017 10:57:09 -0600
Subject: [PATCH 275/354] remove unneeded badge

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 5eb82281..d192d4ae 100644
--- a/README.md
+++ b/README.md
@@ -235,5 +235,3 @@ as he is no longer using it.  As of 2013/11/20 further development and support w
 
 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.
-
-[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](https://raw.githubusercontent.com/chriskacerguis/codeigniter-restserver/master/LICENSE)

From 5a4467bfcc217497a56a649600d10737a8fdb31e Mon Sep 17 00:00:00 2001
From: Petko Bossakov <petko@bossakov.eu>
Date: Tue, 27 Feb 2018 23:34:26 +0200
Subject: [PATCH 276/354] bugfix: if the check_cors and rest_enable_logging
 options are both enabled, an OPTIONS request will cause a fatal error (#882)

---
 application/libraries/REST_Controller.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index b6055c6b..17c35388 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -2336,6 +2336,11 @@ protected function _check_cors()
         // If the request HTTP method is 'OPTIONS', kill the response and send it to the client
         if ($this->input->method() === 'options')
         {
+            // Load DB if needed for logging
+            if (!isset($this->rest->db) && $this->config->item('rest_enable_logging'))
+            {
+                $this->rest->db = $this->load->database($this->config->item('rest_database_group'), TRUE);
+            }
             exit;
         }
     }

From 0ad0310056756e88f8d328d65b2744e9cbc48762 Mon Sep 17 00:00:00 2001
From: Juan Manuel Herrera Carrera <tampiko@gmail.com>
Date: Tue, 27 Feb 2018 15:34:50 -0600
Subject: [PATCH 277/354] update translate (#871)

i translate the todo line, and put some changes in a words of the service, I hope it helps, thanks.
---
 application/language/spanish/rest_controller_lang.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/language/spanish/rest_controller_lang.php b/application/language/spanish/rest_controller_lang.php
index 2ca81056..d96c62bc 100644
--- a/application/language/spanish/rest_controller_lang.php
+++ b/application/language/spanish/rest_controller_lang.php
@@ -4,15 +4,15 @@
  * Spanish language
  */
 
-$lang['text_rest_invalid_api_key'] = 'API key %s No valida'; // %s is the REST API key
-$lang['text_rest_invalid_credentials'] = 'Credenciales Invalidas';
+$lang['text_rest_invalid_api_key'] = 'API key %s No válida'; // %s is the REST API key
+$lang['text_rest_invalid_credentials'] = 'Credenciales Inválidas';
 $lang['text_rest_ip_denied'] = 'IP denegada';
 $lang['text_rest_ip_unauthorized'] = 'IP no autorizada';
 $lang['text_rest_unauthorized'] = 'Acceso no autorizado';
-$lang['text_rest_ajax_only'] = 'Solo peticiones ajax permitidas';
+$lang['text_rest_ajax_only'] = 'Sólo peticiones ajax permitidas';
 $lang['text_rest_api_key_unauthorized'] = 'Esta clave de API no tiene acceso al controlador solicitado';
 $lang['text_rest_api_key_permissions'] = 'Esta clave de API no tiene suficientes permisos';
 $lang['text_rest_api_key_time_limit'] = 'Esta clave de API ha alcanzado el límite de tiempo para este método';
-$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
-$lang['text_rest_unknown_method'] = 'método desconocido';
+$lang['text_rest_ip_address_time_limit'] = 'Esta dirección IP ha alcanzado el límite de tiempo para este método';//todo translate
+$lang['text_rest_unknown_method'] = 'Método desconocido';
 $lang['text_rest_unsupported'] = 'Protocolo no soportado';

From 579885ac21123ecfe007de46f6686a584a198ec2 Mon Sep 17 00:00:00 2001
From: Jason Gegere <jason+github@htmlgraphic.com>
Date: Tue, 27 Feb 2018 15:35:31 -0600
Subject: [PATCH 278/354] load rest config, correct missing vars - Migrations
 (#820) (#897)

---
 application/migrations/20170706030520_create_table_api_keys.php  | 1 +
 application/migrations/20170706031435_create_table_api_logs.php  | 1 +
 .../migrations/20170706032133_create_table_api_access.php        | 1 +
 .../migrations/20170706032825_create_table_api_limits.php        | 1 +
 4 files changed, 4 insertions(+)

diff --git a/application/migrations/20170706030520_create_table_api_keys.php b/application/migrations/20170706030520_create_table_api_keys.php
index d579614d..8c3954d8 100644
--- a/application/migrations/20170706030520_create_table_api_keys.php
+++ b/application/migrations/20170706030520_create_table_api_keys.php
@@ -15,6 +15,7 @@ class Migration_create_table_api_keys extends CI_Migration {
 
 	public function up()
 	{
+		$this->config->load('rest');
 		$table = config_item('rest_keys_table');
 		$fields = array(
 			'id'                           => [
diff --git a/application/migrations/20170706031435_create_table_api_logs.php b/application/migrations/20170706031435_create_table_api_logs.php
index bb52b866..03d6a567 100644
--- a/application/migrations/20170706031435_create_table_api_logs.php
+++ b/application/migrations/20170706031435_create_table_api_logs.php
@@ -15,6 +15,7 @@ class Migration_create_table_api_logs extends CI_Migration {
 
 	public function up()
 	{
+		$this->config->load('rest');
 		$table = config_item('rest_logs_table');
 		$fields = array(
 			'id'            => [
diff --git a/application/migrations/20170706032133_create_table_api_access.php b/application/migrations/20170706032133_create_table_api_access.php
index ac863756..c78cbe3f 100644
--- a/application/migrations/20170706032133_create_table_api_access.php
+++ b/application/migrations/20170706032133_create_table_api_access.php
@@ -15,6 +15,7 @@ class Migration_create_table_api_access extends CI_Migration {
 
 	public function up()
 	{
+		$this->config->load('rest');
 		$table = config_item('rest_access_table');
 		$fields = array(
 			'id'            => [
diff --git a/application/migrations/20170706032825_create_table_api_limits.php b/application/migrations/20170706032825_create_table_api_limits.php
index fdbff1ff..28f211bd 100644
--- a/application/migrations/20170706032825_create_table_api_limits.php
+++ b/application/migrations/20170706032825_create_table_api_limits.php
@@ -15,6 +15,7 @@ class Migration_create_table_api_limits extends CI_Migration {
 
 	public function up()
 	{
+		$this->config->load('rest');
 		$table = config_item('rest_limits_table');
 		$fields = array(
 			'id'           => [

From 2c1c621ca79ff91a4a3f5bbe1c7aa6748b56ad27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mattias=20Sandstr=C3=B6m?=
 <1013635+tangix@users.noreply.github.com>
Date: Thu, 8 Mar 2018 20:39:58 +0100
Subject: [PATCH 279/354] Add config to force CORS pre-flight headers to be
 included (#886)

* Added config option to force setting of CORS pre-flight headers.

* Updated the setting to be empty by default and updated the comment.
---
 application/config/rest.php               | 21 +++++++++++++++++++++
 application/libraries/REST_Controller.php |  9 +++++++++
 2 files changed, 30 insertions(+)

diff --git a/application/config/rest.php b/application/config/rest.php
index cdb92bf4..18327360 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -604,3 +604,24 @@
 |
 */
 $config['allowed_cors_origins'] = [];
+
+/*
+|--------------------------------------------------------------------------
+| CORS Forced Headers
+|--------------------------------------------------------------------------
+|
+| If using CORS checks, always include the headers and values specified here 
+| in the OPTIONS client preflight.
+| Example:
+| $config['forced_cors_headers'] = [
+|   'Access-Control-Allow-Credentials' => 'true'
+| ];
+|
+| Added because of how Sencha Ext JS framework requires the header
+| Access-Control-Allow-Credentials to be set to true to allow the use of
+| credentials in the REST Proxy. 
+| See documentation here:
+| http://docs.sencha.com/extjs/6.5.2/classic/Ext.data.proxy.Rest.html#cfg-withCredentials
+|
+*/
+$config['forced_cors_headers'] = [];
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 17c35388..dfacaabf 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -2333,6 +2333,15 @@ protected function _check_cors()
             }
         }
 
+        // If there are headers that should be forced in the CORS check, add them now
+        if (is_array($this->config->item('forced_cors_headers')))
+        {
+            foreach ($this->config->item('forced_cors_headers') as $header => $value)
+            {
+                header($header . ': ' . $value);
+            }
+        }
+
         // If the request HTTP method is 'OPTIONS', kill the response and send it to the client
         if ($this->input->method() === 'options')
         {

From d70785d802a6361d268c7165f37b8cdf7d8b09e1 Mon Sep 17 00:00:00 2001
From: _bolek_ <grawerpl@users.noreply.github.com>
Date: Sat, 2 Jun 2018 22:50:51 +0200
Subject: [PATCH 280/354] Update composer.json (#922)

Thanks to this namespace will work for classes (with few changens in Format.php and Rest_controller.php)
---
 composer.json | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index a4b9f670..637f86f8 100644
--- a/composer.json
+++ b/composer.json
@@ -21,6 +21,9 @@
 		"classmap": [
 			"application/libraries/Format.php",
 			"application/libraries/REST_Controller.php"
-		]
+		],
+		"psr-4" : {
+			"Restserver\\Libraries\\" : "application/libraries/"
+		}
 	}
-}
\ No newline at end of file
+}

From d03f6141794fbf8ee1e011f24090ddbae9530fb1 Mon Sep 17 00:00:00 2001
From: _bolek_ <grawerpl@users.noreply.github.com>
Date: Sat, 2 Jun 2018 22:51:08 +0200
Subject: [PATCH 281/354] Patch 2 (#923)

* Update Format.php

Allow access to class witch USE statement

* Update Format.php

Remove notification "Non-static method ... should not be called statically"
---
 application/libraries/Format.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/libraries/Format.php b/application/libraries/Format.php
index 60a83a35..5ecb63f7 100644
--- a/application/libraries/Format.php
+++ b/application/libraries/Format.php
@@ -1,4 +1,6 @@
 <?php
+namespace Restserver\Libraries;
+use Exception;
 
 defined('BASEPATH') OR exit('No direct script access allowed');
 
@@ -114,7 +116,7 @@ public function __construct($data = NULL, $from_type = NULL)
      *
      * @return object Instance of the format class
      */
-    public function factory($data, $from_type = NULL)
+    public static function factory($data, $from_type = NULL)
     {
         // $class = __CLASS__;
         // return new $class();

From 23b09976054c956a5216c4529dde39a2d57707f7 Mon Sep 17 00:00:00 2001
From: _bolek_ <grawerpl@users.noreply.github.com>
Date: Sat, 2 Jun 2018 22:51:34 +0200
Subject: [PATCH 282/354] Update REST_Controller.php (#924)

Support for namespece
---
 application/libraries/REST_Controller.php | 36 +++++++++++++----------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index dfacaabf..8c7501df 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1,5 +1,10 @@
 <?php
 
+namespace Restserver\Libraries;
+
+use Exception;
+use stdClass;
+
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 /**
@@ -407,15 +412,15 @@ public function __construct($config = 'rest')
         $this->get_local_config($config);
 
         // At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)
-        if(class_exists('Format'))
-        {
-            $this->format = new Format();
-        }
-        else
-        {
-            $this->load->library('Format', NULL, 'libraryFormat');
-            $this->format = $this->libraryFormat;
-        }
+        //if(class_exists('Format'))
+        //{
+        //    $this->format = new Format();
+        //}
+        //else
+        //{
+        //    $this->load->library('Format', NULL, 'libraryFormat');
+        //    $this->format = $this->libraryFormat;
+        //}
 
 
         // Determine supported output formats from configuration
@@ -505,8 +510,9 @@ public function __construct($config = 'rest')
         // Now we know all about our request, let's try and parse the body if it exists
         if ($this->request->format && $this->request->body)
         {
-            $this->request->body = $this->format->factory($this->request->body, $this->request->format)->to_array();
-            // Assign payload arguments to proper method container
+            $this->request->body = Format::factory($this->request->body, $this->request->format)->to_array();
+		    
+	    // Assign payload arguments to proper method container
             $this->{'_'.$this->request->method.'_args'} = $this->request->body;
         }
 
@@ -840,17 +846,17 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
         	elseif ($data !== NULL)
         	{
             	// If the format method exists, call and return the output in that format
-            	if (method_exists($this->format, 'to_' . $this->response->format))
+            	if (method_exists(Format::class, 'to_' . $this->response->format))
             	{
                 	// Set the format header
                 	$this->output->set_content_type($this->_supported_formats[$this->response->format], strtolower($this->config->item('charset')));
-                	$output = $this->format->factory($data)->{'to_' . $this->response->format}();
+                	$output = Format::factory($data)->{'to_' . $this->response->format}();
 
                 	// An array must be parsed as a string, so as not to cause an array to string error
                 	// Json is the most appropriate form for such a data type
                 	if ($this->response->format === 'array')
                 	{
-                    	$output = $this->format->factory($output)->{'to_json'}();
+                    	$output = Format::factory($output)->{'to_json'}();
                 	}
             	}
             	else
@@ -858,7 +864,7 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
                 	// If an array or object, then parse as a json, so as to be a 'string'
                 	if (is_array($data) || is_object($data))
                 	{
-                    	$data = $this->format->factory($data)->{'to_json'}();
+                    	$data = Format::factory($data)->{'to_json'}();
                 	}
 
                 	// Format is not supported, so output the raw data as a string

From bc73533a57c14c2973aa359b74d5e612da328512 Mon Sep 17 00:00:00 2001
From: _bolek_ <grawerpl@users.noreply.github.com>
Date: Sat, 2 Jun 2018 22:51:47 +0200
Subject: [PATCH 283/354] Update Example.php (#925)

---
 application/controllers/api/Example.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index eb2f9069..7978ce4c 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -1,10 +1,10 @@
 <?php
-
+use Restserver\Libraries\REST_Controller;
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 // This can be removed if you use __autoload() in config.php OR use Modular Extensions
 /** @noinspection PhpIncludeInspection */
-require APPPATH . 'libraries/REST_Controller.php';
+//require APPPATH . 'libraries/REST_Controller.php';
 
 /**
  * This is an example of a few basic user interaction methods you could use

From 97c3618aae10bc5a803f682f1b4839518e55226f Mon Sep 17 00:00:00 2001
From: _bolek_ <grawerpl@users.noreply.github.com>
Date: Sat, 2 Jun 2018 22:52:25 +0200
Subject: [PATCH 284/354] Update Key.php (#926)

---
 application/controllers/api/Key.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
index 547334b6..8f3a64b4 100644
--- a/application/controllers/api/Key.php
+++ b/application/controllers/api/Key.php
@@ -1,10 +1,11 @@
 <?php
+use Restserver\Libraries\REST_Controller;
 
 defined('BASEPATH') OR exit('No direct script access allowed');
 
 // This can be removed if you use __autoload() in config.php OR use Modular Extensions
 /** @noinspection PhpIncludeInspection */
-require APPPATH . '/libraries/REST_Controller.php';
+//require APPPATH . '/libraries/REST_Controller.php';
 
 /**
  * Keys Controller

From 34d8dab64aefb9977b2daffb935725347b363ab4 Mon Sep 17 00:00:00 2001
From: aproram <aproram@gmail.com>
Date: Tue, 31 Jul 2018 01:42:13 +0300
Subject: [PATCH 285/354] Patch 1 (#939)

* Update Example.php

Fix File REST_Controller not found problem

* Update REST_Controller.php

Class 'Restserver\Libraries\CI_Controller' not found
---
 application/controllers/api/Example.php   | 4 +++-
 application/libraries/REST_Controller.php | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 7978ce4c..9bc3a828 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -4,7 +4,9 @@
 
 // This can be removed if you use __autoload() in config.php OR use Modular Extensions
 /** @noinspection PhpIncludeInspection */
-//require APPPATH . 'libraries/REST_Controller.php';
+//To Solve File REST_Controller not found
+require APPPATH . 'libraries/REST_Controller.php';
+require APPPATH . 'libraries/Format.php';
 
 /**
  * This is an example of a few basic user interaction methods you could use
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 8c7501df..5dda5564 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1,7 +1,7 @@
 <?php
 
 namespace Restserver\Libraries;
-
+use CI_Controller;
 use Exception;
 use stdClass;
 

From de75ca9157cd48b3ceb266a1ae4e3d1dfe3ff40f Mon Sep 17 00:00:00 2001
From: Luckydonald <2737108+luckydonald@users.noreply.github.com>
Date: Thu, 20 Sep 2018 05:59:31 -1000
Subject: [PATCH 286/354] Move output format detection upwards (#947)

to allow responses earlier,
i.e. when handling exceptions, which might be thrown in Format::factory, in a REST_Controller subclass.
---
 application/libraries/REST_Controller.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 5dda5564..13f79ef4 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -507,6 +507,12 @@ public function __construct($config = 'rest')
             $this->{'_'.$this->request->method.'_args'} = [];
         }
 
+        // Which format should the data be returned in?
+        $this->response->format = $this->_detect_output_format();
+
+        // Which language should the data be returned in?
+        $this->response->lang = $this->_detect_lang();
+
         // Now we know all about our request, let's try and parse the body if it exists
         if ($this->request->format && $this->request->body)
         {
@@ -531,12 +537,6 @@ public function __construct($config = 'rest')
             $this->{'_'.$this->request->method.'_args'}
         );
 
-        // Which format should the data be returned in?
-        $this->response->format = $this->_detect_output_format();
-
-        // Which language should the data be returned in?
-        $this->response->lang = $this->_detect_lang();
-
         // Extend this function to apply additional checking early on in the process
         $this->early_checks();
 

From d51e373ff151e3b7ed1aefbb6addb40fcedfaf17 Mon Sep 17 00:00:00 2001
From: "Januri D. P" <janury.geek@gmail.com>
Date: Fri, 9 Nov 2018 19:33:01 +0700
Subject: [PATCH 287/354] Update rest_controller_lang.php (#955)

---
 application/language/indonesia/rest_controller_lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/language/indonesia/rest_controller_lang.php b/application/language/indonesia/rest_controller_lang.php
index 771c6835..9931e18b 100644
--- a/application/language/indonesia/rest_controller_lang.php
+++ b/application/language/indonesia/rest_controller_lang.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * English language
+ * Bahasa Indonesia language
  */
 
 $lang['text_rest_invalid_api_key'] = 'Kunci API %s , tidak valid'; // %s is the REST API key

From 32d0586ad289b82a4a354a9180caf0da8f290de3 Mon Sep 17 00:00:00 2001
From: Mofasa <nigbit@qq.com>
Date: Tue, 1 Jan 2019 10:45:39 +0800
Subject: [PATCH 288/354] Enhance: log execute time (#965)

---
 application/libraries/REST_Controller.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 13f79ef4..0e936788 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -405,8 +405,12 @@ public function __construct($config = 'rest')
         // when output is displayed for not damaging data accidentally
         $this->output->parse_exec_vars = FALSE;
 
-        // Start the timer for how long the request takes
-        $this->_start_rtime = microtime(TRUE);
+        // Log the loading time to the log table
+        if ($this->config->item('rest_enable_logging') === TRUE)
+        {
+                // Start the timer for how long the request takes
+		$this->_start_rtime = microtime(TRUE);
+	}
 
         // Load the rest.php configuration file
         $this->get_local_config($config);
@@ -626,12 +630,12 @@ private function get_local_config($config_file)
      */
     public function __destruct()
     {
-        // Get the current timestamp
-        $this->_end_rtime = microtime(TRUE);
-
         // Log the loading time to the log table
         if ($this->config->item('rest_enable_logging') === TRUE)
         {
+            // Get the current timestamp
+            $this->_end_rtime = microtime(TRUE);
+
             $this->_log_access_time();
         }
     }

From 5877df4599967d893e19bc1957cc1a9c5618c245 Mon Sep 17 00:00:00 2001
From: Mofasa <nigbit@qq.com>
Date: Tue, 1 Jan 2019 10:46:17 +0800
Subject: [PATCH 289/354] Enhance:  redundant _check_whitelist_auth checking
 (#966)

---
 application/libraries/REST_Controller.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 0e936788..256f16e2 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -595,10 +595,6 @@ public function __construct($config = 'rest')
                     $this->_check_php_session();
                     break;
             }
-            if ($this->config->item('rest_ip_whitelist_enabled') === TRUE)
-            {
-                $this->_check_whitelist_auth();
-            }
         }
     }
 
@@ -2021,6 +2017,12 @@ protected function _check_login($username = NULL, $password = FALSE)
      */
     protected function _check_php_session()
     {
+        // If whitelist is enabled it has the first chance to kick them out
+        if ($this->config->item('rest_ip_whitelist_enabled'))
+        {
+            $this->_check_whitelist_auth();
+        }
+
         // Get the auth_source config item
         $key = $this->config->item('auth_source');
 

From 3b82afc9afb8134e4e7be789a370cf1cc2068a17 Mon Sep 17 00:00:00 2001
From: Mofasa <nigbit@qq.com>
Date: Tue, 1 Jan 2019 10:46:45 +0800
Subject: [PATCH 290/354] Enhance: no need to access db check twice (#967)

---
 application/libraries/REST_Controller.php | 28 ++++++++++-------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 256f16e2..3c83ae03 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -2279,16 +2279,6 @@ protected function _check_access()
             return TRUE;
         }
 
-        //check if the key has all_access
-        $accessRow = $this->rest->db
-            ->where('key', $this->rest->key)
-            ->get($this->config->item('rest_access_table'))->row_array();
-
-        if (!empty($accessRow) && !empty($accessRow['all_access']))
-        {
-            return TRUE;
-        }
-
         // Fetch controller based on path and controller name
         $controller = implode(
             '/', [
@@ -2299,12 +2289,18 @@ protected function _check_access()
         // Remove any double slashes for safety
         $controller = str_replace('//', '/', $controller);
 
-        // Query the access table and get the number of results
-        return $this->rest->db
-                ->where('key', $this->rest->key)
-                ->where('controller', $controller)
-                ->get($this->config->item('rest_access_table'))
-                ->num_rows() > 0;
+        //check if the key has all_access
+        $accessRow = $this->rest->db
+            ->where('key', $this->rest->key)
+            ->where('controller', $controller)
+            ->get($this->config->item('rest_access_table'))->row_array();
+
+        if (!empty($accessRow) && !empty($accessRow['all_access']))
+        {
+            return TRUE;
+        }
+
+        return false;
     }
 
     /**

From aca82471a2406e05ff846b2140a89342967c5f17 Mon Sep 17 00:00:00 2001
From: Mofasa <nigbit@qq.com>
Date: Tue, 1 Jan 2019 10:47:27 +0800
Subject: [PATCH 291/354] Remove death code (#968)

---
 application/libraries/REST_Controller.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 3c83ae03..06d915b8 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -677,8 +677,6 @@ public function _remap($object_called, $arguments = [])
                 $this->config->item('rest_status_field_name') => FALSE,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unsupported')
             ], self::HTTP_FORBIDDEN);
-
-            $this->is_valid_request = false;
         }
 
         // Remove the supported format from the function name e.g. index.json => index
@@ -714,8 +712,6 @@ public function _remap($object_called, $arguments = [])
                 $this->config->item('rest_status_field_name') => FALSE,
                 $this->config->item('rest_message_field_name') => sprintf($this->lang->line('text_rest_invalid_api_key'), $this->rest->key)
             ], self::HTTP_FORBIDDEN);
-
-            $this->is_valid_request = false;
         }
 
         // Check to see if this key has access to the requested controller
@@ -730,8 +726,6 @@ public function _remap($object_called, $arguments = [])
                 $this->config->item('rest_status_field_name') => FALSE,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_unauthorized')
             ], self::HTTP_UNAUTHORIZED);
-
-            $this->is_valid_request = false;
         }
 
         // Sure it exists, but can they do anything with it?
@@ -741,8 +735,6 @@ public function _remap($object_called, $arguments = [])
                 $this->config->item('rest_status_field_name') => FALSE,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unknown_method')
             ], self::HTTP_METHOD_NOT_ALLOWED);
-
-            $this->is_valid_request = false;
         }
 
         // Doing key related stuff? Can only do it if they have a key right?
@@ -753,8 +745,6 @@ public function _remap($object_called, $arguments = [])
             {
                 $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_time_limit')];
                 $this->response($response, self::HTTP_UNAUTHORIZED);
-
-                $this->is_valid_request = false;
             }
 
             // If no level is set use 0, they probably aren't using permissions
@@ -772,8 +762,6 @@ public function _remap($object_called, $arguments = [])
                 // They don't have good enough perms
                 $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_permissions')];
                 $this->response($response, self::HTTP_UNAUTHORIZED);
-
-                $this->is_valid_request = false;
             }
         }
 
@@ -782,8 +770,6 @@ public function _remap($object_called, $arguments = [])
         {
             $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_address_time_limit')];
             $this->response($response, self::HTTP_UNAUTHORIZED);
-
-            $this->is_valid_request = false;
         }
 
         // No key stuff, but record that stuff is happening

From 03383563745de74b792b577ba6d5020f9638604e Mon Sep 17 00:00:00 2001
From: Mofasa <nigbit@qq.com>
Date: Tue, 1 Jan 2019 10:48:02 +0800
Subject: [PATCH 292/354] minus enhancement (#969)

---
 application/libraries/REST_Controller.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 06d915b8..bfa4a4a2 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1104,11 +1104,12 @@ protected function _detect_api_key()
                 {
                     // multiple ip addresses must be separated using a comma, explode and loop
                     $list_ip_addresses = explode(',', $row->ip_addresses);
+		    $ip_address = $this->input->ip_address();
                     $found_address = FALSE;
 
                     foreach ($list_ip_addresses as $ip_address)
                     {
-                        if ($this->input->ip_address() === trim($ip_address))
+                        if ($ip_address === trim($ip_address))
                         {
                             // there is a match, set the the value to TRUE and break out of the loop
                             $found_address = TRUE;
@@ -1215,8 +1216,8 @@ protected function _check_limit($controller_method)
         switch ($this->config->item('rest_limits_method'))
         {
             case 'IP_ADDRESS':
-                $limited_uri = 'ip-address:' .$this->input->ip_address();
                 $api_key = $this->input->ip_address();
+                $limited_uri = 'ip-address:' . $api_key;
                 break;
 
             case 'API_KEY':
@@ -2181,14 +2182,14 @@ protected function _check_whitelist_auth()
      */
     protected function _force_login($nonce = '')
     {
-        $rest_auth = $this->config->item('rest_auth');
+        $rest_auth = strtolower($this->config->item('rest_auth'));
         $rest_realm = $this->config->item('rest_realm');
-        if (strtolower($rest_auth) === 'basic')
+        if ($rest_auth === 'basic')
         {
             // See http://tools.ietf.org/html/rfc2617#page-5
             header('WWW-Authenticate: Basic realm="'.$rest_realm.'"');
         }
-        elseif (strtolower($rest_auth) === 'digest')
+        elseif ($rest_auth === 'digest')
         {
             // See http://tools.ietf.org/html/rfc2617#page-18
             header(

From f3ba7d76cb14c11602f72b432926a17b8ff7c590 Mon Sep 17 00:00:00 2001
From: Mofasa <nigbit@qq.com>
Date: Mon, 7 Jan 2019 12:50:14 +0800
Subject: [PATCH 293/354] bugfix

---
 application/libraries/REST_Controller.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index bfa4a4a2..2691aff7 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -2102,8 +2102,7 @@ protected function _prepare_digest_auth()
         $digest = (empty($matches[1]) || empty($matches[2])) ? [] : array_combine($matches[1], $matches[2]);
 
         // For digest authentication the library function should return already stored md5(username:restrealm:password) for that username see rest.php::auth_library_function config
-        $username = $this->_check_login($digest['username'], TRUE);
-        if (array_key_exists('username', $digest) === FALSE || $username === FALSE)
+        if (isset($digest['username']) === FALSE || $this->_check_login($digest['username'], TRUE) === FALSE)
         {
             $this->_force_login($unique_id);
         }

From 570d4579c4ccfeeacc6204f421616ce364fbafe2 Mon Sep 17 00:00:00 2001
From: B0mb3tt4 <bombetta.colis@gmail.com>
Date: Tue, 15 Jan 2019 23:56:24 +0100
Subject: [PATCH 294/354] MD5 Response fix

---
 application/libraries/REST_Controller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 2691aff7..2363cfc4 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -2108,7 +2108,7 @@ protected function _prepare_digest_auth()
         }
 
         $md5 = md5(strtoupper($this->request->method).':'.$digest['uri']);
-        $valid_response = md5($username.':'.$digest['nonce'].':'.$digest['nc'].':'.$digest['cnonce'].':'.$digest['qop'].':'.$md5);
+        $valid_response = md5($digest['username'].':'.$digest['nonce'].':'.$digest['nc'].':'.$digest['cnonce'].':'.$digest['qop'].':'.$md5);
 
         // Check if the string don't compare (case-insensitive)
         if (strcasecmp($digest['response'], $valid_response) !== 0)

From 359c2f84503b67eec0863cfc38848e5ab5ae74d4 Mon Sep 17 00:00:00 2001
From: rsmnarts <40693945+rsmnarts@users.noreply.github.com>
Date: Wed, 20 Feb 2019 13:25:03 +0700
Subject: [PATCH 295/354] rename $this->method to $this-methods

---
 application/config/rest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/config/rest.php b/application/config/rest.php
index 18327360..109cb671 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -483,7 +483,7 @@
 | To specify the limits within the controller's __construct() method, add per-method
 | limits with:
 |
-|       $this->method['METHOD_NAME']['limit'] = [NUM_REQUESTS_PER_HOUR];
+|       $this->methods['METHOD_NAME']['limit'] = [NUM_REQUESTS_PER_HOUR];
 |
 | See application/controllers/api/example.php for examples
 */

From 2bb2fe4808cdf4f591ca55f480884909e026fbd1 Mon Sep 17 00:00:00 2001
From: CodeLingoBot <bot@codelingo.io>
Date: Mon, 1 Apr 2019 10:49:35 +1300
Subject: [PATCH 296/354] Fix case of contants based on best practices from
 PSR2

Signed-off-by: CodeLingoBot <bot@codelingo.io>
---
 application/config/ldap.php                   |  2 +-
 application/config/profiler.php               | 22 ++++++------
 application/config/rest.php                   | 34 +++++++++----------
 application/config/routes.php                 |  2 +-
 application/controllers/api/Example.php       | 12 +++----
 application/controllers/api/Key.php           | 28 +++++++--------
 .../20170706025420_create_table_users.php     | 10 +++---
 .../20170706030520_create_table_api_keys.php  | 12 +++----
 .../20170706031435_create_table_api_logs.php  | 12 +++----
 ...20170706032133_create_table_api_access.php |  8 ++---
 ...20170706032825_create_table_api_limits.php |  6 ++--
 11 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/application/config/ldap.php b/application/config/ldap.php
index e4165550..a54b985d 100644
--- a/application/config/ldap.php
+++ b/application/config/ldap.php
@@ -8,7 +8,7 @@
  * There will be a delay while the code times out trying to talk to the main server but things will still work.
 */
 $config['server'] = 'ldapserver1.example.org ldapserver2.example.org';
-$config['port'] = NULL;
+$config['port'] = null;
 /*
  * Controls the LDAP_OPT_NETWORK_TIMEOUT option, this is how long the code will attempt to talk to the primary server if it is unreachable.
  */
diff --git a/application/config/profiler.php b/application/config/profiler.php
index ce026a7e..870880d9 100644
--- a/application/config/profiler.php
+++ b/application/config/profiler.php
@@ -12,15 +12,15 @@
 |	http://codeigniter.com/user_guide/general/profiling.html
 |
 */
-$config['benchmarks']           = TRUE;
-$config['config']               = TRUE;
-$config['controller_info']      = TRUE;
-$config['get']                  = TRUE;
-$config['http_headers']         = TRUE;
-$config['memory_usage']         = TRUE;
-$config['post']                 = TRUE;
-$config['queries']              = TRUE;
-$config['eloquent']             = FALSE;
-$config['uri_string']           = TRUE;
-$config['view_data']            = TRUE;
+$config['benchmarks']           = true;
+$config['config']               = true;
+$config['controller_info']      = true;
+$config['get']                  = true;
+$config['http_headers']         = true;
+$config['memory_usage']         = true;
+$config['post']                 = true;
+$config['queries']              = true;
+$config['eloquent']             = false;
+$config['uri_string']           = true;
+$config['view_data']            = true;
 $config['query_toggle_count']   = 1000;
\ No newline at end of file
diff --git a/application/config/rest.php b/application/config/rest.php
index 109cb671..394937ce 100644
--- a/application/config/rest.php
+++ b/application/config/rest.php
@@ -10,7 +10,7 @@
 | Set to force the use of HTTPS for REST API calls
 |
 */
-$config['force_https'] = FALSE;
+$config['force_https'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -82,7 +82,7 @@
 | Should we enable emulation of the request (e.g. used in Mootools request)
 |
 */
-$config['enable_emulate_request'] = TRUE;
+$config['enable_emulate_request'] = true;
 
 /*
 |--------------------------------------------------------------------------
@@ -110,7 +110,7 @@
 |           authorization key
 |
 */
-$config['rest_auth'] = FALSE;
+$config['rest_auth'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -137,8 +137,8 @@
 | requests etc), set to TRUE;
 |
 */
-$config['allow_auth_and_keys'] = TRUE;
-$config['strict_api_and_auth'] = TRUE; // force the use of both api and auth before a valid api request is made
+$config['allow_auth_and_keys'] = true;
+$config['strict_api_and_auth'] = true; // force the use of both api and auth before a valid api request is made
 
 /*
 |--------------------------------------------------------------------------
@@ -228,7 +228,7 @@
 |    restrict certain methods to IPs in your white-list
 |
 */
-$config['rest_ip_whitelist_enabled'] = FALSE;
+$config['rest_ip_whitelist_enabled'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -238,7 +238,7 @@
 | Handle exceptions caused by the controller
 |
 */
-$config['rest_handle_exceptions'] = TRUE;
+$config['rest_handle_exceptions'] = true;
 
 /*
 |--------------------------------------------------------------------------
@@ -266,7 +266,7 @@
 | 1. Set to TRUE and add any IP address to 'rest_ip_blacklist'
 |
 */
-$config['rest_ip_blacklist_enabled'] = FALSE;
+$config['rest_ip_blacklist_enabled'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -324,7 +324,7 @@
 |   ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 |
 */
-$config['rest_enable_keys'] = FALSE;
+$config['rest_enable_keys'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -404,7 +404,7 @@
 |   ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 |
 */
-$config['rest_enable_logging'] = FALSE;
+$config['rest_enable_logging'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -437,7 +437,7 @@
 |    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 |
 */
-$config['rest_enable_access'] = FALSE;
+$config['rest_enable_access'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -459,7 +459,7 @@
 | Set to FALSE to log as serialized PHP
 |
 */
-$config['rest_logs_json_params'] = FALSE;
+$config['rest_logs_json_params'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -487,7 +487,7 @@
 |
 | See application/controllers/api/example.php for examples
 */
-$config['rest_enable_limits'] = FALSE;
+$config['rest_enable_limits'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -509,7 +509,7 @@
 | Only do this if you are using the $this->rest_format or /format/xml in URLs
 |
 */
-$config['rest_ignore_http_accept'] = FALSE;
+$config['rest_ignore_http_accept'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -524,7 +524,7 @@
 | Hint: This is good for production environments
 |
 */
-$config['rest_ajax_only'] = FALSE;
+$config['rest_ajax_only'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -546,7 +546,7 @@
 | will access it through a browser
 |
 */
-$config['check_cors'] = FALSE;
+$config['check_cors'] = false;
 
 /*
 |--------------------------------------------------------------------------
@@ -590,7 +590,7 @@
 | source domain
 |
 */
-$config['allow_any_cors_domain'] = FALSE;
+$config['allow_any_cors_domain'] = false;
 
 /*
 |--------------------------------------------------------------------------
diff --git a/application/config/routes.php b/application/config/routes.php
index f2d051f7..c0f8cee9 100644
--- a/application/config/routes.php
+++ b/application/config/routes.php
@@ -51,7 +51,7 @@
 */
 $route['default_controller'] = 'welcome';
 $route['404_override'] = '';
-$route['translate_uri_dashes'] = TRUE;
+$route['translate_uri_dashes'] = true;
 
 /*
 | -------------------------------------------------------------------------
diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
index 9bc3a828..3b6de553 100644
--- a/application/controllers/api/Example.php
+++ b/application/controllers/api/Example.php
@@ -46,7 +46,7 @@ public function users_get()
 
         // If the id parameter doesn't exist return all the users
 
-        if ($id === NULL)
+        if ($id === null)
         {
             // Check if the users data store contains users (in case the database result returns NULL)
             if ($users)
@@ -58,7 +58,7 @@ public function users_get()
             {
                 // Set the response and exit
                 $this->response([
-                    'status' => FALSE,
+                    'status' => false,
                     'message' => 'No users were found'
                 ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
             }
@@ -72,13 +72,13 @@ public function users_get()
         if ($id <= 0)
         {
             // Invalid id, set the response and exit.
-            $this->response(NULL, REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
+            $this->response(null, REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
         // Get the user from the array, using the id as key for retrieval.
         // Usually a model is to be used for this.
 
-        $user = NULL;
+        $user = null;
 
         if (!empty($users))
         {
@@ -98,7 +98,7 @@ public function users_get()
         else
         {
             $this->set_response([
-                'status' => FALSE,
+                'status' => false,
                 'message' => 'User could not be found'
             ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
         }
@@ -125,7 +125,7 @@ public function users_delete()
         if ($id <= 0)
         {
             // Set the response and exit
-            $this->response(NULL, REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
+            $this->response(null, REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
 
         // $this->some_model->delete_something($id);
diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
index 8f3a64b4..585f9f60 100644
--- a/application/controllers/api/Key.php
+++ b/application/controllers/api/Key.php
@@ -46,14 +46,14 @@ public function index_put()
         if ($this->_insert_key($key, ['level' => $level, 'ignore_limits' => $ignore_limits]))
         {
             $this->response([
-                'status' => TRUE,
+                'status' => true,
                 'key' => $key
             ], REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
         }
         else
         {
             $this->response([
-                'status' => FALSE,
+                'status' => false,
                 'message' => 'Could not save the key'
             ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
@@ -74,7 +74,7 @@ public function index_delete()
         {
             // It doesn't appear the key exists
             $this->response([
-                'status' => FALSE,
+                'status' => false,
                 'message' => 'Invalid API key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
@@ -84,7 +84,7 @@ public function index_delete()
 
         // Respond that the key was destroyed
         $this->response([
-            'status' => TRUE,
+            'status' => true,
             'message' => 'API key was deleted'
             ], REST_Controller::HTTP_NO_CONTENT); // NO_CONTENT (204) being the HTTP response code
     }
@@ -105,7 +105,7 @@ public function level_post()
         {
             // It doesn't appear the key exists
             $this->response([
-                'status' => FALSE,
+                'status' => false,
                 'message' => 'Invalid API key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
@@ -114,14 +114,14 @@ public function level_post()
         if ($this->_update_key($key, ['level' => $new_level]))
         {
             $this->response([
-                'status' => TRUE,
+                'status' => true,
                 'message' => 'API key was updated'
             ], REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
         else
         {
             $this->response([
-                'status' => FALSE,
+                'status' => false,
                 'message' => 'Could not update the key level'
             ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
@@ -142,7 +142,7 @@ public function suspend_post()
         {
             // It doesn't appear the key exists
             $this->response([
-                'status' => FALSE,
+                'status' => false,
                 'message' => 'Invalid API key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
@@ -151,14 +151,14 @@ public function suspend_post()
         if ($this->_update_key($key, ['level' => 0]))
         {
             $this->response([
-                'status' => TRUE,
+                'status' => true,
                 'message' => 'Key was suspended'
             ], REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
         }
         else
         {
             $this->response([
-                'status' => FALSE,
+                'status' => false,
                 'message' => 'Could not suspend the user'
             ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
@@ -180,7 +180,7 @@ public function regenerate_post()
         {
             // It doesn't appear the key exists
             $this->response([
-                'status' => FALSE,
+                'status' => false,
                 'message' => 'Invalid API key'
             ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
         }
@@ -195,14 +195,14 @@ public function regenerate_post()
             $this->_update_key($old_key, ['level' => 0]);
 
             $this->response([
-                'status' => TRUE,
+                'status' => true,
                 'key' => $new_key
             ], REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
         }
         else
         {
             $this->response([
-                'status' => FALSE,
+                'status' => false,
                 'message' => 'Could not save the key'
             ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
         }
@@ -218,7 +218,7 @@ private function _generate_key()
             $salt = base_convert(bin2hex($this->security->get_random_bytes(64)), 16, 36);
 
             // If an error occurred, then fall back to the previous method
-            if ($salt === FALSE)
+            if ($salt === false)
             {
                 $salt = hash('sha256', time() . mt_rand());
             }
diff --git a/application/migrations/20170706025420_create_table_users.php b/application/migrations/20170706025420_create_table_users.php
index aaeccb69..3553dad3 100644
--- a/application/migrations/20170706025420_create_table_users.php
+++ b/application/migrations/20170706025420_create_table_users.php
@@ -21,12 +21,12 @@ public function up()
 		$fields = array(
 			'id'         => [
 				'type'           => 'INT(11)',
-				'auto_increment' => TRUE,
-				'unsigned'       => TRUE,
+				'auto_increment' => true,
+				'unsigned'       => true,
 			],
 			'email'      => [
 				'type'   => 'VARCHAR(255)',
-				'unique' => TRUE,
+				'unique' => true,
 			],
 			'password'   => [
 				'type' => 'VARCHAR(64)',
@@ -42,8 +42,8 @@ public function up()
 			],
 		);
 		$this->dbforge->add_field($fields);
-		$this->dbforge->add_key('id', TRUE);
-		$this->dbforge->create_table($this->table, TRUE);
+		$this->dbforge->add_key('id', true);
+		$this->dbforge->create_table($this->table, true);
 
 		/*for ($i = 1; $i <= 100; $i++)
 		{
diff --git a/application/migrations/20170706030520_create_table_api_keys.php b/application/migrations/20170706030520_create_table_api_keys.php
index 8c3954d8..42fb5417 100644
--- a/application/migrations/20170706030520_create_table_api_keys.php
+++ b/application/migrations/20170706030520_create_table_api_keys.php
@@ -20,16 +20,16 @@ public function up()
 		$fields = array(
 			'id'                           => [
 				'type'           => 'INT(11)',
-				'auto_increment' => TRUE,
-				'unsigned'       => TRUE,
+				'auto_increment' => true,
+				'unsigned'       => true,
 			],
 			'user_id'                      => [
 				'type'     => 'INT(11)',
-				'unsigned' => TRUE,
+				'unsigned' => true,
 			],
 			config_item('rest_key_column') => [
 				'type'   => 'VARCHAR(' . config_item('rest_key_length') . ')',
-				'unique' => TRUE,
+				'unique' => true,
 			],
 			'level'                        => [
 				'type' => 'INT(2)',
@@ -44,14 +44,14 @@ public function up()
 			],
 			'ip_addresses'                 => [
 				'type' => 'TEXT',
-				'null' => TRUE,
+				'null' => true,
 			],
 			'date_created'                 => [
 				'type' => 'INT(11)',
 			],
 		);
 		$this->dbforge->add_field($fields);
-		$this->dbforge->add_key('id', TRUE);
+		$this->dbforge->add_key('id', true);
 		$this->dbforge->create_table($table);
 		$this->db->query(add_foreign_key($table, 'user_id', 'users(id)', 'CASCADE', 'CASCADE'));
 	}
diff --git a/application/migrations/20170706031435_create_table_api_logs.php b/application/migrations/20170706031435_create_table_api_logs.php
index 03d6a567..db8b4be4 100644
--- a/application/migrations/20170706031435_create_table_api_logs.php
+++ b/application/migrations/20170706031435_create_table_api_logs.php
@@ -20,8 +20,8 @@ public function up()
 		$fields = array(
 			'id'            => [
 				'type'           => 'INT(11)',
-				'auto_increment' => TRUE,
-				'unsigned'       => TRUE,
+				'auto_increment' => true,
+				'unsigned'       => true,
 			],
 			'api_key'       => [
 				'type' => 'VARCHAR(' . config_item('rest_key_length') . ')',
@@ -34,7 +34,7 @@ public function up()
 			],
 			'params'        => [
 				'type' => 'TEXT',
-				'null' => TRUE,
+				'null' => true,
 			],
 			'ip_address'    => [
 				'type' => 'VARCHAR(45)',
@@ -44,19 +44,19 @@ public function up()
 			],
 			'rtime'         => [
 				'type' => 'FLOAT',
-				'null' => TRUE,
+				'null' => true,
 			],
 			'authorized'    => [
 				'type' => 'VARCHAR(1)',
 			],
 			'response_code' => [
 				'type'    => 'SMALLINT(3)',
-				'null'    => TRUE,
+				'null'    => true,
 				'default' => 0,
 			],
 		);
 		$this->dbforge->add_field($fields);
-		$this->dbforge->add_key('id', TRUE);
+		$this->dbforge->add_key('id', true);
 		$this->dbforge->create_table($table);
 		/*$this->db->query(add_foreign_key($table, 'api_key',
 			config_item('rest_keys_table') . '(' . config_item('rest_key_column') . ')', 'CASCADE', 'CASCADE'));*/
diff --git a/application/migrations/20170706032133_create_table_api_access.php b/application/migrations/20170706032133_create_table_api_access.php
index c78cbe3f..df004dda 100644
--- a/application/migrations/20170706032133_create_table_api_access.php
+++ b/application/migrations/20170706032133_create_table_api_access.php
@@ -20,8 +20,8 @@ public function up()
 		$fields = array(
 			'id'            => [
 				'type'           => 'INT(11)',
-				'auto_increment' => TRUE,
-				'unsigned'       => TRUE,
+				'auto_increment' => true,
+				'unsigned'       => true,
 			],
 			'key'           => [
 				'type' => 'VARCHAR(' . config_item('rest_key_length') . ')',
@@ -35,14 +35,14 @@ public function up()
 			],
 			'date_created'  => [
 				'type' => 'DATETIME',
-				'null' => TRUE,
+				'null' => true,
 			],
 			'date_modified' => [
 				'type' => 'TIMESTAMP',
 			],
 		);
 		$this->dbforge->add_field($fields);
-		$this->dbforge->add_key('id', TRUE);
+		$this->dbforge->add_key('id', true);
 		$this->dbforge->add_key('controller');
 		$this->dbforge->create_table($table);
 		$this->db->query(add_foreign_key($table, 'key',
diff --git a/application/migrations/20170706032825_create_table_api_limits.php b/application/migrations/20170706032825_create_table_api_limits.php
index 28f211bd..c7355cb7 100644
--- a/application/migrations/20170706032825_create_table_api_limits.php
+++ b/application/migrations/20170706032825_create_table_api_limits.php
@@ -20,8 +20,8 @@ public function up()
 		$fields = array(
 			'id'           => [
 				'type'           => 'INT(11)',
-				'auto_increment' => TRUE,
-				'unsigned'       => TRUE,
+				'auto_increment' => true,
+				'unsigned'       => true,
 			],
 			'api_key'      => [
 				'type' => 'VARCHAR(' . config_item('rest_key_length') . ')',
@@ -37,7 +37,7 @@ public function up()
 			],
 		);
 		$this->dbforge->add_field($fields);
-		$this->dbforge->add_key('id', TRUE);
+		$this->dbforge->add_key('id', true);
 		$this->dbforge->add_key('uri');
 		$this->dbforge->create_table($table);
 		$this->db->query(add_foreign_key($table, 'api_key',

From 6425ad60f7f108c1e52c2d939dd6b550a5e73a96 Mon Sep 17 00:00:00 2001
From: Kevin Hill <kphill@crain.com>
Date: Tue, 14 May 2019 16:59:19 -0400
Subject: [PATCH 297/354] Add support for CodeIgniter 3.1.0 and PHP 7.2

---
 README.md                                     |  29 +-
 application/libraries/REST_Controller.php     | 362 ++++++------------
 .../libraries/REST_Controller_Definitions.php | 138 +++++++
 composer.json                                 |   4 +-
 4 files changed, 271 insertions(+), 262 deletions(-)
 create mode 100644 application/libraries/REST_Controller_Definitions.php

diff --git a/README.md b/README.md
index d192d4ae..7f54e719 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+
 # CodeIgniter Rest Server
 
 [![Gitter chat](https://badges.gitter.im/chriskacerguis/codeigniter-restserver.png)](https://gitter.im/codeigniter-restserver/Lobby)
@@ -7,8 +8,8 @@ config file and one controller.
 
 ## Requirements
 
-1. PHP 5.4 or greater
-2. CodeIgniter 3.0+
+1. PHP 7.2 or greater
+2. CodeIgniter 3.1.10+
 
 _Note: for 1.7.x support download v2.2 from Downloads tab_
 
@@ -39,8 +40,11 @@ When your controller extends from `REST_Controller`, the method names will be ap
 This allows you to implement a RESTful interface easily:
 
 ```php
-class Books extends REST_Controller
+class Books extends CI_Controller
 {
+   use REST_Controller {
+    REST_Controller::__construct as private __resTraitConstruct;
+  }
   public function index_get()
   {
     // Display all books
@@ -69,9 +73,9 @@ The HTTP spec for DELETE requests precludes the use of parameters.  For delete r
 ```php
 public function index_delete($id)
 {
-	$this->response([
-		'returned from delete:' => $id,
-	]);
+  $this->response([
+    'returned from delete:' => $id,
+  ]);
 }
 ```
 
@@ -146,6 +150,7 @@ If your application uses language files to support multiple locales, `REST_Contr
 public function __construct()
 {
   parent::__construct();
+  $this->__resTraitConstruct();
 
   if (is_array($this->response->lang))
   {
@@ -194,12 +199,12 @@ You'll need to create a new database table to store and access the keys. `REST_C
 
 ```sql
 CREATE TABLE `keys` (
-	`id` INT(11) NOT NULL AUTO_INCREMENT,
-	`key` VARCHAR(40) NOT NULL,
-	`level` INT(2) NOT NULL,
-	`ignore_limits` TINYINT(1) NOT NULL DEFAULT '0',
-	`date_created` INT(11) NOT NULL,
-	PRIMARY KEY (`id`)
+  `id` INT(11) NOT NULL AUTO_INCREMENT,
+  `key` VARCHAR(40) NOT NULL,
+  `level` INT(2) NOT NULL,
+  `ignore_limits` TINYINT(1) NOT NULL DEFAULT '0',
+  `date_created` INT(11) NOT NULL,
+  PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 ```
 
diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 2363cfc4..bcda5f63 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -1,7 +1,6 @@
 <?php
 
 namespace Restserver\Libraries;
-use CI_Controller;
 use Exception;
 use stdClass;
 
@@ -19,140 +18,7 @@
  * @link            https://github.com/chriskacerguis/codeigniter-restserver
  * @version         3.0.0
  */
-abstract class REST_Controller extends CI_Controller {
-
-    // Note: Only the widely used HTTP status codes are documented
-
-    // Informational
-
-    const HTTP_CONTINUE = 100;
-    const HTTP_SWITCHING_PROTOCOLS = 101;
-    const HTTP_PROCESSING = 102;            // RFC2518
-
-    // Success
-
-    /**
-     * The request has succeeded
-     */
-    const HTTP_OK = 200;
-
-    /**
-     * The server successfully created a new resource
-     */
-    const HTTP_CREATED = 201;
-    const HTTP_ACCEPTED = 202;
-    const HTTP_NON_AUTHORITATIVE_INFORMATION = 203;
-
-    /**
-     * The server successfully processed the request, though no content is returned
-     */
-    const HTTP_NO_CONTENT = 204;
-    const HTTP_RESET_CONTENT = 205;
-    const HTTP_PARTIAL_CONTENT = 206;
-    const HTTP_MULTI_STATUS = 207;          // RFC4918
-    const HTTP_ALREADY_REPORTED = 208;      // RFC5842
-    const HTTP_IM_USED = 226;               // RFC3229
-
-    // Redirection
-
-    const HTTP_MULTIPLE_CHOICES = 300;
-    const HTTP_MOVED_PERMANENTLY = 301;
-    const HTTP_FOUND = 302;
-    const HTTP_SEE_OTHER = 303;
-
-    /**
-     * The resource has not been modified since the last request
-     */
-    const HTTP_NOT_MODIFIED = 304;
-    const HTTP_USE_PROXY = 305;
-    const HTTP_RESERVED = 306;
-    const HTTP_TEMPORARY_REDIRECT = 307;
-    const HTTP_PERMANENTLY_REDIRECT = 308;  // RFC7238
-
-    // Client Error
-
-    /**
-     * The request cannot be fulfilled due to multiple errors
-     */
-    const HTTP_BAD_REQUEST = 400;
-
-    /**
-     * The user is unauthorized to access the requested resource
-     */
-    const HTTP_UNAUTHORIZED = 401;
-    const HTTP_PAYMENT_REQUIRED = 402;
-
-    /**
-     * The requested resource is unavailable at this present time
-     */
-    const HTTP_FORBIDDEN = 403;
-
-    /**
-     * The requested resource could not be found
-     *
-     * Note: This is sometimes used to mask if there was an UNAUTHORIZED (401) or
-     * FORBIDDEN (403) error, for security reasons
-     */
-    const HTTP_NOT_FOUND = 404;
-
-    /**
-     * The request method is not supported by the following resource
-     */
-    const HTTP_METHOD_NOT_ALLOWED = 405;
-
-    /**
-     * The request was not acceptable
-     */
-    const HTTP_NOT_ACCEPTABLE = 406;
-    const HTTP_PROXY_AUTHENTICATION_REQUIRED = 407;
-    const HTTP_REQUEST_TIMEOUT = 408;
-
-    /**
-     * The request could not be completed due to a conflict with the current state
-     * of the resource
-     */
-    const HTTP_CONFLICT = 409;
-    const HTTP_GONE = 410;
-    const HTTP_LENGTH_REQUIRED = 411;
-    const HTTP_PRECONDITION_FAILED = 412;
-    const HTTP_REQUEST_ENTITY_TOO_LARGE = 413;
-    const HTTP_REQUEST_URI_TOO_LONG = 414;
-    const HTTP_UNSUPPORTED_MEDIA_TYPE = 415;
-    const HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
-    const HTTP_EXPECTATION_FAILED = 417;
-    const HTTP_I_AM_A_TEAPOT = 418;                                               // RFC2324
-    const HTTP_UNPROCESSABLE_ENTITY = 422;                                        // RFC4918
-    const HTTP_LOCKED = 423;                                                      // RFC4918
-    const HTTP_FAILED_DEPENDENCY = 424;                                           // RFC4918
-    const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425;   // RFC2817
-    const HTTP_UPGRADE_REQUIRED = 426;                                            // RFC2817
-    const HTTP_PRECONDITION_REQUIRED = 428;                                       // RFC6585
-    const HTTP_TOO_MANY_REQUESTS = 429;                                           // RFC6585
-    const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;                             // RFC6585
-
-    // Server Error
-
-    /**
-     * The server encountered an unexpected error
-     *
-     * Note: This is a generic error message when no specific message
-     * is suitable
-     */
-    const HTTP_INTERNAL_SERVER_ERROR = 500;
-
-    /**
-     * The server does not recognise the request method
-     */
-    const HTTP_NOT_IMPLEMENTED = 501;
-    const HTTP_BAD_GATEWAY = 502;
-    const HTTP_SERVICE_UNAVAILABLE = 503;
-    const HTTP_GATEWAY_TIMEOUT = 504;
-    const HTTP_VERSION_NOT_SUPPORTED = 505;
-    const HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL = 506;                        // RFC2295
-    const HTTP_INSUFFICIENT_STORAGE = 507;                                        // RFC4918
-    const HTTP_LOOP_DETECTED = 508;                                               // RFC5842
-    const HTTP_NOT_EXTENDED = 510;                                                // RFC2774
-    const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511;
+trait REST_Controller {
 
     /**
      * This defines the rest format
@@ -351,19 +217,19 @@ abstract class REST_Controller extends CI_Controller {
      * @link http://www.restapitutorial.com/httpstatuscodes.html
      */
     protected $http_status_codes = [
-        self::HTTP_OK => 'OK',
-        self::HTTP_CREATED => 'CREATED',
-        self::HTTP_NO_CONTENT => 'NO CONTENT',
-        self::HTTP_NOT_MODIFIED => 'NOT MODIFIED',
-        self::HTTP_BAD_REQUEST => 'BAD REQUEST',
-        self::HTTP_UNAUTHORIZED => 'UNAUTHORIZED',
-        self::HTTP_FORBIDDEN => 'FORBIDDEN',
-        self::HTTP_NOT_FOUND => 'NOT FOUND',
-        self::HTTP_METHOD_NOT_ALLOWED => 'METHOD NOT ALLOWED',
-        self::HTTP_NOT_ACCEPTABLE => 'NOT ACCEPTABLE',
-        self::HTTP_CONFLICT => 'CONFLICT',
-        self::HTTP_INTERNAL_SERVER_ERROR => 'INTERNAL SERVER ERROR',
-        self::HTTP_NOT_IMPLEMENTED => 'NOT IMPLEMENTED'
+        REST_Controller_Definitions::HTTP_OK => 'OK',
+        REST_Controller_Definitions::HTTP_CREATED => 'CREATED',
+        REST_Controller_Definitions::HTTP_NO_CONTENT => 'NO CONTENT',
+        REST_Controller_Definitions::HTTP_NOT_MODIFIED => 'NOT MODIFIED',
+        REST_Controller_Definitions::HTTP_BAD_REQUEST => 'BAD REQUEST',
+        REST_Controller_Definitions::HTTP_UNAUTHORIZED => 'UNAUTHORIZED',
+        REST_Controller_Definitions::HTTP_FORBIDDEN => 'FORBIDDEN',
+        REST_Controller_Definitions::HTTP_NOT_FOUND => 'NOT FOUND',
+        REST_Controller_Definitions::HTTP_METHOD_NOT_ALLOWED => 'METHOD NOT ALLOWED',
+        REST_Controller_Definitions::HTTP_NOT_ACCEPTABLE => 'NOT ACCEPTABLE',
+        REST_Controller_Definitions::HTTP_CONFLICT => 'CONFLICT',
+        REST_Controller_Definitions::HTTP_INTERNAL_SERVER_ERROR => 'INTERNAL SERVER ERROR',
+        REST_Controller_Definitions::HTTP_NOT_IMPLEMENTED => 'NOT IMPLEMENTED'
     ];
 
     /**
@@ -409,8 +275,8 @@ public function __construct($config = 'rest')
         if ($this->config->item('rest_enable_logging') === TRUE)
         {
                 // Start the timer for how long the request takes
-		$this->_start_rtime = microtime(TRUE);
-	}
+        $this->_start_rtime = microtime(TRUE);
+    }
 
         // Load the rest.php configuration file
         $this->get_local_config($config);
@@ -521,8 +387,8 @@ public function __construct($config = 'rest')
         if ($this->request->format && $this->request->body)
         {
             $this->request->body = Format::factory($this->request->body, $this->request->format)->to_array();
-		    
-	    // Assign payload arguments to proper method container
+            
+        // Assign payload arguments to proper method container
             $this->{'_'.$this->request->method.'_args'} = $this->request->body;
         }
 
@@ -574,7 +440,7 @@ public function __construct($config = 'rest')
             $this->response([
                 $this->config->item('rest_status_field_name') => FALSE,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ajax_only')
-            ], self::HTTP_NOT_ACCEPTABLE);
+            ], REST_Controller_Definitions::HTTP_NOT_ACCEPTABLE);
         }
 
         // When there is no specific override for the current class/method, use the default auth value set in the config
@@ -676,7 +542,7 @@ public function _remap($object_called, $arguments = [])
             $this->response([
                 $this->config->item('rest_status_field_name') => FALSE,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unsupported')
-            ], self::HTTP_FORBIDDEN);
+            ], REST_Controller_Definitions::HTTP_FORBIDDEN);
         }
 
         // Remove the supported format from the function name e.g. index.json => index
@@ -711,7 +577,7 @@ public function _remap($object_called, $arguments = [])
             $this->response([
                 $this->config->item('rest_status_field_name') => FALSE,
                 $this->config->item('rest_message_field_name') => sprintf($this->lang->line('text_rest_invalid_api_key'), $this->rest->key)
-            ], self::HTTP_FORBIDDEN);
+            ], REST_Controller_Definitions::HTTP_FORBIDDEN);
         }
 
         // Check to see if this key has access to the requested controller
@@ -725,7 +591,7 @@ public function _remap($object_called, $arguments = [])
             $this->response([
                 $this->config->item('rest_status_field_name') => FALSE,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_unauthorized')
-            ], self::HTTP_UNAUTHORIZED);
+            ], REST_Controller_Definitions::HTTP_UNAUTHORIZED);
         }
 
         // Sure it exists, but can they do anything with it?
@@ -734,7 +600,7 @@ public function _remap($object_called, $arguments = [])
             $this->response([
                 $this->config->item('rest_status_field_name') => FALSE,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unknown_method')
-            ], self::HTTP_METHOD_NOT_ALLOWED);
+            ], REST_Controller_Definitions::HTTP_METHOD_NOT_ALLOWED);
         }
 
         // Doing key related stuff? Can only do it if they have a key right?
@@ -744,7 +610,7 @@ public function _remap($object_called, $arguments = [])
             if ($this->config->item('rest_enable_limits') && $this->_check_limit($controller_method) === FALSE)
             {
                 $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_time_limit')];
-                $this->response($response, self::HTTP_UNAUTHORIZED);
+                $this->response($response, REST_Controller_Definitions::HTTP_UNAUTHORIZED);
             }
 
             // If no level is set use 0, they probably aren't using permissions
@@ -761,7 +627,7 @@ public function _remap($object_called, $arguments = [])
             {
                 // They don't have good enough perms
                 $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_permissions')];
-                $this->response($response, self::HTTP_UNAUTHORIZED);
+                $this->response($response, REST_Controller_Definitions::HTTP_UNAUTHORIZED);
             }
         }
 
@@ -769,7 +635,7 @@ public function _remap($object_called, $arguments = [])
         elseif ($this->config->item('rest_limits_method') == "IP_ADDRESS" && $this->config->item('rest_enable_limits') && $this->_check_limit($controller_method) === FALSE)
         {
             $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_address_time_limit')];
-            $this->response($response, self::HTTP_UNAUTHORIZED);
+            $this->response($response, REST_Controller_Definitions::HTTP_UNAUTHORIZED);
         }
 
         // No key stuff, but record that stuff is happening
@@ -809,87 +675,87 @@ public function _remap($object_called, $arguments = [])
     public function response($data = NULL, $http_code = NULL, $continue = FALSE)
     {
         //if profiling enabled then print profiling data
-		$isProfilingEnabled = $this->config->item('enable_profiling');
-		if(!$isProfilingEnabled){
-        	ob_start();
-        	// If the HTTP status is not NULL, then cast as an integer
-        	if ($http_code !== NULL)
-        	{
-            	// So as to be safe later on in the process
-            	$http_code = (int) $http_code;
-        	}
-
-        	// Set the output as NULL by default
-        	$output = NULL;
-
-        	// If data is NULL and no HTTP status code provided, then display, error and exit
-        	if ($data === NULL && $http_code === NULL)
-        	{
-            	$http_code = self::HTTP_NOT_FOUND;
-        	}
-
-        	// If data is not NULL and a HTTP status code provided, then continue
-        	elseif ($data !== NULL)
-        	{
-            	// If the format method exists, call and return the output in that format
-            	if (method_exists(Format::class, 'to_' . $this->response->format))
-            	{
-                	// Set the format header
-                	$this->output->set_content_type($this->_supported_formats[$this->response->format], strtolower($this->config->item('charset')));
-                	$output = Format::factory($data)->{'to_' . $this->response->format}();
-
-                	// An array must be parsed as a string, so as not to cause an array to string error
-                	// Json is the most appropriate form for such a data type
-                	if ($this->response->format === 'array')
-                	{
-                    	$output = Format::factory($output)->{'to_json'}();
-                	}
-            	}
-            	else
-            	{
-                	// If an array or object, then parse as a json, so as to be a 'string'
-                	if (is_array($data) || is_object($data))
-                	{
-                    	$data = Format::factory($data)->{'to_json'}();
-                	}
-
-                	// Format is not supported, so output the raw data as a string
-                	$output = $data;
-            	}
-        	}
-
-        	// If not greater than zero, then set the HTTP status code as 200 by default
-        	// Though perhaps 500 should be set instead, for the developer not passing a
-        	// correct HTTP status code
-        	$http_code > 0 || $http_code = self::HTTP_OK;
-
-        	$this->output->set_status_header($http_code);
-
-        	// JC: Log response code only if rest logging enabled
-        	if ($this->config->item('rest_enable_logging') === TRUE)
-        	{
-            	$this->_log_response_code($http_code);
-        	}
-
-        	// Output the data
-        	$this->output->set_output($output);
-
-        	if ($continue === FALSE)
-        	{
-            	// Display the data and exit execution
-            	$this->output->_display();
-            	exit;
-        	}
-        	else
-        	{
-            	ob_end_flush();
-        	}
-
-        	// Otherwise dump the output automatically
-		}
-		else{
-			echo json_encode($data);
-		}
+        $isProfilingEnabled = $this->config->item('enable_profiling');
+        if(!$isProfilingEnabled){
+            ob_start();
+            // If the HTTP status is not NULL, then cast as an integer
+            if ($http_code !== NULL)
+            {
+                // So as to be safe later on in the process
+                $http_code = (int) $http_code;
+            }
+
+            // Set the output as NULL by default
+            $output = NULL;
+
+            // If data is NULL and no HTTP status code provided, then display, error and exit
+            if ($data === NULL && $http_code === NULL)
+            {
+                $http_code = REST_Controller_Definitions::HTTP_NOT_FOUND;
+            }
+
+            // If data is not NULL and a HTTP status code provided, then continue
+            elseif ($data !== NULL)
+            {
+                // If the format method exists, call and return the output in that format
+                if (method_exists(Format::class, 'to_' . $this->response->format))
+                {
+                    // Set the format header
+                    $this->output->set_content_type($this->_supported_formats[$this->response->format], strtolower($this->config->item('charset')));
+                    $output = Format::factory($data)->{'to_' . $this->response->format}();
+
+                    // An array must be parsed as a string, so as not to cause an array to string error
+                    // Json is the most appropriate form for such a data type
+                    if ($this->response->format === 'array')
+                    {
+                        $output = Format::factory($output)->{'to_json'}();
+                    }
+                }
+                else
+                {
+                    // If an array or object, then parse as a json, so as to be a 'string'
+                    if (is_array($data) || is_object($data))
+                    {
+                        $data = Format::factory($data)->{'to_json'}();
+                    }
+
+                    // Format is not supported, so output the raw data as a string
+                    $output = $data;
+                }
+            }
+
+            // If not greater than zero, then set the HTTP status code as 200 by default
+            // Though perhaps 500 should be set instead, for the developer not passing a
+            // correct HTTP status code
+            $http_code > 0 || $http_code = REST_Controller_Definitions::HTTP_OK;
+
+            $this->output->set_status_header($http_code);
+
+            // JC: Log response code only if rest logging enabled
+            if ($this->config->item('rest_enable_logging') === TRUE)
+            {
+                $this->_log_response_code($http_code);
+            }
+
+            // Output the data
+            $this->output->set_output($output);
+
+            if ($continue === FALSE)
+            {
+                // Display the data and exit execution
+                $this->output->_display();
+                exit;
+            }
+            else
+            {
+                ob_end_flush();
+            }
+
+            // Otherwise dump the output automatically
+        }
+        else{
+            echo json_encode($data);
+        }
     }
 
     /**
@@ -1104,7 +970,7 @@ protected function _detect_api_key()
                 {
                     // multiple ip addresses must be separated using a comma, explode and loop
                     $list_ip_addresses = explode(',', $row->ip_addresses);
-		    $ip_address = $this->input->ip_address();
+            $ip_address = $this->input->ip_address();
                     $found_address = FALSE;
 
                     foreach ($list_ip_addresses as $ip_address)
@@ -2020,7 +1886,7 @@ protected function _check_php_session()
             $this->response([
                 $this->config->item('rest_status_field_name') => FALSE,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized')
-            ], self::HTTP_UNAUTHORIZED);
+            ], REST_Controller_Definitions::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -2117,7 +1983,7 @@ protected function _prepare_digest_auth()
             $this->response([
                 $this->config->item('rest_status_field_name') => FALSE,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_invalid_credentials')
-            ], self::HTTP_UNAUTHORIZED);
+            ], REST_Controller_Definitions::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -2139,7 +2005,7 @@ protected function _check_blacklist_auth()
             $this->response([
                 $this->config->item('rest_status_field_name') => FALSE,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_denied')
-            ], self::HTTP_UNAUTHORIZED);
+            ], REST_Controller_Definitions::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -2167,7 +2033,7 @@ protected function _check_whitelist_auth()
             $this->response([
                 $this->config->item('rest_status_field_name') => FALSE,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_unauthorized')
-            ], self::HTTP_UNAUTHORIZED);
+            ], REST_Controller_Definitions::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -2205,7 +2071,7 @@ protected function _force_login($nonce = '')
         $this->response([
             $this->config->item('rest_status_field_name') => FALSE,
             $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized')
-        ], self::HTTP_UNAUTHORIZED);
+        ], REST_Controller_Definitions::HTTP_UNAUTHORIZED);
     }
 
     /**
@@ -2347,4 +2213,4 @@ protected function _check_cors()
             exit;
         }
     }
-}
+}
\ No newline at end of file
diff --git a/application/libraries/REST_Controller_Definitions.php b/application/libraries/REST_Controller_Definitions.php
new file mode 100644
index 00000000..403842ad
--- /dev/null
+++ b/application/libraries/REST_Controller_Definitions.php
@@ -0,0 +1,138 @@
+<?php
+namespace Restserver\Libraries;
+
+class REST_Controller_Definitions  {
+
+    // Note: Only the widely used HTTP status codes are documented
+
+    // Informational
+
+    const HTTP_CONTINUE = 100;
+    const HTTP_SWITCHING_PROTOCOLS = 101;
+    const HTTP_PROCESSING = 102;            // RFC2518
+
+    // Success
+
+    /**
+     * The request has succeeded
+     */
+    const HTTP_OK = 200;
+
+    /**
+     * The server successfully created a new resource
+     */
+    const HTTP_CREATED = 201;
+    const HTTP_ACCEPTED = 202;
+    const HTTP_NON_AUTHORITATIVE_INFORMATION = 203;
+
+    /**
+     * The server successfully processed the request, though no content is returned
+     */
+    const HTTP_NO_CONTENT = 204;
+    const HTTP_RESET_CONTENT = 205;
+    const HTTP_PARTIAL_CONTENT = 206;
+    const HTTP_MULTI_STATUS = 207;          // RFC4918
+    const HTTP_ALREADY_REPORTED = 208;      // RFC5842
+    const HTTP_IM_USED = 226;               // RFC3229
+
+    // Redirection
+
+    const HTTP_MULTIPLE_CHOICES = 300;
+    const HTTP_MOVED_PERMANENTLY = 301;
+    const HTTP_FOUND = 302;
+    const HTTP_SEE_OTHER = 303;
+
+    /**
+     * The resource has not been modified since the last request
+     */
+    const HTTP_NOT_MODIFIED = 304;
+    const HTTP_USE_PROXY = 305;
+    const HTTP_RESERVED = 306;
+    const HTTP_TEMPORARY_REDIRECT = 307;
+    const HTTP_PERMANENTLY_REDIRECT = 308;  // RFC7238
+
+    // Client Error
+
+    /**
+     * The request cannot be fulfilled due to multiple errors
+     */
+    const HTTP_BAD_REQUEST = 400;
+
+    /**
+     * The user is unauthorized to access the requested resource
+     */
+    const HTTP_UNAUTHORIZED = 401;
+    const HTTP_PAYMENT_REQUIRED = 402;
+
+    /**
+     * The requested resource is unavailable at this present time
+     */
+    const HTTP_FORBIDDEN = 403;
+
+    /**
+     * The requested resource could not be found
+     *
+     * Note: This is sometimes used to mask if there was an UNAUTHORIZED (401) or
+     * FORBIDDEN (403) error, for security reasons
+     */
+    const HTTP_NOT_FOUND = 404;
+
+    /**
+     * The request method is not supported by the following resource
+     */
+    const HTTP_METHOD_NOT_ALLOWED = 405;
+
+    /**
+     * The request was not acceptable
+     */
+    const HTTP_NOT_ACCEPTABLE = 406;
+    const HTTP_PROXY_AUTHENTICATION_REQUIRED = 407;
+    const HTTP_REQUEST_TIMEOUT = 408;
+
+    /**
+     * The request could not be completed due to a conflict with the current state
+     * of the resource
+     */
+    const HTTP_CONFLICT = 409;
+    const HTTP_GONE = 410;
+    const HTTP_LENGTH_REQUIRED = 411;
+    const HTTP_PRECONDITION_FAILED = 412;
+    const HTTP_REQUEST_ENTITY_TOO_LARGE = 413;
+    const HTTP_REQUEST_URI_TOO_LONG = 414;
+    const HTTP_UNSUPPORTED_MEDIA_TYPE = 415;
+    const HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
+    const HTTP_EXPECTATION_FAILED = 417;
+    const HTTP_I_AM_A_TEAPOT = 418;                                               // RFC2324
+    const HTTP_UNPROCESSABLE_ENTITY = 422;                                        // RFC4918
+    const HTTP_LOCKED = 423;                                                      // RFC4918
+    const HTTP_FAILED_DEPENDENCY = 424;                                           // RFC4918
+    const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425;   // RFC2817
+    const HTTP_UPGRADE_REQUIRED = 426;                                            // RFC2817
+    const HTTP_PRECONDITION_REQUIRED = 428;                                       // RFC6585
+    const HTTP_TOO_MANY_REQUESTS = 429;                                           // RFC6585
+    const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;                             // RFC6585
+
+    // Server Error
+
+    /**
+     * The server encountered an unexpected error
+     *
+     * Note: This is a generic error message when no specific message
+     * is suitable
+     */
+    const HTTP_INTERNAL_SERVER_ERROR = 500;
+
+    /**
+     * The server does not recognise the request method
+     */
+    const HTTP_NOT_IMPLEMENTED = 501;
+    const HTTP_BAD_GATEWAY = 502;
+    const HTTP_SERVICE_UNAVAILABLE = 503;
+    const HTTP_GATEWAY_TIMEOUT = 504;
+    const HTTP_VERSION_NOT_SUPPORTED = 505;
+    const HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL = 506;                        // RFC2295
+    const HTTP_INSUFFICIENT_STORAGE = 507;                                        // RFC4918
+    const HTTP_LOOP_DETECTED = 508;                                               // RFC5842
+    const HTTP_NOT_EXTENDED = 510;                                                // RFC2774
+    const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511;
+}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 637f86f8..979fd5a3 100644
--- a/composer.json
+++ b/composer.json
@@ -14,8 +14,8 @@
 		"source": "https://github.com/chriskacerguis/codeigniter-restserver"
 	},
 	"require": {
-		"php": ">=5.4.0",
-		"codeigniter/framework": "^3.0.4"
+		"php": ">=7.1.0",
+		"codeigniter/framework": "^3.1.10"
 	},
 	"autoload": {
 		"classmap": [

From ae62b76bc6adc97cbed539eeb6df8ffc7e186fe5 Mon Sep 17 00:00:00 2001
From: azapater <azapater@gmail.com>
Date: Thu, 8 Aug 2019 16:47:12 +0100
Subject: [PATCH 298/354] private variable $auth_override made protected.

This will avoid calling _auth_override_check() in case of need to check that info in the controller.
---
 application/libraries/REST_Controller.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index bcda5f63..5df718ce 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -239,7 +239,7 @@ trait REST_Controller {
     /**
      * @var bool
      */
-    private $auth_override;
+    protected $auth_override;
 
     /**
      * Extend this function to apply additional checking early on in the process
@@ -387,7 +387,7 @@ public function __construct($config = 'rest')
         if ($this->request->format && $this->request->body)
         {
             $this->request->body = Format::factory($this->request->body, $this->request->format)->to_array();
-            
+
         // Assign payload arguments to proper method container
             $this->{'_'.$this->request->method.'_args'} = $this->request->body;
         }

From 3ed956559303e4025371cfb70a10ff0d4d7a3561 Mon Sep 17 00:00:00 2001
From: Ray Li <ray.li.verified@gmail.com>
Date: Wed, 2 Oct 2019 01:11:24 -0500
Subject: [PATCH 299/354] QUICKFIX Continue Returns Response

Fixes issue #1023
The added lines returns the response to the client and allows code to continue executing.

`ob_end_flush; ` does not actually work correctly according to https://stackoverflow.com/questions/10579116/how-to-flush-data-to-browser-but-continue-executing
It is kept for legacy compatibility and to prevent regressions.
---
 application/libraries/REST_Controller.php | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/application/libraries/REST_Controller.php b/application/libraries/REST_Controller.php
index 5df718ce..ab836c3c 100644
--- a/application/libraries/REST_Controller.php
+++ b/application/libraries/REST_Controller.php
@@ -748,7 +748,19 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
             }
             else
             {
-                ob_end_flush();
+                if (is_callable('fastcgi_finish_request')) 
+                {
+                    // Terminates connection and returns response to client on PHP-FPM.
+                    $this->output->_display();
+                    ob_end_flush();
+                    fastcgi_finish_request();
+                    ignore_user_abort(true);
+                }
+                else
+                {
+                    // Legacy compatibility.
+                    ob_end_flush();
+                }
             }
 
             // Otherwise dump the output automatically
@@ -2213,4 +2225,4 @@ protected function _check_cors()
             exit;
         }
     }
-}
\ No newline at end of file
+}

From 67eaafb1cfb2ee0bb70034013b7359aaed11ac2f Mon Sep 17 00:00:00 2001
From: Salim Djerbouh <caddydz4@gmail.com>
Date: Thu, 3 Oct 2019 12:26:39 +0100
Subject: [PATCH 300/354] add import to handling requests example

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 7f54e719..7121a5f5 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,8 @@ When your controller extends from `REST_Controller`, the method names will be ap
 This allows you to implement a RESTful interface easily:
 
 ```php
+use Restserver\Libraries\REST_Controller;
+
 class Books extends CI_Controller
 {
    use REST_Controller {

From fd04c3b44b02e78e5b61f663f36bb7a56e4f4ce2 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chris@cowdog.io>
Date: Sun, 10 Nov 2019 13:56:25 -0600
Subject: [PATCH 301/354] latest changes for 3.1

---
 .codeclimate.yml                              |    3 -
 AUTHORS.md                                    |   10 -
 CHANGELOG.md                                  |   66 -
 README.md                                     |  271 +-
 application/config/config.php.sample          |  482 --
 application/config/hooks.php                  |   21 -
 application/config/ldap.php                   |   15 -
 application/config/profiler.php               |   26 -
 application/config/routes.php                 |   62 -
 application/controllers/Rest_server.php       |   13 -
 application/controllers/Welcome.php           |   27 -
 application/controllers/api/Example.php       |  140 -
 application/controllers/api/Key.php           |  274 --
 application/helpers/db_helper.php             |   69 -
 application/hooks/hooks.profiler.php          |   18 -
 .../language/dutch/rest_controller_lang.php   |   16 -
 application/language/spanish/index.html       |   11 -
 .../language/traditional-chinese/index.html   |   11 -
 application/language/turkish/index.html       |   11 -
 .../libraries/REST_Controller_Definitions.php |  138 -
 application/libraries/index.html              |   11 -
 .../20170706025420_create_table_users.php     |   69 -
 .../20170706030520_create_table_api_keys.php  |   70 -
 .../20170706031435_create_table_api_logs.php  |   76 -
 ...20170706032133_create_table_api_access.php |   63 -
 ...20170706032825_create_table_api_limits.php |   58 -
 application/migrations/index.html             |   11 -
 application/views/index.html                  |   11 -
 application/views/rest_server.php             |  222 -
 application/views/welcome_message.php         |  101 -
 composer.json                                 |   42 +-
 documentation/404.html                        |  110 -
 documentation/class-Example.html              |  457 --
 documentation/class-Format.html               |  983 ----
 documentation/class-Key.html                  |  512 ---
 documentation/class-REST_Controller.html      | 3956 -----------------
 documentation/class-Rest_server.html          |  190 -
 documentation/class-Welcome.html              |  203 -
 documentation/elementlist.js                  |    3 -
 documentation/index.html                      |  131 -
 .../package-CodeIgniter.Libraries.html        |  117 -
 documentation/package-CodeIgniter.Rest.html   |  123 -
 documentation/package-CodeIgniter.html        |  113 -
 documentation/package-None.html               |  127 -
 documentation/resources/collapsed.png         |  Bin 238 -> 0 bytes
 documentation/resources/combined.js           | 1315 ------
 documentation/resources/footer.png            |  Bin 7948 -> 0 bytes
 documentation/resources/inherit.png           |  Bin 152 -> 0 bytes
 documentation/resources/resize.png            |  Bin 216 -> 0 bytes
 documentation/resources/sort.png              |  Bin 171 -> 0 bytes
 documentation/resources/style.css             |  614 ---
 documentation/resources/tree-cleaner.png      |  Bin 126 -> 0 bytes
 documentation/resources/tree-hasnext.png      |  Bin 128 -> 0 bytes
 documentation/resources/tree-last.png         |  Bin 172 -> 0 bytes
 documentation/resources/tree-vertical.png     |  Bin 127 -> 0 bytes
 documentation/source-class-Example.html       |  242 -
 documentation/source-class-Format.html        |  636 ---
 documentation/source-class-Key.html           |  377 --
 .../source-class-REST_Controller.html         | 2316 ----------
 documentation/source-class-Rest_server.html   |  118 -
 documentation/source-class-Welcome.html       |  132 -
 .../config => language/bulgarian}/index.html  |    0
 .../bulgarian/rest_controller_lang.php        |    0
 .../api => language/dutch}/index.html         |    0
 language/dutch/rest_controller_lang.php       |   16 +
 .../english}/index.html                       |    0
 .../english/rest_controller_lang.php          |    0
 .../helpers => language/french}/index.html    |    0
 .../french/rest_controller_lang.php           |    2 +-
 .../bulgarian => language/german}/index.html  |    0
 .../german/rest_controller_lang.php           |    2 +-
 .../greek/rest_controller_lang.php            |    2 +-
 .../language/dutch => language}/index.html    |    0
 .../english => language/indonesia}/index.html |    0
 .../indonesia/rest_controller_lang.php        |    0
 .../french => language/italian}/index.html    |    0
 .../italian/rest_controller_lang.php          |    0
 .../german => language/korean}/index.html     |    0
 .../korean/rest_controller_lang.php           |    2 +-
 .../portuguese-brazilian}/index.html          |    0
 .../rest_controller_lang.php                  |    0
 .../romanian}/index.html                      |    0
 .../romanian/rest_controller_lang.php         |    2 +-
 .../serbian_cyr}/index.html                   |    0
 .../serbian_cyr/rest_controller_lang.php      |    2 +-
 .../serbian_lat}/index.html                   |    0
 .../serbian_lat/rest_controller_lang.php      |    0
 .../simplified-chinese/index.html             |    0
 .../rest_controller_lang.php                  |    2 +-
 .../spanish}/index.html                       |    0
 .../spanish/rest_controller_lang.php          |    2 +-
 .../traditional-chinese}/index.html           |    0
 .../rest_controller_lang.php                  |    0
 .../turkish}/index.html                       |    0
 .../turkish/rest_controller_lang.php          |    0
 {application/libraries => src}/Format.php     |  268 +-
 .../RestController.php                        | 1318 +++---
 src/auth/apikey.php                           |    0
 src/auth/basic.php                            |    0
 src/auth/ldap.php                             |    0
 .../language/serbian_lat => src}/index.html   |    0
 {application/config => src}/rest.php          |   11 +-
 102 files changed, 768 insertions(+), 16054 deletions(-)
 delete mode 100644 .codeclimate.yml
 delete mode 100644 AUTHORS.md
 delete mode 100644 CHANGELOG.md
 delete mode 100644 application/config/config.php.sample
 delete mode 100644 application/config/hooks.php
 delete mode 100644 application/config/ldap.php
 delete mode 100644 application/config/profiler.php
 delete mode 100644 application/config/routes.php
 delete mode 100644 application/controllers/Rest_server.php
 delete mode 100644 application/controllers/Welcome.php
 delete mode 100644 application/controllers/api/Example.php
 delete mode 100644 application/controllers/api/Key.php
 delete mode 100755 application/helpers/db_helper.php
 delete mode 100644 application/hooks/hooks.profiler.php
 delete mode 100644 application/language/dutch/rest_controller_lang.php
 delete mode 100644 application/language/spanish/index.html
 delete mode 100644 application/language/traditional-chinese/index.html
 delete mode 100644 application/language/turkish/index.html
 delete mode 100644 application/libraries/REST_Controller_Definitions.php
 delete mode 100755 application/libraries/index.html
 delete mode 100644 application/migrations/20170706025420_create_table_users.php
 delete mode 100644 application/migrations/20170706030520_create_table_api_keys.php
 delete mode 100644 application/migrations/20170706031435_create_table_api_logs.php
 delete mode 100644 application/migrations/20170706032133_create_table_api_access.php
 delete mode 100644 application/migrations/20170706032825_create_table_api_limits.php
 delete mode 100644 application/migrations/index.html
 delete mode 100644 application/views/index.html
 delete mode 100644 application/views/rest_server.php
 delete mode 100644 application/views/welcome_message.php
 delete mode 100644 documentation/404.html
 delete mode 100644 documentation/class-Example.html
 delete mode 100644 documentation/class-Format.html
 delete mode 100644 documentation/class-Key.html
 delete mode 100644 documentation/class-REST_Controller.html
 delete mode 100644 documentation/class-Rest_server.html
 delete mode 100644 documentation/class-Welcome.html
 delete mode 100644 documentation/elementlist.js
 delete mode 100644 documentation/index.html
 delete mode 100644 documentation/package-CodeIgniter.Libraries.html
 delete mode 100644 documentation/package-CodeIgniter.Rest.html
 delete mode 100644 documentation/package-CodeIgniter.html
 delete mode 100644 documentation/package-None.html
 delete mode 100644 documentation/resources/collapsed.png
 delete mode 100644 documentation/resources/combined.js
 delete mode 100644 documentation/resources/footer.png
 delete mode 100644 documentation/resources/inherit.png
 delete mode 100644 documentation/resources/resize.png
 delete mode 100644 documentation/resources/sort.png
 delete mode 100644 documentation/resources/style.css
 delete mode 100644 documentation/resources/tree-cleaner.png
 delete mode 100644 documentation/resources/tree-hasnext.png
 delete mode 100644 documentation/resources/tree-last.png
 delete mode 100644 documentation/resources/tree-vertical.png
 delete mode 100644 documentation/source-class-Example.html
 delete mode 100644 documentation/source-class-Format.html
 delete mode 100644 documentation/source-class-Key.html
 delete mode 100644 documentation/source-class-REST_Controller.html
 delete mode 100644 documentation/source-class-Rest_server.html
 delete mode 100644 documentation/source-class-Welcome.html
 rename {application/config => language/bulgarian}/index.html (100%)
 rename {application/language => language}/bulgarian/rest_controller_lang.php (100%)
 rename {application/controllers/api => language/dutch}/index.html (100%)
 create mode 100644 language/dutch/rest_controller_lang.php
 rename {application/controllers => language/english}/index.html (100%)
 rename {application/language => language}/english/rest_controller_lang.php (100%)
 rename {application/helpers => language/french}/index.html (100%)
 rename {application/language => language}/french/rest_controller_lang.php (94%)
 rename {application/language/bulgarian => language/german}/index.html (100%)
 rename {application/language => language}/german/rest_controller_lang.php (94%)
 rename {application/language => language}/greek/rest_controller_lang.php (95%)
 rename {application/language/dutch => language}/index.html (100%)
 rename {application/language/english => language/indonesia}/index.html (100%)
 rename {application/language => language}/indonesia/rest_controller_lang.php (100%)
 rename {application/language/french => language/italian}/index.html (100%)
 rename {application/language => language}/italian/rest_controller_lang.php (100%)
 rename {application/language/german => language/korean}/index.html (100%)
 rename {application/language => language}/korean/rest_controller_lang.php (98%)
 rename {application/language => language/portuguese-brazilian}/index.html (100%)
 rename {application/language => language}/portuguese-brazilian/rest_controller_lang.php (100%)
 rename {application/language/indonesia => language/romanian}/index.html (100%)
 rename {application/language => language}/romanian/rest_controller_lang.php (93%)
 rename {application/language/italian => language/serbian_cyr}/index.html (100%)
 rename {application/language => language}/serbian_cyr/rest_controller_lang.php (96%)
 rename {application/language/korean => language/serbian_lat}/index.html (100%)
 rename {application/language => language}/serbian_lat/rest_controller_lang.php (100%)
 rename {application/language => language}/simplified-chinese/index.html (100%)
 rename {application/language => language}/simplified-chinese/rest_controller_lang.php (93%)
 rename {application/language/portuguese-brazilian => language/spanish}/index.html (100%)
 rename {application/language => language}/spanish/rest_controller_lang.php (92%)
 rename {application/language/romanian => language/traditional-chinese}/index.html (100%)
 rename {application/language => language}/traditional-chinese/rest_controller_lang.php (100%)
 rename {application/language/serbian_cyr => language/turkish}/index.html (100%)
 rename {application/language => language}/turkish/rest_controller_lang.php (100%)
 rename {application/libraries => src}/Format.php (68%)
 rename application/libraries/REST_Controller.php => src/RestController.php (63%)
 create mode 100644 src/auth/apikey.php
 create mode 100644 src/auth/basic.php
 create mode 100644 src/auth/ldap.php
 rename {application/language/serbian_lat => src}/index.html (100%)
 mode change 100644 => 100755
 rename {application/config => src}/rest.php (99%)

diff --git a/.codeclimate.yml b/.codeclimate.yml
deleted file mode 100644
index b1059fca..00000000
--- a/.codeclimate.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-exclude_paths:
-- "documentation/"
-- "application/language/"
\ No newline at end of file
diff --git a/AUTHORS.md b/AUTHORS.md
deleted file mode 100644
index ee3551f6..00000000
--- a/AUTHORS.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# The Core Team
-
-* [Chris Kacerguis](//github.com/chriskacerguis)
-* [Phil Sturgeon](//github.com/philsturgeon)
-
-### Special Thanks To
-
-* [Fabian Hanisch](//github.com/Hanisch-IT)
-
-*For a list of people who have contributed to the codebase, see [GitHub's list of contributors](https://github.com/chriskacerguis/codeigniter-restserver/graphs/contributors).  Anyone who has contributed please do a PR and add to this file.*
diff --git a/CHANGELOG.md b/CHANGELOG.md
deleted file mode 100644
index ce83aeda..00000000
--- a/CHANGELOG.md
+++ /dev/null
@@ -1,66 +0,0 @@
-Changelog:
-===========
-
-### UNRELEASED
-* Added support for CodeIgniter controller's index methods (index_GET, index_POST...)
-* Added exceptions handling when the method could not be found
-
-### 2.7.2
-
-* Added $this->query() in which query parameters can now be obtained regardless of whether a GET request is sent or not
-* Added doc comments added to functions
-* Added HTTP status constants e.g. REST_Controller::HTTP_OK
-* Added new CSV formatting function
-* Fixed numerous bug fixes
-* Updated API calls limit can be based on API key, routed url or method name
-* Updated documentation
-* Updated examples (thanks @ivantcholakov and @lagaisse)
-* Updated many functions by re-writing (thanks @softwarespot)
-* Updated performance increase
-
-### 2.7.0
-
-* Added Blacklist IP option
-* Added controller based access controls
-* Added support for OPTIONS, PATCH, and HEAD (from boh1996)
-* Added logging of the time it takes for a request (rtime column in DB)
-* Changed DB schemas to use InnoDB, not MyISAM
-* Updated Readme to reflect new developer (Chris Kacerguis)
-
-### 2.6.2
-
-* Update CodeIgniter files to 2.1.3
-* Fixed issue #165
-
-### 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 bug-fix 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.
-* Response where method doesn't exist is now "HTTP 405 Method Not Allowed", not "HTTP 404 Not Found".
-* Compatible with PHP 5.4.
-* Added support for gzip compression.
-* Fix the apache\_request\_header function with CGI.
-* Fixed up correctly .foo extensions to work when get arguments provided.
-* Allows method emulation via X-HTTP-Method-Override
-* Support for Backbone.emulateHTTP improved.
-* Combine both URI segment and GET params instead of using one or the other
-* Separate each piece of the WWW-Authenticate header for digest requests with a comma.
-* Added IP white-list option.
-
-### 2.5
-
-* Instead of just seeing item, item, item, the singular version of the base-node will be used if possible. [Example](http://d.pr/RS46).
-* Re-factored to use the Format library, which will soon be merged with CodeIgniter.
-* Fixed Limit bug (limit of 5 would allow 6 requests).
-* Added logging for invalid API key requests.
-* Changed serialize to serialized.
diff --git a/README.md b/README.md
index 7121a5f5..4955bb84 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,26 @@
+# CodeIgniter RestServer
 
-# CodeIgniter Rest Server
+[![StyleCI](https://github.styleci.io/repos/219224674/shield?branch=master)](https://github.styleci.io/repos/219224674)
 
-[![Gitter chat](https://badges.gitter.im/chriskacerguis/codeigniter-restserver.png)](https://gitter.im/codeigniter-restserver/Lobby)
-
-A fully RESTful server implementation for CodeIgniter using one library, one
-config file and one controller.
+A fully RESTful server implementation for CodeIgniter using one library, one config file and one controller.
 
 ## Requirements
 
-1. PHP 7.2 or greater
-2. CodeIgniter 3.1.10+
-
-_Note: for 1.7.x support download v2.2 from Downloads tab_
-
-## Important Update on 4.0.0
+- PHP 7.2 or greater
+- CodeIgniter 3.1.11+
 
-Please note that version 4.0.0 is in the works, and is considered a breaking change (per SemVer).  As CI 3.1.0 now has native support for Composer, this library will be moving to be composer based.
+## Installation
 
-Take a look at the "development" branch to see what's up.
+```sh
+composer require chriskacerguis/ci-restserver
+```
 
-## Installation & loading
+## Usage
 
 CodeIgniter Rest Server is available on [Packagist](https://packagist.org/packages/chriskacerguis/codeigniter-restserver) (using semantic versioning), and installation via composer is the recommended way to install Codeigniter Rest Server. Just add this line to your `composer.json` file:
 
 ```json
-"chriskacerguis/codeigniter-restserver": "^3.0"
+"chriskacerguis/codeigniter-restserver": "^3.1"
 ```
 
 or run
@@ -33,212 +29,63 @@ or run
 composer require chriskacerguis/codeigniter-restserver
 ```
 
-## Handling Requests
-
-When your controller extends from `REST_Controller`, the method names will be appended with the HTTP method used to access the request. If you're  making an HTTP `GET` call to `/books`, for instance, it would call a `Books#index_get()` method.
-
-This allows you to implement a RESTful interface easily:
-
-```php
-use Restserver\Libraries\REST_Controller;
-
-class Books extends CI_Controller
-{
-   use REST_Controller {
-    REST_Controller::__construct as private __resTraitConstruct;
-  }
-  public function index_get()
-  {
-    // Display all books
-  }
-
-  public function index_post()
-  {
-    // Create a new book
-  }
-}
-```
-
-`REST_Controller` also supports `PUT` and `DELETE` methods, allowing you to support a truly RESTful interface.
-
-
-Accessing parameters is also easy. Simply use the name of the HTTP verb as a method:
-
-```php
-$this->get('blah'); // GET param
-$this->post('blah'); // POST param
-$this->put('blah'); // PUT param
-```
-
-The HTTP spec for DELETE requests precludes the use of parameters.  For delete requests, you can add items to the URL
-
-```php
-public function index_delete($id)
-{
-  $this->response([
-    'returned from delete:' => $id,
-  ]);
-}
-```
-
-If query parameters are passed via the URL, regardless of whether it's a GET request, can be obtained by the query method:
-
-```php
-$this->query('blah'); // Query param
-```
-
-## Content Types
-
-`REST_Controller` supports a bunch of different request/response formats, including XML, JSON and serialised PHP. By default, the class will check the URL and look for a format either as an extension or as a separate segment.
-
-This means your URLs can look like this:
-```
-http://example.com/books.json
-http://example.com/books?format=json
-```
-
-This can be flaky with URI segments, so the recommend approach is using the HTTP `Accept` header:
-
-```bash
-$ curl -H "Accept: application/json" http://example.com
-```
-
-Any responses you make from the class (see [responses](#responses) for more on this) will be serialised in the designated format.
-
-## Responses
-
-The class provides a `response()` method that allows you to return data in the user's requested response format.
-
-Returning any object / array / string / whatever is easy:
-
-```php
-public function index_get()
-{
-  $this->response($this->db->get('books')->result());
-}
-```
-
-This will automatically return an `HTTP 200 OK` response. You can specify the status code in the second parameter:
+Step 1: Add this to your controller (should be before any of your code)
 
 ```php
-public function index_post()
-  {
-    // ...create new book
-    $this->response($book, 201); // Send an HTTP 201 Created
-  }
+use chriskacerguis\RestServer\RestController;
 ```
 
-If you don't specify a response code, and the data you respond with `== FALSE` (an empty array or string, for instance), the response code will automatically be set to `404 Not Found`:
+Step 2: Extend your controller
 
 ```php
-$this->response([]); // HTTP 404 Not Found
+class Example extends RestController
 ```
 
-## Configuration
-
-You can overwrite all default configurations by creating a rest.php file in your config folder with your configs. 
-All given configurations will overwrite the default ones.
-
-## Language
-
-You can overwrite all default language files. Just add a rest_controller_lang.php to your language and overwrite the what you want.
-
-
-## Multilingual Support
+## Basic GET example
 
-If your application uses language files to support multiple locales, `REST_Controller` will automatically parse the HTTP `Accept-Language` header and provide the language(s) in your actions. This information can be found in the `$this->response->lang` object:
+Here is a basic example of 
 
 ```php
-public function __construct()
-{
-  parent::__construct();
-  $this->__resTraitConstruct();
-
-  if (is_array($this->response->lang))
-  {
-    $this->load->language('application', $this->response->lang[0]);
-  }
-  else
-  {
-    $this->load->language('application', $this->response->lang);
-  }
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+use chriskacerguis\RestServer\RestController;
+
+class Example extends REST_Controller {
+
+    function __construct()
+    {
+        // Construct the parent class
+        parent::__construct();
+    }
+
+    public function users_get()
+    {
+        // Users from a data store e.g. database
+        $users = [
+            ['id' => 1, 'name' => 'John', 'email' => 'john@example.com'],
+            ['id' => 2, 'name' => 'Jim', 'email' => 'jim@example.com'],
+        ];
+
+        $id = $this->get('id');
+
+        if ($id === null)
+        {
+            // Check if the users data store contains users
+            if ($users)
+            {
+                // Set the response and exit
+                $this->response($users, 200);
+            }
+            else
+            {
+                // Set the response and exit
+                $this->response([
+                    'status' => false,
+                    'message' => 'No users were found'
+                ], 404);
+            }
+        }
+    }
 }
-```
-
-## Authentication
-
-This class also provides rudimentary support for HTTP basic authentication and/or the securer HTTP digest access authentication.
-
-You can enable basic authentication by setting the `$config['rest_auth']` to `'basic'`. The `$config['rest_valid_logins']` directive can then be used to set the usernames and passwords able to log in to your system. The class will automatically send all the correct headers to trigger the authentication dialogue:
-
-```php
-$config['rest_valid_logins'] = ['username' => 'password', 'other_person' => 'secure123'];
-```
-
-Enabling digest auth is similarly easy. Configure your desired logins in the config file like above, and set `$config['rest_auth']` to `'digest'`. The class will automatically send out the headers to enable digest auth.
-
-If you're tying this library into an AJAX endpoint where clients authenticate using PHP sessions then you may not like either of the digest nor basic authentication methods. In that case, you can tell the REST Library what PHP session variable to check for. If the variable exists, then the user is authorized. It will be up to your application to set that variable. You can define the variable in ``$config['auth_source']``.  Then tell the library to use a php session variable by setting ``$config['rest_auth']`` to ``session``.
-
-All three methods of authentication can be secured further by using an IP white-list. If you enable `$config['rest_ip_whitelist_enabled']` in your config file, you can then set a list of allowed IPs.
-
-Any client connecting to your API will be checked against the white-listed IP array. If they're on the list, they'll be allowed access. If not, sorry, no can do hombre. The whitelist is a comma-separated string:
-
-```php
-$config['rest_ip_whitelist'] = '123.456.789.0, 987.654.32.1';
-```
-
-Your localhost IPs (`127.0.0.1` and `0.0.0.0`) are allowed by default.
-
-## API Keys
-
-In addition to the authentication methods above, the `REST_Controller` class also supports the use of API keys. Enabling API keys is easy. Turn it on in your **config/rest.php** file:
-
-```php
-$config['rest_enable_keys'] = TRUE;
-```
-
-You'll need to create a new database table to store and access the keys. `REST_Controller` will automatically assume you have a table that looks like this:
-
-```sql
-CREATE TABLE `keys` (
-  `id` INT(11) NOT NULL AUTO_INCREMENT,
-  `key` VARCHAR(40) NOT NULL,
-  `level` INT(2) NOT NULL,
-  `ignore_limits` TINYINT(1) NOT NULL DEFAULT '0',
-  `date_created` INT(11) NOT NULL,
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-```
-
-The class will look for an HTTP header with the API key on each request. An invalid or missing API key will result in an `HTTP 403 Forbidden`.
-
-By default, the HTTP will be `X-API-KEY`. This can be configured in **config/rest.php**.
-
-```bash
-$ curl -X POST -H "X-API-KEY: some_key_here" http://example.com/books
-```
-## Profiling
-Codeigniter Profiler feature has been added to the library, so that you can use the power of CI profiler in your project just by setting config parameter to enable profile through out your application
-Turn it on in your **config/config.php** file:
-
-```php
-TRUE to turn profile ON, FALSE to turn it off
-$config['enable_profiling'] = FALSE;
-```
-Also you need to enable `hooks` in your config.php that looks like this
-```php
-$config['enable_hooks'] = TRUE;
-```
-Also you can refer to **config/config.php.sample** 
-
-## Other Documentation / Tutorials
-
-* [NetTuts: Working with RESTful Services in CodeIgniter](http://net.tutsplus.com/tutorials/php/working-with-restful-services-in-codeigniter-2/)
-
-## Contributions
-
-This project was originally written by Phil Sturgeon, however his involvement has shifted
-as he is no longer using it.  As of 2013/11/20 further development and support will be done by Chris Kacerguis.
-
-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.
+```
\ No newline at end of file
diff --git a/application/config/config.php.sample b/application/config/config.php.sample
deleted file mode 100644
index 77411ce1..00000000
--- a/application/config/config.php.sample
+++ /dev/null
@@ -1,482 +0,0 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/*
-|--------------------------------------------------------------------------
-| Base Site URL
-|--------------------------------------------------------------------------
-|
-| URL to your CodeIgniter root. Typically this will be your base URL,
-| WITH a trailing slash:
-|
-|	http://example.com/
-|
-| WARNING: You MUST set this value!
-|
-| If it is not set, then CodeIgniter will try guess the protocol and path
-| your installation, but due to security concerns the hostname will be set
-| to $_SERVER['SERVER_ADDR'] if available, or localhost otherwise.
-| The auto-detection mechanism exists only for convenience during
-| development and MUST NOT be used in production!
-|
-| If you need to allow multiple domains, remember that this file is still
-| a PHP script and you can easily do that on your own.
-|
-*/
-$config['base_url'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Index File
-|--------------------------------------------------------------------------
-|
-| Typically this will be your index.php file, unless you've renamed it to
-| something else. If you are using mod_rewrite to remove the page set this
-| variable so that it is blank.
-|
-*/
-$config['index_page'] = 'index.php';
-
-/*
-|--------------------------------------------------------------------------
-| URI PROTOCOL
-|--------------------------------------------------------------------------
-|
-| This item determines which server global should be used to retrieve the
-| URI string.  The default setting of 'REQUEST_URI' works for most servers.
-| If your links do not seem to work, try one of the other delicious flavors:
-|
-| 'REQUEST_URI'    Uses $_SERVER['REQUEST_URI']
-| 'QUERY_STRING'   Uses $_SERVER['QUERY_STRING']
-| 'PATH_INFO'      Uses $_SERVER['PATH_INFO']
-|
-| WARNING: If you set this to 'PATH_INFO', URIs will always be URL-decoded!
-*/
-$config['uri_protocol']	= 'REQUEST_URI';
-
-/*
-|--------------------------------------------------------------------------
-| URL suffix
-|--------------------------------------------------------------------------
-|
-| This option allows you to add a suffix to all URLs generated by CodeIgniter.
-| For more information please see the user guide:
-|
-| https://codeigniter.com/user_guide/general/urls.html
-|
-| Note: This option is ignored for CLI requests.
-*/
-$config['url_suffix'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Default Language
-|--------------------------------------------------------------------------
-|
-| This determines which set of language files should be used. Make sure
-| there is an available translation if you intend to use something other
-| than english.
-|
-*/
-$config['language']	= 'english';
-
-/*
-|--------------------------------------------------------------------------
-| Default Character Set
-|--------------------------------------------------------------------------
-|
-| This determines which character set is used by default in various methods
-| that require a character set to be provided.
-|
-| See http://php.net/htmlspecialchars for a list of supported charsets.
-|
-*/
-$config['charset'] = 'UTF-8';
-
-/*
-|--------------------------------------------------------------------------
-| Enable/Disable System Hooks
-|--------------------------------------------------------------------------
-|
-| If you would like to use the 'hooks' feature you must enable it by
-| setting this variable to TRUE (boolean).  See the user guide for details.
-|
-*/
-$config['enable_hooks'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Enable/Disable System Profling
-|--------------------------------------------------------------------------
-|
-| If you would like to use the 'profiling' feature you must enable it by
-| setting this variable to TRUE (boolean).
-|
-*/
-$config['enable_profiling'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Class Extension Prefix
-|--------------------------------------------------------------------------
-|
-| This item allows you to set the filename/classname prefix when extending
-| native libraries.  For more information please see the user guide:
-|
-| https://codeigniter.com/user_guide/general/core_classes.html
-| https://codeigniter.com/user_guide/general/creating_libraries.html
-|
-*/
-$config['subclass_prefix'] = 'MY_';
-
-/*
-|--------------------------------------------------------------------------
-| Composer auto-loading
-|--------------------------------------------------------------------------
-|
-| Enabling this setting will tell CodeIgniter to look for a Composer
-| package auto-loader script in application/vendor/autoload.php.
-|
-|	$config['composer_autoload'] = TRUE;
-|
-| Or if you have your vendor/ directory located somewhere else, you
-| can opt to set a specific path as well:
-|
-|	$config['composer_autoload'] = '/path/to/vendor/autoload.php';
-|
-| For more information about Composer, please visit http://getcomposer.org/
-|
-| Note: This will NOT disable or override the CodeIgniter-specific
-|	autoloading (application/config/autoload.php)
-*/
-$config['composer_autoload'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Allowed URL Characters
-|--------------------------------------------------------------------------
-|
-| This lets you specify which characters are permitted within your URLs.
-| When someone tries to submit a URL with disallowed characters they will
-| get a warning message.
-|
-| As a security measure you are STRONGLY encouraged to restrict URLs to
-| as few characters as possible.  By default only these are allowed: a-z 0-9~%.:_-
-|
-| Leave blank to allow all characters -- but only if you are insane.
-|
-| The configured value is actually a regular expression character group
-| and it will be executed as: ! preg_match('/^[<permitted_uri_chars>]+$/i
-|
-| DO NOT CHANGE THIS UNLESS YOU FULLY UNDERSTAND THE REPERCUSSIONS!!
-|
-| Note: This option is ignored for CLI requests.
-|
-*/
-$config['permitted_uri_chars'] = 'a-z 0-9~%.:_\-';
-
-/*
-|--------------------------------------------------------------------------
-| Enable Query Strings
-|--------------------------------------------------------------------------
-|
-| By default CodeIgniter uses search-engine friendly segment based URLs:
-| example.com/who/what/where/
-|
-| You can optionally enable standard query string based URLs:
-| example.com?who=me&what=something&where=here
-|
-| Options are: TRUE or FALSE (boolean)
-|
-| The other items let you set the query string 'words' that will
-| invoke your controllers and its functions:
-| example.com/index.php?c=controller&m=function
-|
-| Please note that some of the helpers won't work as expected when
-| this feature is enabled, since CodeIgniter is designed primarily to
-| use segment based URLs.
-|
-*/
-$config['enable_query_strings'] = FALSE;
-$config['controller_trigger'] = 'c';
-$config['function_trigger'] = 'm';
-$config['directory_trigger'] = 'd';
-
-/*
-|--------------------------------------------------------------------------
-| Error Logging Threshold
-|--------------------------------------------------------------------------
-|
-| You can enable error logging by setting a threshold over zero. The
-| threshold determines what gets logged. Threshold options are:
-|
-|	0 = Disables logging, Error logging TURNED OFF
-|	1 = Error Messages (including PHP errors)
-|	2 = Debug Messages
-|	3 = Informational Messages
-|	4 = All Messages
-|
-| You can also pass an array with threshold levels to show individual error types
-|
-| 	array(2) = Debug Messages, without Error Messages
-|
-| For a live site you'll usually only enable Errors (1) to be logged otherwise
-| your log files will fill up very fast.
-|
-*/
-$config['log_threshold'] = 0;
-
-/*
-|--------------------------------------------------------------------------
-| Error Logging Directory Path
-|--------------------------------------------------------------------------
-|
-| Leave this BLANK unless you would like to set something other than the default
-| application/logs/ directory. Use a full server path.
-|
-*/
-$config['log_path'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Log File Extension
-|--------------------------------------------------------------------------
-|
-| The default filename extension for log files. The default 'php' allows for
-| protecting the log files via basic scripting, when they are to be stored
-| under a publicly accessible directory.
-|
-| Note: Leaving it blank will default to 'php'.
-|
-*/
-$config['log_file_extension'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Log File Permissions
-|--------------------------------------------------------------------------
-|
-| The file system permissions to be applied on newly created log files.
-|
-| IMPORTANT: This MUST be an integer (no quotes) and you MUST use octal
-|            integer notation (i.e. 0700, 0644, etc.)
-*/
-$config['log_file_permissions'] = 0644;
-
-/*
-|--------------------------------------------------------------------------
-| Date Format for Logs
-|--------------------------------------------------------------------------
-|
-| Each item that is logged has an associated date. You can use PHP date
-| codes to set your own date formatting
-|
-*/
-$config['log_date_format'] = 'Y-m-d H:i:s';
-
-/*
-|--------------------------------------------------------------------------
-| Error Views Directory Path
-|--------------------------------------------------------------------------
-|
-| Leave this BLANK unless you would like to set something other than the default
-| application/views/errors/ directory.  Use a full server path.
-|
-*/
-$config['error_views_path'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Cache Directory Path
-|--------------------------------------------------------------------------
-|
-| Leave this BLANK unless you would like to set something other than the default
-| application/cache/ directory.  Use a full server path.
-|
-*/
-$config['cache_path'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Cache Include Query String
-|--------------------------------------------------------------------------
-|
-| Whether to take the URL query string into consideration when generating
-| output cache files. Valid options are:
-|
-|	FALSE      = Disabled
-|	TRUE       = Enabled, take all query parameters into account.
-|	             Please be aware that this may result in numerous cache
-|	             files generated for the same page over and over again.
-|	array('q') = Enabled, but only take into account the specified list
-|	             of query parameters.
-|
-*/
-$config['cache_query_string'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Encryption Key
-|--------------------------------------------------------------------------
-|
-| If you use the Encryption class, you must set an encryption key.
-| See the user guide for more info.
-|
-| https://codeigniter.com/user_guide/libraries/encryption.html
-|
-*/
-$config['encryption_key'] = '';
-
-/*
-|--------------------------------------------------------------------------
-| Session Variables
-|--------------------------------------------------------------------------
-|
-| 'sess_driver'
-|
-|	The storage driver to use: files, database, redis, memcached
-|
-| 'sess_cookie_name'
-|
-|	The session cookie name, must contain only [0-9a-z_-] characters
-|
-| 'sess_expiration'
-|
-|	The number of SECONDS you want the session to last.
-|	Setting to 0 (zero) means expire when the browser is closed.
-|
-| 'sess_save_path'
-|
-|	The location to save sessions to, driver dependent.
-|
-|	For the 'files' driver, it's a path to a writable directory.
-|	WARNING: Only absolute paths are supported!
-|
-|	For the 'database' driver, it's a table name.
-|	Please read up the manual for the format with other session drivers.
-|
-|	IMPORTANT: You are REQUIRED to set a valid save path!
-|
-| 'sess_match_ip'
-|
-|	Whether to match the user's IP address when reading the session data.
-|
-|	WARNING: If you're using the database driver, don't forget to update
-|	         your session table's PRIMARY KEY when changing this setting.
-|
-| 'sess_time_to_update'
-|
-|	How many seconds between CI regenerating the session ID.
-|
-| 'sess_regenerate_destroy'
-|
-|	Whether to destroy session data associated with the old session ID
-|	when auto-regenerating the session ID. When set to FALSE, the data
-|	will be later deleted by the garbage collector.
-|
-| Other session cookie settings are shared with the rest of the application,
-| except for 'cookie_prefix' and 'cookie_httponly', which are ignored here.
-|
-*/
-$config['sess_driver'] = 'files';
-$config['sess_cookie_name'] = 'ci_session';
-$config['sess_expiration'] = 7200;
-$config['sess_save_path'] = NULL;
-$config['sess_match_ip'] = FALSE;
-$config['sess_time_to_update'] = 300;
-$config['sess_regenerate_destroy'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Cookie Related Variables
-|--------------------------------------------------------------------------
-|
-| 'cookie_prefix'   = Set a cookie name prefix if you need to avoid collisions
-| 'cookie_domain'   = Set to .your-domain.com for site-wide cookies
-| 'cookie_path'     = Typically will be a forward slash
-| 'cookie_secure'   = Cookie will only be set if a secure HTTPS connection exists.
-| 'cookie_httponly' = Cookie will only be accessible via HTTP(S) (no javascript)
-|
-| Note: These settings (with the exception of 'cookie_prefix' and
-|       'cookie_httponly') will also affect sessions.
-|
-*/
-$config['cookie_prefix']	= '';
-$config['cookie_domain']	= '';
-$config['cookie_path']		= '/';
-$config['cookie_secure']	= FALSE;
-$config['cookie_httponly'] 	= FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Cross Site Request Forgery
-|--------------------------------------------------------------------------
-| Enables a CSRF cookie token to be set. When set to TRUE, token will be
-| checked on a submitted form. If you are accepting user data, it is strongly
-| recommended CSRF protection be enabled.
-|
-| 'csrf_token_name' = The token name
-| 'csrf_cookie_name' = The cookie name
-| 'csrf_expire' = The number in seconds the token should expire.
-| 'csrf_regenerate' = Regenerate token on every submission
-| 'csrf_exclude_uris' = Array of URIs which ignore CSRF checks
-*/
-$config['csrf_protection'] = FALSE;
-$config['csrf_token_name'] = 'csrf_test_name';
-$config['csrf_cookie_name'] = 'csrf_cookie_name';
-$config['csrf_expire'] = 7200;
-$config['csrf_regenerate'] = TRUE;
-$config['csrf_exclude_uris'] = array();
-
-/*
-|--------------------------------------------------------------------------
-| Output Compression
-|--------------------------------------------------------------------------
-|
-| Enables Gzip output compression for faster page loads.  When enabled,
-| the output class will test whether your server supports Gzip.
-| Even if it does, however, not all browsers support compression
-| so enable only if you are reasonably sure your visitors can handle it.
-|
-| Only used if zlib.output_compression is turned off in your php.ini.
-| Please do not use it together with httpd-level output compression.
-|
-| VERY IMPORTANT:  If you are getting a blank page when compression is enabled it
-| means you are prematurely outputting something to your browser. It could
-| even be a line of whitespace at the end of one of your scripts.  For
-| compression to work, nothing can be sent before the output buffer is called
-| by the output class.  Do not 'echo' any values with compression enabled.
-|
-*/
-$config['compress_output'] = FALSE;
-
-/*
-|--------------------------------------------------------------------------
-| Master Time Reference
-|--------------------------------------------------------------------------
-|
-| Options are 'local' or any PHP supported timezone. This preference tells
-| the system whether to use your server's local time as the master 'now'
-| reference, or convert it to the configured one timezone. See the 'date
-| helper' page of the user guide for information regarding date handling.
-|
-*/
-$config['time_reference'] = 'local';
-
-/*
-|--------------------------------------------------------------------------
-| Reverse Proxy IPs
-|--------------------------------------------------------------------------
-|
-| If your server is behind a reverse proxy, you must whitelist the proxy
-| IP addresses from which CodeIgniter should trust headers such as
-| HTTP_X_FORWARDED_FOR and HTTP_CLIENT_IP in order to properly identify
-| the visitor's IP address.
-|
-| You can use both an array or a comma-separated list of proxy addresses,
-| as well as specifying whole subnets. Here are a few examples:
-|
-| Comma-separated:	'10.0.1.200,192.168.5.0/24'
-| Array:		array('10.0.1.200', '192.168.5.0/24')
-*/
-$config['proxy_ips'] = '';
diff --git a/application/config/hooks.php b/application/config/hooks.php
deleted file mode 100644
index 7268904b..00000000
--- a/application/config/hooks.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/*
-| -------------------------------------------------------------------------
-| Hooks
-| -------------------------------------------------------------------------
-| This file lets you define "hooks" to extend CI without hacking the core
-| files.  Please see the user guide for info:
-|
-|	http://codeigniter.com/user_guide/general/hooks.html
-|
-*/
-// hook for enable/disable profiling
-$hook['post_controller_constructor'][] = array(
-	'class'    => 'ProfilerEnabler',
-	'function' => 'enableProfiler',
-	'filename' => 'hooks.profiler.php',
-	'filepath' => 'hooks',
-	'params'   => array()
-);
\ No newline at end of file
diff --git a/application/config/ldap.php b/application/config/ldap.php
deleted file mode 100644
index a54b985d..00000000
--- a/application/config/ldap.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-$config['binduser'] = 'cn=Authentication,ou=Services,dc=example,dc=org';
-$config['basedn'] = 'dc=example,dc=org';
-$config['bindpw'] = 'E984asdy2';
-/*
- * The host name parameter can be a space separated list of host names.
- * This means that the LDAP code will talk to a backup server if the main server is not operational.
- * There will be a delay while the code times out trying to talk to the main server but things will still work.
-*/
-$config['server'] = 'ldapserver1.example.org ldapserver2.example.org';
-$config['port'] = null;
-/*
- * Controls the LDAP_OPT_NETWORK_TIMEOUT option, this is how long the code will attempt to talk to the primary server if it is unreachable.
- */
-$config['timeout'] = 5;
\ No newline at end of file
diff --git a/application/config/profiler.php b/application/config/profiler.php
deleted file mode 100644
index 870880d9..00000000
--- a/application/config/profiler.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/*
-| -------------------------------------------------------------------------
-| Profiler Sections
-| -------------------------------------------------------------------------
-| This file lets you determine whether or not various sections of Profiler
-| data are displayed when the Profiler is enabled.
-| Please see the user guide for info:
-|
-|	http://codeigniter.com/user_guide/general/profiling.html
-|
-*/
-$config['benchmarks']           = true;
-$config['config']               = true;
-$config['controller_info']      = true;
-$config['get']                  = true;
-$config['http_headers']         = true;
-$config['memory_usage']         = true;
-$config['post']                 = true;
-$config['queries']              = true;
-$config['eloquent']             = false;
-$config['uri_string']           = true;
-$config['view_data']            = true;
-$config['query_toggle_count']   = 1000;
\ No newline at end of file
diff --git a/application/config/routes.php b/application/config/routes.php
deleted file mode 100644
index c0f8cee9..00000000
--- a/application/config/routes.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/*
-| -------------------------------------------------------------------------
-| URI ROUTING
-| -------------------------------------------------------------------------
-| This file lets you re-map URI requests to specific controller functions.
-|
-| Typically there is a one-to-one relationship between a URL string
-| and its corresponding controller class/method. The segments in a
-| URL normally follow this pattern:
-|
-| example.com/class/method/id/
-|
-| In some instances, however, you may want to remap this relationship
-| so that a different class/function is called than the one
-| corresponding to the URL.
-|
-| Please see the user guide for complete details:
-|
-| https://codeigniter.com/user_guide/general/routing.html
-|
-| -------------------------------------------------------------------------
-| RESERVED ROUTES
-| -------------------------------------------------------------------------
-|
-| There are three reserved routes:
-|
-| $route['default_controller'] = 'welcome';
-|
-| This route indicates which controller class should be loaded if the
-| URI contains no data. In the above example, the "welcome" class
-| would be loaded.
-|
-| $route['404_override'] = 'errors/page_missing';
-|
-| This route will tell the Router which controller/method to use if those
-| provided in the URL cannot be matched to a valid route.
-|
-| $route['translate_uri_dashes'] = FALSE;
-|
-| This is not exactly a route, but allows you to automatically route
-| controller and method names that contain dashes. '-' isn't a valid
-| class or method name character, so it requires translation.
-| When you set this option to TRUE, it will replace ALL dashes in the
-| controller and method URI segments.
-|
-| Examples: my-controller/index -> my_controller/index
-|   my-controller/my-method -> my_controller/my_method
-*/
-$route['default_controller'] = 'welcome';
-$route['404_override'] = '';
-$route['translate_uri_dashes'] = true;
-
-/*
-| -------------------------------------------------------------------------
-| Sample REST API Routes
-| -------------------------------------------------------------------------
-*/
-$route['api/example/users/(:num)'] = 'api/example/users/id/$1'; // Example 4
-$route['api/example/users/(:num)(\.)([a-zA-Z0-9_-]+)(.*)'] = 'api/example/users/id/$1/format/$3$4'; // Example 8
diff --git a/application/controllers/Rest_server.php b/application/controllers/Rest_server.php
deleted file mode 100644
index 5d44f921..00000000
--- a/application/controllers/Rest_server.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-class Rest_server extends CI_Controller {
-
-    public function index()
-    {
-        $this->load->helper('url');
-
-        $this->load->view('rest_server');
-    }
-}
diff --git a/application/controllers/Welcome.php b/application/controllers/Welcome.php
deleted file mode 100644
index 59818c7f..00000000
--- a/application/controllers/Welcome.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-class Welcome extends CI_Controller {
-
-	/**
-	 * Index Page for this controller.
-	 *
-	 * Maps to the following URL
-	 * 		http://example.com/index.php/welcome
-	 *	- or -
-	 * 		http://example.com/index.php/welcome/index
-	 *	- or -
-	 * Since this controller is set as the default controller in
-	 * config/routes.php, it's displayed at http://example.com/
-	 *
-	 * So any other public methods not prefixed with an underscore will
-	 * map to /index.php/welcome/<method_name>
-	 * @see https://codeigniter.com/user_guide/general/urls.html
-	 */
-	public function index()
-	{
-		$this->load->helper('url');
-
-		$this->load->view('welcome_message');
-	}
-}
diff --git a/application/controllers/api/Example.php b/application/controllers/api/Example.php
deleted file mode 100644
index 3b6de553..00000000
--- a/application/controllers/api/Example.php
+++ /dev/null
@@ -1,140 +0,0 @@
-<?php
-use Restserver\Libraries\REST_Controller;
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-// This can be removed if you use __autoload() in config.php OR use Modular Extensions
-/** @noinspection PhpIncludeInspection */
-//To Solve File REST_Controller not found
-require APPPATH . 'libraries/REST_Controller.php';
-require APPPATH . 'libraries/Format.php';
-
-/**
- * This is an example of a few basic user interaction methods you could use
- * all done with a hardcoded array
- *
- * @package         CodeIgniter
- * @subpackage      Rest Server
- * @category        Controller
- * @author          Phil Sturgeon, Chris Kacerguis
- * @license         MIT
- * @link            https://github.com/chriskacerguis/codeigniter-restserver
- */
-class Example extends REST_Controller {
-
-    function __construct()
-    {
-        // Construct the parent class
-        parent::__construct();
-
-        // Configure limits on our controller methods
-        // Ensure you have created the 'limits' table and enabled 'limits' within application/config/rest.php
-        $this->methods['users_get']['limit'] = 500; // 500 requests per hour per user/key
-        $this->methods['users_post']['limit'] = 100; // 100 requests per hour per user/key
-        $this->methods['users_delete']['limit'] = 50; // 50 requests per hour per user/key
-    }
-
-    public function users_get()
-    {
-        // Users from a data store e.g. database
-        $users = [
-            ['id' => 1, 'name' => 'John', 'email' => 'john@example.com', 'fact' => 'Loves coding'],
-            ['id' => 2, 'name' => 'Jim', 'email' => 'jim@example.com', 'fact' => 'Developed on CodeIgniter'],
-            ['id' => 3, 'name' => 'Jane', 'email' => 'jane@example.com', 'fact' => 'Lives in the USA', ['hobbies' => ['guitar', 'cycling']]],
-        ];
-
-        $id = $this->get('id');
-
-        // If the id parameter doesn't exist return all the users
-
-        if ($id === null)
-        {
-            // Check if the users data store contains users (in case the database result returns NULL)
-            if ($users)
-            {
-                // Set the response and exit
-                $this->response($users, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
-            }
-            else
-            {
-                // Set the response and exit
-                $this->response([
-                    'status' => false,
-                    'message' => 'No users were found'
-                ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
-            }
-        }
-
-        // Find and return a single record for a particular user.
-
-        $id = (int) $id;
-
-        // Validate the id.
-        if ($id <= 0)
-        {
-            // Invalid id, set the response and exit.
-            $this->response(null, REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
-        }
-
-        // Get the user from the array, using the id as key for retrieval.
-        // Usually a model is to be used for this.
-
-        $user = null;
-
-        if (!empty($users))
-        {
-            foreach ($users as $key => $value)
-            {
-                if (isset($value['id']) && $value['id'] === $id)
-                {
-                    $user = $value;
-                }
-            }
-        }
-
-        if (!empty($user))
-        {
-            $this->set_response($user, REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
-        }
-        else
-        {
-            $this->set_response([
-                'status' => false,
-                'message' => 'User could not be found'
-            ], REST_Controller::HTTP_NOT_FOUND); // NOT_FOUND (404) being the HTTP response code
-        }
-    }
-
-    public function users_post()
-    {
-        // $this->some_model->update_user( ... );
-        $message = [
-            'id' => 100, // Automatically generated by the model
-            'name' => $this->post('name'),
-            'email' => $this->post('email'),
-            'message' => 'Added a resource'
-        ];
-
-        $this->set_response($message, REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
-    }
-
-    public function users_delete()
-    {
-        $id = (int) $this->get('id');
-
-        // Validate the id.
-        if ($id <= 0)
-        {
-            // Set the response and exit
-            $this->response(null, REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
-        }
-
-        // $this->some_model->delete_something($id);
-        $message = [
-            'id' => $id,
-            'message' => 'Deleted the resource'
-        ];
-
-        $this->set_response($message, REST_Controller::HTTP_NO_CONTENT); // NO_CONTENT (204) being the HTTP response code
-    }
-
-}
diff --git a/application/controllers/api/Key.php b/application/controllers/api/Key.php
deleted file mode 100644
index 585f9f60..00000000
--- a/application/controllers/api/Key.php
+++ /dev/null
@@ -1,274 +0,0 @@
-<?php
-use Restserver\Libraries\REST_Controller;
-
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-// This can be removed if you use __autoload() in config.php OR use Modular Extensions
-/** @noinspection PhpIncludeInspection */
-//require APPPATH . '/libraries/REST_Controller.php';
-
-/**
- * Keys Controller
- * This is a basic Key Management REST controller to make and delete keys
- *
- * @package         CodeIgniter
- * @subpackage      Rest Server
- * @category        Controller
- * @author          Phil Sturgeon, Chris Kacerguis
- * @license         MIT
- * @link            https://github.com/chriskacerguis/codeigniter-restserver
- */
-class Key extends REST_Controller {
-
-    protected $methods = [
-            'index_put' => ['level' => 10, 'limit' => 10],
-            'index_delete' => ['level' => 10],
-            'level_post' => ['level' => 10],
-            'regenerate_post' => ['level' => 10],
-        ];
-
-    /**
-     * Insert a key into the database
-     *
-     * @access public
-     * @return void
-     */
-    public function index_put()
-    {
-        // Build a new key
-        $key = $this->_generate_key();
-
-        // If no key level provided, provide a generic key
-        $level = $this->put('level') ? $this->put('level') : 1;
-        $ignore_limits = ctype_digit($this->put('ignore_limits')) ? (int) $this->put('ignore_limits') : 1;
-
-        // Insert the new key
-        if ($this->_insert_key($key, ['level' => $level, 'ignore_limits' => $ignore_limits]))
-        {
-            $this->response([
-                'status' => true,
-                'key' => $key
-            ], REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
-        }
-        else
-        {
-            $this->response([
-                'status' => false,
-                'message' => 'Could not save the key'
-            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
-        }
-    }
-
-    /**
-     * Remove a key from the database to stop it working
-     *
-     * @access public
-     * @return void
-     */
-    public function index_delete()
-    {
-        $key = $this->delete('key');
-
-        // Does this key exist?
-        if (!$this->_key_exists($key))
-        {
-            // It doesn't appear the key exists
-            $this->response([
-                'status' => false,
-                'message' => 'Invalid API key'
-            ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
-        }
-
-        // Destroy it
-        $this->_delete_key($key);
-
-        // Respond that the key was destroyed
-        $this->response([
-            'status' => true,
-            'message' => 'API key was deleted'
-            ], REST_Controller::HTTP_NO_CONTENT); // NO_CONTENT (204) being the HTTP response code
-    }
-
-    /**
-     * Change the level
-     *
-     * @access public
-     * @return void
-     */
-    public function level_post()
-    {
-        $key = $this->post('key');
-        $new_level = $this->post('level');
-
-        // Does this key exist?
-        if (!$this->_key_exists($key))
-        {
-            // It doesn't appear the key exists
-            $this->response([
-                'status' => false,
-                'message' => 'Invalid API key'
-            ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
-        }
-
-        // Update the key level
-        if ($this->_update_key($key, ['level' => $new_level]))
-        {
-            $this->response([
-                'status' => true,
-                'message' => 'API key was updated'
-            ], REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
-        }
-        else
-        {
-            $this->response([
-                'status' => false,
-                'message' => 'Could not update the key level'
-            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
-        }
-    }
-
-    /**
-     * Suspend a key
-     *
-     * @access public
-     * @return void
-     */
-    public function suspend_post()
-    {
-        $key = $this->post('key');
-
-        // Does this key exist?
-        if (!$this->_key_exists($key))
-        {
-            // It doesn't appear the key exists
-            $this->response([
-                'status' => false,
-                'message' => 'Invalid API key'
-            ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
-        }
-
-        // Update the key level
-        if ($this->_update_key($key, ['level' => 0]))
-        {
-            $this->response([
-                'status' => true,
-                'message' => 'Key was suspended'
-            ], REST_Controller::HTTP_OK); // OK (200) being the HTTP response code
-        }
-        else
-        {
-            $this->response([
-                'status' => false,
-                'message' => 'Could not suspend the user'
-            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
-        }
-    }
-
-    /**
-     * Regenerate a key
-     *
-     * @access public
-     * @return void
-     */
-    public function regenerate_post()
-    {
-        $old_key = $this->post('key');
-        $key_details = $this->_get_key($old_key);
-
-        // Does this key exist?
-        if (!$key_details)
-        {
-            // It doesn't appear the key exists
-            $this->response([
-                'status' => false,
-                'message' => 'Invalid API key'
-            ], REST_Controller::HTTP_BAD_REQUEST); // BAD_REQUEST (400) being the HTTP response code
-        }
-
-        // Build a new key
-        $new_key = $this->_generate_key();
-
-        // Insert the new key
-        if ($this->_insert_key($new_key, ['level' => $key_details->level, 'ignore_limits' => $key_details->ignore_limits]))
-        {
-            // Suspend old key
-            $this->_update_key($old_key, ['level' => 0]);
-
-            $this->response([
-                'status' => true,
-                'key' => $new_key
-            ], REST_Controller::HTTP_CREATED); // CREATED (201) being the HTTP response code
-        }
-        else
-        {
-            $this->response([
-                'status' => false,
-                'message' => 'Could not save the key'
-            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); // INTERNAL_SERVER_ERROR (500) being the HTTP response code
-        }
-    }
-
-    /* Helper Methods */
-
-    private function _generate_key()
-    {
-        do
-        {
-            // Generate a random salt
-            $salt = base_convert(bin2hex($this->security->get_random_bytes(64)), 16, 36);
-
-            // If an error occurred, then fall back to the previous method
-            if ($salt === false)
-            {
-                $salt = hash('sha256', time() . mt_rand());
-            }
-
-            $new_key = substr($salt, 0, config_item('rest_key_length'));
-        }
-        while ($this->_key_exists($new_key));
-
-        return $new_key;
-    }
-
-    /* Private Data Methods */
-
-    private function _get_key($key)
-    {
-        return $this->rest->db
-            ->where(config_item('rest_key_column'), $key)
-            ->get(config_item('rest_keys_table'))
-            ->row();
-    }
-
-    private function _key_exists($key)
-    {
-        return $this->rest->db
-            ->where(config_item('rest_key_column'), $key)
-            ->count_all_results(config_item('rest_keys_table')) > 0;
-    }
-
-    private function _insert_key($key, $data)
-    {
-        $data[config_item('rest_key_column')] = $key;
-        $data['date_created'] = function_exists('now') ? now() : time();
-
-        return $this->rest->db
-            ->set($data)
-            ->insert(config_item('rest_keys_table'));
-    }
-
-    private function _update_key($key, $data)
-    {
-        return $this->rest->db
-            ->where(config_item('rest_key_column'), $key)
-            ->update(config_item('rest_keys_table'), $data);
-    }
-
-    private function _delete_key($key)
-    {
-        return $this->rest->db
-            ->where(config_item('rest_key_column'), $key)
-            ->delete(config_item('rest_keys_table'));
-    }
-
-}
diff --git a/application/helpers/db_helper.php b/application/helpers/db_helper.php
deleted file mode 100755
index 9a007a46..00000000
--- a/application/helpers/db_helper.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * @author   Natan Felles <natanfelles@gmail.com>
- */
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-if ( ! function_exists('add_foreign_key'))
-{
-	/**
-	 * @param string $table       Table name
-	 * @param string $foreign_key Collumn name having the Foreign Key
-	 * @param string $references  Table and column reference. Ex: users(id)
-	 * @param string $on_delete   RESTRICT, NO ACTION, CASCADE, SET NULL, SET DEFAULT
-	 * @param string $on_update   RESTRICT, NO ACTION, CASCADE, SET NULL, SET DEFAULT
-	 *
-	 * @return string SQL command
-	 */
-	function add_foreign_key($table, $foreign_key, $references, $on_delete = 'RESTRICT', $on_update = 'RESTRICT')
-	{
-		$references = explode('(', str_replace(')', '', str_replace('`', '', $references)));
-
-		return "ALTER TABLE `{$table}` ADD CONSTRAINT `{$table}_{$foreign_key}_fk` FOREIGN KEY (`{$foreign_key}`) REFERENCES `{$references[0]}`(`{$references[1]}`) ON DELETE {$on_delete} ON UPDATE {$on_update}";
-	}
-}
-
-if ( ! function_exists('drop_foreign_key'))
-{
-	/**
-	 * @param string $table       Table name
-	 * @param string $foreign_key Collumn name having the Foreign Key
-	 *
-	 * @return string SQL command
-	 */
-	function drop_foreign_key($table, $foreign_key)
-	{
-		return "ALTER TABLE `{$table}` DROP FOREIGN KEY `{$table}_{$foreign_key}_fk`";
-	}
-}
-
-if ( ! function_exists('add_trigger'))
-{
-	/**
-	 * @param string $trigger_name Trigger name
-	 * @param string $table        Table name
-	 * @param string $statement    Command to run
-	 * @param string $time         BEFORE or AFTER
-	 * @param string $event        INSERT, UPDATE or DELETE
-	 * @param string $type         FOR EACH ROW [FOLLOWS|PRECEDES]
-	 *
-	 * @return string SQL Command
-	 */
-	function add_trigger($trigger_name, $table, $statement, $time = 'BEFORE', $event = 'INSERT', $type = 'FOR EACH ROW')
-	{
-		return 'DELIMITER ;;' . PHP_EOL . "CREATE TRIGGER `{$trigger_name}` {$time} {$event} ON `{$table}` {$type}" . PHP_EOL . 'BEGIN' . PHP_EOL . $statement . PHP_EOL . 'END;' . PHP_EOL . 'DELIMITER ;;';
-	}
-}
-
-if ( ! function_exists('drop_trigger'))
-{
-	/**
-	 * @param string $trigger_name Trigger name
-	 *
-	 * @return string SQL Command
-	 */
-	function drop_trigger($trigger_name)
-	{
-		return "DROP TRIGGER {$trigger_name};";
-	}
-}
diff --git a/application/hooks/hooks.profiler.php b/application/hooks/hooks.profiler.php
deleted file mode 100644
index c376fdb8..00000000
--- a/application/hooks/hooks.profiler.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/*
- * Class for enabling profiler through out the application
- *
- * @package        	CodeIgniter
- * @subpackage    	Libraries
- * @category    	Libraries
- * @author        	Zeeshan M
- */
-class ProfilerEnabler
-{
-	// enable or disable profiling based on config values
-	function enableProfiler(){		
-		$CI = &get_instance();
-		$CI->output->enable_profiler( config_item('enable_profiling') );		
-	}
-}
-?>
diff --git a/application/language/dutch/rest_controller_lang.php b/application/language/dutch/rest_controller_lang.php
deleted file mode 100644
index 182ca61c..00000000
--- a/application/language/dutch/rest_controller_lang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/*
- * Dutch language
- */
-$lang['text_rest_invalid_api_key'] 		 = 'Ongeldige API sleutel %s'; // %s is the REST API key
-$lang['text_rest_invalid_credentials']   = 'Ongeldige gegevens';
-$lang['text_rest_ip_denied'] 			 = 'IP-adres geweigerd';
-$lang['text_rest_ip_unauthorized'] 		 = 'IP-adres niet toegestaan';
-$lang['text_rest_unauthorized'] 		 = 'Niet toegestaan';
-$lang['text_rest_ajax_only'] 			 = 'Alleen AJAX requests zijn toegestaan';
-$lang['text_rest_api_key_unauthorized']  = 'De API sleutel heeft geen toegang tot de gevraagde informatie';
-$lang['text_rest_api_key_permissions']   = 'De API sleutel heeft niet genoeg bevoegdheden';
-$lang['text_rest_api_key_time_limit'] 	 = 'De API sleutel heeft de tijdslimiet bereikt';
-$lang['text_rest_ip_address_time_limit'] = 'Het IP-adres heeft de tijdslimiet bereikt';
-$lang['text_rest_unknown_method'] 	     = 'Onbekende actie';
-$lang['text_rest_unsupported'] 			 = 'Protocol wordt niet ondersteund';
diff --git a/application/language/spanish/index.html b/application/language/spanish/index.html
deleted file mode 100644
index b702fbc3..00000000
--- a/application/language/spanish/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>
diff --git a/application/language/traditional-chinese/index.html b/application/language/traditional-chinese/index.html
deleted file mode 100644
index b702fbc3..00000000
--- a/application/language/traditional-chinese/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>
diff --git a/application/language/turkish/index.html b/application/language/turkish/index.html
deleted file mode 100644
index b702fbc3..00000000
--- a/application/language/turkish/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>
diff --git a/application/libraries/REST_Controller_Definitions.php b/application/libraries/REST_Controller_Definitions.php
deleted file mode 100644
index 403842ad..00000000
--- a/application/libraries/REST_Controller_Definitions.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-namespace Restserver\Libraries;
-
-class REST_Controller_Definitions  {
-
-    // Note: Only the widely used HTTP status codes are documented
-
-    // Informational
-
-    const HTTP_CONTINUE = 100;
-    const HTTP_SWITCHING_PROTOCOLS = 101;
-    const HTTP_PROCESSING = 102;            // RFC2518
-
-    // Success
-
-    /**
-     * The request has succeeded
-     */
-    const HTTP_OK = 200;
-
-    /**
-     * The server successfully created a new resource
-     */
-    const HTTP_CREATED = 201;
-    const HTTP_ACCEPTED = 202;
-    const HTTP_NON_AUTHORITATIVE_INFORMATION = 203;
-
-    /**
-     * The server successfully processed the request, though no content is returned
-     */
-    const HTTP_NO_CONTENT = 204;
-    const HTTP_RESET_CONTENT = 205;
-    const HTTP_PARTIAL_CONTENT = 206;
-    const HTTP_MULTI_STATUS = 207;          // RFC4918
-    const HTTP_ALREADY_REPORTED = 208;      // RFC5842
-    const HTTP_IM_USED = 226;               // RFC3229
-
-    // Redirection
-
-    const HTTP_MULTIPLE_CHOICES = 300;
-    const HTTP_MOVED_PERMANENTLY = 301;
-    const HTTP_FOUND = 302;
-    const HTTP_SEE_OTHER = 303;
-
-    /**
-     * The resource has not been modified since the last request
-     */
-    const HTTP_NOT_MODIFIED = 304;
-    const HTTP_USE_PROXY = 305;
-    const HTTP_RESERVED = 306;
-    const HTTP_TEMPORARY_REDIRECT = 307;
-    const HTTP_PERMANENTLY_REDIRECT = 308;  // RFC7238
-
-    // Client Error
-
-    /**
-     * The request cannot be fulfilled due to multiple errors
-     */
-    const HTTP_BAD_REQUEST = 400;
-
-    /**
-     * The user is unauthorized to access the requested resource
-     */
-    const HTTP_UNAUTHORIZED = 401;
-    const HTTP_PAYMENT_REQUIRED = 402;
-
-    /**
-     * The requested resource is unavailable at this present time
-     */
-    const HTTP_FORBIDDEN = 403;
-
-    /**
-     * The requested resource could not be found
-     *
-     * Note: This is sometimes used to mask if there was an UNAUTHORIZED (401) or
-     * FORBIDDEN (403) error, for security reasons
-     */
-    const HTTP_NOT_FOUND = 404;
-
-    /**
-     * The request method is not supported by the following resource
-     */
-    const HTTP_METHOD_NOT_ALLOWED = 405;
-
-    /**
-     * The request was not acceptable
-     */
-    const HTTP_NOT_ACCEPTABLE = 406;
-    const HTTP_PROXY_AUTHENTICATION_REQUIRED = 407;
-    const HTTP_REQUEST_TIMEOUT = 408;
-
-    /**
-     * The request could not be completed due to a conflict with the current state
-     * of the resource
-     */
-    const HTTP_CONFLICT = 409;
-    const HTTP_GONE = 410;
-    const HTTP_LENGTH_REQUIRED = 411;
-    const HTTP_PRECONDITION_FAILED = 412;
-    const HTTP_REQUEST_ENTITY_TOO_LARGE = 413;
-    const HTTP_REQUEST_URI_TOO_LONG = 414;
-    const HTTP_UNSUPPORTED_MEDIA_TYPE = 415;
-    const HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = 416;
-    const HTTP_EXPECTATION_FAILED = 417;
-    const HTTP_I_AM_A_TEAPOT = 418;                                               // RFC2324
-    const HTTP_UNPROCESSABLE_ENTITY = 422;                                        // RFC4918
-    const HTTP_LOCKED = 423;                                                      // RFC4918
-    const HTTP_FAILED_DEPENDENCY = 424;                                           // RFC4918
-    const HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = 425;   // RFC2817
-    const HTTP_UPGRADE_REQUIRED = 426;                                            // RFC2817
-    const HTTP_PRECONDITION_REQUIRED = 428;                                       // RFC6585
-    const HTTP_TOO_MANY_REQUESTS = 429;                                           // RFC6585
-    const HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = 431;                             // RFC6585
-
-    // Server Error
-
-    /**
-     * The server encountered an unexpected error
-     *
-     * Note: This is a generic error message when no specific message
-     * is suitable
-     */
-    const HTTP_INTERNAL_SERVER_ERROR = 500;
-
-    /**
-     * The server does not recognise the request method
-     */
-    const HTTP_NOT_IMPLEMENTED = 501;
-    const HTTP_BAD_GATEWAY = 502;
-    const HTTP_SERVICE_UNAVAILABLE = 503;
-    const HTTP_GATEWAY_TIMEOUT = 504;
-    const HTTP_VERSION_NOT_SUPPORTED = 505;
-    const HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL = 506;                        // RFC2295
-    const HTTP_INSUFFICIENT_STORAGE = 507;                                        // RFC4918
-    const HTTP_LOOP_DETECTED = 508;                                               // RFC5842
-    const HTTP_NOT_EXTENDED = 510;                                                // RFC2774
-    const HTTP_NETWORK_AUTHENTICATION_REQUIRED = 511;
-}
\ No newline at end of file
diff --git a/application/libraries/index.html b/application/libraries/index.html
deleted file mode 100755
index b702fbc3..00000000
--- a/application/libraries/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>
diff --git a/application/migrations/20170706025420_create_table_users.php b/application/migrations/20170706025420_create_table_users.php
deleted file mode 100644
index 3553dad3..00000000
--- a/application/migrations/20170706025420_create_table_users.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * @author   Natan Felles <natanfelles@gmail.com>
- */
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/**
- * Class Migration_create_table_users
- *
- * @property CI_DB_forge         $dbforge
- * @property CI_DB_query_builder $db
- */
-class Migration_create_table_users extends CI_Migration {
-
-
-	protected $table = 'users';
-
-
-	public function up()
-	{
-		$fields = array(
-			'id'         => [
-				'type'           => 'INT(11)',
-				'auto_increment' => true,
-				'unsigned'       => true,
-			],
-			'email'      => [
-				'type'   => 'VARCHAR(255)',
-				'unique' => true,
-			],
-			'password'   => [
-				'type' => 'VARCHAR(64)',
-			],
-			'firstname'  => [
-				'type' => 'VARCHAR(32)',
-			],
-			'lastname'   => [
-				'type' => 'VARCHAR(32)',
-			],
-			'created_at' => [
-				'type' => 'DATETIME',
-			],
-		);
-		$this->dbforge->add_field($fields);
-		$this->dbforge->add_key('id', true);
-		$this->dbforge->create_table($this->table, true);
-
-		/*for ($i = 1; $i <= 100; $i++)
-		{
-			$this->db->insert($this->table, [
-				'email'      => "user-{$i}@mail.com",
-				'password'   => password_hash('codeigniter', PASSWORD_DEFAULT),
-				'firstname'  => "Firstname {$i}",
-				'lastname'   => "Lastname {$i}",
-				'created_at' => date('Y-' . rand(1, 12) . '-' . rand(1, 28) . ' H:i:s'),
-			]);
-		}*/
-	}
-
-
-	public function down()
-	{
-		if ($this->db->table_exists($this->table))
-		{
-			$this->dbforge->drop_table($this->table);
-		}
-	}
-
-}
diff --git a/application/migrations/20170706030520_create_table_api_keys.php b/application/migrations/20170706030520_create_table_api_keys.php
deleted file mode 100644
index 42fb5417..00000000
--- a/application/migrations/20170706030520_create_table_api_keys.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * @author   Natan Felles <natanfelles@gmail.com>
- */
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/**
- * Class Migration_create_table_api_keys
- *
- * @property CI_DB_forge         $dbforge
- * @property CI_DB_query_builder $db
- */
-class Migration_create_table_api_keys extends CI_Migration {
-
-
-	public function up()
-	{
-		$this->config->load('rest');
-		$table = config_item('rest_keys_table');
-		$fields = array(
-			'id'                           => [
-				'type'           => 'INT(11)',
-				'auto_increment' => true,
-				'unsigned'       => true,
-			],
-			'user_id'                      => [
-				'type'     => 'INT(11)',
-				'unsigned' => true,
-			],
-			config_item('rest_key_column') => [
-				'type'   => 'VARCHAR(' . config_item('rest_key_length') . ')',
-				'unique' => true,
-			],
-			'level'                        => [
-				'type' => 'INT(2)',
-			],
-			'ignore_limits'                => [
-				'type'    => 'TINYINT(1)',
-				'default' => 0,
-			],
-			'is_private_key'               => [
-				'type'    => 'TINYINT(1)',
-				'default' => 0,
-			],
-			'ip_addresses'                 => [
-				'type' => 'TEXT',
-				'null' => true,
-			],
-			'date_created'                 => [
-				'type' => 'INT(11)',
-			],
-		);
-		$this->dbforge->add_field($fields);
-		$this->dbforge->add_key('id', true);
-		$this->dbforge->create_table($table);
-		$this->db->query(add_foreign_key($table, 'user_id', 'users(id)', 'CASCADE', 'CASCADE'));
-	}
-
-
-	public function down()
-	{
-		$table = config_item('rest_key_column');
-		if ($this->db->table_exists($table))
-		{
-			$this->db->query(drop_foreign_key($table, 'user_id'));
-			$this->dbforge->drop_table($table);
-		}
-	}
-
-}
diff --git a/application/migrations/20170706031435_create_table_api_logs.php b/application/migrations/20170706031435_create_table_api_logs.php
deleted file mode 100644
index db8b4be4..00000000
--- a/application/migrations/20170706031435_create_table_api_logs.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * @author   Natan Felles <natanfelles@gmail.com>
- */
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/**
- * Class Migration_create_table_api_logs
- *
- * @property CI_DB_forge         $dbforge
- * @property CI_DB_query_builder $db
- */
-class Migration_create_table_api_logs extends CI_Migration {
-
-
-	public function up()
-	{
-		$this->config->load('rest');
-		$table = config_item('rest_logs_table');
-		$fields = array(
-			'id'            => [
-				'type'           => 'INT(11)',
-				'auto_increment' => true,
-				'unsigned'       => true,
-			],
-			'api_key'       => [
-				'type' => 'VARCHAR(' . config_item('rest_key_length') . ')',
-			],
-			'uri'           => [
-				'type' => 'VARCHAR(255)',
-			],
-			'method'        => [
-				'type' => 'ENUM("get","post","options","put","patch","delete")',
-			],
-			'params'        => [
-				'type' => 'TEXT',
-				'null' => true,
-			],
-			'ip_address'    => [
-				'type' => 'VARCHAR(45)',
-			],
-			'time'          => [
-				'type' => 'INT(11)',
-			],
-			'rtime'         => [
-				'type' => 'FLOAT',
-				'null' => true,
-			],
-			'authorized'    => [
-				'type' => 'VARCHAR(1)',
-			],
-			'response_code' => [
-				'type'    => 'SMALLINT(3)',
-				'null'    => true,
-				'default' => 0,
-			],
-		);
-		$this->dbforge->add_field($fields);
-		$this->dbforge->add_key('id', true);
-		$this->dbforge->create_table($table);
-		/*$this->db->query(add_foreign_key($table, 'api_key',
-			config_item('rest_keys_table') . '(' . config_item('rest_key_column') . ')', 'CASCADE', 'CASCADE'));*/
-	}
-
-
-	public function down()
-	{
-		$table = config_item('rest_logs_table');
-		if ($this->db->table_exists($table))
-		{
-			// $this->db->query(drop_foreign_key($table, 'api_key'));
-			$this->dbforge->drop_table($table);
-		}
-	}
-
-}
diff --git a/application/migrations/20170706032133_create_table_api_access.php b/application/migrations/20170706032133_create_table_api_access.php
deleted file mode 100644
index df004dda..00000000
--- a/application/migrations/20170706032133_create_table_api_access.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * @author   Natan Felles <natanfelles@gmail.com>
- */
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/**
- * Class Migration_create_table_api_access
- *
- * @property CI_DB_forge         $dbforge
- * @property CI_DB_query_builder $db
- */
-class Migration_create_table_api_access extends CI_Migration {
-
-
-	public function up()
-	{
-		$this->config->load('rest');
-		$table = config_item('rest_access_table');
-		$fields = array(
-			'id'            => [
-				'type'           => 'INT(11)',
-				'auto_increment' => true,
-				'unsigned'       => true,
-			],
-			'key'           => [
-				'type' => 'VARCHAR(' . config_item('rest_key_length') . ')',
-			],
-			'all_access'    => [
-				'type'    => 'TINYINT(1)',
-				'default' => 0,
-			],
-			'controller'    => [
-				'type' => 'VARCHAR(50)',
-			],
-			'date_created'  => [
-				'type' => 'DATETIME',
-				'null' => true,
-			],
-			'date_modified' => [
-				'type' => 'TIMESTAMP',
-			],
-		);
-		$this->dbforge->add_field($fields);
-		$this->dbforge->add_key('id', true);
-		$this->dbforge->add_key('controller');
-		$this->dbforge->create_table($table);
-		$this->db->query(add_foreign_key($table, 'key',
-			config_item('rest_keys_table') . '(' . config_item('rest_key_column') . ')', 'CASCADE', 'CASCADE'));
-	}
-
-
-	public function down()
-	{
-		$table = config_item('rest_access_table');
-		if ($this->db->table_exists($table))
-		{
-			$this->db->query(drop_foreign_key($table, 'key'));
-			$this->dbforge->drop_table($table);
-		}
-	}
-
-}
diff --git a/application/migrations/20170706032825_create_table_api_limits.php b/application/migrations/20170706032825_create_table_api_limits.php
deleted file mode 100644
index c7355cb7..00000000
--- a/application/migrations/20170706032825_create_table_api_limits.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-/**
- * @author   Natan Felles <natanfelles@gmail.com>
- */
-defined('BASEPATH') OR exit('No direct script access allowed');
-
-/**
- * Class Migration_create_table_api_limits
- *
- * @property CI_DB_forge         $dbforge
- * @property CI_DB_query_builder $db
- */
-class Migration_create_table_api_limits extends CI_Migration {
-
-
-	public function up()
-	{
-		$this->config->load('rest');
-		$table = config_item('rest_limits_table');
-		$fields = array(
-			'id'           => [
-				'type'           => 'INT(11)',
-				'auto_increment' => true,
-				'unsigned'       => true,
-			],
-			'api_key'      => [
-				'type' => 'VARCHAR(' . config_item('rest_key_length') . ')',
-			],
-			'uri'          => [
-				'type' => 'VARCHAR(255)',
-			],
-			'count'        => [
-				'type' => 'INT(10)',
-			],
-			'hour_started' => [
-				'type' => 'INT(11)',
-			],
-		);
-		$this->dbforge->add_field($fields);
-		$this->dbforge->add_key('id', true);
-		$this->dbforge->add_key('uri');
-		$this->dbforge->create_table($table);
-		$this->db->query(add_foreign_key($table, 'api_key',
-			config_item('rest_keys_table') . '(' . config_item('rest_key_column') . ')', 'CASCADE', 'CASCADE'));
-	}
-
-
-	public function down()
-	{
-		$table = config_item('rest_limits_table');
-		if ($this->db->table_exists($table))
-		{
-			$this->db->query(drop_foreign_key($table, 'api_key'));
-			$this->dbforge->drop_table($table);
-		}
-	}
-
-}
diff --git a/application/migrations/index.html b/application/migrations/index.html
deleted file mode 100644
index b702fbc3..00000000
--- a/application/migrations/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>
diff --git a/application/views/index.html b/application/views/index.html
deleted file mode 100644
index b702fbc3..00000000
--- a/application/views/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>
diff --git a/application/views/rest_server.php b/application/views/rest_server.php
deleted file mode 100644
index 5212e6da..00000000
--- a/application/views/rest_server.php
+++ /dev/null
@@ -1,222 +0,0 @@
-<?php
-    defined('BASEPATH') OR exit('No direct script access allowed');
-?>
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>REST Server Tests</title>
-
-    <style>
-
-    ::selection { background-color: #E13300; color: white; }
-    ::-moz-selection { background-color: #E13300; color: white; }
-
-    body {
-        background-color: #FFF;
-        margin: 40px;
-        font: 16px/20px normal Helvetica, Arial, sans-serif;
-        color: #4F5155;
-        word-wrap: break-word;
-    }
-
-    a {
-        color: #039;
-        background-color: transparent;
-        font-weight: normal;
-    }
-
-    h1 {
-        color: #444;
-        background-color: transparent;
-        border-bottom: 1px solid #D0D0D0;
-        font-size: 24px;
-        font-weight: normal;
-        margin: 0 0 14px 0;
-        padding: 14px 15px 10px 15px;
-    }
-
-    code {
-        font-family: Consolas, Monaco, Courier New, Courier, monospace;
-        font-size: 16px;
-        background-color: #f9f9f9;
-        border: 1px solid #D0D0D0;
-        color: #002166;
-        display: block;
-        margin: 14px 0 14px 0;
-        padding: 12px 10px 12px 10px;
-    }
-
-    #body {
-        margin: 0 15px 0 15px;
-    }
-
-    p.footer {
-        text-align: right;
-        font-size: 16px;
-        border-top: 1px solid #D0D0D0;
-        line-height: 32px;
-        padding: 0 10px 0 10px;
-        margin: 20px 0 0 0;
-    }
-
-    #container {
-        margin: 10px;
-        border: 1px solid #D0D0D0;
-        box-shadow: 0 0 8px #D0D0D0;
-    }
-    </style>
-</head>
-<body>
-
-<div id="container">
-    <h1>REST Server Tests</h1>
-
-    <div id="body">
-
-        <h2><a href="http://github.com/%3C?php%20echo%20site_url();%20?%3E">Home</a></h2>
-
-        <p>
-            See the article
-            <a href="http://net.tutsplus.com/tutorials/php/working-with-restful-services-in-codeigniter-2/" target="_blank">
-                http://net.tutsplus.com/tutorials/php/working-with-restful-services-in-codeigniter-2/
-            </a>
-        </p>
-
-        <p>
-            The master project repository is
-            <a href="https://github.com/chriskacerguis/codeigniter-restserver" target="_blank">
-                https://github.com/chriskacerguis/codeigniter-restserver
-            </a>
-        </p>
-
-        <p>
-            Click on the links to check whether the REST server is working.
-        </p>
-
-        <ol>
-            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users'); ?>">Users</a> - defaulting to JSON</li>
-            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/format/csv'); ?>">Users</a> - get it in CSV</li>
-            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/id/1'); ?>">User #1</a> - defaulting to JSON  (users/id/1)</li>
-            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/1'); ?>">User #1</a> - defaulting to JSON  (users/1)</li>
-            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/id/1.xml'); ?>">User #1</a> - get it in XML (users/id/1.xml)</li>
-            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/id/1/format/xml'); ?>">User #1</a> - get it in XML (users/id/1/format/xml)</li>
-            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/id/1?format=xml'); ?>">User #1</a> - get it in XML (users/id/1?format=xml)</li>
-            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/1.xml'); ?>">User #1</a> - get it in XML (users/1.xml)</li>
-            <li><a id="ajax" href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/format/json'); ?>">Users</a> - get it in JSON (AJAX request)</li>
-            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users.html'); ?>">Users</a> - get it in HTML (users.html)</li>
-            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users/format/html'); ?>">Users</a> - get it in HTML (users/format/html)</li>
-            <li><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/api/example/users?format=html'); ?>">Users</a> - get it in HTML (users?format=html)</li>
-        </ol>
-
-    </div>
-
-    <p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>'.CI_VERSION.'</strong>' : '' ?></p>
-</div>
-
-<script src="https://code.jquery.com/jquery-1.12.0.js"></script>
-
-<script>
-    // Create an 'App' namespace
-    var App = App || {};
-
-    // Basic rest module using an IIFE as a way of enclosing private variables
-    App.rest = (function restModule(window) {
-        // Fields
-        var _alert = window.alert;
-        var _JSON = window.JSON;
-
-        // Cache the jQuery selector
-        var _$ajax = null;
-
-        // Cache the jQuery object
-        var $ = null;
-
-        // Methods (private)
-
-        /**
-         * Called on Ajax done
-         *
-         * @return {undefined}
-         */
-        function _ajaxDone(data) {
-            // The 'data' parameter is an array of objects that can be iterated over
-            _alert(_JSON.stringify(data, null, 2));
-        }
-
-        /**
-         * Called on Ajax fail
-         *
-         * @return {undefined}
-         */
-        function _ajaxFail() {
-            _alert('Oh no! A problem with the Ajax request!');
-        }
-
-        /**
-         * On Ajax request
-         *
-         * @param {jQuery} $element Current element selected
-         * @return {undefined}
-         */
-        function _ajaxEvent($element) {
-            $.ajax({
-                    // URL from the link that was 'clicked' on
-                    url: $element.attr('href')
-                })
-                .done(_ajaxDone)
-                .fail(_ajaxFail);
-        }
-
-        /**
-         * Bind events
-         *
-         * @return {undefined}
-         */
-        function _bindEvents() {
-            // Namespace the 'click' event
-            _$ajax.on('click.app.rest.module', function (event) {
-                event.preventDefault();
-
-                // Pass this to the Ajax event function
-                _ajaxEvent($(this));
-            });
-        }
-
-        /**
-         * Cache the DOM node(s)
-         *
-         * @return {undefined}
-         */
-        function _cacheDom() {
-            _$ajax = $('#ajax');
-        }
-
-        // Public API
-        return {
-            /**
-             * Initialise the following module
-             *
-             * @param {object} jQuery Reference to jQuery
-             * @return {undefined}
-             */
-            init: function init(jQuery) {
-                $ = jQuery;
-
-                // Cache the DOM and bind event(s)
-                _cacheDom();
-                _bindEvents();
-            }
-        };
-    }(window));
-
-    // DOM ready event
-    $(function domReady($) {
-        // Initialise the App module
-        App.rest.init($);
-    });
-</script>
-
-</body>
-</html>
diff --git a/application/views/welcome_message.php b/application/views/welcome_message.php
deleted file mode 100644
index 9ba456fc..00000000
--- a/application/views/welcome_message.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-    defined('BASEPATH') OR exit('No direct script access allowed');
-?>
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="utf-8">
-    <title>Welcome to CodeIgniter</title>
-
-    <style type="text/css">
-
-    ::selection { background-color: #E13300; color: white; }
-    ::-moz-selection { background-color: #E13300; color: white; }
-
-    body {
-        background-color: #FFF;
-        margin: 40px;
-        font: 16px/20px normal Helvetica, Arial, sans-serif;
-        color: #4F5155;
-        word-wrap: break-word;
-    }
-
-    a {
-        color: #003399;
-        background-color: transparent;
-        font-weight: normal;
-    }
-
-    h1 {
-        color: #444;
-        background-color: transparent;
-        border-bottom: 1px solid #D0D0D0;
-        font-size: 24px;
-        font-weight: normal;
-        margin: 0 0 14px 0;
-        padding: 14px 15px 10px 15px;
-    }
-
-    code {
-        font-family: Consolas, Monaco, Courier New, Courier, monospace;
-        font-size: 16px;
-        background-color: #f9f9f9;
-        border: 1px solid #D0D0D0;
-        color: #002166;
-        display: block;
-        margin: 14px 0 14px 0;
-        padding: 12px 10px 12px 10px;
-    }
-
-    #body {
-        margin: 0 15px 0 15px;
-    }
-
-    p.footer {
-        text-align: right;
-        font-size: 16px;
-        border-top: 1px solid #D0D0D0;
-        line-height: 32px;
-        padding: 0 10px 0 10px;
-        margin: 20px 0 0 0;
-    }
-
-    #container {
-        margin: 10px;
-        border: 1px solid #D0D0D0;
-        box-shadow: 0 0 8px #D0D0D0;
-    }
-    </style>
-</head>
-<body>
-
-<div id="container">
-    <h1>Welcome to CodeIgniter!</h1>
-
-    <div id="body">
-
-        <h2><a href="http://github.com/%3C?php%20echo%20site_url('http://github.com/rest-server'); ?>">REST Server Tests</a></h2>
-
-        <?php if (file_exists(FCPATH.'documentation/index.html')) : ?>
-        <h2><a href="http://github.com/%3C?php%20echo%20base_url('http://github.com/documentation/index.html'); ?>" target="_blank">REST Server Documentation</a></h2>
-        <?php endif ?>
-
-        <p>The page you are looking at is being generated dynamically by CodeIgniter.</p>
-
-        <p>If you would like to edit this page you'll find it located at:</p>
-        <code>application/views/welcome_message.php</code>
-
-        <p>The corresponding controller for this page is found at:</p>
-        <code>application/controllers/Welcome.php</code>
-
-        <?php if (file_exists(FCPATH.'user_guide/index.html')) : ?>
-        <p>If you are exploring CodeIgniter for the very first time, you should start by reading the <a href="http://github.com/%3C?php%20echo%20base_url('http://github.com/user_guide/index.html'); ?>" target="_blank">User Guide</a>.</p>
-        <?php endif ?>
-    </div>
-
-    <p class="footer">Page rendered in <strong>{elapsed_time}</strong> seconds. <?php echo  (ENVIRONMENT === 'development') ?  'CodeIgniter Version <strong>'.CI_VERSION.'</strong>' : '' ?></p>
-</div>
-
-</body>
-</html>
diff --git a/composer.json b/composer.json
index 979fd5a3..329d3b46 100644
--- a/composer.json
+++ b/composer.json
@@ -1,29 +1,17 @@
 {
-	"description": "REST Server for the CodeIgniter framework",
-	"name": "chriskacerguis/codeigniter-restserver",
-	"type": "library",
-	"homepage": "https://github.com/chriskacerguis/codeigniter-restserver",
-	"authors": [
-		{
-			"name": "Chris Kacerguis",
-			"role": "Developer"
-		}
-	],
-	"license": "MIT",
-	"support": {
-		"source": "https://github.com/chriskacerguis/codeigniter-restserver"
-	},
-	"require": {
-		"php": ">=7.1.0",
-		"codeigniter/framework": "^3.1.10"
-	},
-	"autoload": {
-		"classmap": [
-			"application/libraries/Format.php",
-			"application/libraries/REST_Controller.php"
-		],
-		"psr-4" : {
-			"Restserver\\Libraries\\" : "application/libraries/"
-		}
-	}
+    "name": "chriskacerguis/codeigniter-restserver",
+    "description": "CI Rest Server",
+    "type": "library",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Chris Kacerguis",
+            "email": "chriskacerguis@gmail.com"
+        }
+    ],
+    "minimum-stability": "dev",
+    "autoload": {
+        "psr-4": {"chriskacerguis\\RestServer\\": "src/"}
+    },
+    "require": {}
 }
diff --git a/documentation/404.html b/documentation/404.html
deleted file mode 100644
index 27b3bc36..00000000
--- a/documentation/404.html
+++ /dev/null
@@ -1,110 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="robots" content="noindex">
-
-	<title>Page not found</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li><a href="http://github.com/class-Example.html">Example</a></li>
-				<li><a href="http://github.com/class-Format.html">Format</a></li>
-				<li><a href="http://github.com/class-Key.html">Key</a></li>
-				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
-				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
-				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
-			</ul>
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li>
-<span>Package</span>			</li>
-			<li>
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<div id="content">
-	<h1>Page not found</h1>
-	<p>The requested page could not be found.</p>
-	<p>You have probably clicked on a link that is outdated and points to a page that does not exist any more or you have made an typing error in the address.</p>
-	<p>To continue please try to find requested page in the menu, or use search field on the top.</p>
-</div>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
-<script src="http://github.com/elementlist.js"></script>
-</body>
-</html>
diff --git a/documentation/class-Example.html b/documentation/class-Example.html
deleted file mode 100644
index 7959da84..00000000
--- a/documentation/class-Example.html
+++ /dev/null
@@ -1,457 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-
-	<title>Class Example</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li class="active"><a href="http://github.com/class-Example.html">Example</a></li>
-				<li><a href="http://github.com/class-Key.html">Key</a></li>
-			</ul>
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li>
-<span>Package</span>			</li>
-			<li class="active">
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<div id="content" class="class">
-	<h1>Class Example</h1>
-
-
-	<div class="description">
-	<p>This is an example of a few basic user interaction methods you could use
-all done with a hardcoded array</p>
-	</div>
-
-	<dl class="tree">
-		<dd style="padding-left:0px">
-CI_Controller
-			
-			
-		</dd>
-		<dd style="padding-left:30px">
-			<img src="http://github.com/resources/inherit.png" alt="Extended by">
-			<a href="http://github.com/class-REST_Controller.html"><span>REST_Controller</span></a>
-			
-			
-			
-		</dd>
-		<dd style="padding-left:60px">
-			<img src="http://github.com/resources/inherit.png" alt="Extended by">
-<b><span>Example</span></b>			
-			
-			
-		</dd>
-	</dl>
-
-
-
-
-
-
-
-
-	<div class="info">
-		
-		
-		
-		<b>Package:</b> <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\<a href="http://github.com/package-CodeIgniter.Rest.html">Rest</a><br>
-
-				<b>Category:</b>
-				Controller<br>
-				<b>License:</b>
-				<a href="http://github.com/MIT">MIT</a><br>
-				<b>Author:</b>
-				Phil Sturgeon, Chris Kacerguis<br>
-				<b>Link:</b>
-				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-Example.html#8-137" title="Go to source code">controllers/api/Example.php</a>
-		<br>
-	</div>
-
-
-
-	<table class="summary methods" id="methods">
-	<caption>Methods summary</caption>
-	<tr data-order="__construct" id="___construct">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#___construct">#</a>
-		<code><a href="http://github.com/source-class-Example.html#21-31" title="Go to source code">__construct</a>( <span>string <var>$config</var>,…</span> )</code>
-
-		<div class="description short">
-			<p>Constructor for the REST API</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Constructor for the REST API</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$config</var>,…</dt>
-					<dd><p>Configuration filename minus the file extension
-e.g: my_rest.php is passed as 'my_rest'</p></dd>
-				</dl></div>
-
-
-
-
-				<h4>Overrides</h4>
-				<div class="list"><code><a href="http://github.com/class-REST_Controller.html#___construct">REST_Controller::__construct()</a></code></div>
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="users_get" id="_users_get">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_users_get">#</a>
-		<code><a href="http://github.com/source-class-Example.html#33-102" title="Go to source code">users_get</a>( )</code>
-
-		<div class="description short">
-			
-		</div>
-
-		<div class="description detailed hidden">
-			
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="users_post" id="_users_post">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_users_post">#</a>
-		<code><a href="http://github.com/source-class-Example.html#104-115" title="Go to source code">users_post</a>( )</code>
-
-		<div class="description short">
-			
-		</div>
-
-		<div class="description detailed hidden">
-			
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="users_delete" id="_users_delete">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_users_delete">#</a>
-		<code><a href="http://github.com/source-class-Example.html#117-135" title="Go to source code">users_delete</a>( )</code>
-
-		<div class="description short">
-			
-		</div>
-
-		<div class="description detailed hidden">
-			
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	</table>
-
-	<table class="summary inherited">
-	<caption>Methods inherited from <a href="http://github.com/class-REST_Controller.html#methods">REST_Controller</a></caption>
-	<tr>
-		<td><code>
-			<a href="http://github.com/class-REST_Controller.html#___destruct">__destruct()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__auth_override_check">_auth_override_check()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__check_access">_check_access()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__check_blacklist_auth">_check_blacklist_auth()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__check_cors">_check_cors()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__check_limit">_check_limit()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__check_login">_check_login()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__check_php_session">_check_php_session()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__check_whitelist_auth">_check_whitelist_auth()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__detect_api_key">_detect_api_key()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__detect_input_format">_detect_input_format()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__detect_lang">_detect_lang()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__detect_method">_detect_method()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__detect_output_format">_detect_output_format()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__force_login">_force_login()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__get_default_output_format">_get_default_output_format()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__log_access_time">_log_access_time()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__log_request">_log_request()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__log_response_code">_log_response_code()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__parse_delete">_parse_delete()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__parse_get">_parse_get()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__parse_head">_parse_head()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__parse_options">_parse_options()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__parse_patch">_parse_patch()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__parse_post">_parse_post()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__parse_put">_parse_put()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__parse_query">_parse_query()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__perform_ldap_auth">_perform_ldap_auth()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__perform_library_auth">_perform_library_auth()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__prepare_basic_auth">_prepare_basic_auth()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__prepare_digest_auth">_prepare_digest_auth()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__remap">_remap()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__xss_clean">_xss_clean()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_delete">delete()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_early_checks">early_checks()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_get">get()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_head">head()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_options">options()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_patch">patch()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_post">post()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_put">put()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_query">query()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_response">response()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_set_response">set_response()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_validation_errors">validation_errors()</a>
-		</code></td>
-	</tr>
-	</table>
-
-
-
-
-
-
-
-
-	<table class="summary inherited">
-	<caption>Constants inherited from <a href="http://github.com/class-REST_Controller.html#constants">REST_Controller</a></caption>
-	<tr>
-		<td><code>
-			<a href="http://github.com/class-REST_Controller.html#HTTP_ACCEPTED"><b>HTTP_ACCEPTED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_ALREADY_REPORTED"><b>HTTP_ALREADY_REPORTED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_BAD_GATEWAY"><b>HTTP_BAD_GATEWAY</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_BAD_REQUEST"><b>HTTP_BAD_REQUEST</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_CONFLICT"><b>HTTP_CONFLICT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_CONTINUE"><b>HTTP_CONTINUE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_CREATED"><b>HTTP_CREATED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_EXPECTATION_FAILED"><b>HTTP_EXPECTATION_FAILED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_FAILED_DEPENDENCY"><b>HTTP_FAILED_DEPENDENCY</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_FORBIDDEN"><b>HTTP_FORBIDDEN</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_FOUND"><b>HTTP_FOUND</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_GATEWAY_TIMEOUT"><b>HTTP_GATEWAY_TIMEOUT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_GONE"><b>HTTP_GONE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_IM_USED"><b>HTTP_IM_USED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_INSUFFICIENT_STORAGE"><b>HTTP_INSUFFICIENT_STORAGE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_INTERNAL_SERVER_ERROR"><b>HTTP_INTERNAL_SERVER_ERROR</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_I_AM_A_TEAPOT"><b>HTTP_I_AM_A_TEAPOT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_LENGTH_REQUIRED"><b>HTTP_LENGTH_REQUIRED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_LOCKED"><b>HTTP_LOCKED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_LOOP_DETECTED"><b>HTTP_LOOP_DETECTED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_METHOD_NOT_ALLOWED"><b>HTTP_METHOD_NOT_ALLOWED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_MOVED_PERMANENTLY"><b>HTTP_MOVED_PERMANENTLY</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_MULTIPLE_CHOICES"><b>HTTP_MULTIPLE_CHOICES</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_MULTI_STATUS"><b>HTTP_MULTI_STATUS</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_NETWORK_AUTHENTICATION_REQUIRED"><b>HTTP_NETWORK_AUTHENTICATION_REQUIRED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_NON_AUTHORITATIVE_INFORMATION"><b>HTTP_NON_AUTHORITATIVE_INFORMATION</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_ACCEPTABLE"><b>HTTP_NOT_ACCEPTABLE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_EXTENDED"><b>HTTP_NOT_EXTENDED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_FOUND"><b>HTTP_NOT_FOUND</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_IMPLEMENTED"><b>HTTP_NOT_IMPLEMENTED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_MODIFIED"><b>HTTP_NOT_MODIFIED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_NO_CONTENT"><b>HTTP_NO_CONTENT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_OK"><b>HTTP_OK</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_PARTIAL_CONTENT"><b>HTTP_PARTIAL_CONTENT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_PAYMENT_REQUIRED"><b>HTTP_PAYMENT_REQUIRED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_PERMANENTLY_REDIRECT"><b>HTTP_PERMANENTLY_REDIRECT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_PRECONDITION_FAILED"><b>HTTP_PRECONDITION_FAILED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_PRECONDITION_REQUIRED"><b>HTTP_PRECONDITION_REQUIRED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_PROCESSING"><b>HTTP_PROCESSING</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_PROXY_AUTHENTICATION_REQUIRED"><b>HTTP_PROXY_AUTHENTICATION_REQUIRED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUESTED_RANGE_NOT_SATISFIABLE"><b>HTTP_REQUESTED_RANGE_NOT_SATISFIABLE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUEST_ENTITY_TOO_LARGE"><b>HTTP_REQUEST_ENTITY_TOO_LARGE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE"><b>HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUEST_TIMEOUT"><b>HTTP_REQUEST_TIMEOUT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUEST_URI_TOO_LONG"><b>HTTP_REQUEST_URI_TOO_LONG</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_RESERVED"><b>HTTP_RESERVED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL"><b>HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_RESET_CONTENT"><b>HTTP_RESET_CONTENT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_SEE_OTHER"><b>HTTP_SEE_OTHER</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_SERVICE_UNAVAILABLE"><b>HTTP_SERVICE_UNAVAILABLE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_SWITCHING_PROTOCOLS"><b>HTTP_SWITCHING_PROTOCOLS</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_TEMPORARY_REDIRECT"><b>HTTP_TEMPORARY_REDIRECT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_TOO_MANY_REQUESTS"><b>HTTP_TOO_MANY_REQUESTS</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_UNAUTHORIZED"><b>HTTP_UNAUTHORIZED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_UNPROCESSABLE_ENTITY"><b>HTTP_UNPROCESSABLE_ENTITY</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_UNSUPPORTED_MEDIA_TYPE"><b>HTTP_UNSUPPORTED_MEDIA_TYPE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_UPGRADE_REQUIRED"><b>HTTP_UPGRADE_REQUIRED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_USE_PROXY"><b>HTTP_USE_PROXY</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL"><b>HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_VERSION_NOT_SUPPORTED"><b>HTTP_VERSION_NOT_SUPPORTED</b></a>
-		</code></td>
-	</tr>
-	</table>
-
-
-
-
-	<table class="summary inherited">
-	<caption>Properties inherited from <a href="http://github.com/class-REST_Controller.html#properties">REST_Controller</a></caption>
-	<tr>
-		<td><code>
-			<a href="http://github.com/class-REST_Controller.html#$_allow"><var>$_allow</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_apiuser"><var>$_apiuser</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_args"><var>$_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_delete_args"><var>$_delete_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_enable_xss"><var>$_enable_xss</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_end_rtime"><var>$_end_rtime</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_get_args"><var>$_get_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_head_args"><var>$_head_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_insert_id"><var>$_insert_id</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_options_args"><var>$_options_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_patch_args"><var>$_patch_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_post_args"><var>$_post_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_put_args"><var>$_put_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_query_args"><var>$_query_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_start_rtime"><var>$_start_rtime</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_supported_formats"><var>$_supported_formats</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_user_ldap_dn"><var>$_user_ldap_dn</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$allowed_http_methods"><var>$allowed_http_methods</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$check_cors"><var>$check_cors</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$http_status_codes"><var>$http_status_codes</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$methods"><var>$methods</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$request"><var>$request</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$response"><var>$response</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$rest"><var>$rest</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$rest_format"><var>$rest_format</var></a>
-		</code></td>
-	</tr>
-	</table>
-
-
-
-
-
-</div>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js"></script>
-<script src="http://github.com/elementlist.js"></script>
-</body>
-</html>
diff --git a/documentation/class-Format.html b/documentation/class-Format.html
deleted file mode 100644
index 07d2a5df..00000000
--- a/documentation/class-Format.html
+++ /dev/null
@@ -1,983 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-
-	<title>Class Format</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li class="active"><a href="http://github.com/class-Format.html">Format</a></li>
-				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
-				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
-			</ul>
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li>
-<span>Package</span>			</li>
-			<li class="active">
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<div id="content" class="class">
-	<h1>Class Format</h1>
-
-
-	<div class="description">
-	<p>Format class
-Help convert between various formats such as XML, JSON, CSV, etc.</p>
-	</div>
-
-
-
-
-
-
-
-
-
-	<div class="info">
-		
-		
-		
-		
-
-				<b>License:</b>
-				<a href="http://www.dbad-license.org/">http://www.dbad-license.org/</a><br>
-				<b>Author:</b>
-				Phil Sturgeon, Chris Kacerguis, @softwarespot<br>
-			<b>Located at</b> <a href="http://github.com/source-class-Format.html#5-531" title="Go to source code">libraries/Format.php</a>
-		<br>
-	</div>
-
-
-
-	<table class="summary methods" id="methods">
-	<caption>Methods summary</caption>
-	<tr data-order="__construct" id="___construct">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#___construct">#</a>
-		<code><a href="http://github.com/source-class-Format.html#76-106" title="Go to source code">__construct</a>( <span>null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$from_type</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>DO NOT CALL THIS DIRECTLY, USE factory()</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>DO NOT CALL THIS DIRECTLY, USE factory()</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$data</var></dt>
-					<dd></dd>
-					<dt><var>$from_type</var></dt>
-					<dd></dd>
-				</dl></div>
-
-
-				<h4>Throws</h4>
-				<div class="list">
-					Exception
-				</div>
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="factory" id="_factory">
-
-		<td class="attributes"><code>
-			 public 
-
-			object
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_factory">#</a>
-		<code><a href="http://github.com/source-class-Format.html#108-123" title="Go to source code">factory</a>( <span>mixed <var>$data</var></span>, <span>string <var>$from_type</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>Create an instance of the format class
-e.g: echo $this->format->factory(['foo' => 'bar'])->to_csv();</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Create an instance of the format class
-e.g: echo $this->format->factory(['foo' => 'bar'])->to_csv();</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$data</var></dt>
-					<dd>Data to convert/parse</dd>
-					<dt><var>$from_type</var></dt>
-					<dd>Type to convert from e.g. json, csv, html</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					object<br>Instance of the format class
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="to_array" id="_to_array">
-
-		<td class="attributes"><code>
-			 public 
-
-			array
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_to_array">#</a>
-		<code><a href="http://github.com/source-class-Format.html#127-163" title="Go to source code">to_array</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>Format data as an array</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Format data as an array</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$data</var></dt>
-					<dd><p>Optional data to pass, so as to override the data passed
-to the constructor</p></dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					array<br>Data parsed as an array; otherwise, an empty array
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="to_xml" id="_to_xml">
-
-		<td class="attributes"><code>
-			 public 
-
-			mixed
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_to_xml">#</a>
-		<code><a href="http://github.com/source-class-Format.html#165-248" title="Go to source code">to_xml</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$structure</var> = <span class="php-keyword1">NULL</span></span>, <span>string <var>$basenode</var> = <span class="php-quote">'xml'</span></span> )</code>
-
-		<div class="description short">
-			<p>Format data as XML</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Format data as XML</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$data</var></dt>
-					<dd><p>Optional data to pass, so as to override the data passed
-to the constructor</p></dd>
-					<dt><var>$structure</var></dt>
-					<dd></dd>
-					<dt><var>$basenode</var></dt>
-					<dd></dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					mixed
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="to_html" id="_to_html">
-
-		<td class="attributes"><code>
-			 public 
-
-			mixed
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_to_html">#</a>
-		<code><a href="http://github.com/source-class-Format.html#250-300" title="Go to source code">to_html</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>Format data as HTML</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Format data as HTML</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$data</var></dt>
-					<dd><p>Optional data to pass, so as to override the data passed
-to the constructor</p></dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					mixed
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="to_csv" id="_to_csv">
-
-		<td class="attributes"><code>
-			 public 
-
-			string
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_to_csv">#</a>
-		<code><a href="http://github.com/source-class-Format.html#302-389" title="Go to source code">to_csv</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>string <var>$delimiter</var> = <span class="php-quote">','</span></span>, <span>string <var>$enclosure</var> = <span class="php-quote">'&quot;'</span></span> )</code>
-
-		<div class="description short">
-			
-		</div>
-
-		<div class="description detailed hidden">
-			
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$data</var></dt>
-					<dd><p>Optional data to pass, so as to override the data passed
-to the constructor</p></dd>
-					<dt><var>$delimiter</var></dt>
-					<dd><p>The optional delimiter parameter sets the field
-delimiter (one character only). NULL will use the default value (,)</p></dd>
-					<dt><var>$enclosure</var></dt>
-					<dd><p>The optional enclosure parameter sets the field
-enclosure (one character only). NULL will use the default value (")</p></dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					string<br>A csv string
-				</div>
-
-
-				<h4>Link</h4>
-				<div class="list">
-						<a href="http://www.metashock.de/2014/02/create-csv-file-in-memory-php/">http://www.metashock.de/2014/02/create-csv-file-in-memory-php/</a><br>
-				</div>
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="to_json" id="_to_json">
-
-		<td class="attributes"><code>
-			 public 
-
-			string
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_to_json">#</a>
-		<code><a href="http://github.com/source-class-Format.html#391-427" title="Go to source code">to_json</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>Encode data as json</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Encode data as json</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$data</var></dt>
-					<dd><p>Optional data to pass, so as to override the data passed
-to the constructor</p></dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					string<br>Json representation of a value
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="to_serialized" id="_to_serialized">
-
-		<td class="attributes"><code>
-			 public 
-
-			string
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_to_serialized">#</a>
-		<code><a href="http://github.com/source-class-Format.html#429-446" title="Go to source code">to_serialized</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>Encode data as a serialized array</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Encode data as a serialized array</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$data</var></dt>
-					<dd><p>Optional data to pass, so as to override the data passed
-to the constructor</p></dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					string<br>Serialized data
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="to_php" id="_to_php">
-
-		<td class="attributes"><code>
-			 public 
-
-			mixed
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_to_php">#</a>
-		<code><a href="http://github.com/source-class-Format.html#448-465" title="Go to source code">to_php</a>( <span>mixed|null <var>$data</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>Format data using a PHP structure</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Format data using a PHP structure</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$data</var></dt>
-					<dd><p>Optional data to pass, so as to override the data passed
-to the constructor</p></dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					mixed<br>String representation of a variable
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_from_xml" id="__from_xml">
-
-		<td class="attributes"><code>
-			 protected 
-
-			SimpleXMLElement
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__from_xml">#</a>
-		<code><a href="http://github.com/source-class-Format.html#469-476" title="Go to source code">_from_xml</a>( <span> <var>$data</var></span> )</code>
-
-		<div class="description short">
-			
-		</div>
-
-		<div class="description detailed hidden">
-			
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$data</var></dt>
-					<dd>string</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					SimpleXMLElement<br>XML element object; otherwise, empty array
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_from_csv" id="__from_csv">
-
-		<td class="attributes"><code>
-			 protected 
-
-			array
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__from_csv">#</a>
-		<code><a href="http://github.com/source-class-Format.html#478-502" title="Go to source code">_from_csv</a>( <span>string <var>$data</var></span>, <span>string <var>$delimiter</var> = <span class="php-quote">','</span></span>, <span>string <var>$enclosure</var> = <span class="php-quote">'&quot;'</span></span> )</code>
-
-		<div class="description short">
-			
-		</div>
-
-		<div class="description detailed hidden">
-			
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$data</var></dt>
-					<dd>CSV string</dd>
-					<dt><var>$delimiter</var></dt>
-					<dd><p>The optional delimiter parameter sets the field
-delimiter (one character only). NULL will use the default value (,)</p></dd>
-					<dt><var>$enclosure</var></dt>
-					<dd><p>The optional enclosure parameter sets the field
-enclosure (one character only). NULL will use the default value (")</p></dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					array<br><p>A multi-dimensional array with the outer array being the number of rows
-and the inner arrays the individual fields</p>
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_from_json" id="__from_json">
-
-		<td class="attributes"><code>
-			 protected 
-
-			mixed
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__from_json">#</a>
-		<code><a href="http://github.com/source-class-Format.html#504-511" title="Go to source code">_from_json</a>( <span> <var>$data</var></span> )</code>
-
-		<div class="description short">
-			
-		</div>
-
-		<div class="description detailed hidden">
-			
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$data</var></dt>
-					<dd>json string</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					mixed<br>Decoded json string with leading and trailing whitespace removed
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_from_serialize" id="__from_serialize">
-
-		<td class="attributes"><code>
-			 protected 
-
-			mixed
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__from_serialize">#</a>
-		<code><a href="http://github.com/source-class-Format.html#513-520" title="Go to source code">_from_serialize</a>( <span>string <var>$data</var></span> )</code>
-
-		<div class="description short">
-			
-		</div>
-
-		<div class="description detailed hidden">
-			
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$data</var></dt>
-					<dd>to unserialized</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					mixed<br>Unserialized data
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_from_php" id="__from_php">
-
-		<td class="attributes"><code>
-			 protected 
-
-			string
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__from_php">#</a>
-		<code><a href="http://github.com/source-class-Format.html#522-529" title="Go to source code">_from_php</a>( <span> <var>$data</var></span> )</code>
-
-		<div class="description short">
-			
-		</div>
-
-		<div class="description detailed hidden">
-			
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$data</var></dt>
-					<dd>to trim leading and trailing whitespace</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					string<br>Data with leading and trailing whitespace removed
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	</table>
-
-
-
-
-
-
-
-
-	<table class="summary constants" id="constants">
-	<caption>Constants summary</caption>
-	<tr data-order="ARRAY_FORMAT" id="ARRAY_FORMAT">
-
-		<td class="attributes"><code>string</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-Format.html#14-17" title="Go to source code"><b>ARRAY_FORMAT</b></a>
-			</code>
-
-			<div class="description short">
-				<p>Array output format</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>Array output format</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#ARRAY_FORMAT" class="anchor">#</a>
-				<code><span class="php-quote">'array'</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="CSV_FORMAT" id="CSV_FORMAT">
-
-		<td class="attributes"><code>string</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-Format.html#19-22" title="Go to source code"><b>CSV_FORMAT</b></a>
-			</code>
-
-			<div class="description short">
-				<p>Comma Separated Value (CSV) output format</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>Comma Separated Value (CSV) output format</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#CSV_FORMAT" class="anchor">#</a>
-				<code><span class="php-quote">'csv'</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="JSON_FORMAT" id="JSON_FORMAT">
-
-		<td class="attributes"><code>string</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-Format.html#24-27" title="Go to source code"><b>JSON_FORMAT</b></a>
-			</code>
-
-			<div class="description short">
-				<p>Json output format</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>Json output format</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#JSON_FORMAT" class="anchor">#</a>
-				<code><span class="php-quote">'json'</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTML_FORMAT" id="HTML_FORMAT">
-
-		<td class="attributes"><code>string</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-Format.html#29-32" title="Go to source code"><b>HTML_FORMAT</b></a>
-			</code>
-
-			<div class="description short">
-				<p>HTML output format</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>HTML output format</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTML_FORMAT" class="anchor">#</a>
-				<code><span class="php-quote">'html'</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="PHP_FORMAT" id="PHP_FORMAT">
-
-		<td class="attributes"><code>string</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-Format.html#34-37" title="Go to source code"><b>PHP_FORMAT</b></a>
-			</code>
-
-			<div class="description short">
-				<p>PHP output format</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>PHP output format</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#PHP_FORMAT" class="anchor">#</a>
-				<code><span class="php-quote">'php'</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="SERIALIZED_FORMAT" id="SERIALIZED_FORMAT">
-
-		<td class="attributes"><code>string</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-Format.html#39-42" title="Go to source code"><b>SERIALIZED_FORMAT</b></a>
-			</code>
-
-			<div class="description short">
-				<p>Serialized output format</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>Serialized output format</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#SERIALIZED_FORMAT" class="anchor">#</a>
-				<code><span class="php-quote">'serialized'</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="XML_FORMAT" id="XML_FORMAT">
-
-		<td class="attributes"><code>string</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-Format.html#44-47" title="Go to source code"><b>XML_FORMAT</b></a>
-			</code>
-
-			<div class="description short">
-				<p>XML output format</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>XML output format</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#XML_FORMAT" class="anchor">#</a>
-				<code><span class="php-quote">'xml'</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="DEFAULT_FORMAT" id="DEFAULT_FORMAT">
-
-		<td class="attributes"><code>string</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-Format.html#49-52" title="Go to source code"><b>DEFAULT_FORMAT</b></a>
-			</code>
-
-			<div class="description short">
-				<p>Default format of this class</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>Default format of this class</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#DEFAULT_FORMAT" class="anchor">#</a>
-				<code><code><a href="http://github.com/class-Format.html#JSON_FORMAT">Format::<b>JSON_FORMAT</b></a></code></code>
-			</div>
-		</td>
-	</tr>
-	</table>
-
-
-
-
-	<table class="summary properties" id="properties">
-	<caption>Properties summary</caption>
-	<tr data-order="_data" id="$_data">
-		<td class="attributes"><code>
-			protected  
-			mixed
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-Format.html#61-66" title="Go to source code"><var>$_data</var></a>
-
-			<div class="description short">
-				<p>Data to parse</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>Data to parse</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_data" class="anchor">#</a>
-				<code>[]</code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_from_type" id="$_from_type">
-		<td class="attributes"><code>
-			protected  
-			string
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-Format.html#68-73" title="Go to source code"><var>$_from_type</var></a>
-
-			<div class="description short">
-				<p>Type to convert from</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>Type to convert from</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_from_type" class="anchor">#</a>
-				<code><span class="php-keyword1">NULL</span></code>
-			</div>
-		</td>
-	</tr>
-	</table>
-
-
-
-
-
-
-</div>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js"></script>
-<script src="http://github.com/elementlist.js"></script>
-</body>
-</html>
diff --git a/documentation/class-Key.html b/documentation/class-Key.html
deleted file mode 100644
index d999bfa1..00000000
--- a/documentation/class-Key.html
+++ /dev/null
@@ -1,512 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-
-	<title>Class Key</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li><a href="http://github.com/class-Example.html">Example</a></li>
-				<li class="active"><a href="http://github.com/class-Key.html">Key</a></li>
-			</ul>
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li>
-<span>Package</span>			</li>
-			<li class="active">
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<div id="content" class="class">
-	<h1>Class Key</h1>
-
-
-	<div class="description">
-	<p>Keys Controller
-This is a basic Key Management REST controller to make and delete keys</p>
-	</div>
-
-	<dl class="tree">
-		<dd style="padding-left:0px">
-CI_Controller
-			
-			
-		</dd>
-		<dd style="padding-left:30px">
-			<img src="http://github.com/resources/inherit.png" alt="Extended by">
-			<a href="http://github.com/class-REST_Controller.html"><span>REST_Controller</span></a>
-			
-			
-			
-		</dd>
-		<dd style="padding-left:60px">
-			<img src="http://github.com/resources/inherit.png" alt="Extended by">
-<b><span>Key</span></b>			
-			
-			
-		</dd>
-	</dl>
-
-
-
-
-
-
-
-
-	<div class="info">
-		
-		
-		
-		<b>Package:</b> <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\<a href="http://github.com/package-CodeIgniter.Rest.html">Rest</a><br>
-
-				<b>Category:</b>
-				Controller<br>
-				<b>License:</b>
-				<a href="http://github.com/MIT">MIT</a><br>
-				<b>Author:</b>
-				Phil Sturgeon, Chris Kacerguis<br>
-				<b>Link:</b>
-				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-Key.html#8-272" title="Go to source code">controllers/api/Key.php</a>
-		<br>
-	</div>
-
-
-
-	<table class="summary methods" id="methods">
-	<caption>Methods summary</caption>
-	<tr data-order="index_put" id="_index_put">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_index_put">#</a>
-		<code><a href="http://github.com/source-class-Key.html#28-58" title="Go to source code">index_put</a>( )</code>
-
-		<div class="description short">
-			<p>Insert a key into the database</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Insert a key into the database</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="index_delete" id="_index_delete">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_index_delete">#</a>
-		<code><a href="http://github.com/source-class-Key.html#60-88" title="Go to source code">index_delete</a>( )</code>
-
-		<div class="description short">
-			<p>Remove a key from the database to stop it working</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Remove a key from the database to stop it working</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="level_post" id="_level_post">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_level_post">#</a>
-		<code><a href="http://github.com/source-class-Key.html#90-126" title="Go to source code">level_post</a>( )</code>
-
-		<div class="description short">
-			<p>Change the level</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Change the level</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="suspend_post" id="_suspend_post">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_suspend_post">#</a>
-		<code><a href="http://github.com/source-class-Key.html#128-163" title="Go to source code">suspend_post</a>( )</code>
-
-		<div class="description short">
-			<p>Suspend a key</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Suspend a key</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="regenerate_post" id="_regenerate_post">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_regenerate_post">#</a>
-		<code><a href="http://github.com/source-class-Key.html#165-207" title="Go to source code">regenerate_post</a>( )</code>
-
-		<div class="description short">
-			<p>Regenerate a key</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Regenerate a key</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	</table>
-
-	<table class="summary inherited">
-	<caption>Methods inherited from <a href="http://github.com/class-REST_Controller.html#methods">REST_Controller</a></caption>
-	<tr>
-		<td><code>
-			<a href="http://github.com/class-REST_Controller.html#___construct">__construct()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#___destruct">__destruct()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__auth_override_check">_auth_override_check()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__check_access">_check_access()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__check_blacklist_auth">_check_blacklist_auth()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__check_cors">_check_cors()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__check_limit">_check_limit()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__check_login">_check_login()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__check_php_session">_check_php_session()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__check_whitelist_auth">_check_whitelist_auth()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__detect_api_key">_detect_api_key()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__detect_input_format">_detect_input_format()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__detect_lang">_detect_lang()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__detect_method">_detect_method()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__detect_output_format">_detect_output_format()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__force_login">_force_login()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__get_default_output_format">_get_default_output_format()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__log_access_time">_log_access_time()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__log_request">_log_request()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__log_response_code">_log_response_code()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__parse_delete">_parse_delete()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__parse_get">_parse_get()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__parse_head">_parse_head()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__parse_options">_parse_options()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__parse_patch">_parse_patch()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__parse_post">_parse_post()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__parse_put">_parse_put()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__parse_query">_parse_query()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__perform_ldap_auth">_perform_ldap_auth()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__perform_library_auth">_perform_library_auth()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__prepare_basic_auth">_prepare_basic_auth()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__prepare_digest_auth">_prepare_digest_auth()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__remap">_remap()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#__xss_clean">_xss_clean()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_delete">delete()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_early_checks">early_checks()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_get">get()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_head">head()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_options">options()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_patch">patch()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_post">post()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_put">put()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_query">query()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_response">response()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_set_response">set_response()</a>, 
-			<a href="http://github.com/class-REST_Controller.html#_validation_errors">validation_errors()</a>
-		</code></td>
-	</tr>
-	</table>
-
-
-
-
-
-
-
-
-	<table class="summary inherited">
-	<caption>Constants inherited from <a href="http://github.com/class-REST_Controller.html#constants">REST_Controller</a></caption>
-	<tr>
-		<td><code>
-			<a href="http://github.com/class-REST_Controller.html#HTTP_ACCEPTED"><b>HTTP_ACCEPTED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_ALREADY_REPORTED"><b>HTTP_ALREADY_REPORTED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_BAD_GATEWAY"><b>HTTP_BAD_GATEWAY</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_BAD_REQUEST"><b>HTTP_BAD_REQUEST</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_CONFLICT"><b>HTTP_CONFLICT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_CONTINUE"><b>HTTP_CONTINUE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_CREATED"><b>HTTP_CREATED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_EXPECTATION_FAILED"><b>HTTP_EXPECTATION_FAILED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_FAILED_DEPENDENCY"><b>HTTP_FAILED_DEPENDENCY</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_FORBIDDEN"><b>HTTP_FORBIDDEN</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_FOUND"><b>HTTP_FOUND</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_GATEWAY_TIMEOUT"><b>HTTP_GATEWAY_TIMEOUT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_GONE"><b>HTTP_GONE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_IM_USED"><b>HTTP_IM_USED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_INSUFFICIENT_STORAGE"><b>HTTP_INSUFFICIENT_STORAGE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_INTERNAL_SERVER_ERROR"><b>HTTP_INTERNAL_SERVER_ERROR</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_I_AM_A_TEAPOT"><b>HTTP_I_AM_A_TEAPOT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_LENGTH_REQUIRED"><b>HTTP_LENGTH_REQUIRED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_LOCKED"><b>HTTP_LOCKED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_LOOP_DETECTED"><b>HTTP_LOOP_DETECTED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_METHOD_NOT_ALLOWED"><b>HTTP_METHOD_NOT_ALLOWED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_MOVED_PERMANENTLY"><b>HTTP_MOVED_PERMANENTLY</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_MULTIPLE_CHOICES"><b>HTTP_MULTIPLE_CHOICES</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_MULTI_STATUS"><b>HTTP_MULTI_STATUS</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_NETWORK_AUTHENTICATION_REQUIRED"><b>HTTP_NETWORK_AUTHENTICATION_REQUIRED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_NON_AUTHORITATIVE_INFORMATION"><b>HTTP_NON_AUTHORITATIVE_INFORMATION</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_ACCEPTABLE"><b>HTTP_NOT_ACCEPTABLE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_EXTENDED"><b>HTTP_NOT_EXTENDED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_FOUND"><b>HTTP_NOT_FOUND</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_IMPLEMENTED"><b>HTTP_NOT_IMPLEMENTED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_NOT_MODIFIED"><b>HTTP_NOT_MODIFIED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_NO_CONTENT"><b>HTTP_NO_CONTENT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_OK"><b>HTTP_OK</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_PARTIAL_CONTENT"><b>HTTP_PARTIAL_CONTENT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_PAYMENT_REQUIRED"><b>HTTP_PAYMENT_REQUIRED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_PERMANENTLY_REDIRECT"><b>HTTP_PERMANENTLY_REDIRECT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_PRECONDITION_FAILED"><b>HTTP_PRECONDITION_FAILED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_PRECONDITION_REQUIRED"><b>HTTP_PRECONDITION_REQUIRED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_PROCESSING"><b>HTTP_PROCESSING</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_PROXY_AUTHENTICATION_REQUIRED"><b>HTTP_PROXY_AUTHENTICATION_REQUIRED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUESTED_RANGE_NOT_SATISFIABLE"><b>HTTP_REQUESTED_RANGE_NOT_SATISFIABLE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUEST_ENTITY_TOO_LARGE"><b>HTTP_REQUEST_ENTITY_TOO_LARGE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE"><b>HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUEST_TIMEOUT"><b>HTTP_REQUEST_TIMEOUT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_REQUEST_URI_TOO_LONG"><b>HTTP_REQUEST_URI_TOO_LONG</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_RESERVED"><b>HTTP_RESERVED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL"><b>HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_RESET_CONTENT"><b>HTTP_RESET_CONTENT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_SEE_OTHER"><b>HTTP_SEE_OTHER</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_SERVICE_UNAVAILABLE"><b>HTTP_SERVICE_UNAVAILABLE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_SWITCHING_PROTOCOLS"><b>HTTP_SWITCHING_PROTOCOLS</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_TEMPORARY_REDIRECT"><b>HTTP_TEMPORARY_REDIRECT</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_TOO_MANY_REQUESTS"><b>HTTP_TOO_MANY_REQUESTS</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_UNAUTHORIZED"><b>HTTP_UNAUTHORIZED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_UNPROCESSABLE_ENTITY"><b>HTTP_UNPROCESSABLE_ENTITY</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_UNSUPPORTED_MEDIA_TYPE"><b>HTTP_UNSUPPORTED_MEDIA_TYPE</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_UPGRADE_REQUIRED"><b>HTTP_UPGRADE_REQUIRED</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_USE_PROXY"><b>HTTP_USE_PROXY</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL"><b>HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL</b></a>, 
-			<a href="http://github.com/class-REST_Controller.html#HTTP_VERSION_NOT_SUPPORTED"><b>HTTP_VERSION_NOT_SUPPORTED</b></a>
-		</code></td>
-	</tr>
-	</table>
-
-
-
-	<table class="summary properties" id="properties">
-	<caption>Properties summary</caption>
-	<tr data-order="methods" id="$methods">
-		<td class="attributes"><code>
-			protected  
-			array
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-Key.html#21-26" title="Go to source code"><var>$methods</var></a>
-
-			<div class="description short">
-				<p>Defines the list of method properties such as limit, log and level</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>Defines the list of method properties such as limit, log and level</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$methods" class="anchor">#</a>
-				<code>[
-        <span class="php-quote">'index_put'</span> =&gt; [<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>, <span class="php-quote">'limit'</span> =&gt; <span class="php-num">10</span>],
-        <span class="php-quote">'index_delete'</span> =&gt; [<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>],
-        <span class="php-quote">'level_post'</span> =&gt; [<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>],
-        <span class="php-quote">'regenerate_post'</span> =&gt; [<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>],
-    ]</code>
-			</div>
-		</td>
-	</tr>
-	</table>
-
-	<table class="summary inherited">
-	<caption>Properties inherited from <a href="http://github.com/class-REST_Controller.html#properties">REST_Controller</a></caption>
-	<tr>
-		<td><code>
-			<a href="http://github.com/class-REST_Controller.html#$_allow"><var>$_allow</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_apiuser"><var>$_apiuser</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_args"><var>$_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_delete_args"><var>$_delete_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_enable_xss"><var>$_enable_xss</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_end_rtime"><var>$_end_rtime</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_get_args"><var>$_get_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_head_args"><var>$_head_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_insert_id"><var>$_insert_id</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_options_args"><var>$_options_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_patch_args"><var>$_patch_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_post_args"><var>$_post_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_put_args"><var>$_put_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_query_args"><var>$_query_args</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_start_rtime"><var>$_start_rtime</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_supported_formats"><var>$_supported_formats</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$_user_ldap_dn"><var>$_user_ldap_dn</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$allowed_http_methods"><var>$allowed_http_methods</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$check_cors"><var>$check_cors</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$http_status_codes"><var>$http_status_codes</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$request"><var>$request</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$response"><var>$response</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$rest"><var>$rest</var></a>, 
-			<a href="http://github.com/class-REST_Controller.html#$rest_format"><var>$rest_format</var></a>
-		</code></td>
-	</tr>
-	</table>
-
-
-
-
-
-</div>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js"></script>
-<script src="http://github.com/elementlist.js"></script>
-</body>
-</html>
diff --git a/documentation/class-REST_Controller.html b/documentation/class-REST_Controller.html
deleted file mode 100644
index 1537c7cc..00000000
--- a/documentation/class-REST_Controller.html
+++ /dev/null
@@ -1,3956 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-
-	<title>Class REST_Controller</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li class="active"><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
-			</ul>
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li>
-<span>Package</span>			</li>
-			<li class="active">
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<div id="content" class="class">
-	<h1>Class REST_Controller</h1>
-
-
-	<div class="description">
-	<p>CodeIgniter Rest Controller
-A fully RESTful server implementation for CodeIgniter using one library, one config file and one controller.</p>
-	</div>
-
-	<dl class="tree">
-		<dd style="padding-left:0px">
-CI_Controller
-			
-			
-		</dd>
-		<dd style="padding-left:30px">
-			<img src="http://github.com/resources/inherit.png" alt="Extended by">
-<b><span>REST_Controller</span></b>			
-			
-			
-		</dd>
-	</dl>
-
-
-	<div>
-		<h4>Direct known subclasses</h4>
-			<a href="http://github.com/class-Example.html">Example</a>, 
-			<a href="http://github.com/class-Key.html">Key</a>
-	</div>
-
-
-
-
-
-
-	<div class="info">
-		<b>Abstract</b><br>
-		
-		
-		<b>Package:</b> <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\<a href="http://github.com/package-CodeIgniter.Libraries.html">Libraries</a><br>
-
-				<b>Category:</b>
-				Libraries<br>
-				<b>License:</b>
-				<a href="http://github.com/MIT">MIT</a><br>
-				<b>Author:</b>
-				Phil Sturgeon, Chris Kacerguis<br>
-				<b>Version:</b>
-				3.0.0<br>
-				<b>Link:</b>
-				<a href="https://github.com/chriskacerguis/codeigniter-restserver">https://github.com/chriskacerguis/codeigniter-restserver</a><br>
-			<b>Located at</b> <a href="http://github.com/source-class-REST_Controller.html#5-2211" title="Go to source code">libraries/REST_Controller.php</a>
-		<br>
-	</div>
-
-
-
-	<table class="summary methods" id="methods">
-	<caption>Methods summary</caption>
-	<tr data-order="early_checks" id="_early_checks">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_early_checks">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#362-370" title="Go to source code">early_checks</a>( )</code>
-
-		<div class="description short">
-			<p>Extend this function to apply additional checking early on in the process</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Extend this function to apply additional checking early on in the process</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="__construct" id="___construct">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#___construct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#372-577" title="Go to source code">__construct</a>( <span>string <var>$config</var> = <span class="php-quote">'rest'</span></span> )</code>
-
-		<div class="description short">
-			<p>Constructor for the REST API</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Constructor for the REST API</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$config</var></dt>
-					<dd><p>Configuration filename minus the file extension
-e.g: my_rest.php is passed as 'my_rest'</p></dd>
-				</dl></div>
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="__destruct" id="___destruct">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#___destruct">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#579-596" title="Go to source code">__destruct</a>( )</code>
-
-		<div class="description short">
-			<p>Deconstructor</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Deconstructor</p>
-
-
-
-
-
-				<h4>Author</h4>
-				<div class="list">
-						Chris Kacerguis<br>
-				</div>
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_remap" id="__remap">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__remap">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#598-716" title="Go to source code">_remap</a>( <span>string <var>$object_called</var></span>, <span>array <var>$arguments</var> = []</span> )</code>
-
-		<div class="description short">
-			<p>Requests are not made to methods directly, the request will be for
-an "object". This simply maps the object and method to the correct
-Controller method</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Requests are not made to methods directly, the request will be for
-an "object". This simply maps the object and method to the correct
-Controller method</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$object_called</var></dt>
-					<dd></dd>
-					<dt><var>$arguments</var></dt>
-					<dd>The arguments passed to the controller method</dd>
-				</dl></div>
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="response" id="_response">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#718-799" title="Go to source code">response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean <var>$continue</var> = <span class="php-keyword1">FALSE</span></span> )</code>
-
-		<div class="description short">
-			<p>Takes mixed data and optionally a status code, then creates the response</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Takes mixed data and optionally a status code, then creates the response</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$data</var></dt>
-					<dd>Data to output to the user</dd>
-					<dt><var>$http_code</var></dt>
-					<dd>HTTP status code</dd>
-					<dt><var>$continue</var></dt>
-					<dd><p>TRUE to flush the response to the client and continue
-running the script; otherwise, exit</p></dd>
-				</dl></div>
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="set_response" id="_set_response">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_set_response">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#801-814" title="Go to source code">set_response</a>( <span>array|null <var>$data</var> = <span class="php-keyword1">NULL</span></span>, <span>integer|null <var>$http_code</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>Takes mixed data and optionally a status code, then creates the response
-within the buffers of the Output class. The response is sent to the client
-lately by the framework, after the current controller's method termination.
-All the hooks after the controller's method termination are executable</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Takes mixed data and optionally a status code, then creates the response
-within the buffers of the Output class. The response is sent to the client
-lately by the framework, after the current controller's method termination.
-All the hooks after the controller's method termination are executable</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$data</var></dt>
-					<dd>Data to output to the user</dd>
-					<dt><var>$http_code</var></dt>
-					<dd>HTTP status code</dd>
-				</dl></div>
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_detect_input_format" id="__detect_input_format">
-
-		<td class="attributes"><code>
-			 protected 
-
-			string|null
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__detect_input_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#816-848" title="Go to source code">_detect_input_format</a>( )</code>
-
-		<div class="description short">
-			<p>Get the input format e.g. json or xml</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Get the input format e.g. json or xml</p>
-
-
-
-				<h4>Returns</h4>
-				<div class="list">
-					string|null<br>Supported input format; otherwise, NULL
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_get_default_output_format" id="__get_default_output_format">
-
-		<td class="attributes"><code>
-			 protected 
-
-			string
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__get_default_output_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#850-862" title="Go to source code">_get_default_output_format</a>( )</code>
-
-		<div class="description short">
-			<p>Gets the default format from the configuration. Fallbacks to 'json'
-if the corresponding configuration option $config['rest_default_format']
-is missing or is empty</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Gets the default format from the configuration. Fallbacks to 'json'
-if the corresponding configuration option $config['rest_default_format']
-is missing or is empty</p>
-
-
-
-				<h4>Returns</h4>
-				<div class="list">
-					string<br>The default supported input format
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_detect_output_format" id="__detect_output_format">
-
-		<td class="attributes"><code>
-			 protected 
-
-			mixed|null|string
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__detect_output_format">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#864-933" title="Go to source code">_detect_output_format</a>( )</code>
-
-		<div class="description short">
-			<p>Detect which format should be used to output the data</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Detect which format should be used to output the data</p>
-
-
-
-				<h4>Returns</h4>
-				<div class="list">
-					mixed|null|string<br>Output format
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_detect_method" id="__detect_method">
-
-		<td class="attributes"><code>
-			 protected 
-
-			string|null
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__detect_method">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#935-965" title="Go to source code">_detect_method</a>( )</code>
-
-		<div class="description short">
-			<p>Get the HTTP request string e.g. get or post</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Get the HTTP request string e.g. get or post</p>
-
-
-
-				<h4>Returns</h4>
-				<div class="list">
-					string|null<br>Supported request method as a lowercase string; otherwise, NULL if not supported
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_detect_api_key" id="__detect_api_key">
-
-		<td class="attributes"><code>
-			 protected 
-
-			boolean
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__detect_api_key">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#967-1039" title="Go to source code">_detect_api_key</a>( )</code>
-
-		<div class="description short">
-			<p>See if the user has provided an API key</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>See if the user has provided an API key</p>
-
-
-
-				<h4>Returns</h4>
-				<div class="list">
-					boolean
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_detect_lang" id="__detect_lang">
-
-		<td class="attributes"><code>
-			 protected 
-
-			string|null
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__detect_lang">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1041-1073" title="Go to source code">_detect_lang</a>( )</code>
-
-		<div class="description short">
-			<p>Preferred return language</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Preferred return language</p>
-
-
-
-				<h4>Returns</h4>
-				<div class="list">
-					string|null<br>The language code
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_log_request" id="__log_request">
-
-		<td class="attributes"><code>
-			 protected 
-
-			boolean
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__log_request">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1075-1101" title="Go to source code">_log_request</a>( <span>boolean <var>$authorized</var> = <span class="php-keyword1">FALSE</span></span> )</code>
-
-		<div class="description short">
-			<p>Add the request to the log table</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Add the request to the log table</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$authorized</var></dt>
-					<dd>TRUE the user is authorized; otherwise, FALSE</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					boolean<br>TRUE the data was inserted; otherwise, FALSE
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_check_limit" id="__check_limit">
-
-		<td class="attributes"><code>
-			 protected 
-
-			boolean
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__check_limit">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1103-1203" title="Go to source code">_check_limit</a>( <span>string <var>$controller_method</var></span> )</code>
-
-		<div class="description short">
-			<p>Check if the requests to a controller method exceed a limit</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Check if the requests to a controller method exceed a limit</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$controller_method</var></dt>
-					<dd>The method being called</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					boolean<br>TRUE the call limit is below the threshold; otherwise, FALSE
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_auth_override_check" id="__auth_override_check">
-
-		<td class="attributes"><code>
-			 protected 
-
-			boolean
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__auth_override_check">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1205-1395" title="Go to source code">_auth_override_check</a>( )</code>
-
-		<div class="description short">
-			<p>Check if there is a specific auth type set for the current class/method/HTTP-method being called</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Check if there is a specific auth type set for the current class/method/HTTP-method being called</p>
-
-
-
-				<h4>Returns</h4>
-				<div class="list">
-					boolean
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_parse_get" id="__parse_get">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__parse_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1397-1407" title="Go to source code">_parse_get</a>( )</code>
-
-		<div class="description short">
-			<p>Parse the GET request arguments</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Parse the GET request arguments</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_parse_post" id="__parse_post">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__parse_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1409-1423" title="Go to source code">_parse_post</a>( )</code>
-
-		<div class="description short">
-			<p>Parse the POST request arguments</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Parse the POST request arguments</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_parse_put" id="__parse_put">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__parse_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1425-1442" title="Go to source code">_parse_put</a>( )</code>
-
-		<div class="description short">
-			<p>Parse the PUT request arguments</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Parse the PUT request arguments</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_parse_head" id="__parse_head">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__parse_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1444-1457" title="Go to source code">_parse_head</a>( )</code>
-
-		<div class="description short">
-			<p>Parse the HEAD request arguments</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Parse the HEAD request arguments</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_parse_options" id="__parse_options">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__parse_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1459-1472" title="Go to source code">_parse_options</a>( )</code>
-
-		<div class="description short">
-			<p>Parse the OPTIONS request arguments</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Parse the OPTIONS request arguments</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_parse_patch" id="__parse_patch">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__parse_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1474-1492" title="Go to source code">_parse_patch</a>( )</code>
-
-		<div class="description short">
-			<p>Parse the PATCH request arguments</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Parse the PATCH request arguments</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_parse_delete" id="__parse_delete">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__parse_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1494-1507" title="Go to source code">_parse_delete</a>( )</code>
-
-		<div class="description short">
-			<p>Parse the DELETE request arguments</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Parse the DELETE request arguments</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_parse_query" id="__parse_query">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__parse_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1509-1518" title="Go to source code">_parse_query</a>( )</code>
-
-		<div class="description short">
-			<p>Parse the query parameters</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Parse the query parameters</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="get" id="_get">
-
-		<td class="attributes"><code>
-			 public 
-
-			array|string|null
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_get">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1522-1539" title="Go to source code">get</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>Retrieve a value from a GET request</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Retrieve a value from a GET request</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$key</var></dt>
-					<dd><p>Key to retrieve from the GET request
-If NULL an array of arguments is returned</p></dd>
-					<dt><var>$xss_clean</var></dt>
-					<dd>Whether to apply XSS filtering</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					array|string|null<br>Value from the GET request; otherwise, NULL
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="options" id="_options">
-
-		<td class="attributes"><code>
-			 public 
-
-			array|string|null
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_options">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1541-1558" title="Go to source code">options</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>Retrieve a value from a OPTIONS request</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Retrieve a value from a OPTIONS request</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$key</var></dt>
-					<dd><p>Key to retrieve from the OPTIONS request.
-If NULL an array of arguments is returned</p></dd>
-					<dt><var>$xss_clean</var></dt>
-					<dd>Whether to apply XSS filtering</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					array|string|null<br>Value from the OPTIONS request; otherwise, NULL
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="head" id="_head">
-
-		<td class="attributes"><code>
-			 public 
-
-			array|string|null
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_head">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1560-1577" title="Go to source code">head</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>Retrieve a value from a HEAD request</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Retrieve a value from a HEAD request</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$key</var></dt>
-					<dd><p>Key to retrieve from the HEAD request
-If NULL an array of arguments is returned</p></dd>
-					<dt><var>$xss_clean</var></dt>
-					<dd>Whether to apply XSS filtering</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					array|string|null<br>Value from the HEAD request; otherwise, NULL
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="post" id="_post">
-
-		<td class="attributes"><code>
-			 public 
-
-			array|string|null
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_post">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1579-1596" title="Go to source code">post</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>Retrieve a value from a POST request</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Retrieve a value from a POST request</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$key</var></dt>
-					<dd><p>Key to retrieve from the POST request
-If NULL an array of arguments is returned</p></dd>
-					<dt><var>$xss_clean</var></dt>
-					<dd>Whether to apply XSS filtering</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					array|string|null<br>Value from the POST request; otherwise, NULL
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="put" id="_put">
-
-		<td class="attributes"><code>
-			 public 
-
-			array|string|null
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_put">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1598-1615" title="Go to source code">put</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>Retrieve a value from a PUT request</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Retrieve a value from a PUT request</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$key</var></dt>
-					<dd><p>Key to retrieve from the PUT request
-If NULL an array of arguments is returned</p></dd>
-					<dt><var>$xss_clean</var></dt>
-					<dd>Whether to apply XSS filtering</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					array|string|null<br>Value from the PUT request; otherwise, NULL
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="delete" id="_delete">
-
-		<td class="attributes"><code>
-			 public 
-
-			array|string|null
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_delete">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1617-1634" title="Go to source code">delete</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>Retrieve a value from a DELETE request</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Retrieve a value from a DELETE request</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$key</var></dt>
-					<dd><p>Key to retrieve from the DELETE request
-If NULL an array of arguments is returned</p></dd>
-					<dt><var>$xss_clean</var></dt>
-					<dd>Whether to apply XSS filtering</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					array|string|null<br>Value from the DELETE request; otherwise, NULL
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="patch" id="_patch">
-
-		<td class="attributes"><code>
-			 public 
-
-			array|string|null
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_patch">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1636-1653" title="Go to source code">patch</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>Retrieve a value from a PATCH request</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Retrieve a value from a PATCH request</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$key</var></dt>
-					<dd><p>Key to retrieve from the PATCH request
-If NULL an array of arguments is returned</p></dd>
-					<dt><var>$xss_clean</var></dt>
-					<dd>Whether to apply XSS filtering</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					array|string|null<br>Value from the PATCH request; otherwise, NULL
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="query" id="_query">
-
-		<td class="attributes"><code>
-			 public 
-
-			array|string|null
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_query">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1655-1672" title="Go to source code">query</a>( <span>null <var>$key</var> = <span class="php-keyword1">NULL</span></span>, <span>null <var>$xss_clean</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>Retrieve a value from the query parameters</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Retrieve a value from the query parameters</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$key</var></dt>
-					<dd><p>Key to retrieve from the query parameters
-If NULL an array of arguments is returned</p></dd>
-					<dt><var>$xss_clean</var></dt>
-					<dd>Whether to apply XSS filtering</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					array|string|null<br>Value from the query parameters; otherwise, NULL
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_xss_clean" id="__xss_clean">
-
-		<td class="attributes"><code>
-			 protected 
-
-			string
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__xss_clean">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1674-1688" title="Go to source code">_xss_clean</a>( <span>string <var>$value</var></span>, <span>boolean <var>$xss_clean</var></span> )</code>
-
-		<div class="description short">
-			<p>Sanitizes data so that Cross Site Scripting Hacks can be
-prevented</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Sanitizes data so that Cross Site Scripting Hacks can be
-prevented</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$value</var></dt>
-					<dd>Input data</dd>
-					<dt><var>$xss_clean</var></dt>
-					<dd>Whether to apply XSS filtering</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					string
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="validation_errors" id="_validation_errors">
-
-		<td class="attributes"><code>
-			 public 
-
-			array
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_validation_errors">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1690-1701" title="Go to source code">validation_errors</a>( )</code>
-
-		<div class="description short">
-			<p>Retrieve the validation errors</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Retrieve the validation errors</p>
-
-
-
-				<h4>Returns</h4>
-				<div class="list">
-					array
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_perform_ldap_auth" id="__perform_ldap_auth">
-
-		<td class="attributes"><code>
-			 protected 
-
-			boolean
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__perform_ldap_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1705-1798" title="Go to source code">_perform_ldap_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>Perform LDAP Authentication</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Perform LDAP Authentication</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$username</var></dt>
-					<dd>The username to validate</dd>
-					<dt><var>$password</var></dt>
-					<dd>The password to validate</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					boolean
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_perform_library_auth" id="__perform_library_auth">
-
-		<td class="attributes"><code>
-			 protected 
-
-			boolean
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__perform_library_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1800-1837" title="Go to source code">_perform_library_auth</a>( <span>string <var>$username</var> = <span class="php-quote">''</span></span>, <span>string <var>$password</var> = <span class="php-keyword1">NULL</span></span> )</code>
-
-		<div class="description short">
-			<p>Perform Library Authentication - Override this function to change the way the library is called</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Perform Library Authentication - Override this function to change the way the library is called</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$username</var></dt>
-					<dd>The username to validate</dd>
-					<dt><var>$password</var></dt>
-					<dd>The password to validate</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					boolean
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_check_login" id="__check_login">
-
-		<td class="attributes"><code>
-			 protected 
-
-			boolean
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__check_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1839-1894" title="Go to source code">_check_login</a>( <span>string <var>$username</var> = <span class="php-keyword1">NULL</span></span>, <span>boolean|string <var>$password</var> = <span class="php-keyword1">FALSE</span></span> )</code>
-
-		<div class="description short">
-			<p>Check if the user is logged in</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Check if the user is logged in</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$username</var></dt>
-					<dd>The user's name</dd>
-					<dt><var>$password</var></dt>
-					<dd>The user's password</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					boolean
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_check_php_session" id="__check_php_session">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__check_php_session">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1896-1916" title="Go to source code">_check_php_session</a>( )</code>
-
-		<div class="description short">
-			<p>Check to see if the user is logged in with a PHP session key</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Check to see if the user is logged in with a PHP session key</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_prepare_basic_auth" id="__prepare_basic_auth">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__prepare_basic_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1918-1957" title="Go to source code">_prepare_basic_auth</a>( )</code>
-
-		<div class="description short">
-			<p>Prepares for basic authentication</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Prepares for basic authentication</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_prepare_digest_auth" id="__prepare_digest_auth">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__prepare_digest_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#1959-2014" title="Go to source code">_prepare_digest_auth</a>( )</code>
-
-		<div class="description short">
-			<p>Prepares for digest authentication</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Prepares for digest authentication</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_check_blacklist_auth" id="__check_blacklist_auth">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__check_blacklist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2016-2036" title="Go to source code">_check_blacklist_auth</a>( )</code>
-
-		<div class="description short">
-			<p>Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_check_whitelist_auth" id="__check_whitelist_auth">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__check_whitelist_auth">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2038-2064" title="Go to source code">_check_whitelist_auth</a>( )</code>
-
-		<div class="description short">
-			<p>Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_force_login" id="__force_login">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__force_login">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2066-2097" title="Go to source code">_force_login</a>( <span>string <var>$nonce</var> = <span class="php-quote">''</span></span> )</code>
-
-		<div class="description short">
-			<p>Force logging in by setting the WWW-Authenticate header</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Force logging in by setting the WWW-Authenticate header</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$nonce</var></dt>
-					<dd><p>A server-specified data string which should be uniquely generated
-each time</p></dd>
-				</dl></div>
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_log_access_time" id="__log_access_time">
-
-		<td class="attributes"><code>
-			 protected 
-
-			boolean
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__log_access_time">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2099-2114" title="Go to source code">_log_access_time</a>( )</code>
-
-		<div class="description short">
-			<p>Updates the log table with the total access time</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Updates the log table with the total access time</p>
-
-
-
-				<h4>Returns</h4>
-				<div class="list">
-					boolean<br>TRUE log table updated; otherwise, FALSE
-				</div>
-
-
-				<h4>Author</h4>
-				<div class="list">
-						Chris Kacerguis<br>
-				</div>
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_log_response_code" id="__log_response_code">
-
-		<td class="attributes"><code>
-			 protected 
-
-			boolean
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__log_response_code">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2116-2132" title="Go to source code">_log_response_code</a>( <span> <var>$http_code</var></span> )</code>
-
-		<div class="description short">
-			<p>Updates the log table with HTTP response code</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Updates the log table with HTTP response code</p>
-
-
-				<h4>Parameters</h4>
-				<div class="list"><dl>
-					<dt><var>$http_code</var></dt>
-					<dd>HTTP status code</dd>
-				</dl></div>
-
-				<h4>Returns</h4>
-				<div class="list">
-					boolean<br>TRUE log table updated; otherwise, FALSE
-				</div>
-
-
-				<h4>Author</h4>
-				<div class="list">
-						Justin Chen<br>
-				</div>
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_check_access" id="__check_access">
-
-		<td class="attributes"><code>
-			 protected 
-
-			boolean
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__check_access">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2134-2164" title="Go to source code">_check_access</a>( )</code>
-
-		<div class="description short">
-			<p>Check to see if the API key has access to the controller and methods</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Check to see if the API key has access to the controller and methods</p>
-
-
-
-				<h4>Returns</h4>
-				<div class="list">
-					boolean<br>TRUE the API key has access; otherwise, FALSE
-				</div>
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	<tr data-order="_check_cors" id="__check_cors">
-
-		<td class="attributes"><code>
-			 protected 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#__check_cors">#</a>
-		<code><a href="http://github.com/source-class-REST_Controller.html#2166-2209" title="Go to source code">_check_cors</a>( )</code>
-
-		<div class="description short">
-			<p>Checks allowed domains, and adds appropriate headers for HTTP access control (CORS)</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Checks allowed domains, and adds appropriate headers for HTTP access control (CORS)</p>
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	</table>
-
-
-
-
-
-
-
-
-	<table class="summary constants" id="constants">
-	<caption>Constants summary</caption>
-	<tr data-order="HTTP_CONTINUE" id="HTTP_CONTINUE">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#23" title="Go to source code"><b>HTTP_CONTINUE</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_CONTINUE" class="anchor">#</a>
-				<code><span class="php-num">100</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_SWITCHING_PROTOCOLS" id="HTTP_SWITCHING_PROTOCOLS">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#24" title="Go to source code"><b>HTTP_SWITCHING_PROTOCOLS</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_SWITCHING_PROTOCOLS" class="anchor">#</a>
-				<code><span class="php-num">101</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_PROCESSING" id="HTTP_PROCESSING">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#25" title="Go to source code"><b>HTTP_PROCESSING</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_PROCESSING" class="anchor">#</a>
-				<code><span class="php-num">102</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_OK" id="HTTP_OK">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#29-32" title="Go to source code"><b>HTTP_OK</b></a>
-			</code>
-
-			<div class="description short">
-				<p>The request has succeeded</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The request has succeeded</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_OK" class="anchor">#</a>
-				<code><span class="php-num">200</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_CREATED" id="HTTP_CREATED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#34-37" title="Go to source code"><b>HTTP_CREATED</b></a>
-			</code>
-
-			<div class="description short">
-				<p>The server successfully created a new resource</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The server successfully created a new resource</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_CREATED" class="anchor">#</a>
-				<code><span class="php-num">201</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_ACCEPTED" id="HTTP_ACCEPTED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#38" title="Go to source code"><b>HTTP_ACCEPTED</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_ACCEPTED" class="anchor">#</a>
-				<code><span class="php-num">202</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_NON_AUTHORITATIVE_INFORMATION" id="HTTP_NON_AUTHORITATIVE_INFORMATION">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#39" title="Go to source code"><b>HTTP_NON_AUTHORITATIVE_INFORMATION</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_NON_AUTHORITATIVE_INFORMATION" class="anchor">#</a>
-				<code><span class="php-num">203</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_NO_CONTENT" id="HTTP_NO_CONTENT">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#41-44" title="Go to source code"><b>HTTP_NO_CONTENT</b></a>
-			</code>
-
-			<div class="description short">
-				<p>The server successfully processed the request, though no content is returned</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The server successfully processed the request, though no content is returned</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_NO_CONTENT" class="anchor">#</a>
-				<code><span class="php-num">204</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_RESET_CONTENT" id="HTTP_RESET_CONTENT">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#45" title="Go to source code"><b>HTTP_RESET_CONTENT</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_RESET_CONTENT" class="anchor">#</a>
-				<code><span class="php-num">205</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_PARTIAL_CONTENT" id="HTTP_PARTIAL_CONTENT">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#46" title="Go to source code"><b>HTTP_PARTIAL_CONTENT</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_PARTIAL_CONTENT" class="anchor">#</a>
-				<code><span class="php-num">206</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_MULTI_STATUS" id="HTTP_MULTI_STATUS">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#47" title="Go to source code"><b>HTTP_MULTI_STATUS</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_MULTI_STATUS" class="anchor">#</a>
-				<code><span class="php-num">207</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_ALREADY_REPORTED" id="HTTP_ALREADY_REPORTED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#48" title="Go to source code"><b>HTTP_ALREADY_REPORTED</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_ALREADY_REPORTED" class="anchor">#</a>
-				<code><span class="php-num">208</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_IM_USED" id="HTTP_IM_USED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#49" title="Go to source code"><b>HTTP_IM_USED</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_IM_USED" class="anchor">#</a>
-				<code><span class="php-num">226</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_MULTIPLE_CHOICES" id="HTTP_MULTIPLE_CHOICES">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#53" title="Go to source code"><b>HTTP_MULTIPLE_CHOICES</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_MULTIPLE_CHOICES" class="anchor">#</a>
-				<code><span class="php-num">300</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_MOVED_PERMANENTLY" id="HTTP_MOVED_PERMANENTLY">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#54" title="Go to source code"><b>HTTP_MOVED_PERMANENTLY</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_MOVED_PERMANENTLY" class="anchor">#</a>
-				<code><span class="php-num">301</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_FOUND" id="HTTP_FOUND">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#55" title="Go to source code"><b>HTTP_FOUND</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_FOUND" class="anchor">#</a>
-				<code><span class="php-num">302</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_SEE_OTHER" id="HTTP_SEE_OTHER">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#56" title="Go to source code"><b>HTTP_SEE_OTHER</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_SEE_OTHER" class="anchor">#</a>
-				<code><span class="php-num">303</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_NOT_MODIFIED" id="HTTP_NOT_MODIFIED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#58-61" title="Go to source code"><b>HTTP_NOT_MODIFIED</b></a>
-			</code>
-
-			<div class="description short">
-				<p>The resource has not been modified since the last request</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The resource has not been modified since the last request</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_NOT_MODIFIED" class="anchor">#</a>
-				<code><span class="php-num">304</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_USE_PROXY" id="HTTP_USE_PROXY">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#62" title="Go to source code"><b>HTTP_USE_PROXY</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_USE_PROXY" class="anchor">#</a>
-				<code><span class="php-num">305</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_RESERVED" id="HTTP_RESERVED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#63" title="Go to source code"><b>HTTP_RESERVED</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_RESERVED" class="anchor">#</a>
-				<code><span class="php-num">306</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_TEMPORARY_REDIRECT" id="HTTP_TEMPORARY_REDIRECT">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#64" title="Go to source code"><b>HTTP_TEMPORARY_REDIRECT</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_TEMPORARY_REDIRECT" class="anchor">#</a>
-				<code><span class="php-num">307</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_PERMANENTLY_REDIRECT" id="HTTP_PERMANENTLY_REDIRECT">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#65" title="Go to source code"><b>HTTP_PERMANENTLY_REDIRECT</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_PERMANENTLY_REDIRECT" class="anchor">#</a>
-				<code><span class="php-num">308</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_BAD_REQUEST" id="HTTP_BAD_REQUEST">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#69-72" title="Go to source code"><b>HTTP_BAD_REQUEST</b></a>
-			</code>
-
-			<div class="description short">
-				<p>The request cannot be fulfilled due to multiple errors</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The request cannot be fulfilled due to multiple errors</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_BAD_REQUEST" class="anchor">#</a>
-				<code><span class="php-num">400</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_UNAUTHORIZED" id="HTTP_UNAUTHORIZED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#74-77" title="Go to source code"><b>HTTP_UNAUTHORIZED</b></a>
-			</code>
-
-			<div class="description short">
-				<p>The user is unauthorized to access the requested resource</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The user is unauthorized to access the requested resource</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_UNAUTHORIZED" class="anchor">#</a>
-				<code><span class="php-num">401</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_PAYMENT_REQUIRED" id="HTTP_PAYMENT_REQUIRED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#78" title="Go to source code"><b>HTTP_PAYMENT_REQUIRED</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_PAYMENT_REQUIRED" class="anchor">#</a>
-				<code><span class="php-num">402</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_FORBIDDEN" id="HTTP_FORBIDDEN">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#80-83" title="Go to source code"><b>HTTP_FORBIDDEN</b></a>
-			</code>
-
-			<div class="description short">
-				<p>The requested resource is unavailable at this present time</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The requested resource is unavailable at this present time</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_FORBIDDEN" class="anchor">#</a>
-				<code><span class="php-num">403</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_NOT_FOUND" id="HTTP_NOT_FOUND">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#85-91" title="Go to source code"><b>HTTP_NOT_FOUND</b></a>
-			</code>
-
-			<div class="description short">
-				<p>The requested resource could not be found</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The requested resource could not be found</p>
-
-<p>Note: This is sometimes used to mask if there was an UNAUTHORIZED (401) or
-FORBIDDEN (403) error, for security reasons</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_NOT_FOUND" class="anchor">#</a>
-				<code><span class="php-num">404</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_METHOD_NOT_ALLOWED" id="HTTP_METHOD_NOT_ALLOWED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#93-96" title="Go to source code"><b>HTTP_METHOD_NOT_ALLOWED</b></a>
-			</code>
-
-			<div class="description short">
-				<p>The request method is not supported by the following resource</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The request method is not supported by the following resource</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_METHOD_NOT_ALLOWED" class="anchor">#</a>
-				<code><span class="php-num">405</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_NOT_ACCEPTABLE" id="HTTP_NOT_ACCEPTABLE">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#98-101" title="Go to source code"><b>HTTP_NOT_ACCEPTABLE</b></a>
-			</code>
-
-			<div class="description short">
-				<p>The request was not acceptable</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The request was not acceptable</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_NOT_ACCEPTABLE" class="anchor">#</a>
-				<code><span class="php-num">406</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_PROXY_AUTHENTICATION_REQUIRED" id="HTTP_PROXY_AUTHENTICATION_REQUIRED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#102" title="Go to source code"><b>HTTP_PROXY_AUTHENTICATION_REQUIRED</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_PROXY_AUTHENTICATION_REQUIRED" class="anchor">#</a>
-				<code><span class="php-num">407</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_REQUEST_TIMEOUT" id="HTTP_REQUEST_TIMEOUT">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#103" title="Go to source code"><b>HTTP_REQUEST_TIMEOUT</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_REQUEST_TIMEOUT" class="anchor">#</a>
-				<code><span class="php-num">408</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_CONFLICT" id="HTTP_CONFLICT">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#105-109" title="Go to source code"><b>HTTP_CONFLICT</b></a>
-			</code>
-
-			<div class="description short">
-				<p>The request could not be completed due to a conflict with the current state
-of the resource</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The request could not be completed due to a conflict with the current state
-of the resource</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_CONFLICT" class="anchor">#</a>
-				<code><span class="php-num">409</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_GONE" id="HTTP_GONE">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#110" title="Go to source code"><b>HTTP_GONE</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_GONE" class="anchor">#</a>
-				<code><span class="php-num">410</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_LENGTH_REQUIRED" id="HTTP_LENGTH_REQUIRED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#111" title="Go to source code"><b>HTTP_LENGTH_REQUIRED</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_LENGTH_REQUIRED" class="anchor">#</a>
-				<code><span class="php-num">411</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_PRECONDITION_FAILED" id="HTTP_PRECONDITION_FAILED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#112" title="Go to source code"><b>HTTP_PRECONDITION_FAILED</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_PRECONDITION_FAILED" class="anchor">#</a>
-				<code><span class="php-num">412</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_REQUEST_ENTITY_TOO_LARGE" id="HTTP_REQUEST_ENTITY_TOO_LARGE">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#113" title="Go to source code"><b>HTTP_REQUEST_ENTITY_TOO_LARGE</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_REQUEST_ENTITY_TOO_LARGE" class="anchor">#</a>
-				<code><span class="php-num">413</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_REQUEST_URI_TOO_LONG" id="HTTP_REQUEST_URI_TOO_LONG">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#114" title="Go to source code"><b>HTTP_REQUEST_URI_TOO_LONG</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_REQUEST_URI_TOO_LONG" class="anchor">#</a>
-				<code><span class="php-num">414</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_UNSUPPORTED_MEDIA_TYPE" id="HTTP_UNSUPPORTED_MEDIA_TYPE">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#115" title="Go to source code"><b>HTTP_UNSUPPORTED_MEDIA_TYPE</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_UNSUPPORTED_MEDIA_TYPE" class="anchor">#</a>
-				<code><span class="php-num">415</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_REQUESTED_RANGE_NOT_SATISFIABLE" id="HTTP_REQUESTED_RANGE_NOT_SATISFIABLE">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#116" title="Go to source code"><b>HTTP_REQUESTED_RANGE_NOT_SATISFIABLE</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_REQUESTED_RANGE_NOT_SATISFIABLE" class="anchor">#</a>
-				<code><span class="php-num">416</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_EXPECTATION_FAILED" id="HTTP_EXPECTATION_FAILED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#117" title="Go to source code"><b>HTTP_EXPECTATION_FAILED</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_EXPECTATION_FAILED" class="anchor">#</a>
-				<code><span class="php-num">417</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_I_AM_A_TEAPOT" id="HTTP_I_AM_A_TEAPOT">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#118" title="Go to source code"><b>HTTP_I_AM_A_TEAPOT</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_I_AM_A_TEAPOT" class="anchor">#</a>
-				<code><span class="php-num">418</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_UNPROCESSABLE_ENTITY" id="HTTP_UNPROCESSABLE_ENTITY">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#119" title="Go to source code"><b>HTTP_UNPROCESSABLE_ENTITY</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_UNPROCESSABLE_ENTITY" class="anchor">#</a>
-				<code><span class="php-num">422</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_LOCKED" id="HTTP_LOCKED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#120" title="Go to source code"><b>HTTP_LOCKED</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_LOCKED" class="anchor">#</a>
-				<code><span class="php-num">423</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_FAILED_DEPENDENCY" id="HTTP_FAILED_DEPENDENCY">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#121" title="Go to source code"><b>HTTP_FAILED_DEPENDENCY</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_FAILED_DEPENDENCY" class="anchor">#</a>
-				<code><span class="php-num">424</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL" id="HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#122" title="Go to source code"><b>HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL" class="anchor">#</a>
-				<code><span class="php-num">425</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_UPGRADE_REQUIRED" id="HTTP_UPGRADE_REQUIRED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#123" title="Go to source code"><b>HTTP_UPGRADE_REQUIRED</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_UPGRADE_REQUIRED" class="anchor">#</a>
-				<code><span class="php-num">426</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_PRECONDITION_REQUIRED" id="HTTP_PRECONDITION_REQUIRED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#124" title="Go to source code"><b>HTTP_PRECONDITION_REQUIRED</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_PRECONDITION_REQUIRED" class="anchor">#</a>
-				<code><span class="php-num">428</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_TOO_MANY_REQUESTS" id="HTTP_TOO_MANY_REQUESTS">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#125" title="Go to source code"><b>HTTP_TOO_MANY_REQUESTS</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_TOO_MANY_REQUESTS" class="anchor">#</a>
-				<code><span class="php-num">429</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE" id="HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#126" title="Go to source code"><b>HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE" class="anchor">#</a>
-				<code><span class="php-num">431</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_INTERNAL_SERVER_ERROR" id="HTTP_INTERNAL_SERVER_ERROR">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#130-136" title="Go to source code"><b>HTTP_INTERNAL_SERVER_ERROR</b></a>
-			</code>
-
-			<div class="description short">
-				<p>The server encountered an unexpected error</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The server encountered an unexpected error</p>
-
-<p>Note: This is a generic error message when no specific message
-is suitable</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_INTERNAL_SERVER_ERROR" class="anchor">#</a>
-				<code><span class="php-num">500</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_NOT_IMPLEMENTED" id="HTTP_NOT_IMPLEMENTED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#138-141" title="Go to source code"><b>HTTP_NOT_IMPLEMENTED</b></a>
-			</code>
-
-			<div class="description short">
-				<p>The server does not recognise the request method</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The server does not recognise the request method</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_NOT_IMPLEMENTED" class="anchor">#</a>
-				<code><span class="php-num">501</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_BAD_GATEWAY" id="HTTP_BAD_GATEWAY">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#142" title="Go to source code"><b>HTTP_BAD_GATEWAY</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_BAD_GATEWAY" class="anchor">#</a>
-				<code><span class="php-num">502</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_SERVICE_UNAVAILABLE" id="HTTP_SERVICE_UNAVAILABLE">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#143" title="Go to source code"><b>HTTP_SERVICE_UNAVAILABLE</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_SERVICE_UNAVAILABLE" class="anchor">#</a>
-				<code><span class="php-num">503</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_GATEWAY_TIMEOUT" id="HTTP_GATEWAY_TIMEOUT">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#144" title="Go to source code"><b>HTTP_GATEWAY_TIMEOUT</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_GATEWAY_TIMEOUT" class="anchor">#</a>
-				<code><span class="php-num">504</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_VERSION_NOT_SUPPORTED" id="HTTP_VERSION_NOT_SUPPORTED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#145" title="Go to source code"><b>HTTP_VERSION_NOT_SUPPORTED</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_VERSION_NOT_SUPPORTED" class="anchor">#</a>
-				<code><span class="php-num">505</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL" id="HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#146" title="Go to source code"><b>HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL" class="anchor">#</a>
-				<code><span class="php-num">506</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_INSUFFICIENT_STORAGE" id="HTTP_INSUFFICIENT_STORAGE">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#147" title="Go to source code"><b>HTTP_INSUFFICIENT_STORAGE</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_INSUFFICIENT_STORAGE" class="anchor">#</a>
-				<code><span class="php-num">507</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_LOOP_DETECTED" id="HTTP_LOOP_DETECTED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#148" title="Go to source code"><b>HTTP_LOOP_DETECTED</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_LOOP_DETECTED" class="anchor">#</a>
-				<code><span class="php-num">508</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_NOT_EXTENDED" id="HTTP_NOT_EXTENDED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#149" title="Go to source code"><b>HTTP_NOT_EXTENDED</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_NOT_EXTENDED" class="anchor">#</a>
-				<code><span class="php-num">510</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="HTTP_NETWORK_AUTHENTICATION_REQUIRED" id="HTTP_NETWORK_AUTHENTICATION_REQUIRED">
-
-		<td class="attributes"><code>integer</code></td>
-		<td class="name">
-			<code>
-				<a href="http://github.com/source-class-REST_Controller.html#150" title="Go to source code"><b>HTTP_NETWORK_AUTHENTICATION_REQUIRED</b></a>
-			</code>
-
-			<div class="description short">
-				
-			</div>
-
-			<div class="description detailed hidden">
-				
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#HTTP_NETWORK_AUTHENTICATION_REQUIRED" class="anchor">#</a>
-				<code><span class="php-num">511</span></code>
-			</div>
-		</td>
-	</tr>
-	</table>
-
-
-
-
-	<table class="summary properties" id="properties">
-	<caption>Properties summary</caption>
-	<tr data-order="rest_format" id="$rest_format">
-		<td class="attributes"><code>
-			protected  
-			string|null
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#152-158" title="Go to source code"><var>$rest_format</var></a>
-
-			<div class="description short">
-				<p>This defines the rest format
-Must be overridden it in a controller so that it is set</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>This defines the rest format
-Must be overridden it in a controller so that it is set</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$rest_format" class="anchor">#</a>
-				<code><span class="php-keyword1">NULL</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="methods" id="$methods">
-		<td class="attributes"><code>
-			protected  
-			array
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#160-165" title="Go to source code"><var>$methods</var></a>
-
-			<div class="description short">
-				<p>Defines the list of method properties such as limit, log and level</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>Defines the list of method properties such as limit, log and level</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$methods" class="anchor">#</a>
-				<code>[]</code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="allowed_http_methods" id="$allowed_http_methods">
-		<td class="attributes"><code>
-			protected  
-			array
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#167-172" title="Go to source code"><var>$allowed_http_methods</var></a>
-
-			<div class="description short">
-				<p>List of allowed HTTP methods</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>List of allowed HTTP methods</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$allowed_http_methods" class="anchor">#</a>
-				<code>[<span class="php-quote">'get'</span>, <span class="php-quote">'delete'</span>, <span class="php-quote">'post'</span>, <span class="php-quote">'put'</span>, <span class="php-quote">'options'</span>, <span class="php-quote">'patch'</span>, <span class="php-quote">'head'</span>]</code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="request" id="$request">
-		<td class="attributes"><code>
-			protected  
-			object
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#174-181" title="Go to source code"><var>$request</var></a>
-
-			<div class="description short">
-				<p>Contains details about the request
-Fields: body, format, method, ssl
-Note: This is a dynamic object (stdClass)</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>Contains details about the request
-Fields: body, format, method, ssl
-Note: This is a dynamic object (stdClass)</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$request" class="anchor">#</a>
-				<code><span class="php-keyword1">NULL</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="response" id="$response">
-		<td class="attributes"><code>
-			protected  
-			object
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#183-190" title="Go to source code"><var>$response</var></a>
-
-			<div class="description short">
-				<p>Contains details about the response
-Fields: format, lang
-Note: This is a dynamic object (stdClass)</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>Contains details about the response
-Fields: format, lang
-Note: This is a dynamic object (stdClass)</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$response" class="anchor">#</a>
-				<code><span class="php-keyword1">NULL</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="rest" id="$rest">
-		<td class="attributes"><code>
-			protected  
-			object
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#192-199" title="Go to source code"><var>$rest</var></a>
-
-			<div class="description short">
-				<p>Contains details about the REST API
-Fields: db, ignore_limits, key, level, user_id
-Note: This is a dynamic object (stdClass)</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>Contains details about the REST API
-Fields: db, ignore_limits, key, level, user_id
-Note: This is a dynamic object (stdClass)</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$rest" class="anchor">#</a>
-				<code><span class="php-keyword1">NULL</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_get_args" id="$_get_args">
-		<td class="attributes"><code>
-			protected  
-			array
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#201-206" title="Go to source code"><var>$_get_args</var></a>
-
-			<div class="description short">
-				<p>The arguments for the GET request method</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The arguments for the GET request method</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_get_args" class="anchor">#</a>
-				<code>[]</code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_post_args" id="$_post_args">
-		<td class="attributes"><code>
-			protected  
-			array
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#208-213" title="Go to source code"><var>$_post_args</var></a>
-
-			<div class="description short">
-				<p>The arguments for the POST request method</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The arguments for the POST request method</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_post_args" class="anchor">#</a>
-				<code>[]</code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_put_args" id="$_put_args">
-		<td class="attributes"><code>
-			protected  
-			array
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#215-220" title="Go to source code"><var>$_put_args</var></a>
-
-			<div class="description short">
-				<p>The arguments for the PUT request method</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The arguments for the PUT request method</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_put_args" class="anchor">#</a>
-				<code>[]</code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_delete_args" id="$_delete_args">
-		<td class="attributes"><code>
-			protected  
-			array
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#222-227" title="Go to source code"><var>$_delete_args</var></a>
-
-			<div class="description short">
-				<p>The arguments for the DELETE request method</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The arguments for the DELETE request method</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_delete_args" class="anchor">#</a>
-				<code>[]</code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_patch_args" id="$_patch_args">
-		<td class="attributes"><code>
-			protected  
-			array
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#229-234" title="Go to source code"><var>$_patch_args</var></a>
-
-			<div class="description short">
-				<p>The arguments for the PATCH request method</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The arguments for the PATCH request method</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_patch_args" class="anchor">#</a>
-				<code>[]</code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_head_args" id="$_head_args">
-		<td class="attributes"><code>
-			protected  
-			array
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#236-241" title="Go to source code"><var>$_head_args</var></a>
-
-			<div class="description short">
-				<p>The arguments for the HEAD request method</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The arguments for the HEAD request method</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_head_args" class="anchor">#</a>
-				<code>[]</code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_options_args" id="$_options_args">
-		<td class="attributes"><code>
-			protected  
-			array
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#243-248" title="Go to source code"><var>$_options_args</var></a>
-
-			<div class="description short">
-				<p>The arguments for the OPTIONS request method</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The arguments for the OPTIONS request method</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_options_args" class="anchor">#</a>
-				<code>[]</code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_query_args" id="$_query_args">
-		<td class="attributes"><code>
-			protected  
-			array
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#250-255" title="Go to source code"><var>$_query_args</var></a>
-
-			<div class="description short">
-				<p>The arguments for the query parameters</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The arguments for the query parameters</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_query_args" class="anchor">#</a>
-				<code>[]</code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_args" id="$_args">
-		<td class="attributes"><code>
-			protected  
-			array
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#257-262" title="Go to source code"><var>$_args</var></a>
-
-			<div class="description short">
-				<p>The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_args" class="anchor">#</a>
-				<code>[]</code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_insert_id" id="$_insert_id">
-		<td class="attributes"><code>
-			protected  
-			string
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#264-269" title="Go to source code"><var>$_insert_id</var></a>
-
-			<div class="description short">
-				<p>The insert_id of the log entry (if we have one)</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The insert_id of the log entry (if we have one)</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_insert_id" class="anchor">#</a>
-				<code><span class="php-quote">''</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_allow" id="$_allow">
-		<td class="attributes"><code>
-			protected  
-			boolean
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#271-276" title="Go to source code"><var>$_allow</var></a>
-
-			<div class="description short">
-				<p>If the request is allowed based on the API key provided</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>If the request is allowed based on the API key provided</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_allow" class="anchor">#</a>
-				<code><span class="php-keyword1">TRUE</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_user_ldap_dn" id="$_user_ldap_dn">
-		<td class="attributes"><code>
-			protected  
-			string
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#278-283" title="Go to source code"><var>$_user_ldap_dn</var></a>
-
-			<div class="description short">
-				<p>The LDAP Distinguished Name of the User post authentication</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The LDAP Distinguished Name of the User post authentication</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_user_ldap_dn" class="anchor">#</a>
-				<code><span class="php-quote">''</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_start_rtime" id="$_start_rtime">
-		<td class="attributes"><code>
-			protected  
-			string
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#285-290" title="Go to source code"><var>$_start_rtime</var></a>
-
-			<div class="description short">
-				<p>The start of the response time from the server</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The start of the response time from the server</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_start_rtime" class="anchor">#</a>
-				<code><span class="php-quote">''</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_end_rtime" id="$_end_rtime">
-		<td class="attributes"><code>
-			protected  
-			string
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#292-297" title="Go to source code"><var>$_end_rtime</var></a>
-
-			<div class="description short">
-				<p>The end of the response time from the server</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>The end of the response time from the server</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_end_rtime" class="anchor">#</a>
-				<code><span class="php-quote">''</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_supported_formats" id="$_supported_formats">
-		<td class="attributes"><code>
-			protected  
-			array
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#299-313" title="Go to source code"><var>$_supported_formats</var></a>
-
-			<div class="description short">
-				<p>List all supported methods, the first will be the default format</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>List all supported methods, the first will be the default format</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_supported_formats" class="anchor">#</a>
-				<code>[
-        <span class="php-quote">'json'</span> =&gt; <span class="php-quote">'application/json'</span>,
-        <span class="php-quote">'array'</span> =&gt; <span class="php-quote">'application/json'</span>,
-        <span class="php-quote">'csv'</span> =&gt; <span class="php-quote">'application/csv'</span>,
-        <span class="php-quote">'html'</span> =&gt; <span class="php-quote">'text/html'</span>,
-        <span class="php-quote">'jsonp'</span> =&gt; <span class="php-quote">'application/javascript'</span>,
-        <span class="php-quote">'php'</span> =&gt; <span class="php-quote">'text/plain'</span>,
-        <span class="php-quote">'serialized'</span> =&gt; <span class="php-quote">'application/vnd.php.serialized'</span>,
-        <span class="php-quote">'xml'</span> =&gt; <span class="php-quote">'application/xml'</span>
-    ]</code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_apiuser" id="$_apiuser">
-		<td class="attributes"><code>
-			protected  
-			object
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#315-320" title="Go to source code"><var>$_apiuser</var></a>
-
-			<div class="description short">
-				<p>Information about the current API user</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>Information about the current API user</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_apiuser" class="anchor">#</a>
-				<code></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="check_cors" id="$check_cors">
-		<td class="attributes"><code>
-			protected  
-			boolean
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#322-327" title="Go to source code"><var>$check_cors</var></a>
-
-			<div class="description short">
-				<p>Whether or not to perform a CORS check and apply CORS headers to the request</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>Whether or not to perform a CORS check and apply CORS headers to the request</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$check_cors" class="anchor">#</a>
-				<code><span class="php-keyword1">NULL</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="_enable_xss" id="$_enable_xss">
-		<td class="attributes"><code>
-			protected  
-			boolean
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#329-337" title="Go to source code"><var>$_enable_xss</var></a>
-
-			<div class="description short">
-				<p>Enable XSS flag
-Determines whether the XSS filter is always active when
-GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered
-Set automatically based on config setting</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>Enable XSS flag
-Determines whether the XSS filter is always active when
-GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered
-Set automatically based on config setting</p>
-
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$_enable_xss" class="anchor">#</a>
-				<code><span class="php-keyword1">FALSE</span></code>
-			</div>
-		</td>
-	</tr>
-	<tr data-order="http_status_codes" id="$http_status_codes">
-		<td class="attributes"><code>
-			protected  
-			array
-		</code></td>
-
-		<td class="name">
-				<a href="http://github.com/source-class-REST_Controller.html#339-360" title="Go to source code"><var>$http_status_codes</var></a>
-
-			<div class="description short">
-				<p>HTTP status codes and their respective description
-Note: Only the widely used HTTP status codes are used</p>
-			</div>
-
-			<div class="description detailed hidden">
-				<p>HTTP status codes and their respective description
-Note: Only the widely used HTTP status codes are used</p>
-
-					<h4>Link</h4>
-					<div class="list">
-							<a href="http://www.restapitutorial.com/httpstatuscodes.html">http://www.restapitutorial.com/httpstatuscodes.html</a><br>
-					</div>
-			</div>
-		</td>
-		<td class="value">
-			<div>
-				<a href="#$http_status_codes" class="anchor">#</a>
-				<code>[
-    self::HTTP_OK =&gt; <span class="php-quote">'OK'</span>,
-    self::HTTP_CREATED =&gt; <span class="php-quote">'CREATED'</span>,
-    self::HTTP_NO_CONTENT =&gt; <span class="php-quote">'NO CONTENT'</span>,
-    self::HTTP_NOT_MODIFIED =&gt; <span class="php-quote">'NOT MODIFIED'</span>,
-    self::HTTP_BAD_REQUEST =&gt; <span class="php-quote">'BAD REQUEST'</span>,
-    self::HTTP_UNAUTHORIZED =&gt; <span class="php-quote">'UNAUTHORIZED'</span>,
-    self::HTTP_FORBIDDEN =&gt; <span class="php-quote">'FORBIDDEN'</span>,
-    self::HTTP_NOT_FOUND =&gt; <span class="php-quote">'NOT FOUND'</span>,
-    self::HTTP_METHOD_NOT_ALLOWED =&gt; <span class="php-quote">'METHOD NOT ALLOWED'</span>,
-    self::HTTP_NOT_ACCEPTABLE =&gt; <span class="php-quote">'NOT ACCEPTABLE'</span>,
-    self::HTTP_CONFLICT =&gt; <span class="php-quote">'CONFLICT'</span>,
-    self::HTTP_INTERNAL_SERVER_ERROR =&gt; <span class="php-quote">'INTERNAL SERVER ERROR'</span>,
-    self::HTTP_NOT_IMPLEMENTED =&gt; <span class="php-quote">'NOT IMPLEMENTED'</span>
-]</code>
-			</div>
-		</td>
-	</tr>
-	</table>
-
-
-
-
-
-
-</div>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js"></script>
-<script src="http://github.com/elementlist.js"></script>
-</body>
-</html>
diff --git a/documentation/class-Rest_server.html b/documentation/class-Rest_server.html
deleted file mode 100644
index 20eae472..00000000
--- a/documentation/class-Rest_server.html
+++ /dev/null
@@ -1,190 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-
-	<title>Class Rest_server</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li><a href="http://github.com/class-Format.html">Format</a></li>
-				<li class="active"><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
-				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
-			</ul>
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li>
-<span>Package</span>			</li>
-			<li class="active">
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<div id="content" class="class">
-	<h1>Class Rest_server</h1>
-
-
-
-	<dl class="tree">
-		<dd style="padding-left:0px">
-CI_Controller
-			
-			
-		</dd>
-		<dd style="padding-left:30px">
-			<img src="http://github.com/resources/inherit.png" alt="Extended by">
-<b><span>Rest_server</span></b>			
-			
-			
-		</dd>
-	</dl>
-
-
-
-
-
-
-
-
-	<div class="info">
-		
-		
-		
-		
-
-			<b>Located at</b> <a href="http://github.com/source-class-Rest_server.html#5-13" title="Go to source code">controllers/Rest_server.php</a>
-		<br>
-	</div>
-
-
-
-	<table class="summary methods" id="methods">
-	<caption>Methods summary</caption>
-	<tr data-order="index" id="_index">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_index">#</a>
-		<code><a href="http://github.com/source-class-Rest_server.html#7-12" title="Go to source code">index</a>( )</code>
-
-		<div class="description short">
-			
-		</div>
-
-		<div class="description detailed hidden">
-			
-
-
-
-
-
-
-
-		</div>
-		</div></td>
-	</tr>
-	</table>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</div>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js"></script>
-<script src="http://github.com/elementlist.js"></script>
-</body>
-</html>
diff --git a/documentation/class-Welcome.html b/documentation/class-Welcome.html
deleted file mode 100644
index cb9f0f28..00000000
--- a/documentation/class-Welcome.html
+++ /dev/null
@@ -1,203 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-
-	<title>Class Welcome</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li><a href="http://github.com/class-Format.html">Format</a></li>
-				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
-				<li class="active"><a href="http://github.com/class-Welcome.html">Welcome</a></li>
-			</ul>
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li>
-<span>Package</span>			</li>
-			<li class="active">
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<div id="content" class="class">
-	<h1>Class Welcome</h1>
-
-
-
-	<dl class="tree">
-		<dd style="padding-left:0px">
-CI_Controller
-			
-			
-		</dd>
-		<dd style="padding-left:30px">
-			<img src="http://github.com/resources/inherit.png" alt="Extended by">
-<b><span>Welcome</span></b>			
-			
-			
-		</dd>
-	</dl>
-
-
-
-
-
-
-
-
-	<div class="info">
-		
-		
-		
-		
-
-			<b>Located at</b> <a href="http://github.com/source-class-Welcome.html#4-27" title="Go to source code">controllers/Welcome.php</a>
-		<br>
-	</div>
-
-
-
-	<table class="summary methods" id="methods">
-	<caption>Methods summary</caption>
-	<tr data-order="index" id="_index">
-
-		<td class="attributes"><code>
-			 public 
-
-			
-			
-			</code>
-		</td>
-
-		<td class="name"><div>
-		<a class="anchor" href="#_index">#</a>
-		<code><a href="http://github.com/source-class-Welcome.html#6-26" title="Go to source code">index</a>( )</code>
-
-		<div class="description short">
-			<p>Index Page for this controller.</p>
-		</div>
-
-		<div class="description detailed hidden">
-			<p>Index Page for this controller.</p>
-
-<p>Maps to the following URL http://example.com/index.php/welcome
-- or - http://example.com/index.php/welcome/index
-- or -
-Since this controller is set as the default controller in
-config/routes.php, it's displayed at http://example.com/</p>
-
-<p>So any other public methods not prefixed with an underscore will
-map to /index.php/welcome/<method_name></p>
-
-
-
-
-
-				<h4>See</h4>
-				<div class="list">
-						https://codeigniter.com/user_guide/general/urls.html<br>
-				</div>
-
-
-		</div>
-		</div></td>
-	</tr>
-	</table>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</div>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js"></script>
-<script src="http://github.com/elementlist.js"></script>
-</body>
-</html>
diff --git a/documentation/elementlist.js b/documentation/elementlist.js
deleted file mode 100644
index b52ccbf6..00000000
--- a/documentation/elementlist.js
+++ /dev/null
@@ -1,3 +0,0 @@
-
-var ApiGen = ApiGen || {};
-ApiGen.elements = [["c","Example"],["c","Format"],["c","Key"],["c","REST_Controller"],["c","Rest_server"],["c","Welcome"]];
diff --git a/documentation/index.html b/documentation/index.html
deleted file mode 100644
index e2e1801a..00000000
--- a/documentation/index.html
+++ /dev/null
@@ -1,131 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-
-	<title>Overview</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-<span>Overview</span>
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li><a href="http://github.com/class-Example.html">Example</a></li>
-				<li><a href="http://github.com/class-Format.html">Format</a></li>
-				<li><a href="http://github.com/class-Key.html">Key</a></li>
-				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
-				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
-				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
-			</ul>
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search" autofocus>
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li class="active">
-<span>Overview</span>			</li>
-			<li>
-<span>Package</span>			</li>
-			<li>
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<div id="content">
-	<h1>Overview</h1>
-
-
-
-	<table class="summary" id="packages">
-		<caption>Packages summary</caption>
-			<tr>
-				<td class="name">
-					<a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>
-				</td>
-			</tr>
-			<tr>
-				<td class="name">
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">CodeIgniter\Libraries</a>
-				</td>
-			</tr>
-			<tr>
-				<td class="name">
-					<a href="http://github.com/package-CodeIgniter.Rest.html">CodeIgniter\Rest</a>
-				</td>
-			</tr>
-			<tr>
-				<td class="name">
-					<a href="http://github.com/package-None.html">None</a>
-				</td>
-			</tr>
-	</table>
-
-</div>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
-<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
-</body>
-</html>
diff --git a/documentation/package-CodeIgniter.Libraries.html b/documentation/package-CodeIgniter.Libraries.html
deleted file mode 100644
index 2e0fe2ed..00000000
--- a/documentation/package-CodeIgniter.Libraries.html
+++ /dev/null
@@ -1,117 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-
-	<title>Package CodeIgniter\Libraries</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li class="active">
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li class="active">
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
-			</ul>
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li class="active">
-<span>Package</span>			</li>
-			<li>
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<div id="content" class="package">
-	<h1>Package <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\Libraries</h1>
-
-
-
-<table class="summary" id="classes">
-<caption>Classes summary</caption>
-<tr>
-	<td class="name"><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></td>
-	<td><p>CodeIgniter Rest Controller
-A fully RESTful server implementation for CodeIgniter using one library, one config file and one controller.</p></td>
-</tr>
-</table>
-
-
-
-
-
-</div>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
-<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
-</body>
-</html>
diff --git a/documentation/package-CodeIgniter.Rest.html b/documentation/package-CodeIgniter.Rest.html
deleted file mode 100644
index f6d41a7d..00000000
--- a/documentation/package-CodeIgniter.Rest.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-
-	<title>Package CodeIgniter\Rest</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li class="active">
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li class="active">
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li><a href="http://github.com/class-Example.html">Example</a></li>
-				<li><a href="http://github.com/class-Key.html">Key</a></li>
-			</ul>
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li class="active">
-<span>Package</span>			</li>
-			<li>
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<div id="content" class="package">
-	<h1>Package <a href="http://github.com/package-CodeIgniter.html">CodeIgniter</a>\Rest</h1>
-
-
-
-<table class="summary" id="classes">
-<caption>Classes summary</caption>
-<tr>
-	<td class="name"><a href="http://github.com/class-Example.html">Example</a></td>
-	<td><p>This is an example of a few basic user interaction methods you could use
-all done with a hardcoded array</p></td>
-</tr>
-<tr>
-	<td class="name"><a href="http://github.com/class-Key.html">Key</a></td>
-	<td><p>Keys Controller
-This is a basic Key Management REST controller to make and delete keys</p></td>
-</tr>
-</table>
-
-
-
-
-
-</div>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
-<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
-</body>
-</html>
diff --git a/documentation/package-CodeIgniter.html b/documentation/package-CodeIgniter.html
deleted file mode 100644
index e9351dfc..00000000
--- a/documentation/package-CodeIgniter.html
+++ /dev/null
@@ -1,113 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-
-	<title>Package CodeIgniter</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li class="active">
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-
-
-		<div id="elements">
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li class="active">
-<span>Package</span>			</li>
-			<li>
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<div id="content" class="package">
-	<h1>Package CodeIgniter</h1>
-
-	<table class="summary" id="packages">
-	<caption>Packages summary</caption>
-	<tr>
-		<td class="name"><a href="http://github.com/package-CodeIgniter.Libraries.html">CodeIgniter\Libraries</a></td>
-	</tr>
-	<tr>
-		<td class="name"><a href="http://github.com/package-CodeIgniter.Rest.html">CodeIgniter\Rest</a></td>
-	</tr>
-	</table>
-
-
-
-
-
-
-
-</div>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
-<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
-</body>
-</html>
diff --git a/documentation/package-None.html b/documentation/package-None.html
deleted file mode 100644
index 08b3ad5c..00000000
--- a/documentation/package-None.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-
-	<title>No package</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li class="active">
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li><a href="http://github.com/class-Format.html">Format</a></li>
-				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
-				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
-			</ul>
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li class="active">
-<span>Package</span>			</li>
-			<li>
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<div id="content" class="package">
-	<h1>No package</h1>
-
-
-
-<table class="summary" id="classes">
-<caption>Classes summary</caption>
-<tr>
-	<td class="name"><a href="http://github.com/class-Format.html">Format</a></td>
-	<td><p>Format class
-Help convert between various formats such as XML, JSON, CSV, etc.</p></td>
-</tr>
-<tr>
-	<td class="name"><a href="http://github.com/class-Rest_server.html">Rest_server</a></td>
-	<td></td>
-</tr>
-<tr>
-	<td class="name"><a href="http://github.com/class-Welcome.html">Welcome</a></td>
-	<td></td>
-</tr>
-</table>
-
-
-
-
-
-</div>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
-<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
-</body>
-</html>
diff --git a/documentation/resources/collapsed.png b/documentation/resources/collapsed.png
deleted file mode 100644
index 56e7323931a3ca5774e2e85ba622c6282c122f5f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 238
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XCV09yhE&{2`t$$4z4PH~`Tr$57<li+^aQ8{zG`fkxUuf^
z_5TjNE-TrrSW-BdlfOwXy7GU%)}aGO9Fh&b=q5PwC(BIiHtyMYOeaX@;!Sp!WokKk
zvim0b6mv^t#)e$D$9{OT4%2QC_jSjf2F2{GN;s_~G5^LUj$`saHg!xmeetwXj-I@P
k{Dnm!vcFOV9U2%Jew_<Y6?$7B2y`2Rr>mdKI;Vst0QmG<2><{9

diff --git a/documentation/resources/combined.js b/documentation/resources/combined.js
deleted file mode 100644
index 84bde60a..00000000
--- a/documentation/resources/combined.js
+++ /dev/null
@@ -1,1315 +0,0 @@
-
-var ApiGen = ApiGen || {};
-ApiGen.config = {"options":{"elementDetailsCollapsed":true,"elementsOrder":"natural"},"name":"ApiGen theme","templatesPath":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src","resources":{"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/resources":"resources"},"templates":{"overview":{"filename":"index.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/overview.latte"},"combined":{"filename":"resources\/combined.js","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/combined.js.latte"},"elementlist":{"filename":"elementlist.js","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/elementlist.js.latte"},"404":{"filename":"404.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/404.latte"},"package":{"filename":"package-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/package.latte"},"namespace":{"filename":"namespace-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/namespace.latte"},"class":{"filename":"class-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/class.latte"},"constant":{"filename":"constant-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/constant.latte"},"function":{"filename":"function-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/function.latte"},"annotationGroup":{"filename":"annotation-group-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/annotation-group.latte"},"source":{"filename":"source-%s.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/source.latte"},"tree":{"filename":"tree.html","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/tree.latte"},"sitemap":{"filename":"sitemap.xml","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/sitemap.xml.latte"},"opensearch":{"filename":"opensearch.xml","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/opensearch.xml.latte"},"robots":{"filename":"robots.txt","template":"phar:\/\/C:\/Users\/softwarespot\/Documents\/GitHub\/codeigniter-restserver\/apigen.phar\/bin\/..\/\/vendor\/apigen\/theme-default\/src\/robots.txt.latte"}}};
-
-
-	/*! jQuery v1.10.2 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license
-*/
-(function(e,t){var n,r,i=typeof t,o=e.location,a=e.document,s=a.documentElement,l=e.jQuery,u=e.$,c={},p=[],f="1.10.2",d=p.concat,h=p.push,g=p.slice,m=p.indexOf,y=c.toString,v=c.hasOwnProperty,b=f.trim,x=function(e,t){return new x.fn.init(e,t,r)},w=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,T=/\S+/g,C=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,N=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,k=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,E=/^[\],:{}\s]*$/,S=/(?:^|:|,)(?:\s*\[)+/g,A=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,j=/"[^"\\\r\n]*"|true|false|null|-?(?:\d+\.|)\d+(?:[eE][+-]?\d+|)/g,D=/^-ms-/,L=/-([\da-z])/gi,H=function(e,t){return t.toUpperCase()},q=function(e){(a.addEventListener||"load"===e.type||"complete"===a.readyState)&&(_(),x.ready())},_=function(){a.addEventListener?(a.removeEventListener("DOMContentLoaded",q,!1),e.removeEventListener("load",q,!1)):(a.detachEvent("onreadystatechange",q),e.detachEvent("onload",q))};x.fn=x.prototype={jquery:f,constructor:x,init:function(e,n,r){var i,o;if(!e)return this;if("string"==typeof e){if(i="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:N.exec(e),!i||!i[1]&&n)return!n||n.jquery?(n||r).find(e):this.constructor(n).find(e);if(i[1]){if(n=n instanceof x?n[0]:n,x.merge(this,x.parseHTML(i[1],n&&n.nodeType?n.ownerDocument||n:a,!0)),k.test(i[1])&&x.isPlainObject(n))for(i in n)x.isFunction(this[i])?this[i](n[i]):this.attr(i,n[i]);return this}if(o=a.getElementById(i[2]),o&&o.parentNode){if(o.id!==i[2])return r.find(e);this.length=1,this[0]=o}return this.context=a,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?r.ready(e):(e.selector!==t&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return g.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(g.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,n,r,i,o,a,s=arguments[0]||{},l=1,u=arguments.length,c=!1;for("boolean"==typeof s&&(c=s,s=arguments[1]||{},l=2),"object"==typeof s||x.isFunction(s)||(s={}),u===l&&(s=this,--l);u>l;l++)if(null!=(o=arguments[l]))for(i in o)e=s[i],r=o[i],s!==r&&(c&&r&&(x.isPlainObject(r)||(n=x.isArray(r)))?(n?(n=!1,a=e&&x.isArray(e)?e:[]):a=e&&x.isPlainObject(e)?e:{},s[i]=x.extend(c,a,r)):r!==t&&(s[i]=r));return s},x.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=l),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){if(e===!0?!--x.readyWait:!x.isReady){if(!a.body)return setTimeout(x.ready);x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(a,[x]),x.fn.trigger&&x(a).trigger("ready").off("ready"))}},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray||function(e){return"array"===x.type(e)},isWindow:function(e){return null!=e&&e==e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?c[y.call(e)]||"object":typeof e},isPlainObject:function(e){var n;if(!e||"object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!v.call(e,"constructor")&&!v.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(r){return!1}if(x.support.ownLast)for(n in e)return v.call(e,n);for(n in e);return n===t||v.call(e,n)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||a;var r=k.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:function(n){return e.JSON&&e.JSON.parse?e.JSON.parse(n):null===n?n:"string"==typeof n&&(n=x.trim(n),n&&E.test(n.replace(A,"@").replace(j,"]").replace(S,"")))?Function("return "+n)():(x.error("Invalid JSON: "+n),t)},parseXML:function(n){var r,i;if(!n||"string"!=typeof n)return null;try{e.DOMParser?(i=new DOMParser,r=i.parseFromString(n,"text/xml")):(r=new ActiveXObject("Microsoft.XMLDOM"),r.async="false",r.loadXML(n))}catch(o){r=t}return r&&r.documentElement&&!r.getElementsByTagName("parsererror").length||x.error("Invalid XML: "+n),r},noop:function(){},globalEval:function(t){t&&x.trim(t)&&(e.execScript||function(t){e.eval.call(e,t)})(t)},camelCase:function(e){return e.replace(D,"ms-").replace(L,H)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,a=M(e);if(n){if(a){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(a){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:b&&!b.call("\ufeff\u00a0")?function(e){return null==e?"":b.call(e)}:function(e){return null==e?"":(e+"").replace(C,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(M(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){var r;if(t){if(m)return m.call(t,e,n);for(r=t.length,n=n?0>n?Math.max(0,r+n):n:0;r>n;n++)if(n in t&&t[n]===e)return n}return-1},merge:function(e,n){var r=n.length,i=e.length,o=0;if("number"==typeof r)for(;r>o;o++)e[i++]=n[o];else while(n[o]!==t)e[i++]=n[o++];return e.length=i,e},grep:function(e,t,n){var r,i=[],o=0,a=e.length;for(n=!!n;a>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,a=M(e),s=[];if(a)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(s[s.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(s[s.length]=r);return d.apply([],s)},guid:1,proxy:function(e,n){var r,i,o;return"string"==typeof n&&(o=e[n],n=e,e=o),x.isFunction(e)?(r=g.call(arguments,2),i=function(){return e.apply(n||this,r.concat(g.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):t},access:function(e,n,r,i,o,a,s){var l=0,u=e.length,c=null==r;if("object"===x.type(r)){o=!0;for(l in r)x.access(e,n,l,r[l],!0,a,s)}else if(i!==t&&(o=!0,x.isFunction(i)||(s=!0),c&&(s?(n.call(e,i),n=null):(c=n,n=function(e,t,n){return c.call(x(e),n)})),n))for(;u>l;l++)n(e[l],r,s?i:i.call(e[l],l,n(e[l],r)));return o?e:c?n.call(e):u?n(e[0],r):a},now:function(){return(new Date).getTime()},swap:function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i}}),x.ready.promise=function(t){if(!n)if(n=x.Deferred(),"complete"===a.readyState)setTimeout(x.ready);else if(a.addEventListener)a.addEventListener("DOMContentLoaded",q,!1),e.addEventListener("load",q,!1);else{a.attachEvent("onreadystatechange",q),e.attachEvent("onload",q);var r=!1;try{r=null==e.frameElement&&a.documentElement}catch(i){}r&&r.doScroll&&function o(){if(!x.isReady){try{r.doScroll("left")}catch(e){return setTimeout(o,50)}_(),x.ready()}}()}return n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){c["[object "+t+"]"]=t.toLowerCase()});function M(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}r=x(a),function(e,t){var n,r,i,o,a,s,l,u,c,p,f,d,h,g,m,y,v,b="sizzle"+-new Date,w=e.document,T=0,C=0,N=st(),k=st(),E=st(),S=!1,A=function(e,t){return e===t?(S=!0,0):0},j=typeof t,D=1<<31,L={}.hasOwnProperty,H=[],q=H.pop,_=H.push,M=H.push,O=H.slice,F=H.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},B="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",P="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",W=R.replace("w","w#"),$="\\["+P+"*("+R+")"+P+"*(?:([*^$|!~]?=)"+P+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+W+")|)|)"+P+"*\\]",I=":("+R+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+$.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+P+"+|((?:^|[^\\\\])(?:\\\\.)*)"+P+"+$","g"),X=RegExp("^"+P+"*,"+P+"*"),U=RegExp("^"+P+"*([>+~]|"+P+")"+P+"*"),V=RegExp(P+"*[+~]"),Y=RegExp("="+P+"*([^\\]'\"]*)"+P+"*\\]","g"),J=RegExp(I),G=RegExp("^"+W+"$"),Q={ID:RegExp("^#("+R+")"),CLASS:RegExp("^\\.("+R+")"),TAG:RegExp("^("+R.replace("w","w*")+")"),ATTR:RegExp("^"+$),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+P+"*(even|odd|(([+-]|)(\\d*)n|)"+P+"*(?:([+-]|)"+P+"*(\\d+)|))"+P+"*\\)|)","i"),bool:RegExp("^(?:"+B+")$","i"),needsContext:RegExp("^"+P+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+P+"*((?:-\\d)?\\d*)"+P+"*\\)|)(?=[^-]|$)","i")},K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,et=/^(?:input|select|textarea|button)$/i,tt=/^h\d$/i,nt=/'|\\/g,rt=RegExp("\\\\([\\da-f]{1,6}"+P+"?|("+P+")|.)","ig"),it=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{M.apply(H=O.call(w.childNodes),w.childNodes),H[w.childNodes.length].nodeType}catch(ot){M={apply:H.length?function(e,t){_.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function at(e,t,n,i){var o,a,s,l,u,c,d,m,y,x;if((t?t.ownerDocument||t:w)!==f&&p(t),t=t||f,n=n||[],!e||"string"!=typeof e)return n;if(1!==(l=t.nodeType)&&9!==l)return[];if(h&&!i){if(o=Z.exec(e))if(s=o[1]){if(9===l){if(a=t.getElementById(s),!a||!a.parentNode)return n;if(a.id===s)return n.push(a),n}else if(t.ownerDocument&&(a=t.ownerDocument.getElementById(s))&&v(t,a)&&a.id===s)return n.push(a),n}else{if(o[2])return M.apply(n,t.getElementsByTagName(e)),n;if((s=o[3])&&r.getElementsByClassName&&t.getElementsByClassName)return M.apply(n,t.getElementsByClassName(s)),n}if(r.qsa&&(!g||!g.test(e))){if(m=d=b,y=t,x=9===l&&e,1===l&&"object"!==t.nodeName.toLowerCase()){c=mt(e),(d=t.getAttribute("id"))?m=d.replace(nt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",u=c.length;while(u--)c[u]=m+yt(c[u]);y=V.test(e)&&t.parentNode||t,x=c.join(",")}if(x)try{return M.apply(n,y.querySelectorAll(x)),n}catch(T){}finally{d||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,n,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>o.cacheLength&&delete t[e.shift()],t[n]=r}return t}function lt(e){return e[b]=!0,e}function ut(e){var t=f.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function ct(e,t){var n=e.split("|"),r=e.length;while(r--)o.attrHandle[n[r]]=t}function pt(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function dt(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return lt(function(t){return t=+t,lt(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}s=at.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},r=at.support={},p=at.setDocument=function(e){var n=e?e.ownerDocument||e:w,i=n.defaultView;return n!==f&&9===n.nodeType&&n.documentElement?(f=n,d=n.documentElement,h=!s(n),i&&i.attachEvent&&i!==i.top&&i.attachEvent("onbeforeunload",function(){p()}),r.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),r.getElementsByTagName=ut(function(e){return e.appendChild(n.createComment("")),!e.getElementsByTagName("*").length}),r.getElementsByClassName=ut(function(e){return e.innerHTML="<div class='a'></div><div class='a i'></div>",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),r.getById=ut(function(e){return d.appendChild(e).id=b,!n.getElementsByName||!n.getElementsByName(b).length}),r.getById?(o.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){return e.getAttribute("id")===t}}):(delete o.find.ID,o.filter.ID=function(e){var t=e.replace(rt,it);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),o.find.TAG=r.getElementsByTagName?function(e,n){return typeof n.getElementsByTagName!==j?n.getElementsByTagName(e):t}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},o.find.CLASS=r.getElementsByClassName&&function(e,n){return typeof n.getElementsByClassName!==j&&h?n.getElementsByClassName(e):t},m=[],g=[],(r.qsa=K.test(n.querySelectorAll))&&(ut(function(e){e.innerHTML="<select><option selected=''></option></select>",e.querySelectorAll("[selected]").length||g.push("\\["+P+"*(?:value|"+B+")"),e.querySelectorAll(":checked").length||g.push(":checked")}),ut(function(e){var t=n.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&g.push("[*^$]="+P+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||g.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),g.push(",.*:")})),(r.matchesSelector=K.test(y=d.webkitMatchesSelector||d.mozMatchesSelector||d.oMatchesSelector||d.msMatchesSelector))&&ut(function(e){r.disconnectedMatch=y.call(e,"div"),y.call(e,"[s!='']:x"),m.push("!=",I)}),g=g.length&&RegExp(g.join("|")),m=m.length&&RegExp(m.join("|")),v=K.test(d.contains)||d.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},A=d.compareDocumentPosition?function(e,t){if(e===t)return S=!0,0;var i=t.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(t);return i?1&i||!r.sortDetached&&t.compareDocumentPosition(e)===i?e===n||v(w,e)?-1:t===n||v(w,t)?1:c?F.call(c,e)-F.call(c,t):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,t){var r,i=0,o=e.parentNode,a=t.parentNode,s=[e],l=[t];if(e===t)return S=!0,0;if(!o||!a)return e===n?-1:t===n?1:o?-1:a?1:c?F.call(c,e)-F.call(c,t):0;if(o===a)return pt(e,t);r=e;while(r=r.parentNode)s.unshift(r);r=t;while(r=r.parentNode)l.unshift(r);while(s[i]===l[i])i++;return i?pt(s[i],l[i]):s[i]===w?-1:l[i]===w?1:0},n):f},at.matches=function(e,t){return at(e,null,null,t)},at.matchesSelector=function(e,t){if((e.ownerDocument||e)!==f&&p(e),t=t.replace(Y,"='$1']"),!(!r.matchesSelector||!h||m&&m.test(t)||g&&g.test(t)))try{var n=y.call(e,t);if(n||r.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(i){}return at(t,f,null,[e]).length>0},at.contains=function(e,t){return(e.ownerDocument||e)!==f&&p(e),v(e,t)},at.attr=function(e,n){(e.ownerDocument||e)!==f&&p(e);var i=o.attrHandle[n.toLowerCase()],a=i&&L.call(o.attrHandle,n.toLowerCase())?i(e,n,!h):t;return a===t?r.attributes||!h?e.getAttribute(n):(a=e.getAttributeNode(n))&&a.specified?a.value:null:a},at.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},at.uniqueSort=function(e){var t,n=[],i=0,o=0;if(S=!r.detectDuplicates,c=!r.sortStable&&e.slice(0),e.sort(A),S){while(t=e[o++])t===e[o]&&(i=n.push(o));while(i--)e.splice(n[i],1)}return e},a=at.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=a(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=a(t);return n},o=at.selectors={cacheLength:50,createPseudo:lt,match:Q,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(rt,it),e[3]=(e[4]||e[5]||"").replace(rt,it),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||at.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&at.error(e[0]),e},PSEUDO:function(e){var n,r=!e[5]&&e[2];return Q.CHILD.test(e[0])?null:(e[3]&&e[4]!==t?e[2]=e[4]:r&&J.test(r)&&(n=mt(r,!0))&&(n=r.indexOf(")",r.length-n)-r.length)&&(e[0]=e[0].slice(0,n),e[2]=r.slice(0,n)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(rt,it).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=N[e+" "];return t||(t=RegExp("(^|"+P+")"+e+"("+P+"|$)"))&&N(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=at.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,l){var u,c,p,f,d,h,g=o!==a?"nextSibling":"previousSibling",m=t.parentNode,y=s&&t.nodeName.toLowerCase(),v=!l&&!s;if(m){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?m.firstChild:m.lastChild],a&&v){c=m[b]||(m[b]={}),u=c[e]||[],d=u[0]===T&&u[1],f=u[0]===T&&u[2],p=d&&m.childNodes[d];while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[T,d,f];break}}else if(v&&(u=(t[b]||(t[b]={}))[e])&&u[0]===T)f=u[1];else while(p=++d&&p&&p[g]||(f=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(v&&((p[b]||(p[b]={}))[e]=[T,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=o.pseudos[e]||o.setFilters[e.toLowerCase()]||at.error("unsupported pseudo: "+e);return r[b]?r(t):r.length>1?(n=[e,e,"",t],o.setFilters.hasOwnProperty(e.toLowerCase())?lt(function(e,n){var i,o=r(e,t),a=o.length;while(a--)i=F.call(e,o[a]),e[i]=!(n[i]=o[a])}):function(e){return r(e,0,n)}):r}},pseudos:{not:lt(function(e){var t=[],n=[],r=l(e.replace(z,"$1"));return r[b]?lt(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:lt(function(e){return function(t){return at(e,t).length>0}}),contains:lt(function(e){return function(t){return(t.textContent||t.innerText||a(t)).indexOf(e)>-1}}),lang:lt(function(e){return G.test(e||"")||at.error("unsupported lang: "+e),e=e.replace(rt,it).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===d},focus:function(e){return e===f.activeElement&&(!f.hasFocus||f.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!o.pseudos.empty(e)},header:function(e){return tt.test(e.nodeName)},input:function(e){return et.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},o.pseudos.nth=o.pseudos.eq;for(n in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})o.pseudos[n]=ft(n);for(n in{submit:!0,reset:!0})o.pseudos[n]=dt(n);function gt(){}gt.prototype=o.filters=o.pseudos,o.setFilters=new gt;function mt(e,t){var n,r,i,a,s,l,u,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,l=[],u=o.preFilter;while(s){(!n||(r=X.exec(s)))&&(r&&(s=s.slice(r[0].length)||s),l.push(i=[])),n=!1,(r=U.exec(s))&&(n=r.shift(),i.push({value:n,type:r[0].replace(z," ")}),s=s.slice(n.length));for(a in o.filter)!(r=Q[a].exec(s))||u[a]&&!(r=u[a](r))||(n=r.shift(),i.push({value:n,type:a,matches:r}),s=s.slice(n.length));if(!n)break}return t?s.length:s?at.error(e):k(e,l).slice(0)}function yt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function vt(e,t,n){var r=t.dir,o=n&&"parentNode"===r,a=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||o)return e(t,n,i)}:function(t,n,s){var l,u,c,p=T+" "+a;if(s){while(t=t[r])if((1===t.nodeType||o)&&e(t,n,s))return!0}else while(t=t[r])if(1===t.nodeType||o)if(c=t[b]||(t[b]={}),(u=c[r])&&u[0]===p){if((l=u[1])===!0||l===i)return l===!0}else if(u=c[r]=[p],u[1]=e(t,n,s)||i,u[1]===!0)return!0}}function bt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,a=[],s=0,l=e.length,u=null!=t;for(;l>s;s++)(o=e[s])&&(!n||n(o,r,i))&&(a.push(o),u&&t.push(s));return a}function wt(e,t,n,r,i,o){return r&&!r[b]&&(r=wt(r)),i&&!i[b]&&(i=wt(i,o)),lt(function(o,a,s,l){var u,c,p,f=[],d=[],h=a.length,g=o||Nt(t||"*",s.nodeType?[s]:s,[]),m=!e||!o&&t?g:xt(g,f,e,s,l),y=n?i||(o?e:h||r)?[]:a:m;if(n&&n(m,y,s,l),r){u=xt(y,d),r(u,[],s,l),c=u.length;while(c--)(p=u[c])&&(y[d[c]]=!(m[d[c]]=p))}if(o){if(i||e){if(i){u=[],c=y.length;while(c--)(p=y[c])&&u.push(m[c]=p);i(null,y=[],u,l)}c=y.length;while(c--)(p=y[c])&&(u=i?F.call(o,p):f[c])>-1&&(o[u]=!(a[u]=p))}}else y=xt(y===a?y.splice(h,y.length):y),i?i(null,a,y,l):M.apply(a,y)})}function Tt(e){var t,n,r,i=e.length,a=o.relative[e[0].type],s=a||o.relative[" "],l=a?1:0,c=vt(function(e){return e===t},s,!0),p=vt(function(e){return F.call(t,e)>-1},s,!0),f=[function(e,n,r){return!a&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;i>l;l++)if(n=o.relative[e[l].type])f=[vt(bt(f),n)];else{if(n=o.filter[e[l].type].apply(null,e[l].matches),n[b]){for(r=++l;i>r;r++)if(o.relative[e[r].type])break;return wt(l>1&&bt(f),l>1&&yt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&Tt(e.slice(l,r)),i>r&&Tt(e=e.slice(r)),i>r&&yt(e))}f.push(n)}return bt(f)}function Ct(e,t){var n=0,r=t.length>0,a=e.length>0,s=function(s,l,c,p,d){var h,g,m,y=[],v=0,b="0",x=s&&[],w=null!=d,C=u,N=s||a&&o.find.TAG("*",d&&l.parentNode||l),k=T+=null==C?1:Math.random()||.1;for(w&&(u=l!==f&&l,i=n);null!=(h=N[b]);b++){if(a&&h){g=0;while(m=e[g++])if(m(h,l,c)){p.push(h);break}w&&(T=k,i=++n)}r&&((h=!m&&h)&&v--,s&&x.push(h))}if(v+=b,r&&b!==v){g=0;while(m=t[g++])m(x,y,l,c);if(s){if(v>0)while(b--)x[b]||y[b]||(y[b]=q.call(p));y=xt(y)}M.apply(p,y),w&&!s&&y.length>0&&v+t.length>1&&at.uniqueSort(p)}return w&&(T=k,u=C),x};return r?lt(s):s}l=at.compile=function(e,t){var n,r=[],i=[],o=E[e+" "];if(!o){t||(t=mt(e)),n=t.length;while(n--)o=Tt(t[n]),o[b]?r.push(o):i.push(o);o=E(e,Ct(i,r))}return o};function Nt(e,t,n){var r=0,i=t.length;for(;i>r;r++)at(e,t[r],n);return n}function kt(e,t,n,i){var a,s,u,c,p,f=mt(e);if(!i&&1===f.length){if(s=f[0]=f[0].slice(0),s.length>2&&"ID"===(u=s[0]).type&&r.getById&&9===t.nodeType&&h&&o.relative[s[1].type]){if(t=(o.find.ID(u.matches[0].replace(rt,it),t)||[])[0],!t)return n;e=e.slice(s.shift().value.length)}a=Q.needsContext.test(e)?0:s.length;while(a--){if(u=s[a],o.relative[c=u.type])break;if((p=o.find[c])&&(i=p(u.matches[0].replace(rt,it),V.test(s[0].type)&&t.parentNode||t))){if(s.splice(a,1),e=i.length&&yt(s),!e)return M.apply(n,i),n;break}}}return l(e,f)(i,t,!h,n,V.test(e)),n}r.sortStable=b.split("").sort(A).join("")===b,r.detectDuplicates=S,p(),r.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(f.createElement("div"))}),ut(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||ct("type|href|height|width",function(e,n,r){return r?t:e.getAttribute(n,"type"===n.toLowerCase()?1:2)}),r.attributes&&ut(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||ct("value",function(e,n,r){return r||"input"!==e.nodeName.toLowerCase()?t:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||ct(B,function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&i.specified?i.value:e[n]===!0?n.toLowerCase():null}),x.find=at,x.expr=at.selectors,x.expr[":"]=x.expr.pseudos,x.unique=at.uniqueSort,x.text=at.getText,x.isXMLDoc=at.isXML,x.contains=at.contains}(e);var O={};function F(e){var t=O[e]={};return x.each(e.match(T)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?O[e]||F(e):x.extend({},e);var n,r,i,o,a,s,l=[],u=!e.once&&[],c=function(t){for(r=e.memory&&t,i=!0,a=s||0,s=0,o=l.length,n=!0;l&&o>a;a++)if(l[a].apply(t[0],t[1])===!1&&e.stopOnFalse){r=!1;break}n=!1,l&&(u?u.length&&c(u.shift()):r?l=[]:p.disable())},p={add:function(){if(l){var t=l.length;(function i(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&p.has(n)||l.push(n):n&&n.length&&"string"!==r&&i(n)})})(arguments),n?o=l.length:r&&(s=t,c(r))}return this},remove:function(){return l&&x.each(arguments,function(e,t){var r;while((r=x.inArray(t,l,r))>-1)l.splice(r,1),n&&(o>=r&&o--,a>=r&&a--)}),this},has:function(e){return e?x.inArray(e,l)>-1:!(!l||!l.length)},empty:function(){return l=[],o=0,this},disable:function(){return l=u=r=t,this},disabled:function(){return!l},lock:function(){return u=t,r||p.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!l||i&&!u||(t=t||[],t=[e,t.slice?t.slice():t],n?u.push(t):c(t)),this},fire:function(){return p.fireWith(this,arguments),this},fired:function(){return!!i}};return p},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var a=o[0],s=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=s&&s.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[a+"With"](this===r?n.promise():this,s?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var a=o[2],s=o[3];r[o[1]]=a.add,s&&a.add(function(){n=s},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=a.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=g.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),a=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?g.call(arguments):r,n===s?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},s,l,u;if(r>1)for(s=Array(r),l=Array(r),u=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(a(t,u,n)).fail(o.reject).progress(a(t,l,s)):--i;return i||o.resolveWith(u,n),o.promise()}}),x.support=function(t){var n,r,o,s,l,u,c,p,f,d=a.createElement("div");if(d.setAttribute("className","t"),d.innerHTML="  <link/><table></table><a href='http://github.com/a'>a</a><input type='checkbox'/>",n=d.getElementsByTagName("*")||[],r=d.getElementsByTagName("a")[0],!r||!r.style||!n.length)return t;s=a.createElement("select"),u=s.appendChild(a.createElement("option")),o=d.getElementsByTagName("input")[0],r.style.cssText="top:1px;float:left;opacity:.5",t.getSetAttribute="t"!==d.className,t.leadingWhitespace=3===d.firstChild.nodeType,t.tbody=!d.getElementsByTagName("tbody").length,t.htmlSerialize=!!d.getElementsByTagName("link").length,t.style=/top/.test(r.getAttribute("style")),t.hrefNormalized="/a"===r.getAttribute("href"),t.opacity=/^0.5/.test(r.style.opacity),t.cssFloat=!!r.style.cssFloat,t.checkOn=!!o.value,t.optSelected=u.selected,t.enctype=!!a.createElement("form").enctype,t.html5Clone="<:nav></:nav>"!==a.createElement("nav").cloneNode(!0).outerHTML,t.inlineBlockNeedsLayout=!1,t.shrinkWrapBlocks=!1,t.pixelPosition=!1,t.deleteExpando=!0,t.noCloneEvent=!0,t.reliableMarginRight=!0,t.boxSizingReliable=!0,o.checked=!0,t.noCloneChecked=o.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!u.disabled;try{delete d.test}catch(h){t.deleteExpando=!1}o=a.createElement("input"),o.setAttribute("value",""),t.input=""===o.getAttribute("value"),o.value="t",o.setAttribute("type","radio"),t.radioValue="t"===o.value,o.setAttribute("checked","t"),o.setAttribute("name","t"),l=a.createDocumentFragment(),l.appendChild(o),t.appendChecked=o.checked,t.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,d.attachEvent&&(d.attachEvent("onclick",function(){t.noCloneEvent=!1}),d.cloneNode(!0).click());for(f in{submit:!0,change:!0,focusin:!0})d.setAttribute(c="on"+f,"t"),t[f+"Bubbles"]=c in e||d.attributes[c].expando===!1;d.style.backgroundClip="content-box",d.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===d.style.backgroundClip;for(f in x(t))break;return t.ownLast="0"!==f,x(function(){var n,r,o,s="padding:0;margin:0;border:0;display:block;box-sizing:content-box;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;",l=a.getElementsByTagName("body")[0];l&&(n=a.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",l.appendChild(n).appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",o=d.getElementsByTagName("td"),o[0].style.cssText="padding:0;margin:0;border:0;display:none",p=0===o[0].offsetHeight,o[0].style.display="",o[1].style.display="none",t.reliableHiddenOffsets=p&&0===o[0].offsetHeight,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",x.swap(l,null!=l.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===d.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(d,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(d,null)||{width:"4px"}).width,r=d.appendChild(a.createElement("div")),r.style.cssText=d.style.cssText=s,r.style.marginRight=r.style.width="0",d.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),typeof d.style.zoom!==i&&(d.innerHTML="",d.style.cssText=s+"width:1px;padding:1px;display:inline;zoom:1",t.inlineBlockNeedsLayout=3===d.offsetWidth,d.style.display="block",d.innerHTML="<div></div>",d.firstChild.style.width="5px",t.shrinkWrapBlocks=3!==d.offsetWidth,t.inlineBlockNeedsLayout&&(l.style.zoom=1)),l.removeChild(n),n=d=o=r=null)}),n=s=l=u=r=o=null,t
-}({});var B=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,P=/([A-Z])/g;function R(e,n,r,i){if(x.acceptData(e)){var o,a,s=x.expando,l=e.nodeType,u=l?x.cache:e,c=l?e[s]:e[s]&&s;if(c&&u[c]&&(i||u[c].data)||r!==t||"string"!=typeof n)return c||(c=l?e[s]=p.pop()||x.guid++:s),u[c]||(u[c]=l?{}:{toJSON:x.noop}),("object"==typeof n||"function"==typeof n)&&(i?u[c]=x.extend(u[c],n):u[c].data=x.extend(u[c].data,n)),a=u[c],i||(a.data||(a.data={}),a=a.data),r!==t&&(a[x.camelCase(n)]=r),"string"==typeof n?(o=a[n],null==o&&(o=a[x.camelCase(n)])):o=a,o}}function W(e,t,n){if(x.acceptData(e)){var r,i,o=e.nodeType,a=o?x.cache:e,s=o?e[x.expando]:x.expando;if(a[s]){if(t&&(r=n?a[s]:a[s].data)){x.isArray(t)?t=t.concat(x.map(t,x.camelCase)):t in r?t=[t]:(t=x.camelCase(t),t=t in r?[t]:t.split(" ")),i=t.length;while(i--)delete r[t[i]];if(n?!I(r):!x.isEmptyObject(r))return}(n||(delete a[s].data,I(a[s])))&&(o?x.cleanData([e],!0):x.support.deleteExpando||a!=a.window?delete a[s]:a[s]=null)}}}x.extend({cache:{},noData:{applet:!0,embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"},hasData:function(e){return e=e.nodeType?x.cache[e[x.expando]]:e[x.expando],!!e&&!I(e)},data:function(e,t,n){return R(e,t,n)},removeData:function(e,t){return W(e,t)},_data:function(e,t,n){return R(e,t,n,!0)},_removeData:function(e,t){return W(e,t,!0)},acceptData:function(e){if(e.nodeType&&1!==e.nodeType&&9!==e.nodeType)return!1;var t=e.nodeName&&x.noData[e.nodeName.toLowerCase()];return!t||t!==!0&&e.getAttribute("classid")===t}}),x.fn.extend({data:function(e,n){var r,i,o=null,a=0,s=this[0];if(e===t){if(this.length&&(o=x.data(s),1===s.nodeType&&!x._data(s,"parsedAttrs"))){for(r=s.attributes;r.length>a;a++)i=r[a].name,0===i.indexOf("data-")&&(i=x.camelCase(i.slice(5)),$(s,i,o[i]));x._data(s,"parsedAttrs",!0)}return o}return"object"==typeof e?this.each(function(){x.data(this,e)}):arguments.length>1?this.each(function(){x.data(this,e,n)}):s?$(s,e,x.data(s,e)):null},removeData:function(e){return this.each(function(){x.removeData(this,e)})}});function $(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(P,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:B.test(r)?x.parseJSON(r):r}catch(o){}x.data(e,n,r)}else r=t}return r}function I(e){var t;for(t in e)if(("data"!==t||!x.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}x.extend({queue:function(e,n,r){var i;return e?(n=(n||"fx")+"queue",i=x._data(e,n),r&&(!i||x.isArray(r)?i=x._data(e,n,x.makeArray(r)):i.push(r)),i||[]):t},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),a=function(){x.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return x._data(e,n)||x._data(e,n,{empty:x.Callbacks("once memory").add(function(){x._removeData(e,t+"queue"),x._removeData(e,n)})})}}),x.fn.extend({queue:function(e,n){var r=2;return"string"!=typeof e&&(n=e,e="fx",r--),r>arguments.length?x.queue(this[0],e):n===t?this:this.each(function(){var t=x.queue(this,e,n);x._queueHooks(this,e),"fx"===e&&"inprogress"!==t[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,n){var r,i=1,o=x.Deferred(),a=this,s=this.length,l=function(){--i||o.resolveWith(a,[a])};"string"!=typeof e&&(n=e,e=t),e=e||"fx";while(s--)r=x._data(a[s],e+"queueHooks"),r&&r.empty&&(i++,r.empty.add(l));return l(),o.promise(n)}});var z,X,U=/[\t\r\n\f]/g,V=/\r/g,Y=/^(?:input|select|textarea|button|object)$/i,J=/^(?:a|area)$/i,G=/^(?:checked|selected)$/i,Q=x.support.getSetAttribute,K=x.support.input;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return e=x.propFix[e]||e,this.each(function(){try{this[e]=t,delete this[e]}catch(n){}})},addClass:function(e){var t,n,r,i,o,a=0,s=this.length,l="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,a=0,s=this.length,l=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(l)for(t=(e||"").match(T)||[];s>a;a++)if(n=this[a],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(U," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,r=0,o=x(this),a=e.match(T)||[];while(t=a[r++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===i||"boolean"===n)&&(this.className&&x._data(this,"__className__",this.className),this.className=this.className||e===!1?"":x._data(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(U," ").indexOf(t)>=0)return!0;return!1},val:function(e){var n,r,i,o=this[0];{if(arguments.length)return i=x.isFunction(e),this.each(function(n){var o;1===this.nodeType&&(o=i?e.call(this,n,x(this).val()):e,null==o?o="":"number"==typeof o?o+="":x.isArray(o)&&(o=x.map(o,function(e){return null==e?"":e+""})),r=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],r&&"set"in r&&r.set(this,o,"value")!==t||(this.value=o))});if(o)return r=x.valHooks[o.type]||x.valHooks[o.nodeName.toLowerCase()],r&&"get"in r&&(n=r.get(o,"value"))!==t?n:(n=o.value,"string"==typeof n?n.replace(V,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=x.find.attr(e,"value");return null!=t?t:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,a=o?null:[],s=o?i+1:r.length,l=0>i?s:o?i:0;for(;s>l;l++)if(n=r[l],!(!n.selected&&l!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;a.push(t)}return a},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),a=i.length;while(a--)r=i[a],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,n,r){var o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===i?x.prop(e,n,r):(1===s&&x.isXMLDoc(e)||(n=n.toLowerCase(),o=x.attrHooks[n]||(x.expr.match.bool.test(n)?X:z)),r===t?o&&"get"in o&&null!==(a=o.get(e,n))?a:(a=x.find.attr(e,n),null==a?t:a):null!==r?o&&"set"in o&&(a=o.set(e,r,n))!==t?a:(e.setAttribute(n,r+""),r):(x.removeAttr(e,n),t))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(T);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)?K&&Q||!G.test(n)?e[r]=!1:e[x.camelCase("default-"+n)]=e[r]=!1:x.attr(e,n,""),e.removeAttribute(Q?n:r)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,n,r){var i,o,a,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return a=1!==s||!x.isXMLDoc(e),a&&(n=x.propFix[n]||n,o=x.propHooks[n]),r!==t?o&&"set"in o&&(i=o.set(e,r,n))!==t?i:e[n]=r:o&&"get"in o&&null!==(i=o.get(e,n))?i:e[n]},propHooks:{tabIndex:{get:function(e){var t=x.find.attr(e,"tabindex");return t?parseInt(t,10):Y.test(e.nodeName)||J.test(e.nodeName)&&e.href?0:-1}}}}),X={set:function(e,t,n){return t===!1?x.removeAttr(e,n):K&&Q||!G.test(n)?e.setAttribute(!Q&&x.propFix[n]||n,n):e[x.camelCase("default-"+n)]=e[n]=!0,n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,n){var r=x.expr.attrHandle[n]||x.find.attr;x.expr.attrHandle[n]=K&&Q||!G.test(n)?function(e,n,i){var o=x.expr.attrHandle[n],a=i?t:(x.expr.attrHandle[n]=t)!=r(e,n,i)?n.toLowerCase():null;return x.expr.attrHandle[n]=o,a}:function(e,n,r){return r?t:e[x.camelCase("default-"+n)]?n.toLowerCase():null}}),K&&Q||(x.attrHooks.value={set:function(e,n,r){return x.nodeName(e,"input")?(e.defaultValue=n,t):z&&z.set(e,n,r)}}),Q||(z={set:function(e,n,r){var i=e.getAttributeNode(r);return i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},x.expr.attrHandle.id=x.expr.attrHandle.name=x.expr.attrHandle.coords=function(e,n,r){var i;return r?t:(i=e.getAttributeNode(n))&&""!==i.value?i.value:null},x.valHooks.button={get:function(e,n){var r=e.getAttributeNode(n);return r&&r.specified?r.value:t},set:z.set},x.attrHooks.contenteditable={set:function(e,t,n){z.set(e,""===t?!1:t,n)}},x.each(["width","height"],function(e,n){x.attrHooks[n]={set:function(e,r){return""===r?(e.setAttribute(n,"auto"),r):t}}})),x.support.hrefNormalized||x.each(["href","src"],function(e,t){x.propHooks[t]={get:function(e){return e.getAttribute(t,4)}}}),x.support.style||(x.attrHooks.style={get:function(e){return e.style.cssText||t},set:function(e,t){return e.style.cssText=t+""}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex),null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.support.enctype||(x.propFix.enctype="encoding"),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,n){return x.isArray(n)?e.checked=x.inArray(x(e).val(),n)>=0:t}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var Z=/^(?:input|select|textarea)$/i,et=/^key/,tt=/^(?:mouse|contextmenu)|click/,nt=/^(?:focusinfocus|focusoutblur)$/,rt=/^([^.]*)(?:\.(.+)|)$/;function it(){return!0}function ot(){return!1}function at(){try{return a.activeElement}catch(e){}}x.event={global:{},add:function(e,n,r,o,a){var s,l,u,c,p,f,d,h,g,m,y,v=x._data(e);if(v){r.handler&&(c=r,r=c.handler,a=c.selector),r.guid||(r.guid=x.guid++),(l=v.events)||(l=v.events={}),(f=v.handle)||(f=v.handle=function(e){return typeof x===i||e&&x.event.triggered===e.type?t:x.event.dispatch.apply(f.elem,arguments)},f.elem=e),n=(n||"").match(T)||[""],u=n.length;while(u--)s=rt.exec(n[u])||[],g=y=s[1],m=(s[2]||"").split(".").sort(),g&&(p=x.event.special[g]||{},g=(a?p.delegateType:p.bindType)||g,p=x.event.special[g]||{},d=x.extend({type:g,origType:y,data:o,handler:r,guid:r.guid,selector:a,needsContext:a&&x.expr.match.needsContext.test(a),namespace:m.join(".")},c),(h=l[g])||(h=l[g]=[],h.delegateCount=0,p.setup&&p.setup.call(e,o,m,f)!==!1||(e.addEventListener?e.addEventListener(g,f,!1):e.attachEvent&&e.attachEvent("on"+g,f))),p.add&&(p.add.call(e,d),d.handler.guid||(d.handler.guid=r.guid)),a?h.splice(h.delegateCount++,0,d):h.push(d),x.event.global[g]=!0);e=null}},remove:function(e,t,n,r,i){var o,a,s,l,u,c,p,f,d,h,g,m=x.hasData(e)&&x._data(e);if(m&&(c=m.events)){t=(t||"").match(T)||[""],u=t.length;while(u--)if(s=rt.exec(t[u])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){p=x.event.special[d]||{},d=(r?p.delegateType:p.bindType)||d,f=c[d]||[],s=s[2]&&RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),l=o=f.length;while(o--)a=f[o],!i&&g!==a.origType||n&&n.guid!==a.guid||s&&!s.test(a.namespace)||r&&r!==a.selector&&("**"!==r||!a.selector)||(f.splice(o,1),a.selector&&f.delegateCount--,p.remove&&p.remove.call(e,a));l&&!f.length&&(p.teardown&&p.teardown.call(e,h,m.handle)!==!1||x.removeEvent(e,d,m.handle),delete c[d])}else for(d in c)x.event.remove(e,d+t[u],n,r,!0);x.isEmptyObject(c)&&(delete m.handle,x._removeData(e,"events"))}},trigger:function(n,r,i,o){var s,l,u,c,p,f,d,h=[i||a],g=v.call(n,"type")?n.type:n,m=v.call(n,"namespace")?n.namespace.split("."):[];if(u=f=i=i||a,3!==i.nodeType&&8!==i.nodeType&&!nt.test(g+x.event.triggered)&&(g.indexOf(".")>=0&&(m=g.split("."),g=m.shift(),m.sort()),l=0>g.indexOf(":")&&"on"+g,n=n[x.expando]?n:new x.Event(g,"object"==typeof n&&n),n.isTrigger=o?2:3,n.namespace=m.join("."),n.namespace_re=n.namespace?RegExp("(^|\\.)"+m.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,n.result=t,n.target||(n.target=i),r=null==r?[n]:x.makeArray(r,[n]),p=x.event.special[g]||{},o||!p.trigger||p.trigger.apply(i,r)!==!1)){if(!o&&!p.noBubble&&!x.isWindow(i)){for(c=p.delegateType||g,nt.test(c+g)||(u=u.parentNode);u;u=u.parentNode)h.push(u),f=u;f===(i.ownerDocument||a)&&h.push(f.defaultView||f.parentWindow||e)}d=0;while((u=h[d++])&&!n.isPropagationStopped())n.type=d>1?c:p.bindType||g,s=(x._data(u,"events")||{})[n.type]&&x._data(u,"handle"),s&&s.apply(u,r),s=l&&u[l],s&&x.acceptData(u)&&s.apply&&s.apply(u,r)===!1&&n.preventDefault();if(n.type=g,!o&&!n.isDefaultPrevented()&&(!p._default||p._default.apply(h.pop(),r)===!1)&&x.acceptData(i)&&l&&i[g]&&!x.isWindow(i)){f=i[l],f&&(i[l]=null),x.event.triggered=g;try{i[g]()}catch(y){}x.event.triggered=t,f&&(i[l]=f)}return n.result}},dispatch:function(e){e=x.event.fix(e);var n,r,i,o,a,s=[],l=g.call(arguments),u=(x._data(this,"events")||{})[e.type]||[],c=x.event.special[e.type]||{};if(l[0]=e,e.delegateTarget=this,!c.preDispatch||c.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),n=0;while((o=s[n++])&&!e.isPropagationStopped()){e.currentTarget=o.elem,a=0;while((i=o.handlers[a++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(i.namespace))&&(e.handleObj=i,e.data=i.data,r=((x.event.special[i.origType]||{}).handle||i.handler).apply(o.elem,l),r!==t&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,e),e.result}},handlers:function(e,n){var r,i,o,a,s=[],l=n.delegateCount,u=e.target;if(l&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!=this;u=u.parentNode||this)if(1===u.nodeType&&(u.disabled!==!0||"click"!==e.type)){for(o=[],a=0;l>a;a++)i=n[a],r=i.selector+" ",o[r]===t&&(o[r]=i.needsContext?x(r,this).index(u)>=0:x.find(r,this,null,[u]).length),o[r]&&o.push(i);o.length&&s.push({elem:u,handlers:o})}return n.length>l&&s.push({elem:this,handlers:n.slice(l)}),s},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,o=e,s=this.fixHooks[i];s||(this.fixHooks[i]=s=tt.test(i)?this.mouseHooks:et.test(i)?this.keyHooks:{}),r=s.props?this.props.concat(s.props):this.props,e=new x.Event(o),t=r.length;while(t--)n=r[t],e[n]=o[n];return e.target||(e.target=o.srcElement||a),3===e.target.nodeType&&(e.target=e.target.parentNode),e.metaKey=!!e.metaKey,s.filter?s.filter(e,o):e},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,n){var r,i,o,s=n.button,l=n.fromElement;return null==e.pageX&&null!=n.clientX&&(i=e.target.ownerDocument||a,o=i.documentElement,r=i.body,e.pageX=n.clientX+(o&&o.scrollLeft||r&&r.scrollLeft||0)-(o&&o.clientLeft||r&&r.clientLeft||0),e.pageY=n.clientY+(o&&o.scrollTop||r&&r.scrollTop||0)-(o&&o.clientTop||r&&r.clientTop||0)),!e.relatedTarget&&l&&(e.relatedTarget=l===e.target?n.toElement:l),e.which||s===t||(e.which=1&s?1:2&s?3:4&s?2:0),e}},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==at()&&this.focus)try{return this.focus(),!1}catch(e){}},delegateType:"focusin"},blur:{trigger:function(){return this===at()&&this.blur?(this.blur(),!1):t},delegateType:"focusout"},click:{trigger:function(){return x.nodeName(this,"input")&&"checkbox"===this.type&&this.click?(this.click(),!1):t},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==t&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=a.removeEventListener?function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)}:function(e,t,n){var r="on"+t;e.detachEvent&&(typeof e[r]===i&&(e[r]=null),e.detachEvent(r,n))},x.Event=function(e,n){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.returnValue===!1||e.getPreventDefault&&e.getPreventDefault()?it:ot):this.type=e,n&&x.extend(this,n),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,t):new x.Event(e,n)},x.Event.prototype={isDefaultPrevented:ot,isPropagationStopped:ot,isImmediatePropagationStopped:ot,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=it,e&&(e.preventDefault?e.preventDefault():e.returnValue=!1)},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=it,e&&(e.stopPropagation&&e.stopPropagation(),e.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=it,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.submitBubbles||(x.event.special.submit={setup:function(){return x.nodeName(this,"form")?!1:(x.event.add(this,"click._submit keypress._submit",function(e){var n=e.target,r=x.nodeName(n,"input")||x.nodeName(n,"button")?n.form:t;r&&!x._data(r,"submitBubbles")&&(x.event.add(r,"submit._submit",function(e){e._submit_bubble=!0}),x._data(r,"submitBubbles",!0))}),t)},postDispatch:function(e){e._submit_bubble&&(delete e._submit_bubble,this.parentNode&&!e.isTrigger&&x.event.simulate("submit",this.parentNode,e,!0))},teardown:function(){return x.nodeName(this,"form")?!1:(x.event.remove(this,"._submit"),t)}}),x.support.changeBubbles||(x.event.special.change={setup:function(){return Z.test(this.nodeName)?(("checkbox"===this.type||"radio"===this.type)&&(x.event.add(this,"propertychange._change",function(e){"checked"===e.originalEvent.propertyName&&(this._just_changed=!0)}),x.event.add(this,"click._change",function(e){this._just_changed&&!e.isTrigger&&(this._just_changed=!1),x.event.simulate("change",this,e,!0)})),!1):(x.event.add(this,"beforeactivate._change",function(e){var t=e.target;Z.test(t.nodeName)&&!x._data(t,"changeBubbles")&&(x.event.add(t,"change._change",function(e){!this.parentNode||e.isSimulated||e.isTrigger||x.event.simulate("change",this.parentNode,e,!0)}),x._data(t,"changeBubbles",!0))}),t)},handle:function(e){var n=e.target;return this!==n||e.isSimulated||e.isTrigger||"radio"!==n.type&&"checkbox"!==n.type?e.handleObj.handler.apply(this,arguments):t},teardown:function(){return x.event.remove(this,"._change"),!Z.test(this.nodeName)}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&a.addEventListener(e,r,!0)},teardown:function(){0===--n&&a.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,n,r,i,o){var a,s;if("object"==typeof e){"string"!=typeof n&&(r=r||n,n=t);for(a in e)this.on(a,n,r,e[a],o);return this}if(null==r&&null==i?(i=n,r=n=t):null==i&&("string"==typeof n?(i=r,r=t):(i=r,r=n,n=t)),i===!1)i=ot;else if(!i)return this;return 1===o&&(s=i,i=function(e){return x().off(e),s.apply(this,arguments)},i.guid=s.guid||(s.guid=x.guid++)),this.each(function(){x.event.add(this,e,i,r,n)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,n,r){var i,o;if(e&&e.preventDefault&&e.handleObj)return i=e.handleObj,x(e.delegateTarget).off(i.namespace?i.origType+"."+i.namespace:i.origType,i.selector,i.handler),this;if("object"==typeof e){for(o in e)this.off(o,n,e[o]);return this}return(n===!1||"function"==typeof n)&&(r=n,n=t),r===!1&&(r=ot),this.each(function(){x.event.remove(this,e,r,n)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,n){var r=this[0];return r?x.event.trigger(e,n,r,!0):t}});var st=/^.[^:#\[\.,]*$/,lt=/^(?:parents|prev(?:Until|All))/,ut=x.expr.match.needsContext,ct={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t,n=x(e,this),r=n.length;return this.filter(function(){for(t=0;r>t;t++)if(x.contains(this,n[t]))return!0})},not:function(e){return this.pushStack(ft(this,e||[],!0))},filter:function(e){return this.pushStack(ft(this,e||[],!1))},is:function(e){return!!ft(this,"string"==typeof e&&ut.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],a=ut.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(a?a.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?x.inArray(this[0],x(e)):x.inArray(e.jquery?e[0]:e,this):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function pt(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return pt(e,"nextSibling")},prev:function(e){return pt(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return x.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(ct[e]||(i=x.unique(i)),lt.test(e)&&(i=i.reverse())),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,n,r){var i=[],o=e[n];while(o&&9!==o.nodeType&&(r===t||1!==o.nodeType||!x(o).is(r)))1===o.nodeType&&i.push(o),o=o[n];return i},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function ft(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(st.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return x.inArray(e,t)>=0!==n})}function dt(e){var t=ht.split("|"),n=e.createDocumentFragment();if(n.createElement)while(t.length)n.createElement(t.pop());return n}var ht="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",gt=/ jQuery\d+="(?:null|\d+)"/g,mt=RegExp("<(?:"+ht+")[\\s/>]","i"),yt=/^\s+/,vt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bt=/<([\w:]+)/,xt=/<tbody/i,wt=/<|&#?\w+;/,Tt=/<(?:script|style|link)/i,Ct=/^(?:checkbox|radio)$/i,Nt=/checked\s*(?:[^=]|=\s*.checked.)/i,kt=/^$|\/(?:java|ecma)script/i,Et=/^true\/(.*)/,St=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g,At={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],area:[1,"<map>","</map>"],param:[1,"<object>","</object>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:x.support.htmlSerialize?[0,"",""]:[1,"X<div>","</div>"]},jt=dt(a),Dt=jt.appendChild(a.createElement("div"));At.optgroup=At.option,At.tbody=At.tfoot=At.colgroup=At.caption=At.thead,At.th=At.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===t?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||a).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Lt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(Ft(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&_t(Ft(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++){1===e.nodeType&&x.cleanData(Ft(e,!1));while(e.firstChild)e.removeChild(e.firstChild);e.options&&x.nodeName(e,"select")&&(e.options.length=0)}return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var n=this[0]||{},r=0,i=this.length;if(e===t)return 1===n.nodeType?n.innerHTML.replace(gt,""):t;if(!("string"!=typeof e||Tt.test(e)||!x.support.htmlSerialize&&mt.test(e)||!x.support.leadingWhitespace&&yt.test(e)||At[(bt.exec(e)||["",""])[1].toLowerCase()])){e=e.replace(vt,"<$1></$2>");try{for(;i>r;r++)n=this[r]||{},1===n.nodeType&&(x.cleanData(Ft(n,!1)),n.innerHTML=e);n=0}catch(o){}}n&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=d.apply([],e);var r,i,o,a,s,l,u=0,c=this.length,p=this,f=c-1,h=e[0],g=x.isFunction(h);if(g||!(1>=c||"string"!=typeof h||x.support.checkClone)&&Nt.test(h))return this.each(function(r){var i=p.eq(r);g&&(e[0]=h.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(l=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),r=l.firstChild,1===l.childNodes.length&&(l=r),r)){for(a=x.map(Ft(l,"script"),Ht),o=a.length;c>u;u++)i=l,u!==f&&(i=x.clone(i,!0,!0),o&&x.merge(a,Ft(i,"script"))),t.call(this[u],i,u);if(o)for(s=a[a.length-1].ownerDocument,x.map(a,qt),u=0;o>u;u++)i=a[u],kt.test(i.type||"")&&!x._data(i,"globalEval")&&x.contains(s,i)&&(i.src?x._evalUrl(i.src):x.globalEval((i.text||i.textContent||i.innerHTML||"").replace(St,"")));l=r=null}return this}});function Lt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function Ht(e){return e.type=(null!==x.find.attr(e,"type"))+"/"+e.type,e}function qt(e){var t=Et.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function _t(e,t){var n,r=0;for(;null!=(n=e[r]);r++)x._data(n,"globalEval",!t||x._data(t[r],"globalEval"))}function Mt(e,t){if(1===t.nodeType&&x.hasData(e)){var n,r,i,o=x._data(e),a=x._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)x.event.add(t,n,s[n][r])}a.data&&(a.data=x.extend({},a.data))}}function Ot(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!x.support.noCloneEvent&&t[x.expando]){i=x._data(t);for(r in i.events)x.removeEvent(t,r,i.handle);t.removeAttribute(x.expando)}"script"===n&&t.text!==e.text?(Ht(t).text=e.text,qt(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),x.support.html5Clone&&e.innerHTML&&!x.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Ct.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=0,i=[],o=x(e),a=o.length-1;for(;a>=r;r++)n=r===a?this:this.clone(!0),x(o[r])[t](n),h.apply(i,n.get());return this.pushStack(i)}});function Ft(e,n){var r,o,a=0,s=typeof e.getElementsByTagName!==i?e.getElementsByTagName(n||"*"):typeof e.querySelectorAll!==i?e.querySelectorAll(n||"*"):t;if(!s)for(s=[],r=e.childNodes||e;null!=(o=r[a]);a++)!n||x.nodeName(o,n)?s.push(o):x.merge(s,Ft(o,n));return n===t||n&&x.nodeName(e,n)?x.merge([e],s):s}function Bt(e){Ct.test(e.type)&&(e.defaultChecked=e.checked)}x.extend({clone:function(e,t,n){var r,i,o,a,s,l=x.contains(e.ownerDocument,e);if(x.support.html5Clone||x.isXMLDoc(e)||!mt.test("<"+e.nodeName+">")?o=e.cloneNode(!0):(Dt.innerHTML=e.outerHTML,Dt.removeChild(o=Dt.firstChild)),!(x.support.noCloneEvent&&x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(r=Ft(o),s=Ft(e),a=0;null!=(i=s[a]);++a)r[a]&&Ot(i,r[a]);if(t)if(n)for(s=s||Ft(e),r=r||Ft(o),a=0;null!=(i=s[a]);a++)Mt(i,r[a]);else Mt(e,o);return r=Ft(o,"script"),r.length>0&&_t(r,!l&&Ft(e,"script")),r=s=i=null,o},buildFragment:function(e,t,n,r){var i,o,a,s,l,u,c,p=e.length,f=dt(t),d=[],h=0;for(;p>h;h++)if(o=e[h],o||0===o)if("object"===x.type(o))x.merge(d,o.nodeType?[o]:o);else if(wt.test(o)){s=s||f.appendChild(t.createElement("div")),l=(bt.exec(o)||["",""])[1].toLowerCase(),c=At[l]||At._default,s.innerHTML=c[1]+o.replace(vt,"<$1></$2>")+c[2],i=c[0];while(i--)s=s.lastChild;if(!x.support.leadingWhitespace&&yt.test(o)&&d.push(t.createTextNode(yt.exec(o)[0])),!x.support.tbody){o="table"!==l||xt.test(o)?"<table>"!==c[1]||xt.test(o)?0:s:s.firstChild,i=o&&o.childNodes.length;while(i--)x.nodeName(u=o.childNodes[i],"tbody")&&!u.childNodes.length&&o.removeChild(u)}x.merge(d,s.childNodes),s.textContent="";while(s.firstChild)s.removeChild(s.firstChild);s=f.lastChild}else d.push(t.createTextNode(o));s&&f.removeChild(s),x.support.appendChecked||x.grep(Ft(d,"input"),Bt),h=0;while(o=d[h++])if((!r||-1===x.inArray(o,r))&&(a=x.contains(o.ownerDocument,o),s=Ft(f.appendChild(o),"script"),a&&_t(s),n)){i=0;while(o=s[i++])kt.test(o.type||"")&&n.push(o)}return s=null,f},cleanData:function(e,t){var n,r,o,a,s=0,l=x.expando,u=x.cache,c=x.support.deleteExpando,f=x.event.special;for(;null!=(n=e[s]);s++)if((t||x.acceptData(n))&&(o=n[l],a=o&&u[o])){if(a.events)for(r in a.events)f[r]?x.event.remove(n,r):x.removeEvent(n,r,a.handle);
-u[o]&&(delete u[o],c?delete n[l]:typeof n.removeAttribute!==i?n.removeAttribute(l):n[l]=null,p.push(o))}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}}),x.fn.extend({wrapAll:function(e){if(x.isFunction(e))return this.each(function(t){x(this).wrapAll(e.call(this,t))});if(this[0]){var t=x(e,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstChild&&1===e.firstChild.nodeType)e=e.firstChild;return e}).append(this)}return this},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var Pt,Rt,Wt,$t=/alpha\([^)]*\)/i,It=/opacity\s*=\s*([^)]*)/,zt=/^(top|right|bottom|left)$/,Xt=/^(none|table(?!-c[ea]).+)/,Ut=/^margin/,Vt=RegExp("^("+w+")(.*)$","i"),Yt=RegExp("^("+w+")(?!px)[a-z%]+$","i"),Jt=RegExp("^([+-])=("+w+")","i"),Gt={BODY:"block"},Qt={position:"absolute",visibility:"hidden",display:"block"},Kt={letterSpacing:0,fontWeight:400},Zt=["Top","Right","Bottom","Left"],en=["Webkit","O","Moz","ms"];function tn(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=en.length;while(i--)if(t=en[i]+n,t in e)return t;return r}function nn(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function rn(e,t){var n,r,i,o=[],a=0,s=e.length;for(;s>a;a++)r=e[a],r.style&&(o[a]=x._data(r,"olddisplay"),n=r.style.display,t?(o[a]||"none"!==n||(r.style.display=""),""===r.style.display&&nn(r)&&(o[a]=x._data(r,"olddisplay",ln(r.nodeName)))):o[a]||(i=nn(r),(n&&"none"!==n||!i)&&x._data(r,"olddisplay",i?n:x.css(r,"display"))));for(a=0;s>a;a++)r=e[a],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[a]||"":"none"));return e}x.fn.extend({css:function(e,n){return x.access(this,function(e,n,r){var i,o,a={},s=0;if(x.isArray(n)){for(o=Rt(e),i=n.length;i>s;s++)a[n[s]]=x.css(e,n[s],!1,o);return a}return r!==t?x.style(e,n,r):x.css(e,n)},e,n,arguments.length>1)},show:function(){return rn(this,!0)},hide:function(){return rn(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){nn(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Wt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":x.support.cssFloat?"cssFloat":"styleFloat"},style:function(e,n,r,i){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var o,a,s,l=x.camelCase(n),u=e.style;if(n=x.cssProps[l]||(x.cssProps[l]=tn(u,l)),s=x.cssHooks[n]||x.cssHooks[l],r===t)return s&&"get"in s&&(o=s.get(e,!1,i))!==t?o:u[n];if(a=typeof r,"string"===a&&(o=Jt.exec(r))&&(r=(o[1]+1)*o[2]+parseFloat(x.css(e,n)),a="number"),!(null==r||"number"===a&&isNaN(r)||("number"!==a||x.cssNumber[l]||(r+="px"),x.support.clearCloneStyle||""!==r||0!==n.indexOf("background")||(u[n]="inherit"),s&&"set"in s&&(r=s.set(e,r,i))===t)))try{u[n]=r}catch(c){}}},css:function(e,n,r,i){var o,a,s,l=x.camelCase(n);return n=x.cssProps[l]||(x.cssProps[l]=tn(e.style,l)),s=x.cssHooks[n]||x.cssHooks[l],s&&"get"in s&&(a=s.get(e,!0,r)),a===t&&(a=Wt(e,n,i)),"normal"===a&&n in Kt&&(a=Kt[n]),""===r||r?(o=parseFloat(a),r===!0||x.isNumeric(o)?o||0:a):a}}),e.getComputedStyle?(Rt=function(t){return e.getComputedStyle(t,null)},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s.getPropertyValue(n)||s[n]:t,u=e.style;return s&&(""!==l||x.contains(e.ownerDocument,e)||(l=x.style(e,n)),Yt.test(l)&&Ut.test(n)&&(i=u.width,o=u.minWidth,a=u.maxWidth,u.minWidth=u.maxWidth=u.width=l,l=s.width,u.width=i,u.minWidth=o,u.maxWidth=a)),l}):a.documentElement.currentStyle&&(Rt=function(e){return e.currentStyle},Wt=function(e,n,r){var i,o,a,s=r||Rt(e),l=s?s[n]:t,u=e.style;return null==l&&u&&u[n]&&(l=u[n]),Yt.test(l)&&!zt.test(n)&&(i=u.left,o=e.runtimeStyle,a=o&&o.left,a&&(o.left=e.currentStyle.left),u.left="fontSize"===n?"1em":l,l=u.pixelLeft+"px",u.left=i,a&&(o.left=a)),""===l?"auto":l});function on(e,t,n){var r=Vt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function an(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;for(;4>o;o+=2)"margin"===n&&(a+=x.css(e,n+Zt[o],!0,i)),r?("content"===n&&(a-=x.css(e,"padding"+Zt[o],!0,i)),"margin"!==n&&(a-=x.css(e,"border"+Zt[o]+"Width",!0,i))):(a+=x.css(e,"padding"+Zt[o],!0,i),"padding"!==n&&(a+=x.css(e,"border"+Zt[o]+"Width",!0,i)));return a}function sn(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=Rt(e),a=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=Wt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Yt.test(i))return i;r=a&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+an(e,t,n||(a?"border":"content"),r,o)+"px"}function ln(e){var t=a,n=Gt[e];return n||(n=un(e,t),"none"!==n&&n||(Pt=(Pt||x("<iframe frameborder='0' width='0' height='0'/>").css("cssText","display:block !important")).appendTo(t.documentElement),t=(Pt[0].contentWindow||Pt[0].contentDocument).document,t.write("<!doctype html><html><body>"),t.close(),n=un(e,t),Pt.detach()),Gt[e]=n),n}function un(e,t){var n=x(t.createElement(e)).appendTo(t.body),r=x.css(n[0],"display");return n.remove(),r}x.each(["height","width"],function(e,n){x.cssHooks[n]={get:function(e,r,i){return r?0===e.offsetWidth&&Xt.test(x.css(e,"display"))?x.swap(e,Qt,function(){return sn(e,n,i)}):sn(e,n,i):t},set:function(e,t,r){var i=r&&Rt(e);return on(e,t,r?an(e,n,r,x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,i),i):0)}}}),x.support.opacity||(x.cssHooks.opacity={get:function(e,t){return It.test((t&&e.currentStyle?e.currentStyle.filter:e.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":t?"1":""},set:function(e,t){var n=e.style,r=e.currentStyle,i=x.isNumeric(t)?"alpha(opacity="+100*t+")":"",o=r&&r.filter||n.filter||"";n.zoom=1,(t>=1||""===t)&&""===x.trim(o.replace($t,""))&&n.removeAttribute&&(n.removeAttribute("filter"),""===t||r&&!r.filter)||(n.filter=$t.test(o)?o.replace($t,i):o+" "+i)}}),x(function(){x.support.reliableMarginRight||(x.cssHooks.marginRight={get:function(e,n){return n?x.swap(e,{display:"inline-block"},Wt,[e,"marginRight"]):t}}),!x.support.pixelPosition&&x.fn.position&&x.each(["top","left"],function(e,n){x.cssHooks[n]={get:function(e,r){return r?(r=Wt(e,n),Yt.test(r)?x(e).position()[n]+"px":r):t}}})}),x.expr&&x.expr.filters&&(x.expr.filters.hidden=function(e){return 0>=e.offsetWidth&&0>=e.offsetHeight||!x.support.reliableHiddenOffsets&&"none"===(e.style&&e.style.display||x.css(e,"display"))},x.expr.filters.visible=function(e){return!x.expr.filters.hidden(e)}),x.each({margin:"",padding:"",border:"Width"},function(e,t){x.cssHooks[e+t]={expand:function(n){var r=0,i={},o="string"==typeof n?n.split(" "):[n];for(;4>r;r++)i[e+Zt[r]+t]=o[r]||o[r-2]||o[0];return i}},Ut.test(e)||(x.cssHooks[e+t].set=on)});var cn=/%20/g,pn=/\[\]$/,fn=/\r?\n/g,dn=/^(?:submit|button|image|reset|file)$/i,hn=/^(?:input|select|textarea|keygen)/i;x.fn.extend({serialize:function(){return x.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=x.prop(this,"elements");return e?x.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!x(this).is(":disabled")&&hn.test(this.nodeName)&&!dn.test(e)&&(this.checked||!Ct.test(e))}).map(function(e,t){var n=x(this).val();return null==n?null:x.isArray(n)?x.map(n,function(e){return{name:t.name,value:e.replace(fn,"\r\n")}}):{name:t.name,value:n.replace(fn,"\r\n")}}).get()}}),x.param=function(e,n){var r,i=[],o=function(e,t){t=x.isFunction(t)?t():null==t?"":t,i[i.length]=encodeURIComponent(e)+"="+encodeURIComponent(t)};if(n===t&&(n=x.ajaxSettings&&x.ajaxSettings.traditional),x.isArray(e)||e.jquery&&!x.isPlainObject(e))x.each(e,function(){o(this.name,this.value)});else for(r in e)gn(r,e[r],n,o);return i.join("&").replace(cn,"+")};function gn(e,t,n,r){var i;if(x.isArray(t))x.each(t,function(t,i){n||pn.test(e)?r(e,i):gn(e+"["+("object"==typeof i?t:"")+"]",i,n,r)});else if(n||"object"!==x.type(t))r(e,t);else for(i in t)gn(e+"["+i+"]",t[i],n,r)}x.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(e,t){x.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),x.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)},bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}});var mn,yn,vn=x.now(),bn=/\?/,xn=/#.*$/,wn=/([?&])_=[^&]*/,Tn=/^(.*?):[ \t]*([^\r\n]*)\r?$/gm,Cn=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Nn=/^(?:GET|HEAD)$/,kn=/^\/\//,En=/^([\w.+-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,Sn=x.fn.load,An={},jn={},Dn="*/".concat("*");try{yn=o.href}catch(Ln){yn=a.createElement("a"),yn.href="",yn=yn.href}mn=En.exec(yn.toLowerCase())||[];function Hn(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(T)||[];if(x.isFunction(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function qn(e,n,r,i){var o={},a=e===jn;function s(l){var u;return o[l]=!0,x.each(e[l]||[],function(e,l){var c=l(n,r,i);return"string"!=typeof c||a||o[c]?a?!(u=c):t:(n.dataTypes.unshift(c),s(c),!1)}),u}return s(n.dataTypes[0])||!o["*"]&&s("*")}function _n(e,n){var r,i,o=x.ajaxSettings.flatOptions||{};for(i in n)n[i]!==t&&((o[i]?e:r||(r={}))[i]=n[i]);return r&&x.extend(!0,e,r),e}x.fn.load=function(e,n,r){if("string"!=typeof e&&Sn)return Sn.apply(this,arguments);var i,o,a,s=this,l=e.indexOf(" ");return l>=0&&(i=e.slice(l,e.length),e=e.slice(0,l)),x.isFunction(n)?(r=n,n=t):n&&"object"==typeof n&&(a="POST"),s.length>0&&x.ajax({url:e,type:a,dataType:"html",data:n}).done(function(e){o=arguments,s.html(i?x("<div>").append(x.parseHTML(e)).find(i):e)}).complete(r&&function(e,t){s.each(r,o||[e.responseText,t,e])}),this},x.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){x.fn[t]=function(e){return this.on(t,e)}}),x.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:yn,type:"GET",isLocal:Cn.test(mn[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":Dn,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":x.parseJSON,"text xml":x.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?_n(_n(e,x.ajaxSettings),t):_n(x.ajaxSettings,e)},ajaxPrefilter:Hn(An),ajaxTransport:Hn(jn),ajax:function(e,n){"object"==typeof e&&(n=e,e=t),n=n||{};var r,i,o,a,s,l,u,c,p=x.ajaxSetup({},n),f=p.context||p,d=p.context&&(f.nodeType||f.jquery)?x(f):x.event,h=x.Deferred(),g=x.Callbacks("once memory"),m=p.statusCode||{},y={},v={},b=0,w="canceled",C={readyState:0,getResponseHeader:function(e){var t;if(2===b){if(!c){c={};while(t=Tn.exec(a))c[t[1].toLowerCase()]=t[2]}t=c[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return 2===b?a:null},setRequestHeader:function(e,t){var n=e.toLowerCase();return b||(e=v[n]=v[n]||e,y[e]=t),this},overrideMimeType:function(e){return b||(p.mimeType=e),this},statusCode:function(e){var t;if(e)if(2>b)for(t in e)m[t]=[m[t],e[t]];else C.always(e[C.status]);return this},abort:function(e){var t=e||w;return u&&u.abort(t),k(0,t),this}};if(h.promise(C).complete=g.add,C.success=C.done,C.error=C.fail,p.url=((e||p.url||yn)+"").replace(xn,"").replace(kn,mn[1]+"//"),p.type=n.method||n.type||p.method||p.type,p.dataTypes=x.trim(p.dataType||"*").toLowerCase().match(T)||[""],null==p.crossDomain&&(r=En.exec(p.url.toLowerCase()),p.crossDomain=!(!r||r[1]===mn[1]&&r[2]===mn[2]&&(r[3]||("http:"===r[1]?"80":"443"))===(mn[3]||("http:"===mn[1]?"80":"443")))),p.data&&p.processData&&"string"!=typeof p.data&&(p.data=x.param(p.data,p.traditional)),qn(An,p,n,C),2===b)return C;l=p.global,l&&0===x.active++&&x.event.trigger("ajaxStart"),p.type=p.type.toUpperCase(),p.hasContent=!Nn.test(p.type),o=p.url,p.hasContent||(p.data&&(o=p.url+=(bn.test(o)?"&":"?")+p.data,delete p.data),p.cache===!1&&(p.url=wn.test(o)?o.replace(wn,"$1_="+vn++):o+(bn.test(o)?"&":"?")+"_="+vn++)),p.ifModified&&(x.lastModified[o]&&C.setRequestHeader("If-Modified-Since",x.lastModified[o]),x.etag[o]&&C.setRequestHeader("If-None-Match",x.etag[o])),(p.data&&p.hasContent&&p.contentType!==!1||n.contentType)&&C.setRequestHeader("Content-Type",p.contentType),C.setRequestHeader("Accept",p.dataTypes[0]&&p.accepts[p.dataTypes[0]]?p.accepts[p.dataTypes[0]]+("*"!==p.dataTypes[0]?", "+Dn+"; q=0.01":""):p.accepts["*"]);for(i in p.headers)C.setRequestHeader(i,p.headers[i]);if(p.beforeSend&&(p.beforeSend.call(f,C,p)===!1||2===b))return C.abort();w="abort";for(i in{success:1,error:1,complete:1})C[i](p[i]);if(u=qn(jn,p,n,C)){C.readyState=1,l&&d.trigger("ajaxSend",[C,p]),p.async&&p.timeout>0&&(s=setTimeout(function(){C.abort("timeout")},p.timeout));try{b=1,u.send(y,k)}catch(N){if(!(2>b))throw N;k(-1,N)}}else k(-1,"No Transport");function k(e,n,r,i){var c,y,v,w,T,N=n;2!==b&&(b=2,s&&clearTimeout(s),u=t,a=i||"",C.readyState=e>0?4:0,c=e>=200&&300>e||304===e,r&&(w=Mn(p,C,r)),w=On(p,w,C,c),c?(p.ifModified&&(T=C.getResponseHeader("Last-Modified"),T&&(x.lastModified[o]=T),T=C.getResponseHeader("etag"),T&&(x.etag[o]=T)),204===e||"HEAD"===p.type?N="nocontent":304===e?N="notmodified":(N=w.state,y=w.data,v=w.error,c=!v)):(v=N,(e||!N)&&(N="error",0>e&&(e=0))),C.status=e,C.statusText=(n||N)+"",c?h.resolveWith(f,[y,N,C]):h.rejectWith(f,[C,N,v]),C.statusCode(m),m=t,l&&d.trigger(c?"ajaxSuccess":"ajaxError",[C,p,c?y:v]),g.fireWith(f,[C,N]),l&&(d.trigger("ajaxComplete",[C,p]),--x.active||x.event.trigger("ajaxStop")))}return C},getJSON:function(e,t,n){return x.get(e,t,n,"json")},getScript:function(e,n){return x.get(e,t,n,"script")}}),x.each(["get","post"],function(e,n){x[n]=function(e,r,i,o){return x.isFunction(r)&&(o=o||i,i=r,r=t),x.ajax({url:e,type:n,dataType:o,data:r,success:i})}});function Mn(e,n,r){var i,o,a,s,l=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),o===t&&(o=e.mimeType||n.getResponseHeader("Content-Type"));if(o)for(s in l)if(l[s]&&l[s].test(o)){u.unshift(s);break}if(u[0]in r)a=u[0];else{for(s in r){if(!u[0]||e.converters[s+" "+u[0]]){a=s;break}i||(i=s)}a=a||i}return a?(a!==u[0]&&u.unshift(a),r[a]):t}function On(e,t,n,r){var i,o,a,s,l,u={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)u[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!l&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),l=o,o=c.shift())if("*"===o)o=l;else if("*"!==l&&l!==o){if(a=u[l+" "+o]||u["* "+o],!a)for(i in u)if(s=i.split(" "),s[1]===o&&(a=u[l+" "+s[0]]||u["* "+s[0]])){a===!0?a=u[i]:u[i]!==!0&&(o=s[0],c.unshift(s[1]));break}if(a!==!0)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(p){return{state:"parsererror",error:a?p:"No conversion from "+l+" to "+o}}}return{state:"success",data:t}}x.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(e){return x.globalEval(e),e}}}),x.ajaxPrefilter("script",function(e){e.cache===t&&(e.cache=!1),e.crossDomain&&(e.type="GET",e.global=!1)}),x.ajaxTransport("script",function(e){if(e.crossDomain){var n,r=a.head||x("head")[0]||a.documentElement;return{send:function(t,i){n=a.createElement("script"),n.async=!0,e.scriptCharset&&(n.charset=e.scriptCharset),n.src=e.url,n.onload=n.onreadystatechange=function(e,t){(t||!n.readyState||/loaded|complete/.test(n.readyState))&&(n.onload=n.onreadystatechange=null,n.parentNode&&n.parentNode.removeChild(n),n=null,t||i(200,"success"))},r.insertBefore(n,r.firstChild)},abort:function(){n&&n.onload(t,!0)}}}});var Fn=[],Bn=/(=)\?(?=&|$)|\?\?/;x.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Fn.pop()||x.expando+"_"+vn++;return this[e]=!0,e}}),x.ajaxPrefilter("json jsonp",function(n,r,i){var o,a,s,l=n.jsonp!==!1&&(Bn.test(n.url)?"url":"string"==typeof n.data&&!(n.contentType||"").indexOf("application/x-www-form-urlencoded")&&Bn.test(n.data)&&"data");return l||"jsonp"===n.dataTypes[0]?(o=n.jsonpCallback=x.isFunction(n.jsonpCallback)?n.jsonpCallback():n.jsonpCallback,l?n[l]=n[l].replace(Bn,"$1"+o):n.jsonp!==!1&&(n.url+=(bn.test(n.url)?"&":"?")+n.jsonp+"="+o),n.converters["script json"]=function(){return s||x.error(o+" was not called"),s[0]},n.dataTypes[0]="json",a=e[o],e[o]=function(){s=arguments},i.always(function(){e[o]=a,n[o]&&(n.jsonpCallback=r.jsonpCallback,Fn.push(o)),s&&x.isFunction(a)&&a(s[0]),s=a=t}),"script"):t});var Pn,Rn,Wn=0,$n=e.ActiveXObject&&function(){var e;for(e in Pn)Pn[e](t,!0)};function In(){try{return new e.XMLHttpRequest}catch(t){}}function zn(){try{return new e.ActiveXObject("Microsoft.XMLHTTP")}catch(t){}}x.ajaxSettings.xhr=e.ActiveXObject?function(){return!this.isLocal&&In()||zn()}:In,Rn=x.ajaxSettings.xhr(),x.support.cors=!!Rn&&"withCredentials"in Rn,Rn=x.support.ajax=!!Rn,Rn&&x.ajaxTransport(function(n){if(!n.crossDomain||x.support.cors){var r;return{send:function(i,o){var a,s,l=n.xhr();if(n.username?l.open(n.type,n.url,n.async,n.username,n.password):l.open(n.type,n.url,n.async),n.xhrFields)for(s in n.xhrFields)l[s]=n.xhrFields[s];n.mimeType&&l.overrideMimeType&&l.overrideMimeType(n.mimeType),n.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");try{for(s in i)l.setRequestHeader(s,i[s])}catch(u){}l.send(n.hasContent&&n.data||null),r=function(e,i){var s,u,c,p;try{if(r&&(i||4===l.readyState))if(r=t,a&&(l.onreadystatechange=x.noop,$n&&delete Pn[a]),i)4!==l.readyState&&l.abort();else{p={},s=l.status,u=l.getAllResponseHeaders(),"string"==typeof l.responseText&&(p.text=l.responseText);try{c=l.statusText}catch(f){c=""}s||!n.isLocal||n.crossDomain?1223===s&&(s=204):s=p.text?200:404}}catch(d){i||o(-1,d)}p&&o(s,c,p,u)},n.async?4===l.readyState?setTimeout(r):(a=++Wn,$n&&(Pn||(Pn={},x(e).unload($n)),Pn[a]=r),l.onreadystatechange=r):r()},abort:function(){r&&r(t,!0)}}}});var Xn,Un,Vn=/^(?:toggle|show|hide)$/,Yn=RegExp("^(?:([+-])=|)("+w+")([a-z%]*)$","i"),Jn=/queueHooks$/,Gn=[nr],Qn={"*":[function(e,t){var n=this.createTween(e,t),r=n.cur(),i=Yn.exec(t),o=i&&i[3]||(x.cssNumber[e]?"":"px"),a=(x.cssNumber[e]||"px"!==o&&+r)&&Yn.exec(x.css(n.elem,e)),s=1,l=20;if(a&&a[3]!==o){o=o||a[3],i=i||[],a=+r||1;do s=s||".5",a/=s,x.style(n.elem,e,a+o);while(s!==(s=n.cur()/r)&&1!==s&&--l)}return i&&(a=n.start=+a||+r||0,n.unit=o,n.end=i[1]?a+(i[1]+1)*i[2]:+i[2]),n}]};function Kn(){return setTimeout(function(){Xn=t}),Xn=x.now()}function Zn(e,t,n){var r,i=(Qn[t]||[]).concat(Qn["*"]),o=0,a=i.length;for(;a>o;o++)if(r=i[o].call(n,t,e))return r}function er(e,t,n){var r,i,o=0,a=Gn.length,s=x.Deferred().always(function(){delete l.elem}),l=function(){if(i)return!1;var t=Xn||Kn(),n=Math.max(0,u.startTime+u.duration-t),r=n/u.duration||0,o=1-r,a=0,l=u.tweens.length;for(;l>a;a++)u.tweens[a].run(o);return s.notifyWith(e,[u,o,n]),1>o&&l?n:(s.resolveWith(e,[u]),!1)},u=s.promise({elem:e,props:x.extend({},t),opts:x.extend(!0,{specialEasing:{}},n),originalProperties:t,originalOptions:n,startTime:Xn||Kn(),duration:n.duration,tweens:[],createTween:function(t,n){var r=x.Tween(e,u.opts,t,n,u.opts.specialEasing[t]||u.opts.easing);return u.tweens.push(r),r},stop:function(t){var n=0,r=t?u.tweens.length:0;if(i)return this;for(i=!0;r>n;n++)u.tweens[n].run(1);return t?s.resolveWith(e,[u,t]):s.rejectWith(e,[u,t]),this}}),c=u.props;for(tr(c,u.opts.specialEasing);a>o;o++)if(r=Gn[o].call(u,e,c,u.opts))return r;return x.map(c,Zn,u),x.isFunction(u.opts.start)&&u.opts.start.call(e,u),x.fx.timer(x.extend(l,{elem:e,anim:u,queue:u.opts.queue})),u.progress(u.opts.progress).done(u.opts.done,u.opts.complete).fail(u.opts.fail).always(u.opts.always)}function tr(e,t){var n,r,i,o,a;for(n in e)if(r=x.camelCase(n),i=t[r],o=e[n],x.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),a=x.cssHooks[r],a&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}x.Animation=x.extend(er,{tweener:function(e,t){x.isFunction(e)?(t=e,e=["*"]):e=e.split(" ");var n,r=0,i=e.length;for(;i>r;r++)n=e[r],Qn[n]=Qn[n]||[],Qn[n].unshift(t)},prefilter:function(e,t){t?Gn.unshift(e):Gn.push(e)}});function nr(e,t,n){var r,i,o,a,s,l,u=this,c={},p=e.style,f=e.nodeType&&nn(e),d=x._data(e,"fxshow");n.queue||(s=x._queueHooks(e,"fx"),null==s.unqueued&&(s.unqueued=0,l=s.empty.fire,s.empty.fire=function(){s.unqueued||l()}),s.unqueued++,u.always(function(){u.always(function(){s.unqueued--,x.queue(e,"fx").length||s.empty.fire()})})),1===e.nodeType&&("height"in t||"width"in t)&&(n.overflow=[p.overflow,p.overflowX,p.overflowY],"inline"===x.css(e,"display")&&"none"===x.css(e,"float")&&(x.support.inlineBlockNeedsLayout&&"inline"!==ln(e.nodeName)?p.zoom=1:p.display="inline-block")),n.overflow&&(p.overflow="hidden",x.support.shrinkWrapBlocks||u.always(function(){p.overflow=n.overflow[0],p.overflowX=n.overflow[1],p.overflowY=n.overflow[2]}));for(r in t)if(i=t[r],Vn.exec(i)){if(delete t[r],o=o||"toggle"===i,i===(f?"hide":"show"))continue;c[r]=d&&d[r]||x.style(e,r)}if(!x.isEmptyObject(c)){d?"hidden"in d&&(f=d.hidden):d=x._data(e,"fxshow",{}),o&&(d.hidden=!f),f?x(e).show():u.done(function(){x(e).hide()}),u.done(function(){var t;x._removeData(e,"fxshow");for(t in c)x.style(e,t,c[t])});for(r in c)a=Zn(f?d[r]:0,r,u),r in d||(d[r]=a.start,f&&(a.end=a.start,a.start="width"===r||"height"===r?1:0))}}function rr(e,t,n,r,i){return new rr.prototype.init(e,t,n,r,i)}x.Tween=rr,rr.prototype={constructor:rr,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||"swing",this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(x.cssNumber[n]?"":"px")},cur:function(){var e=rr.propHooks[this.prop];return e&&e.get?e.get(this):rr.propHooks._default.get(this)},run:function(e){var t,n=rr.propHooks[this.prop];return this.pos=t=this.options.duration?x.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):rr.propHooks._default.set(this),this}},rr.prototype.init.prototype=rr.prototype,rr.propHooks={_default:{get:function(e){var t;return null==e.elem[e.prop]||e.elem.style&&null!=e.elem.style[e.prop]?(t=x.css(e.elem,e.prop,""),t&&"auto"!==t?t:0):e.elem[e.prop]},set:function(e){x.fx.step[e.prop]?x.fx.step[e.prop](e):e.elem.style&&(null!=e.elem.style[x.cssProps[e.prop]]||x.cssHooks[e.prop])?x.style(e.elem,e.prop,e.now+e.unit):e.elem[e.prop]=e.now}}},rr.propHooks.scrollTop=rr.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},x.each(["toggle","show","hide"],function(e,t){var n=x.fn[t];x.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ir(t,!0),e,r,i)}}),x.fn.extend({fadeTo:function(e,t,n,r){return this.filter(nn).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=x.isEmptyObject(e),o=x.speed(t,n,r),a=function(){var t=er(this,x.extend({},e),o);(i||x._data(this,"finish"))&&t.stop(!0)};return a.finish=a,i||o.queue===!1?this.each(a):this.queue(o.queue,a)},stop:function(e,n,r){var i=function(e){var t=e.stop;delete e.stop,t(r)};return"string"!=typeof e&&(r=n,n=e,e=t),n&&e!==!1&&this.queue(e||"fx",[]),this.each(function(){var t=!0,n=null!=e&&e+"queueHooks",o=x.timers,a=x._data(this);if(n)a[n]&&a[n].stop&&i(a[n]);else for(n in a)a[n]&&a[n].stop&&Jn.test(n)&&i(a[n]);for(n=o.length;n--;)o[n].elem!==this||null!=e&&o[n].queue!==e||(o[n].anim.stop(r),t=!1,o.splice(n,1));(t||!r)&&x.dequeue(this,e)})},finish:function(e){return e!==!1&&(e=e||"fx"),this.each(function(){var t,n=x._data(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=x.timers,a=r?r.length:0;for(n.finish=!0,x.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;a>t;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}});function ir(e,t){var n,r={height:e},i=0;for(t=t?1:0;4>i;i+=2-t)n=Zt[i],r["margin"+n]=r["padding"+n]=e;return t&&(r.opacity=r.width=e),r}x.each({slideDown:ir("show"),slideUp:ir("hide"),slideToggle:ir("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){x.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),x.speed=function(e,t,n){var r=e&&"object"==typeof e?x.extend({},e):{complete:n||!n&&t||x.isFunction(e)&&e,duration:e,easing:n&&t||t&&!x.isFunction(t)&&t};return r.duration=x.fx.off?0:"number"==typeof r.duration?r.duration:r.duration in x.fx.speeds?x.fx.speeds[r.duration]:x.fx.speeds._default,(null==r.queue||r.queue===!0)&&(r.queue="fx"),r.old=r.complete,r.complete=function(){x.isFunction(r.old)&&r.old.call(this),r.queue&&x.dequeue(this,r.queue)},r},x.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2}},x.timers=[],x.fx=rr.prototype.init,x.fx.tick=function(){var e,n=x.timers,r=0;for(Xn=x.now();n.length>r;r++)e=n[r],e()||n[r]!==e||n.splice(r--,1);n.length||x.fx.stop(),Xn=t},x.fx.timer=function(e){e()&&x.timers.push(e)&&x.fx.start()},x.fx.interval=13,x.fx.start=function(){Un||(Un=setInterval(x.fx.tick,x.fx.interval))},x.fx.stop=function(){clearInterval(Un),Un=null},x.fx.speeds={slow:600,fast:200,_default:400},x.fx.step={},x.expr&&x.expr.filters&&(x.expr.filters.animated=function(e){return x.grep(x.timers,function(t){return e===t.elem}).length}),x.fn.offset=function(e){if(arguments.length)return e===t?this:this.each(function(t){x.offset.setOffset(this,e,t)});var n,r,o={top:0,left:0},a=this[0],s=a&&a.ownerDocument;if(s)return n=s.documentElement,x.contains(n,a)?(typeof a.getBoundingClientRect!==i&&(o=a.getBoundingClientRect()),r=or(s),{top:o.top+(r.pageYOffset||n.scrollTop)-(n.clientTop||0),left:o.left+(r.pageXOffset||n.scrollLeft)-(n.clientLeft||0)}):o},x.offset={setOffset:function(e,t,n){var r=x.css(e,"position");"static"===r&&(e.style.position="relative");var i=x(e),o=i.offset(),a=x.css(e,"top"),s=x.css(e,"left"),l=("absolute"===r||"fixed"===r)&&x.inArray("auto",[a,s])>-1,u={},c={},p,f;l?(c=i.position(),p=c.top,f=c.left):(p=parseFloat(a)||0,f=parseFloat(s)||0),x.isFunction(t)&&(t=t.call(e,n,o)),null!=t.top&&(u.top=t.top-o.top+p),null!=t.left&&(u.left=t.left-o.left+f),"using"in t?t.using.call(e,u):i.css(u)}},x.fn.extend({position:function(){if(this[0]){var e,t,n={top:0,left:0},r=this[0];return"fixed"===x.css(r,"position")?t=r.getBoundingClientRect():(e=this.offsetParent(),t=this.offset(),x.nodeName(e[0],"html")||(n=e.offset()),n.top+=x.css(e[0],"borderTopWidth",!0),n.left+=x.css(e[0],"borderLeftWidth",!0)),{top:t.top-n.top-x.css(r,"marginTop",!0),left:t.left-n.left-x.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent||s;while(e&&!x.nodeName(e,"html")&&"static"===x.css(e,"position"))e=e.offsetParent;return e||s})}}),x.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,n){var r=/Y/.test(n);x.fn[e]=function(i){return x.access(this,function(e,i,o){var a=or(e);return o===t?a?n in a?a[n]:a.document.documentElement[i]:e[i]:(a?a.scrollTo(r?x(a).scrollLeft():o,r?o:x(a).scrollTop()):e[i]=o,t)},e,i,arguments.length,null)}});function or(e){return x.isWindow(e)?e:9===e.nodeType?e.defaultView||e.parentWindow:!1}x.each({Height:"height",Width:"width"},function(e,n){x.each({padding:"inner"+e,content:n,"":"outer"+e},function(r,i){x.fn[i]=function(i,o){var a=arguments.length&&(r||"boolean"!=typeof i),s=r||(i===!0||o===!0?"margin":"border");return x.access(this,function(n,r,i){var o;return x.isWindow(n)?n.document.documentElement["client"+e]:9===n.nodeType?(o=n.documentElement,Math.max(n.body["scroll"+e],o["scroll"+e],n.body["offset"+e],o["offset"+e],o["client"+e])):i===t?x.css(n,r,s):x.style(n,r,i,s)},n,a?i:t,a,null)}})}),x.fn.size=function(){return this.length},x.fn.andSelf=x.fn.addBack,"object"==typeof module&&module&&"object"==typeof module.exports?module.exports=x:(e.jQuery=e.$=x,"function"==typeof define&&define.amd&&define("jquery",[],function(){return x}))})(window);
-
-	/*!
- * jQuery Cookie Plugin v1.3.1
- * https://github.com/carhartl/jquery-cookie
- *
- * Copyright 2013 Klaus Hartl
- * Released under the MIT license
- */
-(function ($, document, undefined) {
-
-	var pluses = /\+/g;
-
-	function raw(s) {
-		return s;
-	}
-
-	function decoded(s) {
-		return unRfc2068(decodeURIComponent(s.replace(pluses, ' ')));
-	}
-
-	function unRfc2068(value) {
-		if (value.indexOf('"') === 0) {
-			// This is a quoted cookie as according to RFC2068, unescape
-			value = value.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\');
-		}
-		return value;
-	}
-
-	function fromJSON(value) {
-		return config.json ? JSON.parse(value) : value;
-	}
-
-	var config = $.cookie = function (key, value, options) {
-
-		// write
-		if (value !== undefined) {
-			options = $.extend({}, config.defaults, options);
-
-			if (value === null) {
-				options.expires = -1;
-			}
-
-			if (typeof options.expires === 'number') {
-				var days = options.expires, t = options.expires = new Date();
-				t.setDate(t.getDate() + days);
-			}
-
-			value = config.json ? JSON.stringify(value) : String(value);
-
-			return (document.cookie = [
-				encodeURIComponent(key), '=', config.raw ? value : encodeURIComponent(value),
-				options.expires ? '; expires=' + options.expires.toUTCString() : '', // use expires attribute, max-age is not supported by IE
-				options.path    ? '; path=' + options.path : '',
-				options.domain  ? '; domain=' + options.domain : '',
-				options.secure  ? '; secure' : ''
-			].join(''));
-		}
-
-		// read
-		var decode = config.raw ? raw : decoded;
-		var cookies = document.cookie.split('; ');
-		var result = key ? null : {};
-		for (var i = 0, l = cookies.length; i < l; i++) {
-			var parts = cookies[i].split('=');
-			var name = decode(parts.shift());
-			var cookie = decode(parts.join('='));
-
-			if (key && key === name) {
-				result = fromJSON(cookie);
-				break;
-			}
-
-			if (!key) {
-				result[name] = fromJSON(cookie);
-			}
-		}
-
-		return result;
-	};
-
-	config.defaults = {};
-
-	$.removeCookie = function (key, options) {
-		if ($.cookie(key) !== null) {
-			$.cookie(key, null, options);
-			return true;
-		}
-		return false;
-	};
-
-})(jQuery, document);
-
-	/*!
- * sprintf and vsprintf for jQuery
- * somewhat based on http://jan.moesen.nu/code/javascript/sprintf-and-printf-in-javascript/
- * Copyright (c) 2008 Sabin Iacob (m0n5t3r) <iacobs@m0n5t3r.info>
- * @license http://www.gnu.org/licenses/gpl.html
- * @project jquery.sprintf
- */
-(function(d){var a={b:function(e){return parseInt(e,10).toString(2)},c:function(e){return String.fromCharCode(parseInt(e,10))},d:function(e){return parseInt(e,10)},u:function(e){return Math.abs(e)},f:function(f,e){e=parseInt(e,10);f=parseFloat(f);if(isNaN(e&&f)){return NaN}return e&&f.toFixed(e)||f},o:function(e){return parseInt(e,10).toString(8)},s:function(e){return e},x:function(e){return(""+parseInt(e,10).toString(16)).toLowerCase()},X:function(e){return(""+parseInt(e,10).toString(16)).toUpperCase()}};var c=/%(?:(\d+)?(?:\.(\d+))?|\(([^)]+)\))([%bcdufosxX])/g;var b=function(f){if(f.length==1&&typeof f[0]=="object"){f=f[0];return function(i,h,k,j,g,m,l){return a[g](f[j])}}else{var e=0;return function(i,h,k,j,g,m,l){if(g=="%"){return"%"}return a[g](f[e++],k)}}};d.extend({sprintf:function(f){var e=Array.apply(null,arguments).slice(1);return f.replace(c,b(e))},vsprintf:function(f,e){return f.replace(c,b(e))}})})(jQuery);
-
-	/*
- * jQuery Autocomplete plugin 1.2.3
- *
- * Copyright (c) 2009 Jörn Zaefferer
- *
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- *
- * With small modifications by Alfonso Gómez-Arzola.
- * See changelog for details.
- *
- */
-
-;(function($) {
-
-$.fn.extend({
-	autocomplete: function(urlOrData, options) {
-		var isUrl = typeof urlOrData == "string";
-		options = $.extend({}, $.Autocompleter.defaults, {
-			url: isUrl ? urlOrData : null,
-			data: isUrl ? null : urlOrData,
-			delay: isUrl ? $.Autocompleter.defaults.delay : 10,
-			max: options && !options.scroll ? 10 : 150,
-			noRecord: "No Records."
-		}, options);
-
-		// if highlight is set to false, replace it with a do-nothing function
-		options.highlight = options.highlight || function(value) { return value; };
-
-		// if the formatMatch option is not specified, then use formatItem for backwards compatibility
-		options.formatMatch = options.formatMatch || options.formatItem;
-
-		return this.each(function() {
-			new $.Autocompleter(this, options);
-		});
-	},
-	result: function(handler) {
-		return this.bind("result", handler);
-	},
-	search: function(handler) {
-		return this.trigger("search", [handler]);
-	},
-	flushCache: function() {
-		return this.trigger("flushCache");
-	},
-	setOptions: function(options){
-		return this.trigger("setOptions", [options]);
-	},
-	unautocomplete: function() {
-		return this.trigger("unautocomplete");
-	}
-});
-
-$.Autocompleter = function(input, options) {
-
-	var KEY = {
-		UP: 38,
-		DOWN: 40,
-		DEL: 46,
-		TAB: 9,
-		RETURN: 13,
-		ESC: 27,
-		COMMA: 188,
-		PAGEUP: 33,
-		PAGEDOWN: 34,
-		BACKSPACE: 8
-	};
-
-	var globalFailure = null;
-	if(options.failure != null && typeof options.failure == "function") {
-	  globalFailure = options.failure;
-	}
-
-	// Create $ object for input element
-	var $input = $(input).attr("autocomplete", "off").addClass(options.inputClass);
-
-	var timeout;
-	var previousValue = "";
-	var cache = $.Autocompleter.Cache(options);
-	var hasFocus = 0;
-	var lastKeyPressCode;
-	var config = {
-		mouseDownOnSelect: false
-	};
-	var select = $.Autocompleter.Select(options, input, selectCurrent, config);
-
-	var blockSubmit;
-
-	// prevent form submit in opera when selecting with return key
-  navigator.userAgent.indexOf("Opera") != -1 && $(input.form).bind("submit.autocomplete", function() {
-		if (blockSubmit) {
-			blockSubmit = false;
-			return false;
-		}
-	});
-
-	// older versions of opera don't trigger keydown multiple times while pressed, others don't work with keypress at all
-	$input.bind((navigator.userAgent.indexOf("Opera") != -1 && !'KeyboardEvent' in window ? "keypress" : "keydown") + ".autocomplete", function(event) {
-		// a keypress means the input has focus
-		// avoids issue where input had focus before the autocomplete was applied
-		hasFocus = 1;
-		// track last key pressed
-		lastKeyPressCode = event.keyCode;
-		switch(event.keyCode) {
-
-			case KEY.UP:
-				if ( select.visible() ) {
-					event.preventDefault();
-					select.prev();
-				} else {
-					onChange(0, true);
-				}
-				break;
-
-			case KEY.DOWN:
-				if ( select.visible() ) {
-					event.preventDefault();
-					select.next();
-				} else {
-					onChange(0, true);
-				}
-				break;
-
-			case KEY.PAGEUP:
-				if ( select.visible() ) {
-  				event.preventDefault();
-					select.pageUp();
-				} else {
-					onChange(0, true);
-				}
-				break;
-
-			case KEY.PAGEDOWN:
-				if ( select.visible() ) {
-  				event.preventDefault();
-					select.pageDown();
-				} else {
-					onChange(0, true);
-				}
-				break;
-
-			// matches also semicolon
-			case options.multiple && $.trim(options.multipleSeparator) == "," && KEY.COMMA:
-			case KEY.TAB:
-			case KEY.RETURN:
-				if( selectCurrent() ) {
-					// stop default to prevent a form submit, Opera needs special handling
-					event.preventDefault();
-					blockSubmit = true;
-					return false;
-				}
-				break;
-
-			case KEY.ESC:
-				select.hide();
-				break;
-
-			default:
-				clearTimeout(timeout);
-				timeout = setTimeout(onChange, options.delay);
-				break;
-		}
-	}).focus(function(){
-		// track whether the field has focus, we shouldn't process any
-		// results if the field no longer has focus
-		hasFocus++;
-	}).blur(function() {
-	  hasFocus = 0;
-		if (!config.mouseDownOnSelect) {
-			hideResults();
-		}
-	}).click(function() {
-		// show select when clicking in a focused field
-		// but if clickFire is true, don't require field
-		// to be focused to begin with; just show select
-		if( options.clickFire ) {
-		  if ( !select.visible() ) {
-  			onChange(0, true);
-  		}
-		} else {
-		  if ( hasFocus++ > 1 && !select.visible() ) {
-  			onChange(0, true);
-  		}
-		}
-	}).bind("search", function() {
-		var fn = (arguments.length > 1) ? arguments[1] : null;
-		function findValueCallback(q, data) {
-			var result;
-			if( data && data.length ) {
-				for (var i=0; i < data.length; i++) {
-					if( data[i].result.toLowerCase() == q.toLowerCase() ) {
-						result = data[i];
-						break;
-					}
-				}
-			}
-			if( typeof fn == "function" ) fn(result);
-			else $input.trigger("result", result && [result.data, result.value]);
-		}
-		$.each(trimWords($input.val()), function(i, value) {
-			request(value, findValueCallback, findValueCallback);
-		});
-	}).bind("flushCache", function() {
-		cache.flush();
-	}).bind("setOptions", function() {
-		$.extend(true, options, arguments[1]);
-		// if we've updated the data, repopulate
-		if ( "data" in arguments[1] )
-			cache.populate();
-	}).bind("unautocomplete", function() {
-		select.unbind();
-		$input.unbind();
-		$(input.form).unbind(".autocomplete");
-	});
-
-
-	function selectCurrent() {
-		var selected = select.selected();
-		if( !selected )
-			return false;
-
-		var v = selected.result;
-		previousValue = v;
-
-		if ( options.multiple ) {
-			var words = trimWords($input.val());
-			if ( words.length > 1 ) {
-				var seperator = options.multipleSeparator.length;
-				var cursorAt = $(input).selection().start;
-				var wordAt, progress = 0;
-				$.each(words, function(i, word) {
-					progress += word.length;
-					if (cursorAt <= progress) {
-						wordAt = i;
-						return false;
-					}
-					progress += seperator;
-				});
-				words[wordAt] = v;
-				//$.Autocompleter.Selection(input, progress + seperator, progress + seperator);
-				v = words.join( options.multipleSeparator );
-			}
-			v += options.multipleSeparator;
-		}
-
-		$input.val(v);
-		hideResultsNow();
-		$input.trigger("result", [selected.data, selected.value]);
-		return true;
-	}
-
-	function onChange(crap, skipPrevCheck) {
-		if( lastKeyPressCode == KEY.DEL ) {
-			select.hide();
-			return;
-		}
-
-		var currentValue = $input.val();
-
-		if ( !skipPrevCheck && currentValue == previousValue )
-			return;
-
-		previousValue = currentValue;
-
-		currentValue = lastWord(currentValue);
-		if ( currentValue.length >= options.minChars) {
-			$input.addClass(options.loadingClass);
-			if (!options.matchCase)
-				currentValue = currentValue.toLowerCase();
-			request(currentValue, receiveData, hideResultsNow);
-		} else {
-			stopLoading();
-			select.hide();
-		}
-	};
-
-	function trimWords(value) {
-		if (!value)
-			return [""];
-		if (!options.multiple)
-			return [$.trim(value)];
-		return $.map(value.split(options.multipleSeparator), function(word) {
-			return $.trim(value).length ? $.trim(word) : null;
-		});
-	}
-
-	function lastWord(value) {
-		if ( !options.multiple )
-			return value;
-		var words = trimWords(value);
-		if (words.length == 1)
-			return words[0];
-		var cursorAt = $(input).selection().start;
-		if (cursorAt == value.length) {
-			words = trimWords(value)
-		} else {
-			words = trimWords(value.replace(value.substring(cursorAt), ""));
-		}
-		return words[words.length - 1];
-	}
-
-	// fills in the input box w/the first match (assumed to be the best match)
-	// q: the term entered
-	// sValue: the first matching result
-	function autoFill(q, sValue){
-		// autofill in the complete box w/the first match as long as the user hasn't entered in more data
-		// if the last user key pressed was backspace, don't autofill
-		if( options.autoFill && (lastWord($input.val()).toLowerCase() == q.toLowerCase()) && lastKeyPressCode != KEY.BACKSPACE ) {
-			// fill in the value (keep the case the user has typed)
-			$input.val($input.val() + sValue.substring(lastWord(previousValue).length));
-			// select the portion of the value not typed by the user (so the next character will erase)
-			$(input).selection(previousValue.length, previousValue.length + sValue.length);
-		}
-	};
-
-	function hideResults() {
-		clearTimeout(timeout);
-		timeout = setTimeout(hideResultsNow, 200);
-	};
-
-	function hideResultsNow() {
-		var wasVisible = select.visible();
-		select.hide();
-		clearTimeout(timeout);
-		stopLoading();
-		if (options.mustMatch) {
-			// call search and run callback
-			$input.search(
-				function (result){
-					// if no value found, clear the input box
-					if( !result ) {
-						if (options.multiple) {
-							var words = trimWords($input.val()).slice(0, -1);
-							$input.val( words.join(options.multipleSeparator) + (words.length ? options.multipleSeparator : "") );
-						}
-						else {
-							$input.val( "" );
-							$input.trigger("result", null);
-						}
-					}
-				}
-			);
-		}
-	};
-
-	function receiveData(q, data) {
-		if ( data && data.length && hasFocus ) {
-			stopLoading();
-			select.display(data, q);
-			autoFill(q, data[0].value);
-			select.show();
-		} else {
-			hideResultsNow();
-		}
-	};
-
-	function request(term, success, failure) {
-		if (!options.matchCase)
-			term = term.toLowerCase();
-		var data = cache.load(term);
-		// recieve the cached data
-		if (data) {
-			if(data.length)	{
-				success(term, data);
-			}
-			else{
-				var parsed = options.parse && options.parse(options.noRecord) || parse(options.noRecord);
-				success(term,parsed);
-			}
-		// if an AJAX url has been supplied, try loading the data now
-		} else if( (typeof options.url == "string") && (options.url.length > 0) ){
-
-			var extraParams = {
-				timestamp: +new Date()
-			};
-			$.each(options.extraParams, function(key, param) {
-				extraParams[key] = typeof param == "function" ? param() : param;
-			});
-
-			$.ajax({
-				// try to leverage ajaxQueue plugin to abort previous requests
-				mode: "abort",
-				// limit abortion to this input
-				port: "autocomplete" + input.name,
-				dataType: options.dataType,
-				url: options.url,
-				data: $.extend({
-					q: lastWord(term),
-					limit: options.max
-				}, extraParams),
-				success: function(data) {
-					var parsed = options.parse && options.parse(data) || parse(data);
-					cache.add(term, parsed);
-					success(term, parsed);
-				}
-			});
-		} else {
-			// if we have a failure, we need to empty the list -- this prevents the the [TAB] key from selecting the last successful match
-			select.emptyList();
-			if(globalFailure != null) {
-        globalFailure();
-      }
-      else {
-        failure(term);
-			}
-		}
-	};
-
-	function parse(data) {
-		var parsed = [];
-		var rows = data.split("\n");
-		for (var i=0; i < rows.length; i++) {
-			var row = $.trim(rows[i]);
-			if (row) {
-				row = row.split("|");
-				parsed[parsed.length] = {
-					data: row,
-					value: row[0],
-					result: options.formatResult && options.formatResult(row, row[0]) || row[0]
-				};
-			}
-		}
-		return parsed;
-	};
-
-	function stopLoading() {
-		$input.removeClass(options.loadingClass);
-	};
-
-};
-
-$.Autocompleter.defaults = {
-	inputClass: "ac_input",
-	resultsClass: "ac_results",
-	loadingClass: "ac_loading",
-	minChars: 1,
-	delay: 400,
-	matchCase: false,
-	matchSubset: true,
-	matchContains: false,
-	cacheLength: 100,
-	max: 1000,
-	mustMatch: false,
-	extraParams: {},
-	selectFirst: true,
-	formatItem: function(row) { return row[0]; },
-	formatMatch: null,
-	autoFill: false,
-	width: 0,
-	multiple: false,
-	multipleSeparator: " ",
-	inputFocus: true,
-	clickFire: false,
-	highlight: function(value, term) {
-		return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + term.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi, "\\$1") + ")(?![^<>]*>)(?![^&;]+;)", "gi"), "<strong>$1</strong>");
-	},
-    scroll: true,
-    scrollHeight: 180,
-    scrollJumpPosition: true
-};
-
-$.Autocompleter.Cache = function(options) {
-
-	var data = {};
-	var length = 0;
-
-	function matchSubset(s, sub) {
-		return (new RegExp(sub.toUpperCase().replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi, "\\$1").replace(/[A-Z0-9]/g, function(m, offset) {
-			return offset === 0 ? '(?:' + m + '|^' + m.toLowerCase() + ')' : '(?:.*' + m + '|' + m.toLowerCase() + ')';
-		}))).test(s); // find by initials
-	};
-
-	function add(q, value) {
-		if (length > options.cacheLength){
-			flush();
-		}
-		if (!data[q]){
-			length++;
-		}
-		data[q] = value;
-	}
-
-	function populate(){
-		if( !options.data ) return false;
-		// track the matches
-		var stMatchSets = {},
-			nullData = 0;
-
-		// no url was specified, we need to adjust the cache length to make sure it fits the local data store
-		if( !options.url ) options.cacheLength = 1;
-
-		// track all options for minChars = 0
-		stMatchSets[""] = [];
-
-		// loop through the array and create a lookup structure
-		for ( var i = 0, ol = options.data.length; i < ol; i++ ) {
-			var rawValue = options.data[i];
-			// if rawValue is a string, make an array otherwise just reference the array
-			rawValue = (typeof rawValue == "string") ? [rawValue] : rawValue;
-
-			var value = options.formatMatch(rawValue, i+1, options.data.length);
-			if ( typeof(value) === 'undefined' || value === false )
-				continue;
-
-			var firstChar = value.charAt(0).toLowerCase();
-			// if no lookup array for this character exists, look it up now
-			if( !stMatchSets[firstChar] )
-				stMatchSets[firstChar] = [];
-
-			// if the match is a string
-			var row = {
-				value: value,
-				data: rawValue,
-				result: options.formatResult && options.formatResult(rawValue) || value
-			};
-
-			// push the current match into the set list
-			stMatchSets[firstChar].push(row);
-
-			// keep track of minChars zero items
-			if ( nullData++ < options.max ) {
-				stMatchSets[""].push(row);
-			}
-		};
-
-		// add the data items to the cache
-		$.each(stMatchSets, function(i, value) {
-			// increase the cache size
-			options.cacheLength++;
-			// add to the cache
-			add(i, value);
-		});
-	}
-
-	// populate any existing data
-	setTimeout(populate, 25);
-
-	function flush(){
-		data = {};
-		length = 0;
-	}
-
-	return {
-		flush: flush,
-		add: add,
-		populate: populate,
-		load: function(q) {
-			if (!options.cacheLength || !length)
-				return null;
-			/*
-			 * if dealing w/local data and matchContains than we must make sure
-			 * to loop through all the data collections looking for matches
-			 */
-			if( !options.url && options.matchContains ){
-				// track all matches
-				var csub = [];
-				// loop through all the data grids for matches
-				for( var k in data ){
-					// don't search through the stMatchSets[""] (minChars: 0) cache
-					// this prevents duplicates
-					if( k.length > 0 ){
-						var c = data[k];
-						$.each(c, function(i, x) {
-							// if we've got a match, add it to the array
-							if (matchSubset(x.value, q)) {
-								csub.push(x);
-							}
-						});
-					}
-				}
-				return csub;
-			} else
-			// if the exact item exists, use it
-			if (data[q]){
-				return data[q];
-			} else
-			if (options.matchSubset) {
-				for (var i = q.length - 1; i >= options.minChars; i--) {
-					var c = data[q.substr(0, i)];
-					if (c) {
-						var csub = [];
-						$.each(c, function(i, x) {
-							if (matchSubset(x.value, q)) {
-								csub[csub.length] = x;
-							}
-						});
-						return csub;
-					}
-				}
-			}
-			return null;
-		}
-	};
-};
-
-$.Autocompleter.Select = function (options, input, select, config) {
-	var CLASSES = {
-		ACTIVE: "ac_over"
-	};
-
-	var listItems,
-		active = -1,
-		data,
-		term = "",
-		needsInit = true,
-		element,
-		list;
-
-	// Create results
-	function init() {
-		if (!needsInit)
-			return;
-		element = $("<div/>")
-		.hide()
-		.addClass(options.resultsClass)
-		.css("position", "absolute")
-		.appendTo(document.body)
-		.hover(function(event) {
-		  // Browsers except FF do not fire mouseup event on scrollbars, resulting in mouseDownOnSelect remaining true, and results list not always hiding.
-		  if($(this).is(":visible")) {
-		    input.focus();
-		  }
-		  config.mouseDownOnSelect = false;
-		});
-
-		list = $("<ul/>").appendTo(element).mouseover( function(event) {
-			if(target(event).nodeName && target(event).nodeName.toUpperCase() == 'LI') {
-	            active = $("li", list).removeClass(CLASSES.ACTIVE).index(target(event));
-			    $(target(event)).addClass(CLASSES.ACTIVE);
-	        }
-		}).click(function(event) {
-			$(target(event)).addClass(CLASSES.ACTIVE);
-			select();
-			if( options.inputFocus )
-			  input.focus();
-			return false;
-		}).mousedown(function() {
-			config.mouseDownOnSelect = true;
-		}).mouseup(function() {
-			config.mouseDownOnSelect = false;
-		});
-
-		if( options.width > 0 )
-			element.css("width", options.width);
-
-		needsInit = false;
-	}
-
-	function target(event) {
-		var element = event.target;
-		while(element && element.tagName != "LI")
-			element = element.parentNode;
-		// more fun with IE, sometimes event.target is empty, just ignore it then
-		if(!element)
-			return [];
-		return element;
-	}
-
-	function moveSelect(step) {
-		listItems.slice(active, active + 1).removeClass(CLASSES.ACTIVE);
-		movePosition(step);
-        var activeItem = listItems.slice(active, active + 1).addClass(CLASSES.ACTIVE);
-        if(options.scroll) {
-            var offset = 0;
-            listItems.slice(0, active).each(function() {
-				offset += this.offsetHeight;
-			});
-            if((offset + activeItem[0].offsetHeight - list.scrollTop()) > list[0].clientHeight) {
-                list.scrollTop(offset + activeItem[0].offsetHeight - list.innerHeight());
-            } else if(offset < list.scrollTop()) {
-                list.scrollTop(offset);
-            }
-        }
-	};
-
-	function movePosition(step) {
-		if (options.scrollJumpPosition || (!options.scrollJumpPosition && !((step < 0 && active == 0) || (step > 0 && active == listItems.size() - 1)) )) {
-			active += step;
-			if (active < 0) {
-				active = listItems.size() - 1;
-			} else if (active >= listItems.size()) {
-				active = 0;
-			}
-		}
-	}
-
-
-	function limitNumberOfItems(available) {
-		return options.max && options.max < available
-			? options.max
-			: available;
-	}
-
-	function fillList() {
-		list.empty();
-		var max = limitNumberOfItems(data.length);
-		for (var i=0; i < max; i++) {
-			if (!data[i])
-				continue;
-			var formatted = options.formatItem(data[i].data, i+1, max, data[i].value, term);
-			if ( formatted === false )
-				continue;
-			var li = $("<li/>").html( options.highlight(formatted, term) ).addClass(i%2 == 0 ? "ac_even" : "ac_odd").appendTo(list)[0];
-			$.data(li, "ac_data", data[i]);
-		}
-		listItems = list.find("li");
-		if ( options.selectFirst ) {
-			listItems.slice(0, 1).addClass(CLASSES.ACTIVE);
-			active = 0;
-		}
-		// apply bgiframe if available
-		if ( $.fn.bgiframe )
-			list.bgiframe();
-	}
-
-	return {
-		display: function(d, q) {
-			init();
-			data = d;
-			term = q;
-			fillList();
-		},
-		next: function() {
-			moveSelect(1);
-		},
-		prev: function() {
-			moveSelect(-1);
-		},
-		pageUp: function() {
-			if (active != 0 && active - 8 < 0) {
-				moveSelect( -active );
-			} else {
-				moveSelect(-8);
-			}
-		},
-		pageDown: function() {
-			if (active != listItems.size() - 1 && active + 8 > listItems.size()) {
-				moveSelect( listItems.size() - 1 - active );
-			} else {
-				moveSelect(8);
-			}
-		},
-		hide: function() {
-			element && element.hide();
-			listItems && listItems.removeClass(CLASSES.ACTIVE);
-			active = -1;
-		},
-		visible : function() {
-			return element && element.is(":visible");
-		},
-		current: function() {
-			return this.visible() && (listItems.filter("." + CLASSES.ACTIVE)[0] || options.selectFirst && listItems[0]);
-		},
-		show: function() {
-			var offset = $(input).offset();
-			element.css({
-				width: typeof options.width == "string" || options.width > 0 ? options.width : $(input).width(),
-				top: offset.top + input.offsetHeight,
-				left: offset.left
-			}).show();
-            if(options.scroll) {
-                list.scrollTop(0);
-                list.css({
-					maxHeight: options.scrollHeight,
-					overflow: 'auto'
-				});
-
-                if(navigator.userAgent.indexOf("MSIE") != -1 && typeof document.body.style.maxHeight === "undefined") {
-					var listHeight = 0;
-					listItems.each(function() {
-						listHeight += this.offsetHeight;
-					});
-					var scrollbarsVisible = listHeight > options.scrollHeight;
-                    list.css('height', scrollbarsVisible ? options.scrollHeight : listHeight );
-					if (!scrollbarsVisible) {
-						// IE doesn't recalculate width when scrollbar disappears
-						listItems.width( list.width() - parseInt(listItems.css("padding-left")) - parseInt(listItems.css("padding-right")) );
-					}
-                }
-
-            }
-		},
-		selected: function() {
-			var selected = listItems && listItems.filter("." + CLASSES.ACTIVE).removeClass(CLASSES.ACTIVE);
-			return selected && selected.length && $.data(selected[0], "ac_data");
-		},
-		emptyList: function (){
-			list && list.empty();
-		},
-		unbind: function() {
-			element && element.remove();
-		}
-	};
-};
-
-$.fn.selection = function(start, end) {
-	if (start !== undefined) {
-		return this.each(function() {
-			if( this.createTextRange ){
-				var selRange = this.createTextRange();
-				if (end === undefined || start == end) {
-					selRange.move("character", start);
-					selRange.select();
-				} else {
-					selRange.collapse(true);
-					selRange.moveStart("character", start);
-					selRange.moveEnd("character", end);
-					selRange.select();
-				}
-			} else if( this.setSelectionRange ){
-				this.setSelectionRange(start, end);
-			} else if( this.selectionStart ){
-				this.selectionStart = start;
-				this.selectionEnd = end;
-			}
-		});
-	}
-	var field = this[0];
-	if ( field.createTextRange ) {
-		var range = document.selection.createRange(),
-			orig = field.value,
-			teststring = "<->",
-			textLength = range.text.length;
-		range.text = teststring;
-		var caretAt = field.value.indexOf(teststring);
-		field.value = orig;
-		this.selection(caretAt, caretAt + textLength);
-		return {
-			start: caretAt,
-			end: caretAt + textLength
-		}
-	} else if( field.selectionStart !== undefined ){
-		return {
-			start: field.selectionStart,
-			end: field.selectionEnd
-		}
-	}
-};
-
-})(jQuery);
-
-	/**
- * jQuery.fn.sortElements
- * --------------
- * @author James Padolsey (http://james.padolsey.com)
- * @version 0.11
- * @updated 18-MAR-2010
- * --------------
- * @param Function comparator:
- *   Exactly the same behaviour as [1,2,3].sort(comparator)
- *
- * @param Function getSortable
- *   A function that should return the element that is
- *   to be sorted. The comparator will run on the
- *   current collection, but you may want the actual
- *   resulting sort to occur on a parent or another
- *   associated element.
- *
- *   E.g. $('td').sortElements(comparator, function(){
- *      return this.parentNode;
- *   })
- *
- *   The <td>'s parent (<tr>) will be sorted instead
- *   of the <td> itself.
- */
-jQuery.fn.sortElements = (function(){
-
-    var sort = [].sort;
-
-    return function(comparator, getSortable) {
-
-        getSortable = getSortable || function(){return this;};
-
-        var placements = this.map(function(){
-
-            var sortElement = getSortable.call(this),
-                parentNode = sortElement.parentNode,
-
-                // Since the element itself will change position, we have
-                // to have some way of storing it's original position in
-                // the DOM. The easiest way is to have a 'flag' node:
-                nextSibling = parentNode.insertBefore(
-                    document.createTextNode(''),
-                    sortElement.nextSibling
-                );
-
-            return function() {
-
-                if (parentNode === this) {
-                    throw new Error(
-                        "You can't sort elements if any one is a descendant of another."
-                    );
-                }
-
-                // Insert before flag:
-                parentNode.insertBefore(this, nextSibling);
-                // Remove flag:
-                parentNode.removeChild(nextSibling);
-
-            };
-
-        });
-
-        return sort.call(this, comparator).each(function(i){
-            placements[i].call(getSortable.call(this));
-        });
-
-    };
-
-})();
-	$(window).load(function() {
-	var $document = $(document);
-	var $left = $('#left');
-	var $right = $('#right');
-	var $rightInner = $('#rightInner');
-	var $splitter = $('#splitter');
-	var $groups = $('#groups');
-	var $content = $('#content');
-
-	// Menu
-
-	// Hide deep packages and namespaces
-	$('ul span', $groups).click(function(event) {
-		event.preventDefault();
-		event.stopPropagation();
-		$(this)
-			.toggleClass('collapsed')
-			.parent()
-				.next('ul')
-					.toggleClass('collapsed');
-	}).click();
-
-	$active = $('ul li.active', $groups);
-	if ($active.length > 0) {
-		// Open active
-		$('> a > span', $active).click();
-	} else {
-		$main = $('> ul > li.main', $groups);
-		if ($main.length > 0) {
-			// Open first level of the main project
-			$('> a > span', $main).click();
-		} else {
-			// Open first level of all
-			$('> ul > li > a > span', $groups).click();
-		}
-	}
-
-	// Content
-
-	// Search autocompletion
-	var autocompleteFound = false;
-	var autocompleteFiles = {'c': 'class', 'co': 'constant', 'f': 'function', 'm': 'class', 'mm': 'class', 'p': 'class', 'mp': 'class', 'cc': 'class'};
-	var $search = $('#search input[name=q]');
-	$search
-		.autocomplete(ApiGen.elements, {
-			matchContains: true,
-			scrollHeight: 200,
-			max: 20,
-			noRecord: '',
-			highlight: function(value, term) {
-				var term = term.toUpperCase().replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi, "\\$1").replace(/[A-Z0-9]/g, function(m, offset) {
-					return offset === 0 ? '(?:' + m + '|^' + m.toLowerCase() + ')' : '(?:(?:[^<>]|<[^<>]*>)*' + m + '|' + m.toLowerCase() + ')';
-				});
-				return value.replace(new RegExp("(?![^&;]+;)(?!<[^<>]*)(" + term + ")(?![^<>]*>)(?![^&;]+;)"), "<strong>$1</strong>");
-			},
-			formatItem: function(data) {
-				return data.length > 1 ? data[1].replace(/^(.+\\)(.+)$/, '<span><small>$1</small>$2</span>') : data[0];
-			},
-			formatMatch: function(data) {
-				return data[1];
-			},
-			formatResult: function(data) {
-				return data[1];
-			},
-			show: function($list) {
-				var $items = $('li span', $list);
-				var maxWidth = Math.max.apply(null, $items.map(function() {
-					return $(this).width();
-				}));
-				// 10px padding
-				$list
-					.width(Math.max(maxWidth + 10, $search.innerWidth()))
-					.css('left', $search.offset().left + $search.outerWidth() - $list.outerWidth());
-			}
-		}).result(function(event, data) {
-			autocompleteFound = true;
-			var location = window.location.href.split('/');
-			location.pop();
-			var parts = data[1].split(/::|$/);
-			var file = $.sprintf(ApiGen.config.templates[autocompleteFiles[data[0]]].filename, parts[0].replace(/\(\)/, '').replace(/[^\w]/g, '.'));
-			if (parts[1]) {
-				file += '#' + ('mm' === data[0] || 'mp' === data[0] ? 'm' : '') + parts[1].replace(/([\w]+)\(\)/, '_$1');
-			}
-			location.push(file);
-			window.location = location.join('/');
-
-			// Workaround for Opera bug
-			$(this).closest('form').attr('action', location.join('/'));
-		}).closest('form')
-			.submit(function() {
-				var query = $search.val();
-				if ('' === query) {
-					return false;
-				}
-				return !autocompleteFound && '' !== $('#search input[name=cx]').val();
-			});
-
-	// Save natural order
-	$('table.summary tr[data-order]', $content).each(function(index) {
-		do {
-			index = '0' + index;
-		} while (index.length < 3);
-		$(this).attr('data-order-natural', index);
-	});
-
-	// Switch between natural and alphabetical order
-	var $caption = $('table.summary', $content)
-		.filter(':has(tr[data-order])')
-			.find('caption');
-	$caption
-		.click(function() {
-			var $this = $(this);
-			var order = $this.data('order') || 'natural';
-			order = 'natural' === order ? 'alphabetical' : 'natural';
-			$this.data('order', order);
-			$.cookie('order', order, {expires: 365});
-			var attr = 'alphabetical' === order ? 'data-order' : 'data-order-natural';
-			$this
-				.closest('table')
-					.find('tr').sortElements(function(a, b) {
-						return $(a).attr(attr) > $(b).attr(attr) ? 1 : -1;
-					});
-			return false;
-		})
-		.addClass('switchable')
-		.attr('title', 'Switch between natural and alphabetical order');
-	if ((null === $.cookie('order') && 'alphabetical' === ApiGen.config.options.elementsOrder) || 'alphabetical' === $.cookie('order')) {
-		$caption.click();
-	}
-
-	// Open details
-	if (ApiGen.config.options.elementDetailsCollapsed) {
-		$('tr', $content).filter(':has(.detailed)')
-			.click(function() {
-				var $this = $(this);
-				$('.short', $this).hide();
-				$('.detailed', $this).show();
-			});
-	}
-
-	// Splitter
-	var splitterWidth = $splitter.width();
-	var splitterPosition = $.cookie('splitter') ? parseInt($.cookie('splitter')) : null;
-	var splitterPositionBackup = $.cookie('splitterBackup') ? parseInt($.cookie('splitterBackup')) : null;
-	function setSplitterPosition(position)
-	{
-		splitterPosition = position;
-
-		$left.width(position);
-		$right.css('margin-left', position + splitterWidth);
-		$splitter.css('left', position);
-	}
-	function setContentWidth()
-	{
-		var width = $rightInner.width();
-		$rightInner
-			.toggleClass('medium', width <= 960)
-			.toggleClass('small', width <= 650);
-	}
-	$splitter.mousedown(function() {
-			$splitter.addClass('active');
-
-			$document.mousemove(function(event) {
-				if (event.pageX >= 230 && $document.width() - event.pageX >= 600 + splitterWidth) {
-					setSplitterPosition(event.pageX);
-					setContentWidth();
-				}
-			});
-
-			$()
-				.add($splitter)
-				.add($document)
-					.mouseup(function() {
-						$splitter
-							.removeClass('active')
-							.unbind('mouseup');
-						$document
-							.unbind('mousemove')
-							.unbind('mouseup');
-
-						$.cookie('splitter', splitterPosition, {expires: 365});
-					});
-
-			return false;
-		});
-	$splitter.dblclick(function() {
-		if (splitterPosition) {
-			splitterPositionBackup = $left.width();
-			setSplitterPosition(0);
-		} else {
-			setSplitterPosition(splitterPositionBackup);
-			splitterPositionBackup = null;
-		}
-
-		setContentWidth();
-
-		$.cookie('splitter', splitterPosition, {expires: 365});
-		$.cookie('splitterBackup', splitterPositionBackup, {expires: 365});
-	});
-	if (null !== splitterPosition) {
-		setSplitterPosition(splitterPosition);
-	}
-	setContentWidth();
-	$(window).resize(setContentWidth);
-
-	// Select selected lines
-	var matches = window.location.hash.substr(1).match(/^\d+(?:-\d+)?(?:,\d+(?:-\d+)?)*$/);
-	if (null !== matches) {
-		var lists = matches[0].split(',');
-		for (var i = 0; i < lists.length; i++) {
-			var lines = lists[i].split('-');
-			lines[0] = parseInt(lines[0]);
-			lines[1] = parseInt(lines[1] || lines[0]);
-			for (var j = lines[0]; j <= lines[1]; j++) {
-				$('#' + j).addClass('selected');
-			}
-		}
-
-		var $firstLine = $('#' + parseInt(matches[0]));
-		if ($firstLine.length > 0) {
-			$document.scrollTop($firstLine.offset().top);
-		}
-	}
-
-	// Save selected lines
-	var lastLine;
-	$('.l a').click(function(event) {
-		event.preventDefault();
-
-		var $selectedLine = $(this).parent();
-		var selectedLine = parseInt($selectedLine.attr('id'));
-
-		if (event.shiftKey) {
-			if (lastLine) {
-				for (var i = Math.min(selectedLine, lastLine); i <= Math.max(selectedLine, lastLine); i++) {
-					$('#' + i).addClass('selected');
-				}
-			} else {
-				$selectedLine.addClass('selected');
-			}
-		} else if (event.ctrlKey) {
-			$selectedLine.toggleClass('selected');
-		} else {
-			var $selected = $('.l.selected')
-				.not($selectedLine)
-				.removeClass('selected');
-			if ($selected.length > 0) {
-				$selectedLine.addClass('selected');
-			} else {
-				$selectedLine.toggleClass('selected');
-			}
-		}
-
-		lastLine = $selectedLine.hasClass('selected') ? selectedLine : null;
-
-		// Update hash
-		var lines = $('.l.selected')
-			.map(function() {
-				return parseInt($(this).attr('id'));
-			})
-			.get()
-			.sort(function(a, b) {
-				return a - b;
-			});
-
-		var hash = [];
-		var list = [];
-		for (var j = 0; j < lines.length; j++) {
-			if (0 === j && j + 1 === lines.length) {
-				hash.push(lines[j]);
-			} else if (0 === j) {
-				list[0] = lines[j];
-			} else if (lines[j - 1] + 1 !== lines[j] && j + 1 === lines.length) {
-				hash.push(list.join('-'));
-				hash.push(lines[j]);
-			} else if (lines[j - 1] + 1 !== lines[j]) {
-				hash.push(list.join('-'));
-				list = [lines[j]];
-			} else if (j + 1 === lines.length) {
-				list[1] = lines[j];
-				hash.push(list.join('-'));
-			} else {
-				list[1] = lines[j];
-			}
-		}
-
-		hash = hash.join(',');
-		$backup = $('#' + hash).removeAttr('id');
-		window.location.hash = hash;
-		$backup.attr('id', hash);
-	});
-});
-
diff --git a/documentation/resources/footer.png b/documentation/resources/footer.png
deleted file mode 100644
index d99890c2c2cbcc06dc27265decd4ab5868cbda54..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7948
zcmd^k2Uino)Gk(zg1}J`5d@Xu5h+pyX#yf5T@(l{bQGl5&>||L(v+3}Awg*hfzW#q
z5ileqB9MqQffOM?fDl3`;l^{m@2>kF?q1J4v*(?)-g#%wGkfnf^UB)N<izoF$9Z^o
zPMF@gb&rSV5Sr_!|8<DV>g8>7+yNeI^ZUjW>g>WIX=(X4olaX_TV7wMGd9*XnCqLH
z8=EXHn5;k8<T7)U!DRly<|cD%Ym>FL$>o2++G76!`+u;--u@TtE%v|I+1dUV?CtHX
z?QJfzw|D;axxBN@#m?@|?*D+h`{V!1ySsb4T-*C&T>f+TpTpt&JN6%Oea;?t<o^NZ
zKil8u?Eh=#=H?a_7M7NlR#sNl*48#QHuvt`v$eIofB*i22M_G*?CkCB9UL400Dz;T
zqmz@9v$L~{i;JtPD-Z~Db8~ZdclYq{@bvWb^78Wb_V)4d@%8n6`0(MQN00pc{QUj>
zA3uH^5D*X;7#I{36dW8J5)u*`8X6WB79JiR5fKp?85tE76&)Q70)b*;Vq#-s<Kp7t
z<Kq(&62M^alP6CS6BD04efsR#v**vBCnY7lc<~}RIr-(wm#<#Edj0x!N=iy<YHC_q
zT6%hVMn=Y)H*em)eVdt?nU$55ot>SNlarg93xPnOP-tFWUVeUlK|uiw1}iKqgu~$o
z1fr;@=-s<_@87>KE-o%9DJd;2Eh{T4FE9V_;lsy|A1f*<Dl03INMu!2RdsbW3Wchv
zsj024t*fi6udi=tXlQI~Y-(z1Zf<UAX=!b3ZEI_5Z*TAD=;-Y1?CR?3?(Y8d=~GWn
z&*#sddwYAoeEHJX*Vo_QKQJ)x_3KwO8a+5Th{0g6SnSZy5DtgK<MH3VeH$Jg{{H>@
z$jHd(=;+wk7=b__5{W;4{1_h}|M~Oh#Kgqp<mA-U)b#Z9%*@QMU%zH&XXobT=I7^0
zBodiSrcfwUD)sm8-wO*1i;Igi8f|H5X?b~hWo3m<r?0NAuC1-Dudg#0jE#*ACRetb
zT=lZHwzz8Ks*Wo~uE73?iYpSXIs%%*q<MG_@Pyy9wEa&l|KBo?EsIx%n;wn@-vNa2
z@bI1bvmM~chn?l&Iag+S%iw<WfhEFF&`E={M}wUgtM4D;<-hpT>=geik;T7H2}+k7
z+uPrlyg^r`52zlhU+npDNJ%B7Jv>qm4s6b1u#ZH<DAJ;JBm|Oy9}uqXQ!B~DVq#?b
z9)&sP-|337tHggGhqC{U&@UL$E21#imxymF%VU59mj@%2V`+qT{g3DZl#@H6;}OB(
zjG7YU@4LhAp{2iaw9I=pUJ7(Rk5s<%)Ha)pD7n$+<dGhAywgjPuJlh!^pD3HMVVqk
zgD0HHvNnfWC;#dtDSyQ36!*=>;WDkF8OGw|fp12E4Q8#+rfH@@2*DdjwXew*5;dvL
z>Yj=!wK_(5ie+hRPlfN9q@0DqjSGCqN5Y4%S=5x@bosi{(39SHAHz4HyK+O|`py0E
zWlg8Y53iSrJo@G}8h0T2?o)TDaEhCn`H!<oq1laN&!v{~V{clYn(O@#7j-jI4Pfmv
zH!7*~!g71#eP++r2G;&}eZ>3}rC>|JQz%-6CZy~t7W-WuHpIAGa8+kwcWmR=dy(A<
zEBh??_i9I%s|yDk^X$eNX&Us9U*0XU!XS<zH;MaJR#%5lX&U&RD?dj)ce%iKqI`ln
zA#%IAK`E_wFTmm${Rpr>MNrr^1!fZbS8wO>&DCkV&S+kZ*ijFN(9K(X<DlbTGUVjH
zwDt^s*f)_mq$15Ao(<c$)j3iKx^?#A2~F7p-^u_~F-C^5&B*IEh<)Nu0PkayWu%h(
z%-;c@r${cM<%ieGo%VVcIb~(Slj)Juy+Ug*zgWN40gxbThA48@NipTf9<Al<1dSfI
zCs6riR;=Ca&1xQRbPYD2U5U(VH@{vF6z{t*__rNA{_YJ^6ARd~^0Ge(Bf|HSSo3Ia
z9%P|yJR#x~a}lO`6a9PIeCl=NtEzRola4-^;JoVn;m6T$uM9epGG;TKW2KMGM)RA@
zy)t}MLXxVM>wmuT)Hm|#3zs^>qh$NRrGL-?;zvKP8p)x}EHev89FakOg};Yx@1M@8
za!lb-m^i5ScC%ptvB!?VG098IP~Rg82rCOdKO0>@3azasrZp*I%!gC(;1uZ|iDr{y
zLe)RXj_^Wjh#oxmPUy>pzif_s!cM_vPg6J1pP1Evf6AbZ>mm~cOI7wUrfcVbYuX1g
z0w_zKkLWxOM}Svr+m!FiDt?;01J7Q*QVP;)eI`&c5abRHXxHsFRzhrtSsZ3chUvOP
z9+w8Rq_N~ZSXG}J`5KHUZ@&s|dH<3U{p@h)?6A<lwZDcLnwK~8;{6I}_aJg0W$%>S
zT<3t3QU0Mh)jx8`_5|Q5`R7wLS3WLRg|&?tzujN)X6Nc~UXlF`6V_RRvj+7cmhkwu
zcEq&ssku?+6NS2@rU}B&XtIy7Mce4E@2KlE?aou$;q%XJPPiivq&|G<dG`4~Ny@lm
zIBPlV$m_GVY_OAWcSghJiU#IEn;FA}mijHCJ>8y(Q~$xAu^fI#2WruOb4^8iR~Bt3
zYI)6778Lmn(2%)OHXvD(@1Im9LUaS~J#lEUVD09;AFH#Ey%^XZucpm+`^JXyVKu{x
zFAap=pYGSZtXXdnf>Wy36#j5eyJ69>(Zswu0<!7yq_W#BK7qQtth;ya*OecC@!FAA
z-(xeAR1n20A`7LcW<bFU^Pl?Rwk`#$x1CV6Krl=9i5b(;+YI#Z*{FOs7!79i#vu=B
zeK*n~B&NH4@H}CC*ih)%g<DrrLo9EWaUN?+-b;+ph4?i`z6q#X$%4S|hSDRm^^z>l
zd{W$M`dbKSR`TN~56r_X6rh2P7T7V?wn?Ye`@cvDo|<l>)w*6E>%Z|yqJ7;CCvohH
zaH~ZBi_iZ}9_&-_ld_49-&F3z(@L8RDu!Dgl*gnG@;PT!#vh6%CK36Q6&i#BU!0mo
z`c?)hHZZj7Of9q7k7MRv(#!0800oD9H^ij{2Yc$=WpVGmBP1MxW^3({g#xE_@S3o7
zO={eC29oiJ%D`QQ<FUqr>H?kCz!;iSkQ=hH=43xy;p+u0>!Z4YoDHY-`TP$3EXV$4
zsh6h8&L`VN3F;>@6GKsw_kT(oK@MXF;#rX^Y!a&;Xa&~V-#ay}-+T3TQX|trg!D}r
zP#-l%l=P^1r25O)faI)AGaf7M=~ZX5br?**`uas4Reu4Rim5=-0j%`~;ru^8O`C5*
zPyXK^|8E@5punipBI>N0OJ`m@rYRd8MVIkhYoGH?sA)esD0unQP+oof@lh<S*!Q3=
z%fk9I-oD&|Y*esYP8P@zYj?kpP7IbQc{ci%!#9|U&%L0x8zmyWw;+9zB%QD&dZARg
zJR4)IPd^m*{KP9yXKV4CWOB%yGBWC0>6z<&XU`VT3#*jMm2K`6nZ6Y3bDaj)l7fwd
z_?ul<_g}v;P_b3a{aaOg<zm=zGD!0k)+o6aw5k&$u9p^sNQ;9)4}8eevd4$d7^}Bh
z%VN&^WGK<ArO>xT<)wVMD;`(XzqPlt6aE%Tz0z9m(d8936gRw5vFA+@CFD<@_6|1Z
zUcve(MjDz?_Db)Kc`h@O1ieu2RhF8o?(-2)e((w5{W221$<VuLLb|Be&r7xe{Xoz&
z#FiNIzCa~p-pc%Y8g<0x?!Cn5D`@F9)Zj^=RGzSZKN*@@(q69;mJkovVHSJ#9t;Vn
z6KxPVU+y3QH4!jk{0Iq_&=o`s#15Pc&B12B6HxWaMQ+&{jIXsgr0FLO$`kjqb5yl_
zz8Z&?Vsk~q#*kXE_<64hM`d7Lt54TM@EAqKFGa_5xy8^2Z7!Pc=hKnvb-U11(T))o
z`mmLO8EUjciakD~VCp|0p;A5;313l~1cF+^qn6j^4hLz8_0FEP8o=i1sy;kZC2SNH
zKkZ_5;h9$nQo$d4mqDdFC4`@A%8iF+4Pfv@L{M;7Z<2z9q%QhyN6Ar|ch^tUQRHE;
zM&lzF&PnZ^({jYgU{^;zl!GcEomk$Njp*)abd^U(g{~81A(5?(L#6R?#!aaYWHm?0
zZ%oD)6tuDT-=r<<!eB-|=&RmA08c_b0tOkWtL#6i_PQ&t#XhR7b!@CNFpzTg>HxTV
z2-qdC+tJ9`ep+^W>9l|UudPigy4JgY5*YJnn7LTVo+U_jYDuB88@)3C4+&v0_wb94
zxQYwECE?+@Ues{Tf8gAD1}WdFuC;8%(Q`9@zNzibP&;i@<s_w7#q8*y6^5Bi*FwQ{
zA1d4!>Q|G`z#L+H)lthR<V}t&=zUAxT^fsXa@p~7$?EhJ)Pf-C)w<pRdCF!(aE5)*
zh?(mZf6NIVf_NB*UGbSV!%A7N=t81s1>1ojK01ac^^^7ac>@WuyF~Ia-K@bCNtspk
zgw{)8ri9!uEca=yeb27)eu2%j9aO@cpxmyfOoBFx=2Hi`YjA%kp)G(brp_{==lp*z
zU{yTr@)dkJfj-EVJB38j9Ti*Gpw4@rO4~WV!?A_-MOvfU7FAWk44DFdO3J4F5Tvlm
zUr$d14&)^@o_W~+y*3$}={eZ9F4yX4moMY104jw!DMCNW=}Q>j1~};rA&YY+%&drk
zN_sBwUAyD{20_bwb!GDMQTFXN_Cw9Y&ymCJcM0k0UJ8JyAMgC$@Mm|D`5B<sg?}Vc
zs(@o@&fJP5be%TI?G_B5gJUiS-adO`=U|mg?BHPCm&r2}>?-XtAJiu7%Xn-TG?CTR
z+Jx^+t6tvN6S>%??I*i*!sMmCVCcE9ANP_!B=4!4ZN5yJBWwFwG7s18RlL-`-W*^z
zlIHz^PF))6TnUT>HOEf$jJJTlzjK><Kx?{jx+(+R>ZzcmIEa}+mvTON;?z;RKJr7T
z*wmT}EV$7(Rv3fxf)&-#?S18Qyl}tDq@ErH7M;KXcZvJPFkZuK37P8N-lEFwj1WZ-
z_tm>fF%LrsYW)UcmUjv`61_9y1n_+C^|993##%yl7^dw^y+lClw9CMWCe&vd0JOy3
z<Ff^%AG`cWD5biTy!XDNLWxG(_KCNj`MjgTBX#Y5fAkv@5Oe@^utGW4b9>KBxOMj_
z<fE+$)(pp$(MafSX^spvJI6bvwX;GphJb&s*C4L$-G57kB$fL8S_b1Vel;6Dk`<F%
zJ`YMdD_lRHe=4(XOR8m`qbdSp5j=;&(6)oqDjsk@I~c8A>=k^Nc_r`G)|+enynQwx
zC|BB@^EEkxv3}sOQhHnHSeptJ+DL-cHSg+&M7?optu=Cw28xP_dhPEll%(-1dcD=z
zpS^e^h;oVTCZb;}?b7axZS=vlGR^-YLSjA?B+o~~KdD9^$FF5AvN1xe*RlPhYy2Q3
zK-8qs85v@>KJFTW@1J9Jimhc!kp&1JD*IJJ8Df!&%lF19WwdQ;ds((z=l`3Lht%(=
zMszdrC^mlr=(VmBK{>^w*=1j$zIkD1H$E{w$)FauH54M4X9mAAGjo|yi^P*-u7NFm
zLeyAr<=+W<^qp(>rEI0|%h*zur6lK=ImfCq2#e!wE5JQd5!v1D2b@P1@z?bAf0u@C
z9%Y27;Ilt^H^x6zfL%R}%$65Mjs;R_)TnmZx0h@6UNZqYW*mdOnaevy0Ix}BB0Q^A
za_GiGxi&a{Z6(#-43a{)dbB3yn1V7S-T!NwS7BXXo+rVI7<Y+v9kVy3f*8ctB2_8e
zb09SPb(D;t-=;o|Lpckt0@5>lvCj24(7xE|#hLYdt?u)+W3!JzoL%d5%REOy`Iphx
zjBW92#xE~=rb?)pEV%zJw_p-j{o6yz5Tq?!0jyaqLrjnO8k89^m`lFw^FWo#f5Uvm
zQP(=d>s^ez0HOG!TVRU`@+u`YVnB{$T9*#`#=qLcLhA=+Q?<PdLqS>OizY62iXUmF
zQ;+HNnl5CFIE00i*x^SfYtkL;b<7CDtW@BDN>P9%rP;y|sRcx74N0qFEb19cUt9yi
z$W@ZTIR!H(ULb-Dv^-ptedV!Uv5L)t?KK`LYmApweAQxJepSXJf%mSrR+79o^*Sdi
z^TWU&2v%dxsucMc9G-;olT+>7JGKLg9~B&zqu4Q)Kmt&yFK?7@3+5MZT+_7_Tw;CE
zwC{$GZxpL1%bVe5E<0uWV}!yg*=dX=(Pt~|CP7ALD+cD=bn}xL(XeZY)h4w%DG_Lx
zO0&F2*IQ@XvRpB24kb^Or4yMk{KoY-zBVg57eS%wCIA{Ebc}K{#<(}D32xiGLd@0j
z+0g^o>Fyuv2Gq^GDlpfN$fI3G)mMcz;2aQNVf8C{&-AjLZ7I1f*gk64SG5FJ#*tBv
zui{d?LpCu`iE`e>w~h~M)xG>Dc*hpqBCm9J4Jk`FfX^06?_|ef#OqP5bE!J}OXo(z
zG|%212^Pnniau(!fd9THR&G~!yS1C$+r9r>6nrp1ny$ctwo+uMpH&aKyrd}nmH`1G
z^AXg`+j+%P1F`6yb&L^o>@>y1kHa#IL3feajVc2jqq~#l@~uTn%`+NAD_39o$lfmK
zQU;RuYZ6J=d#WxS0O=^v0Z^dC{25JE{E^@BK|XRzW=sBuQ&y=?+lLhQjuGLtD^NqY
z42nOa+&^9OUCRwGPmByDe*ZRRiS~uBR4y@~z@#S9zk}(lN6R19XhzqQbji~y1F-MT
z!4&v}s_VPX?NBx|=AG+D$aZ5wEpQpK6QTQrhXdj%4vXf6WO(2l^<9*7@s}S9+>qK1
zKv>{9sR<FzD@5uOEf0ZVPs#<|y8<JEqn#uj?<ti5q?xM}d_ct)7Uq1Dl4&rokQgJ)
zH|7~~E%n8$oB!+1Li~@hXVtpCQ>sU+@Fd;eAjPm@gYSJ^1r?x_^}}%Y(p7Q&SH5fR
z{N-!YC;=!R!FT;!jYgK%EOK_cY}|8+8_<dS`a~<77b~@OUd_uTloMXqtm8?^XTT6}
zNYOKPLZaJ|?prPWyYHj*3~7QDtb8qBPONo32}TxGC5ls>#p^tEf7_!WYcvuc`RWi1
z6Fb+H#W|;6+?t4)F<!`Iz41lskvqs9n#nuzE?1r8ofTXx^{pAFm|wP*5xcSo6kPJ`
zLeV?YsFc#$#HwzxfyjGC3F8QZTfQ0U<C=<;kR{FK4DUi^h<FLo0nVw|i|a6bq-Z%|
ze?HotS+N9|;<&a<ijIez04e2h#o0<a?Z%Ajl>DmPyC^BA8Mx3p2q~reHNWuv(l{sW
zxdJtMky*^uV=OjgNRGO**@;SU;WTwswD`cnu@|W_L@MoqA2W4IvW{vSd9JZ~dylSR
z2dwIHPUv*~V82)zQw3bIpYV?Fl<cXW&PQ#%G<&2vqd4HS?_b$TLb{~|KU6e1L3^1*
zxqpcwr0gT`y_j@O%Ti!;e4Upt95PveD<;Sw_`SzAbfBeXK9h|C?FhML$L=4fbj&<A
z-<e=9hNcPt_J0iMWHheivtR5b<d4cEAEB`@c|GE1kj+^Vm}igFP7JK+B>JvqbMEV^
zR=Y}If-=a7WKW8!)(J<B1hp3Fs`adTkFuWGA+J4zXPnwIkAxA<R|YgnqG8Gq*ycnA
zY1bS#JGH<JQ$;5<A>c#6GvAg5qsP4n1G&{Pxp7vl&9DI&v4dV|{VG1q;ca}5bKbVY
zd2m;w<UrdbTd@_gi%;|ketSH|@+nTkwa&WcUfun=Gx`=OQUC<HZB}#6D$8MA^x*}^
zHg`hQB?WCuZJ>gyqN|d#^*Z0gi^58qWG7#mestSyJSyvy7B8!Ym427v4;SwIa8A#L
z5h7kVAo<T*($&FwvYJo$f^HG`$45v6{kY@<g0C{|FH6n9E%dOi3!=z}n!!#Ty8chb
zrsHzyq;2QG(}=zfvv6*`k@;-6P6L;}WRAnm<LaiwNUY^J;QsD@5tyfn?zZh!6^4t2
z>xWI5br~VATB`Jmcz)A}-%tDBr{ISbFEK&8dtKkM^H0{348PZ)$WD+A!yA12AmdOo
znG;ha@yd|tAdWO)1k3$2v_RPQiW#p&E3xzI0=3e{$ALc$TZ};m@iq6N(+i)2zs}mK
z*<(d_(pyP840Rt^#A8E>MgO0U;ZH`+Yr--#pxi<k@wIIpu&(7(p@kWr4D9ZV%uA?1
zv|DY~vlbM8|6(kbPKZ2nUf1<f)Up_#UWiCp=3Ba2a`%?sQp#2!`x<2gT5pLX`45PP
zI@fix->vZFz8XUdAGgZ{itIS$7xu+Aq7KHQnfJR`Sc7C^I!k}DZrE|$W7cmtv|VB2
zZ>n(AY63fxekC@S0fkfv(XnwoaebAU3)JDC7?1N|4)wTkNE{t%gfmOG!9_)M{SFw*
zs-qPSD~An%aB04ZY)<sDr`}jcP=0-+o<f`h8yW6~(wypWNob;Qr=`n_?5rZ(*q4yJ
zvfHw@|F$U)WFPQ8{(#fu&N^+@RfgntJp0pD4dryOjWW>{eHVT2&kD!=`U}ct&Tlby
zz`z-$91bT?W7j{<lvGXPRu)ysp_{6Fmd%b`u3c_jbH=7E8SLQ>-yK<0<PEc~>yu!*
zq~N8(tFwKD8xI)gg>@@p9&A<wO88sSnk(rly;$eFU6O;=;UT0~bm7jLnTT0$GUhv^
zaczaPBUQo93hT3g><%c<pnOB@<+-9tr<HXKnMg~DDRo^WZuccL0#}G+9#6^jDIv<v
z#)Q~TBP1>edZ8(O+@AXQ-Jw#UE4TSh7LRhXfZ(Xq`7T^>Rg7Bn)R|3AK=4&I$1cxS
z1Kehxznm~{8kvje=QbAs6f}QifkImA8AmhDNG^sx(`lH%3w*p@Mr&$KSl5U}bm6a;
zt=RCD^nIQwDB=c|(et<x?rK1vz@mf{W{EFF)+$LD=S<6dPWXV#J_dV!>FbH!YiASo
z%W=-U2I6RC@V$Y)<0K72v*Me`bx0`lX1b!!l90EP?1_`ISBk>{lb}TaT-uc(11{N}
zQh5o$0Q?>KovNIy#3L>5fZYk%IwPTbFo7W74On91^GnP;^M7KUeG9(SRPX!g0z(n&
zv&TNs4lJvkO(7fhY#g|Bn;!J`s*?-)*%caMcDwUp*QvO~(!}a(5ir*S-(vK%+8Z+W
zvaev^#>$P+e$H)=Q@wLVvHPRhnQZ*e4S(0kAw6-sl@<NmM(p&_;|V-XXT~A0eUTqJ
zzZ)O!Ki%5dP2%)3Dk0fUj&0WHguxHwC@g1;FT&@pR8^5hgxbZt{a=Yt?;iT{sO8aE
z+dg`CjIgii-I?JLNUPE~3hFDbwe!n^w=xTE{1DL8EMm!0n$cR2p#n{YbGaYXCeM(Y
zF?8Y~<}KZO_>JVBwnNHerfUgSBRjI)cLjjh3%=vI4a7SAABah@WqhC@tDH5ERPtz)
z72ATLI<K$#i^l){%zSg(w7$W8PAx>d>zZ|sBf=pxT?MSR?){y2@l@WOcv)dThe`$Y
z7_<?}d-vn@eTZ5!z(GDY<;VoCKnc*kpqguj^VHDU%EJFTYA=>{yFM@YD#*3dHI(Cu
zbJ`SU=chi{R0QWWRne{FMBnRtuj|ImP?a{WAC-$Lx+8<9itFb)f9zIwq|t|j>9kX3
zFD~FA;(?p?)OH5ht^L;eV;n=5N*mc@OJ3MN6&JONS|CoJCtcw0y~(pHxepeK8f_7K
zOE`5!w?Ee53Y_m?j5G@<{rz3{;qdc&>MLpbm&RF3&wTD{H(Z=Kxqe_)YP=Ym)ARFT
zge#rV<ppf8%9p>T_C9EN?y}H6YD>3RY8-gH{xos0v*(D|irLCO6?Gy2yyW4fx}!k_
zj!?{2)R&~nE>1u}-?~4ra*#JSWp?u8hr9fMq1=KQ$<*p!{cC0>;KsI$NYHOFWID;L
zx$j+fQo-ot5#~W+1&Ntq9Q!FcSSK}ucivQ2&X-vOC(OsV@~(f0m&U8Dj4&M1Nvp4#
zWz0)!H6gqVFNvXg#;lI6B>4W;TbL~o`7FM}(5;w*3Kd8Hv@0rjovY$BL|m5vAGqi^
XqgiS9*EIJx7LTd1<*jN%x2OLHZd{|i

diff --git a/documentation/resources/inherit.png b/documentation/resources/inherit.png
deleted file mode 100644
index 957079b84e49bf180e0b601840ddcde0108e181e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 152
zcmeAS@N?(olHy`uVBq!ia0vp^{6Ngd!3-pihitnGq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c6|n{Qgt!7}AXu8d^E{AZDhcun{?G7qyMY&wC*|ql7*cU7
rDZz!6$HC&nPY#A>i+9V5GO$Q6gdSwr_d2+Y5v14C)z4*}Q$iB}Nwq1B

diff --git a/documentation/resources/resize.png b/documentation/resources/resize.png
deleted file mode 100644
index fb98a7a3c83122d833ce1f2987e049d946b8f4dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^tU%1k#0(_c5A*Q?Ddu7)&kzm{j@u9YAAsZnd_r9R
z!$6<c(|;f}B|(0{495SJ<^7UDY6?6eiy0WWK7cTz(;AZ*KtY)j*NBqf{Irtt#G+IN
z$CUh}R0X%pqSW&IqU>S?=U@}IO_vt{)ro=BITxiSmSpDVDTHL^rZN~9>l>Ks8yepE
rcVse91+S-zV+hC0<bdLY1C0y@{LItUm+tEWN-%i3`njxgN@xNAO<h6N

diff --git a/documentation/resources/sort.png b/documentation/resources/sort.png
deleted file mode 100644
index 0d0fea14dbdfb76546dbee3d912f44d3bbe4c5e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmeAS@N?(olHy`uVBq!ia0vp^qCm{a!3-o{-JR|Nq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c6|n{Qgt#i}8UUGZRqr|jDW;Mjzu^B2Pq!O*0eQNfE{-7;
zw~`WCnAviC*x1;70@>J964_E5cNk1c?3wZGQ9$?A7@0hWL?#vq2HRSOdDkUx&jM;>
N@O1TaS?83{1OS>JFbMzv

diff --git a/documentation/resources/style.css b/documentation/resources/style.css
deleted file mode 100644
index 0d35c212..00000000
--- a/documentation/resources/style.css
+++ /dev/null
@@ -1,614 +0,0 @@
-body {
-	font: 13px/1.5 Verdana, 'Geneva CE', lucida, sans-serif;
-	margin: 0;
-	padding: 0;
-	background: #ffffff;
-	color: #333333;
-}
-
-h1, h2, h3, h4, caption {
-	font-family: 'Trebuchet MS', 'Geneva CE', lucida, sans-serif;
-	color: #053368;
-}
-
-h1 {
-	color: #1e5eb6;
-	font-size: 230%;
-	font-weight: normal;
-	margin: .3em 0;
-}
-
-h2 {
-	color: #1e5eb6;
-	font-size: 150%;
-	font-weight: normal;
-	margin: -.3em 0 .3em 0;
-}
-
-h3 {
-	font-size: 1.6em;
-	font-weight: normal;
-	margin-bottom: 2px;
-}
-
-h4 {
-	font-size: 100%;
-	font-weight: bold;
-	padding: 0;
-	margin: 0;
-}
-
-caption {
-	border: 1px solid #cccccc;
-	background: #ecede5;
-	font-weight: bold;
-	font-size: 1.2em;
-	padding: 3px 5px;
-	text-align: left;
-	margin-bottom: 0;
-}
-
-p {
-	margin: .7em 0 1em;
-	padding: 0;
-}
-
-hr {
-	margin: 2em 0 1em;
-	border: none;
-	border-top: 1px solid #cccccc;
-	height: 0;
-}
-
-a {
-	color: #006aeb;
-	padding: 3px 1px;
-	text-decoration: none;
-}
-
-h1 a {
-	color: #1e5eb6;
-}
-
-a:hover, a:active, a:focus, a:hover b, a:hover var {
-	background-color: #006aeb;
-	color: #ffffff !important;
-}
-
-code, var, pre {
-	font-family: monospace;
-}
-
-var {
-	font-weight: bold;
-	font-style: normal;
-	color: #ca8a04;
-}
-
-pre {
-	margin: 0;
-}
-
-code a b {
-	color: #000000;
-}
-
-.deprecated {
-	text-decoration: line-through;
-	opacity: .5;
-}
-
-.invalid {
-	color: #e71818;
-}
-
-.hidden {
-	display: none;
-}
-
-/* Left side */
-#left {
-	overflow: auto;
-	width: 270px;
-	height: 100%;
-	position: fixed;
-}
-
-/* Menu */
-#menu {
-	padding: 10px;
-}
-
-#menu ul {
-	list-style: none;
-	padding: 0;
-	margin: 0;
-}
-
-#menu ul ul {
-	padding-left: 10px;
-}
-
-#menu li {
-	white-space: nowrap;
-	position: relative;
-}
-
-#menu a {
-	display: block;
-	padding: 0 2px;
-}
-
-#menu .active > a, #menu > span {
-	color: #333333;
-	background: none;
-	font-weight: bold;
-}
-
-#menu .active > a.invalid {
-	color: #e71818;
-}
-
-#menu .active > a:hover, #menu .active > a:active, #menu .active > a:focus {
-	background-color: #006aeb;
-}
-
-#menu #groups span {
-	position: absolute;
-	top: 4px;
-	right: 2px;
-	cursor: pointer;
-	display: block;
-	width: 12px;
-	height: 12px;
-	background: url('http://github.com/collapsed.png') transparent 0 0 no-repeat;
-}
-
-#menu #groups span:hover {
-	background-position: -12px 0;
-}
-
-#menu #groups span.collapsed {
-	background-position: 0 -12px;
-}
-
-#menu #groups span.collapsed:hover {
-	background-position: -12px -12px;
-}
-
-#menu #groups ul.collapsed {
-	display: none;
-}
-
-/* Right side */
-#right {
-	overflow: auto;
-	margin-left: 275px;
-	height: 100%;
-	position: relative;
-	left: 0;
-	right: 0;
-}
-
-#rightInner {
-	max-width: 1000px;
-	min-width: 350px;
-}
-
-/* Search */
-#search {
-	float: right;
-	margin: 3px 8px;
-}
-
-#search input.text {
-	padding: 3px 5px;
-	width: 250px;
-}
-
-/* Autocomplete */
-.ac_results {
-	padding: 0;
-	border: 1px solid #cccccc;
-	background-color: #ffffff;
-	overflow: hidden;
-	z-index: 99999;
-}
-
-.ac_results ul {
-	width: 100%;
-	list-style-position: outside;
-	list-style: none;
-	padding: 0;
-	margin: 0;
-}
-
-.ac_results li {
-	margin: 0;
-	padding: 2px 5px;
-	cursor: default;
-	display: block;
-	font: 12px 'Trebuchet MS', 'Geneva CE', lucida, sans-serif;
-	line-height: 16px;
-	overflow: hidden;
-	white-space: nowrap;
-}
-
-.ac_results li strong {
-	color: #000000;
-}
-
-.ac_odd {
-	background-color: #eeeeee;
-}
-
-.ac_over {
-	background-color: #006aeb;
-	color: #ffffff;
-}
-
-.ac_results li.ac_over strong {
-	color: #ffffff;
-}
-
-/* Navigation */
-#navigation {
-	padding: 3px 8px;
-	background-color: #f6f6f4;
-	height: 26px;
-}
-
-#navigation ul {
-	list-style: none;
-	margin: 0 8px 4px 0;
-	padding: 0;
-	overflow: hidden;
-	float: left;
-}
-
-#navigation ul + ul {
-	border-left: 1px solid #000000;
-	padding-left: 8px;
-}
-
-#navigation ul li {
-	float: left;
-	margin: 2px;
-	padding: 0 3px;
-	font-family: Verdana, 'Geneva CE', lucida, sans-serif;
-	color: #808080;
-}
-
-#navigation ul li.active {
-	background-color: #053368;
-	color: #ffffff;
-	font-weight: bold;
-}
-
-#navigation ul li a {
-	color: #000000;
-	font-weight: bold;
-	padding: 0;
-}
-
-#navigation ul li span {
-	float: left;
-	padding: 0 3px;
-}
-
-#navigation ul li a:hover span, #navigation ul li a:active span, #navigation ul li a:focus span {
-	background-color: #006aeb;
-}
-
-/* Content */
-#content {
-	clear: both;
-	padding: 5px 15px;
-}
-
-.description pre {
-	padding: .6em;
-	background: #fcfcf7;
-}
-
-#content > .description {
-	background: #ecede5;
-	padding: 1px 8px;
-	margin: 1.2em 0;
-}
-
-#content > .description pre {
-	margin: .5em 0;
-}
-
-dl.tree {
-	margin: 1.2em 0;
-}
-
-dl.tree dd {
-	margin: 0;
-	padding: 0;
-}
-
-.info {
-	margin: 1.2em 0;
-}
-
-.summary {
-	border: 1px solid #cccccc;
-	border-collapse: collapse;
-	font-size: 1em;
-	width: 100%;
-	margin: 1.2em 0 2.4em;
-}
-
-.summary caption {
-	border-width: 1px 1px 0;
-}
-
-.summary caption.switchable {
-	background: #ecede5 url('http://github.com/sort.png') no-repeat center right;
-	cursor: pointer;
-}
-
-.summary td {
-	border: 1px solid #cccccc;
-	margin: 0;
-	padding: 3px 10px;
-	font-size: 1em;
-	vertical-align: top;
-}
-
-.summary td:first-child {
-	text-align: right;
-}
-
-.summary td hr {
-	margin: 3px -10px;
-}
-
-#packages.summary td:first-child, #namespaces.summary td:first-child, .inherited.summary td:first-child, .used.summary td:first-child {
-	text-align: left;
-}
-
-.summary tr:hover td {
-	background: #f6f6f4;
-}
-
-.summary .description pre {
-	border: .5em solid #ecede5;
-}
-
-.summary .description p {
-	margin: 0;
-}
-
-.summary .description p + p, .summary .description ul {
-	margin: 3px 0 0 0;
-}
-
-.summary .description.detailed h4 {
-	margin-top: 3px;
-}
-
-.summary dl {
-	margin: 0;
-}
-
-.summary dd {
-	margin: 0 0 0 25px;
-}
-
-.name, .attributes {
-	white-space: nowrap;
-}
-
-.value code {
-	white-space: pre-wrap;
-}
-
-td.name, td.attributes {
-	width: 1%;
-}
-
-td.attributes {
-	width: 1%;
-}
-
-.class .methods .name, .class .properties .name, .class .constants .name {
-	width: auto;
-	white-space: normal;
-}
-
-.class .methods .name > div > code {
-	white-space: pre-wrap;
-}
-
-.class .methods .name > div > code span, .function .value > code {
-	white-space: nowrap;
-}
-
-.class .methods td.name > div, .class td.value > div {
-	position: relative;
-	padding-right: 1em;
-}
-
-.anchor {
-	position: absolute;
-	top: 0;
-	right: 0;
-	line-height: 1;
-	font-size: 85%;
-	margin: 0;
-	color: #006aeb !important;
-}
-
-.list {
-	margin: 0 0 5px 25px;
-}
-
-div.invalid {
-	background-color: #fae4e0;
-	padding: 10px;
-}
-
-/* Splitter */
-#splitter {
-	position: fixed;
-	height: 100%;
-	width: 5px;
-	left: 270px;
-	background: #1e5eb6 url('http://github.com/resize.png') left center no-repeat;
-	cursor: e-resize;
-}
-
-#splitter.active {
-	opacity: .5;
-}
-
-/* Footer */
-#footer {
-	border-top: 1px solid #e9eeef;
-	clear: both;
-	color: #a7a7a7;
-	font-size: 8pt;
-	text-align: center;
-	padding: 20px 0 0;
-	margin: 3em 0 0;
-	height: 90px;
-	background: #ffffff url('http://github.com/footer.png') no-repeat center top;
-}
-
-/* Tree */
-div.tree ul {
-	list-style: none;
-	background: url('http://github.com/tree-vertical.png') left repeat-y;
-	padding: 0;
-	margin-left: 20px;
-}
-
-div.tree li {
-	margin: 0;
-	padding: 0;
-}
-
-div.tree div {
-	padding-left: 30px;
-}
-
-div.tree div.notlast {
-	background: url('http://github.com/tree-hasnext.png') left 10px no-repeat;
-}
-
-div.tree div.last {
-	background: url('http://github.com/tree-last.png') left -240px no-repeat;
-}
-
-div.tree li.last {
-	background: url('http://github.com/tree-cleaner.png') left center repeat-y;
-}
-
-div.tree span.padding {
-	padding-left: 15px;
-}
-
-/* Source code */
-.php-keyword1 {
-	color: #e71818;
-	font-weight: bold;
-}
-
-.php-keyword2 {
-	font-weight: bold;
-}
-
-.php-var {
-	color: #d59401;
-	font-weight: bold;
-}
-
-.php-num {
-	color: #cd0673;
-}
-
-.php-quote {
-	color: #008000;
-}
-
-.php-comment {
-	color: #929292;
-}
-
-.xlang {
-	color: #ff0000;
-	font-weight: bold;
-}
-
-span.l {
-	display: block;
-}
-
-span.l.selected {
-	background: #f6f6f4;
-}
-
-span.l a {
-	color: #333333;
-}
-
-span.l a:hover, div.l a:active, div.l a:focus {
-	background: transparent;
-	color: #333333 !important;
-}
-
-span.l .php-var a {
-	color: #d59401;
-}
-
-span.l .php-var a:hover, span.l .php-var a:active, span.l .php-var a:focus {
-	color: #d59401 !important;
-}
-
-span.l a.l {
-	padding-left: 2px;
-	color: #c0c0c0;
-}
-
-span.l a.l:hover, span.l a.l:active, span.l a.l:focus {
-	background: transparent;
-	color: #c0c0c0 !important;
-}
-
-#rightInner.medium #navigation {
-	height: 52px;
-}
-
-#rightInner.medium #navigation ul:first-child + ul {
-	clear: left;
-	border: none;
-	padding: 0;
-}
-
-#rightInner.medium .name, #rightInner.medium .attributes {
-	white-space: normal;
-}
-
-#rightInner.small #search {
-	float: left;
-}
-
-#rightInner.small #navigation {
-	height: 78px;
-}
-
-#rightInner.small #navigation ul:first-child {
-	clear: both;
-}
-
-/* global style */
-.left, .summary td.left {
-	text-align: left;
-}
-.right, .summary td.right {
-	text-align: right;
-}
diff --git a/documentation/resources/tree-cleaner.png b/documentation/resources/tree-cleaner.png
deleted file mode 100644
index 2eb9085be54558b89d461883c440f5f46f9736c1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^B0$W@!3-o{`qYU7DajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_d9MQi~+A+G=b{|7Qd4_&SUQhc5+jv*Ddk`fLuF);BkFo-fR
Uc0H0%1<EjZy85}Sb4q9e0Bubm!~g&Q

diff --git a/documentation/resources/tree-hasnext.png b/documentation/resources/tree-hasnext.png
deleted file mode 100644
index 91d6b79ab4c4d479f1bbd2d035aacf682d6b6b24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 128
zcmeAS@N?(olHy`uVBq!ia0vp^azM<;!3-q-<-NNHq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c6|n{Qgt!9f|Ns9ly*d9bkR{;h;uunKD=Fa!3l9f_Kmr5f
WItCFtg_<`&IR;NxKbLh*2~7Z6!6X&{

diff --git a/documentation/resources/tree-last.png b/documentation/resources/tree-last.png
deleted file mode 100644
index 7f319f8f950bf32e5932d6d37e424806edb248a4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 172
zcmeAS@N?(olHy`uVBq!ia0vp^atsWNUpSb7ELpeQ13*f$#5JNMI6tkVJh3R1!7(L2
zDOJHUH!(dmC^a#qvhZZ84NwtVfKQ0)|NsAi%+N!Z>wuJvr;B4q#jQ6dH}Wzta4;|U
z_5X4opPHS*8kOj$OSWE%%3h01{0i>}>H&cdp4<iu_njHpe(b%&0TS?Z^>bP0l+XkK
DMdmrX

diff --git a/documentation/resources/tree-vertical.png b/documentation/resources/tree-vertical.png
deleted file mode 100644
index 384908b28e9958c9842f258350799221e3fa2020..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 127
zcmeAS@N?(olHy`uVBq!ia0vp^B0$W@!3-o{`qYU7DajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_d9MQi~+A+G=b{|7Qd4_&SUQv9ASjv*Ddk`fNE^e`~8F))ZR
VFl8!!&jCs?c)I$ztaD0e0sxs!A(8+9

diff --git a/documentation/source-class-Example.html b/documentation/source-class-Example.html
deleted file mode 100644
index 9544bae6..00000000
--- a/documentation/source-class-Example.html
+++ /dev/null
@@ -1,242 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="robots" content="noindex">
-
-	<title>File controllers/api/Example.php</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li><a href="http://github.com/class-Example.html">Example</a></li>
-				<li><a href="http://github.com/class-Format.html">Format</a></li>
-				<li><a href="http://github.com/class-Key.html">Key</a></li>
-				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
-				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
-				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
-			</ul>
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li>
-<span>Package</span>			</li>
-			<li>
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<pre><code><span id="1" class="l"><a href="#1">  1: </a><span class="xlang">&lt;?php</span>
-</span><span id="2" class="l"><a href="#2">  2: </a>
-</span><span id="3" class="l"><a href="#3">  3: </a><span class="php-keyword2">defined</span>(<span class="php-quote">'BASEPATH'</span>) <span class="php-keyword1">OR</span> <span class="php-keyword1">exit</span>(<span class="php-quote">'No direct script access allowed'</span>);
-</span><span id="4" class="l"><a href="#4">  4: </a>
-</span><span id="5" class="l"><a href="#5">  5: </a><span class="php-comment">// This can be removed if you use __autoload() in config.php OR use Modular Extensions</span>
-</span><span id="6" class="l"><a href="#6">  6: </a><span class="php-keyword1">require</span> APPPATH . <span class="php-quote">'/libraries/REST_Controller.php'</span>;
-</span><span id="7" class="l"><a href="#7">  7: </a>
-</span><span id="8" class="l"><a href="#8">  8: </a><span class="php-comment">/**
-</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment"> * This is an example of a few basic user interaction methods you could use
-</span></span><span id="10" class="l"><a href="#10"> 10: </a><span class="php-comment"> * all done with a hardcoded array
-</span></span><span id="11" class="l"><a href="#11"> 11: </a><span class="php-comment"> *
-</span></span><span id="12" class="l"><a href="#12"> 12: </a><span class="php-comment"> * @package         CodeIgniter
-</span></span><span id="13" class="l"><a href="#13"> 13: </a><span class="php-comment"> * @subpackage      Rest Server
-</span></span><span id="14" class="l"><a href="#14"> 14: </a><span class="php-comment"> * @category        Controller
-</span></span><span id="15" class="l"><a href="#15"> 15: </a><span class="php-comment"> * @author          Phil Sturgeon, Chris Kacerguis
-</span></span><span id="16" class="l"><a href="#16"> 16: </a><span class="php-comment"> * @license         MIT
-</span></span><span id="17" class="l"><a href="#17"> 17: </a><span class="php-comment"> * @link            https://github.com/chriskacerguis/codeigniter-restserver
-</span></span><span id="18" class="l"><a href="#18"> 18: </a><span class="php-comment"> */</span>
-</span><span id="19" class="l"><a href="#19"> 19: </a><span class="php-keyword1">class</span> Example <span class="php-keyword1">extends</span> REST_Controller {
-</span><span id="20" class="l"><a href="#20"> 20: </a>
-</span><span id="21" class="l"><a href="#21"> 21: </a>    <span class="php-keyword1">function</span> __construct()
-</span><span id="22" class="l"><a href="#22"> 22: </a>    {
-</span><span id="23" class="l"><a href="#23"> 23: </a>        <span class="php-comment">// Construct the parent class</span>
-</span><span id="24" class="l"><a href="#24"> 24: </a>        parent::__construct();
-</span><span id="25" class="l"><a href="#25"> 25: </a>
-</span><span id="26" class="l"><a href="#26"> 26: </a>        <span class="php-comment">// Configure limits on our controller methods</span>
-</span><span id="27" class="l"><a href="#27"> 27: </a>        <span class="php-comment">// Ensure you have created the 'limits' table and enabled 'limits' within application/config/rest.php</span>
-</span><span id="28" class="l"><a href="#28"> 28: </a>        <span class="php-var">$this</span>-&gt;methods[<span class="php-quote">'user_get'</span>][<span class="php-quote">'limit'</span>] = <span class="php-num">500</span>; <span class="php-comment">// 500 requests per hour per user/key</span>
-</span><span id="29" class="l"><a href="#29"> 29: </a>        <span class="php-var">$this</span>-&gt;methods[<span class="php-quote">'user_post'</span>][<span class="php-quote">'limit'</span>] = <span class="php-num">100</span>; <span class="php-comment">// 100 requests per hour per user/key</span>
-</span><span id="30" class="l"><a href="#30"> 30: </a>        <span class="php-var">$this</span>-&gt;methods[<span class="php-quote">'user_delete'</span>][<span class="php-quote">'limit'</span>] = <span class="php-num">50</span>; <span class="php-comment">// 50 requests per hour per user/key</span>
-</span><span id="31" class="l"><a href="#31"> 31: </a>    }
-</span><span id="32" class="l"><a href="#32"> 32: </a>
-</span><span id="33" class="l"><a href="#33"> 33: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> users_get()
-</span><span id="34" class="l"><a href="#34"> 34: </a>    {
-</span><span id="35" class="l"><a href="#35"> 35: </a>        <span class="php-comment">// Users from a data store e.g. database</span>
-</span><span id="36" class="l"><a href="#36"> 36: </a>        <span class="php-var">$users</span> = [
-</span><span id="37" class="l"><a href="#37"> 37: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">1</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'John'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'john@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Loves coding'</span>],
-</span><span id="38" class="l"><a href="#38"> 38: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">2</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jim'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jim@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Developed on CodeIgniter'</span>],
-</span><span id="39" class="l"><a href="#39"> 39: </a>            [<span class="php-quote">'id'</span> =&gt; <span class="php-num">3</span>, <span class="php-quote">'name'</span> =&gt; <span class="php-quote">'Jane'</span>, <span class="php-quote">'email'</span> =&gt; <span class="php-quote">'jane@example.com'</span>, <span class="php-quote">'fact'</span> =&gt; <span class="php-quote">'Lives in the USA'</span>, [<span class="php-quote">'hobbies'</span> =&gt; [<span class="php-quote">'guitar'</span>, <span class="php-quote">'cycling'</span>]]],
-</span><span id="40" class="l"><a href="#40"> 40: </a>        ];
-</span><span id="41" class="l"><a href="#41"> 41: </a>
-</span><span id="42" class="l"><a href="#42"> 42: </a>        <span class="php-var">$id</span> = <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>);
-</span><span id="43" class="l"><a href="#43"> 43: </a>
-</span><span id="44" class="l"><a href="#44"> 44: </a>        <span class="php-comment">// If the id parameter doesn't exist return all the users</span>
-</span><span id="45" class="l"><a href="#45"> 45: </a>
-</span><span id="46" class="l"><a href="#46"> 46: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$id</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="47" class="l"><a href="#47"> 47: </a>        {
-</span><span id="48" class="l"><a href="#48"> 48: </a>            <span class="php-comment">// Check if the users data store contains users (in case the database result returns NULL)</span>
-</span><span id="49" class="l"><a href="#49"> 49: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$users</span>)
-</span><span id="50" class="l"><a href="#50"> 50: </a>            {
-</span><span id="51" class="l"><a href="#51"> 51: </a>                <span class="php-comment">// Set the response and exit</span>
-</span><span id="52" class="l"><a href="#52"> 52: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$users</span>, REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
-</span><span id="53" class="l"><a href="#53"> 53: </a>            }
-</span><span id="54" class="l"><a href="#54"> 54: </a>            <span class="php-keyword1">else</span>
-</span><span id="55" class="l"><a href="#55"> 55: </a>            {
-</span><span id="56" class="l"><a href="#56"> 56: </a>                <span class="php-comment">// Set the response and exit</span>
-</span><span id="57" class="l"><a href="#57"> 57: </a>                <span class="php-var">$this</span>-&gt;response([
-</span><span id="58" class="l"><a href="#58"> 58: </a>                    <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="59" class="l"><a href="#59"> 59: </a>                    <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'No users were found'</span>
-</span><span id="60" class="l"><a href="#60"> 60: </a>                ], REST_Controller::HTTP_NOT_FOUND); <span class="php-comment">// NOT_FOUND (404) being the HTTP response code</span>
-</span><span id="61" class="l"><a href="#61"> 61: </a>            }
-</span><span id="62" class="l"><a href="#62"> 62: </a>        }
-</span><span id="63" class="l"><a href="#63"> 63: </a>
-</span><span id="64" class="l"><a href="#64"> 64: </a>        <span class="php-comment">// Find and return a single record for a particular user.</span>
-</span><span id="65" class="l"><a href="#65"> 65: </a>
-</span><span id="66" class="l"><a href="#66"> 66: </a>        <span class="php-var">$id</span> = (int) <span class="php-var">$id</span>;
-</span><span id="67" class="l"><a href="#67"> 67: </a>
-</span><span id="68" class="l"><a href="#68"> 68: </a>        <span class="php-comment">// Validate the id.</span>
-</span><span id="69" class="l"><a href="#69"> 69: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$id</span> &lt;= <span class="php-num">0</span>)
-</span><span id="70" class="l"><a href="#70"> 70: </a>        {
-</span><span id="71" class="l"><a href="#71"> 71: </a>            <span class="php-comment">// Invalid id, set the response and exit.</span>
-</span><span id="72" class="l"><a href="#72"> 72: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">NULL</span>, REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
-</span><span id="73" class="l"><a href="#73"> 73: </a>        }
-</span><span id="74" class="l"><a href="#74"> 74: </a>
-</span><span id="75" class="l"><a href="#75"> 75: </a>        <span class="php-comment">// Get the user from the array, using the id as key for retreival.</span>
-</span><span id="76" class="l"><a href="#76"> 76: </a>        <span class="php-comment">// Usually a model is to be used for this.</span>
-</span><span id="77" class="l"><a href="#77"> 77: </a>
-</span><span id="78" class="l"><a href="#78"> 78: </a>        <span class="php-var">$user</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="79" class="l"><a href="#79"> 79: </a>
-</span><span id="80" class="l"><a href="#80"> 80: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$users</span>))
-</span><span id="81" class="l"><a href="#81"> 81: </a>        {
-</span><span id="82" class="l"><a href="#82"> 82: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$users</span> <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
-</span><span id="83" class="l"><a href="#83"> 83: </a>            {
-</span><span id="84" class="l"><a href="#84"> 84: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$value</span>[<span class="php-quote">'id'</span>]) &amp;&amp; <span class="php-var">$value</span>[<span class="php-quote">'id'</span>] === <span class="php-var">$id</span>)
-</span><span id="85" class="l"><a href="#85"> 85: </a>                {
-</span><span id="86" class="l"><a href="#86"> 86: </a>                    <span class="php-var">$user</span> = <span class="php-var">$value</span>;
-</span><span id="87" class="l"><a href="#87"> 87: </a>                }
-</span><span id="88" class="l"><a href="#88"> 88: </a>            }
-</span><span id="89" class="l"><a href="#89"> 89: </a>        }
-</span><span id="90" class="l"><a href="#90"> 90: </a>
-</span><span id="91" class="l"><a href="#91"> 91: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword1">empty</span>(<span class="php-var">$user</span>))
-</span><span id="92" class="l"><a href="#92"> 92: </a>        {
-</span><span id="93" class="l"><a href="#93"> 93: </a>            <span class="php-var">$this</span>-&gt;set_response(<span class="php-var">$user</span>, REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
-</span><span id="94" class="l"><a href="#94"> 94: </a>        }
-</span><span id="95" class="l"><a href="#95"> 95: </a>        <span class="php-keyword1">else</span>
-</span><span id="96" class="l"><a href="#96"> 96: </a>        {
-</span><span id="97" class="l"><a href="#97"> 97: </a>            <span class="php-var">$this</span>-&gt;set_response([
-</span><span id="98" class="l"><a href="#98"> 98: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="99" class="l"><a href="#99"> 99: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'User could not be found'</span>
-</span><span id="100" class="l"><a href="#100">100: </a>            ], REST_Controller::HTTP_NOT_FOUND); <span class="php-comment">// NOT_FOUND (404) being the HTTP response code</span>
-</span><span id="101" class="l"><a href="#101">101: </a>        }
-</span><span id="102" class="l"><a href="#102">102: </a>    }
-</span><span id="103" class="l"><a href="#103">103: </a>
-</span><span id="104" class="l"><a href="#104">104: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> users_post()
-</span><span id="105" class="l"><a href="#105">105: </a>    {
-</span><span id="106" class="l"><a href="#106">106: </a>        <span class="php-comment">// $this-&gt;some_model-&gt;update_user( ... );</span>
-</span><span id="107" class="l"><a href="#107">107: </a>        <span class="php-var">$message</span> = [
-</span><span id="108" class="l"><a href="#108">108: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-num">100</span>, <span class="php-comment">// Automatically generated by the model</span>
-</span><span id="109" class="l"><a href="#109">109: </a>            <span class="php-quote">'name'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'name'</span>),
-</span><span id="110" class="l"><a href="#110">110: </a>            <span class="php-quote">'email'</span> =&gt; <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'email'</span>),
-</span><span id="111" class="l"><a href="#111">111: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Added a resource'</span>
-</span><span id="112" class="l"><a href="#112">112: </a>        ];
-</span><span id="113" class="l"><a href="#113">113: </a>
-</span><span id="114" class="l"><a href="#114">114: </a>        <span class="php-var">$this</span>-&gt;set_response(<span class="php-var">$message</span>, REST_Controller::HTTP_CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
-</span><span id="115" class="l"><a href="#115">115: </a>    }
-</span><span id="116" class="l"><a href="#116">116: </a>
-</span><span id="117" class="l"><a href="#117">117: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> users_delete()
-</span><span id="118" class="l"><a href="#118">118: </a>    {
-</span><span id="119" class="l"><a href="#119">119: </a>        <span class="php-var">$id</span> = (int) <span class="php-var">$this</span>-&gt;get(<span class="php-quote">'id'</span>);
-</span><span id="120" class="l"><a href="#120">120: </a>
-</span><span id="121" class="l"><a href="#121">121: </a>        <span class="php-comment">// Validate the id.</span>
-</span><span id="122" class="l"><a href="#122">122: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$id</span> &lt;= <span class="php-num">0</span>)
-</span><span id="123" class="l"><a href="#123">123: </a>        {
-</span><span id="124" class="l"><a href="#124">124: </a>            <span class="php-comment">// Set the response and exit</span>
-</span><span id="125" class="l"><a href="#125">125: </a>            <span class="php-var">$this</span>-&gt;response(<span class="php-keyword1">NULL</span>, REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
-</span><span id="126" class="l"><a href="#126">126: </a>        }
-</span><span id="127" class="l"><a href="#127">127: </a>
-</span><span id="128" class="l"><a href="#128">128: </a>        <span class="php-comment">// $this-&gt;some_model-&gt;delete_something($id);</span>
-</span><span id="129" class="l"><a href="#129">129: </a>        <span class="php-var">$message</span> = [
-</span><span id="130" class="l"><a href="#130">130: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$id</span>,
-</span><span id="131" class="l"><a href="#131">131: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Deleted the resource'</span>
-</span><span id="132" class="l"><a href="#132">132: </a>        ];
-</span><span id="133" class="l"><a href="#133">133: </a>
-</span><span id="134" class="l"><a href="#134">134: </a>        <span class="php-var">$this</span>-&gt;set_response(<span class="php-var">$message</span>, REST_Controller::HTTP_NO_CONTENT); <span class="php-comment">// NO_CONTENT (204) being the HTTP response code</span>
-</span><span id="135" class="l"><a href="#135">135: </a>    }
-</span><span id="136" class="l"><a href="#136">136: </a>
-</span><span id="137" class="l"><a href="#137">137: </a>}
-</span><span id="138" class="l"><a href="#138">138: </a></span></code></pre>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
-<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
-</body>
-</html>
diff --git a/documentation/source-class-Format.html b/documentation/source-class-Format.html
deleted file mode 100644
index d1b5353d..00000000
--- a/documentation/source-class-Format.html
+++ /dev/null
@@ -1,636 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="robots" content="noindex">
-
-	<title>File libraries/Format.php</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li><a href="http://github.com/class-Example.html">Example</a></li>
-				<li><a href="http://github.com/class-Format.html">Format</a></li>
-				<li><a href="http://github.com/class-Key.html">Key</a></li>
-				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
-				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
-				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
-			</ul>
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li>
-<span>Package</span>			</li>
-			<li>
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<pre><code><span id="1" class="l"><a href="#1">  1: </a><span class="xlang">&lt;?php</span>
-</span><span id="2" class="l"><a href="#2">  2: </a>
-</span><span id="3" class="l"><a href="#3">  3: </a><span class="php-keyword2">defined</span>(<span class="php-quote">'BASEPATH'</span>) <span class="php-keyword1">OR</span> <span class="php-keyword1">exit</span>(<span class="php-quote">'No direct script access allowed'</span>);
-</span><span id="4" class="l"><a href="#4">  4: </a>
-</span><span id="5" class="l"><a href="#5">  5: </a><span class="php-comment">/**
-</span></span><span id="6" class="l"><a href="#6">  6: </a><span class="php-comment"> * Format class
-</span></span><span id="7" class="l"><a href="#7">  7: </a><span class="php-comment"> * Help convert between various formats such as XML, JSON, CSV, etc.
-</span></span><span id="8" class="l"><a href="#8">  8: </a><span class="php-comment"> *
-</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment"> * @author    Phil Sturgeon, Chris Kacerguis, @softwarespot
-</span></span><span id="10" class="l"><a href="#10"> 10: </a><span class="php-comment"> * @license   http://www.dbad-license.org/
-</span></span><span id="11" class="l"><a href="#11"> 11: </a><span class="php-comment"> */</span>
-</span><span id="12" class="l"><a href="#12"> 12: </a><span class="php-keyword1">class</span> Format {
-</span><span id="13" class="l"><a href="#13"> 13: </a>
-</span><span id="14" class="l"><a href="#14"> 14: </a>    <span class="php-comment">/**
-</span></span><span id="15" class="l"><a href="#15"> 15: </a><span class="php-comment">     * Array output format
-</span></span><span id="16" class="l"><a href="#16"> 16: </a><span class="php-comment">     */</span>
-</span><span id="17" class="l"><a href="#17"> 17: </a>    <span class="php-keyword1">const</span> ARRAY_FORMAT = <span class="php-quote">'array'</span>;
-</span><span id="18" class="l"><a href="#18"> 18: </a>
-</span><span id="19" class="l"><a href="#19"> 19: </a>    <span class="php-comment">/**
-</span></span><span id="20" class="l"><a href="#20"> 20: </a><span class="php-comment">     * Comma Separated Value (CSV) output format
-</span></span><span id="21" class="l"><a href="#21"> 21: </a><span class="php-comment">     */</span>
-</span><span id="22" class="l"><a href="#22"> 22: </a>    <span class="php-keyword1">const</span> CSV_FORMAT = <span class="php-quote">'csv'</span>;
-</span><span id="23" class="l"><a href="#23"> 23: </a>
-</span><span id="24" class="l"><a href="#24"> 24: </a>    <span class="php-comment">/**
-</span></span><span id="25" class="l"><a href="#25"> 25: </a><span class="php-comment">     * Json output format
-</span></span><span id="26" class="l"><a href="#26"> 26: </a><span class="php-comment">     */</span>
-</span><span id="27" class="l"><a href="#27"> 27: </a>    <span class="php-keyword1">const</span> JSON_FORMAT = <span class="php-quote">'json'</span>;
-</span><span id="28" class="l"><a href="#28"> 28: </a>
-</span><span id="29" class="l"><a href="#29"> 29: </a>    <span class="php-comment">/**
-</span></span><span id="30" class="l"><a href="#30"> 30: </a><span class="php-comment">     * HTML output format
-</span></span><span id="31" class="l"><a href="#31"> 31: </a><span class="php-comment">     */</span>
-</span><span id="32" class="l"><a href="#32"> 32: </a>    <span class="php-keyword1">const</span> HTML_FORMAT = <span class="php-quote">'html'</span>;
-</span><span id="33" class="l"><a href="#33"> 33: </a>
-</span><span id="34" class="l"><a href="#34"> 34: </a>    <span class="php-comment">/**
-</span></span><span id="35" class="l"><a href="#35"> 35: </a><span class="php-comment">     * PHP output format
-</span></span><span id="36" class="l"><a href="#36"> 36: </a><span class="php-comment">     */</span>
-</span><span id="37" class="l"><a href="#37"> 37: </a>    <span class="php-keyword1">const</span> PHP_FORMAT = <span class="php-quote">'php'</span>;
-</span><span id="38" class="l"><a href="#38"> 38: </a>
-</span><span id="39" class="l"><a href="#39"> 39: </a>    <span class="php-comment">/**
-</span></span><span id="40" class="l"><a href="#40"> 40: </a><span class="php-comment">     * Serialized output format
-</span></span><span id="41" class="l"><a href="#41"> 41: </a><span class="php-comment">     */</span>
-</span><span id="42" class="l"><a href="#42"> 42: </a>    <span class="php-keyword1">const</span> SERIALIZED_FORMAT = <span class="php-quote">'serialized'</span>;
-</span><span id="43" class="l"><a href="#43"> 43: </a>
-</span><span id="44" class="l"><a href="#44"> 44: </a>    <span class="php-comment">/**
-</span></span><span id="45" class="l"><a href="#45"> 45: </a><span class="php-comment">     * XML output format
-</span></span><span id="46" class="l"><a href="#46"> 46: </a><span class="php-comment">     */</span>
-</span><span id="47" class="l"><a href="#47"> 47: </a>    <span class="php-keyword1">const</span> XML_FORMAT = <span class="php-quote">'xml'</span>;
-</span><span id="48" class="l"><a href="#48"> 48: </a>
-</span><span id="49" class="l"><a href="#49"> 49: </a>    <span class="php-comment">/**
-</span></span><span id="50" class="l"><a href="#50"> 50: </a><span class="php-comment">     * Default format of this class
-</span></span><span id="51" class="l"><a href="#51"> 51: </a><span class="php-comment">     */</span>
-</span><span id="52" class="l"><a href="#52"> 52: </a>    <span class="php-keyword1">const</span> DEFAULT_FORMAT = self::JSON_FORMAT; <span class="php-comment">// Couldn't be DEFAULT, as this is a keyword</span>
-</span><span id="53" class="l"><a href="#53"> 53: </a>
-</span><span id="54" class="l"><a href="#54"> 54: </a>    <span class="php-comment">/**
-</span></span><span id="55" class="l"><a href="#55"> 55: </a><span class="php-comment">     * CodeIgniter instance
-</span></span><span id="56" class="l"><a href="#56"> 56: </a><span class="php-comment">     *
-</span></span><span id="57" class="l"><a href="#57"> 57: </a><span class="php-comment">     * @var object
-</span></span><span id="58" class="l"><a href="#58"> 58: </a><span class="php-comment">     */</span>
-</span><span id="59" class="l"><a href="#59"> 59: </a>    <span class="php-keyword1">private</span> <span class="php-var">$_CI</span>;
-</span><span id="60" class="l"><a href="#60"> 60: </a>
-</span><span id="61" class="l"><a href="#61"> 61: </a>    <span class="php-comment">/**
-</span></span><span id="62" class="l"><a href="#62"> 62: </a><span class="php-comment">     * Data to parse
-</span></span><span id="63" class="l"><a href="#63"> 63: </a><span class="php-comment">     *
-</span></span><span id="64" class="l"><a href="#64"> 64: </a><span class="php-comment">     * @var mixed
-</span></span><span id="65" class="l"><a href="#65"> 65: </a><span class="php-comment">     */</span>
-</span><span id="66" class="l"><a href="#66"> 66: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_data</span> = [];
-</span><span id="67" class="l"><a href="#67"> 67: </a>
-</span><span id="68" class="l"><a href="#68"> 68: </a>    <span class="php-comment">/**
-</span></span><span id="69" class="l"><a href="#69"> 69: </a><span class="php-comment">     * Type to convert from
-</span></span><span id="70" class="l"><a href="#70"> 70: </a><span class="php-comment">     *
-</span></span><span id="71" class="l"><a href="#71"> 71: </a><span class="php-comment">     * @var string
-</span></span><span id="72" class="l"><a href="#72"> 72: </a><span class="php-comment">     */</span>
-</span><span id="73" class="l"><a href="#73"> 73: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_from_type</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="74" class="l"><a href="#74"> 74: </a>
-</span><span id="75" class="l"><a href="#75"> 75: </a>    <span class="php-comment">/**
-</span></span><span id="76" class="l"><a href="#76"> 76: </a><span class="php-comment">     * DO NOT CALL THIS DIRECTLY, USE factory()
-</span></span><span id="77" class="l"><a href="#77"> 77: </a><span class="php-comment">     *
-</span></span><span id="78" class="l"><a href="#78"> 78: </a><span class="php-comment">     * @param NULL $data
-</span></span><span id="79" class="l"><a href="#79"> 79: </a><span class="php-comment">     * @param NULL $from_type
-</span></span><span id="80" class="l"><a href="#80"> 80: </a><span class="php-comment">     * @throws Exception
-</span></span><span id="81" class="l"><a href="#81"> 81: </a><span class="php-comment">     */</span>
-</span><span id="82" class="l"><a href="#82"> 82: </a>
-</span><span id="83" class="l"><a href="#83"> 83: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$from_type</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="84" class="l"><a href="#84"> 84: </a>    {
-</span><span id="85" class="l"><a href="#85"> 85: </a>        <span class="php-comment">// Get the CodeIgniter reference</span>
-</span><span id="86" class="l"><a href="#86"> 86: </a>        <span class="php-var">$this</span>-&gt;_CI = &amp;get_instance();
-</span><span id="87" class="l"><a href="#87"> 87: </a>
-</span><span id="88" class="l"><a href="#88"> 88: </a>        <span class="php-comment">// Load the inflector helper</span>
-</span><span id="89" class="l"><a href="#89"> 89: </a>        <span class="php-var">$this</span>-&gt;_CI-&gt;load-&gt;helper(<span class="php-quote">'inflector'</span>);
-</span><span id="90" class="l"><a href="#90"> 90: </a>
-</span><span id="91" class="l"><a href="#91"> 91: </a>        <span class="php-comment">// If the provided data is already formatted we should probably convert it to an array</span>
-</span><span id="92" class="l"><a href="#92"> 92: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$from_type</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="93" class="l"><a href="#93"> 93: </a>        {
-</span><span id="94" class="l"><a href="#94"> 94: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span>.<span class="php-var">$from_type</span>))
-</span><span id="95" class="l"><a href="#95"> 95: </a>            {
-</span><span id="96" class="l"><a href="#96"> 96: </a>                <span class="php-var">$data</span> = <span class="php-keyword2">call_user_func</span>([<span class="php-var">$this</span>, <span class="php-quote">'_from_'</span>.<span class="php-var">$from_type</span>], <span class="php-var">$data</span>);
-</span><span id="97" class="l"><a href="#97"> 97: </a>            }
-</span><span id="98" class="l"><a href="#98"> 98: </a>            <span class="php-keyword1">else</span>
-</span><span id="99" class="l"><a href="#99"> 99: </a>            {
-</span><span id="100" class="l"><a href="#100">100: </a>                <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'Format class does not support conversion from &quot;'</span>.<span class="php-var">$from_type</span>.<span class="php-quote">'&quot;.'</span>);
-</span><span id="101" class="l"><a href="#101">101: </a>            }
-</span><span id="102" class="l"><a href="#102">102: </a>        }
-</span><span id="103" class="l"><a href="#103">103: </a>
-</span><span id="104" class="l"><a href="#104">104: </a>        <span class="php-comment">// Set the member variable to the data passed</span>
-</span><span id="105" class="l"><a href="#105">105: </a>        <span class="php-var">$this</span>-&gt;_data = <span class="php-var">$data</span>;
-</span><span id="106" class="l"><a href="#106">106: </a>    }
-</span><span id="107" class="l"><a href="#107">107: </a>
-</span><span id="108" class="l"><a href="#108">108: </a>    <span class="php-comment">/**
-</span></span><span id="109" class="l"><a href="#109">109: </a><span class="php-comment">     * Create an instance of the format class
-</span></span><span id="110" class="l"><a href="#110">110: </a><span class="php-comment">     * e.g: echo $this-&gt;format-&gt;factory(['foo' =&gt; 'bar'])-&gt;to_csv();
-</span></span><span id="111" class="l"><a href="#111">111: </a><span class="php-comment">     *
-</span></span><span id="112" class="l"><a href="#112">112: </a><span class="php-comment">     * @param mixed $data Data to convert/parse
-</span></span><span id="113" class="l"><a href="#113">113: </a><span class="php-comment">     * @param string $from_type Type to convert from e.g. json, csv, html
-</span></span><span id="114" class="l"><a href="#114">114: </a><span class="php-comment">     *
-</span></span><span id="115" class="l"><a href="#115">115: </a><span class="php-comment">     * @return object Instance of the format class
-</span></span><span id="116" class="l"><a href="#116">116: </a><span class="php-comment">     */</span>
-</span><span id="117" class="l"><a href="#117">117: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> factory(<span class="php-var">$data</span>, <span class="php-var">$from_type</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="118" class="l"><a href="#118">118: </a>    {
-</span><span id="119" class="l"><a href="#119">119: </a>        <span class="php-comment">// $class = __CLASS__;</span>
-</span><span id="120" class="l"><a href="#120">120: </a>        <span class="php-comment">// return new $class();</span>
-</span><span id="121" class="l"><a href="#121">121: </a>
-</span><span id="122" class="l"><a href="#122">122: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">new</span> <span class="php-keyword1">static</span>(<span class="php-var">$data</span>, <span class="php-var">$from_type</span>);
-</span><span id="123" class="l"><a href="#123">123: </a>    }
-</span><span id="124" class="l"><a href="#124">124: </a>
-</span><span id="125" class="l"><a href="#125">125: </a>    <span class="php-comment">// FORMATTING OUTPUT ---------------------------------------------------------</span>
-</span><span id="126" class="l"><a href="#126">126: </a>
-</span><span id="127" class="l"><a href="#127">127: </a>    <span class="php-comment">/**
-</span></span><span id="128" class="l"><a href="#128">128: </a><span class="php-comment">     * Format data as an array
-</span></span><span id="129" class="l"><a href="#129">129: </a><span class="php-comment">     *
-</span></span><span id="130" class="l"><a href="#130">130: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="131" class="l"><a href="#131">131: </a><span class="php-comment">     * to the constructor
-</span></span><span id="132" class="l"><a href="#132">132: </a><span class="php-comment">     * @return array Data parsed as an array; otherwise, an empty array
-</span></span><span id="133" class="l"><a href="#133">133: </a><span class="php-comment">     */</span>
-</span><span id="134" class="l"><a href="#134">134: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_array(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="135" class="l"><a href="#135">135: </a>    {
-</span><span id="136" class="l"><a href="#136">136: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="137" class="l"><a href="#137">137: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="138" class="l"><a href="#138">138: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="139" class="l"><a href="#139">139: </a>        {
-</span><span id="140" class="l"><a href="#140">140: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="141" class="l"><a href="#141">141: </a>        }
-</span><span id="142" class="l"><a href="#142">142: </a>
-</span><span id="143" class="l"><a href="#143">143: </a>        <span class="php-comment">// Cast as an array if not already</span>
-</span><span id="144" class="l"><a href="#144">144: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="145" class="l"><a href="#145">145: </a>        {
-</span><span id="146" class="l"><a href="#146">146: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
-</span><span id="147" class="l"><a href="#147">147: </a>        }
-</span><span id="148" class="l"><a href="#148">148: </a>
-</span><span id="149" class="l"><a href="#149">149: </a>        <span class="php-var">$array</span> = [];
-</span><span id="150" class="l"><a href="#150">150: </a>        <span class="php-keyword1">foreach</span> ((<span class="php-keyword1">array</span>) <span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
-</span><span id="151" class="l"><a href="#151">151: </a>        {
-</span><span id="152" class="l"><a href="#152">152: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>) === <span class="php-keyword1">TRUE</span> || <span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="153" class="l"><a href="#153">153: </a>            {
-</span><span id="154" class="l"><a href="#154">154: </a>                <span class="php-var">$array</span>[<span class="php-var">$key</span>] = <span class="php-var">$this</span>-&gt;to_array(<span class="php-var">$value</span>);
-</span><span id="155" class="l"><a href="#155">155: </a>            }
-</span><span id="156" class="l"><a href="#156">156: </a>            <span class="php-keyword1">else</span>
-</span><span id="157" class="l"><a href="#157">157: </a>            {
-</span><span id="158" class="l"><a href="#158">158: </a>                <span class="php-var">$array</span>[<span class="php-var">$key</span>] = <span class="php-var">$value</span>;
-</span><span id="159" class="l"><a href="#159">159: </a>            }
-</span><span id="160" class="l"><a href="#160">160: </a>        }
-</span><span id="161" class="l"><a href="#161">161: </a>
-</span><span id="162" class="l"><a href="#162">162: </a>        <span class="php-keyword1">return</span> <span class="php-var">$array</span>;
-</span><span id="163" class="l"><a href="#163">163: </a>    }
-</span><span id="164" class="l"><a href="#164">164: </a>
-</span><span id="165" class="l"><a href="#165">165: </a>    <span class="php-comment">/**
-</span></span><span id="166" class="l"><a href="#166">166: </a><span class="php-comment">     * Format data as XML
-</span></span><span id="167" class="l"><a href="#167">167: </a><span class="php-comment">     *
-</span></span><span id="168" class="l"><a href="#168">168: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="169" class="l"><a href="#169">169: </a><span class="php-comment">     * to the constructor
-</span></span><span id="170" class="l"><a href="#170">170: </a><span class="php-comment">     * @param NULL $structure
-</span></span><span id="171" class="l"><a href="#171">171: </a><span class="php-comment">     * @param string $basenode
-</span></span><span id="172" class="l"><a href="#172">172: </a><span class="php-comment">     * @return mixed
-</span></span><span id="173" class="l"><a href="#173">173: </a><span class="php-comment">     */</span>
-</span><span id="174" class="l"><a href="#174">174: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_xml(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$structure</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$basenode</span> = <span class="php-quote">'xml'</span>)
-</span><span id="175" class="l"><a href="#175">175: </a>    {
-</span><span id="176" class="l"><a href="#176">176: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="177" class="l"><a href="#177">177: </a>        {
-</span><span id="178" class="l"><a href="#178">178: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="179" class="l"><a href="#179">179: </a>        }
-</span><span id="180" class="l"><a href="#180">180: </a>
-</span><span id="181" class="l"><a href="#181">181: </a>        <span class="php-comment">// turn off compatibility mode as simple xml throws a wobbly if you don't.</span>
-</span><span id="182" class="l"><a href="#182">182: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ini_get</span>(<span class="php-quote">'zend.ze1_compatibility_mode'</span>) == <span class="php-num">1</span>)
-</span><span id="183" class="l"><a href="#183">183: </a>        {
-</span><span id="184" class="l"><a href="#184">184: </a>            <span class="php-keyword2">ini_set</span>(<span class="php-quote">'zend.ze1_compatibility_mode'</span>, <span class="php-num">0</span>);
-</span><span id="185" class="l"><a href="#185">185: </a>        }
-</span><span id="186" class="l"><a href="#186">186: </a>
-</span><span id="187" class="l"><a href="#187">187: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$structure</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="188" class="l"><a href="#188">188: </a>        {
-</span><span id="189" class="l"><a href="#189">189: </a>            <span class="php-var">$structure</span> = <span class="php-keyword2">simplexml_load_string</span>(<span class="php-quote">&quot;&lt;?xml version='1.0' encoding='utf-8'?&gt;&lt;</span><span class="php-var">$basenode</span><span class="php-quote"> /&gt;&quot;</span>);
-</span><span id="190" class="l"><a href="#190">190: </a>        }
-</span><span id="191" class="l"><a href="#191">191: </a>
-</span><span id="192" class="l"><a href="#192">192: </a>        <span class="php-comment">// Force it to be something useful</span>
-</span><span id="193" class="l"><a href="#193">193: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="194" class="l"><a href="#194">194: </a>        {
-</span><span id="195" class="l"><a href="#195">195: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
-</span><span id="196" class="l"><a href="#196">196: </a>        }
-</span><span id="197" class="l"><a href="#197">197: </a>
-</span><span id="198" class="l"><a href="#198">198: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$key</span> =&gt; <span class="php-var">$value</span>)
-</span><span id="199" class="l"><a href="#199">199: </a>        {
-</span><span id="200" class="l"><a href="#200">200: </a>
-</span><span id="201" class="l"><a href="#201">201: </a>            <span class="php-comment">//change false/true to 0/1</span>
-</span><span id="202" class="l"><a href="#202">202: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">is_bool</span>(<span class="php-var">$value</span>))
-</span><span id="203" class="l"><a href="#203">203: </a>            {
-</span><span id="204" class="l"><a href="#204">204: </a>                <span class="php-var">$value</span> = (int) <span class="php-var">$value</span>;
-</span><span id="205" class="l"><a href="#205">205: </a>            }
-</span><span id="206" class="l"><a href="#206">206: </a>
-</span><span id="207" class="l"><a href="#207">207: </a>            <span class="php-comment">// no numeric keys in our xml please!</span>
-</span><span id="208" class="l"><a href="#208">208: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">is_numeric</span>(<span class="php-var">$key</span>))
-</span><span id="209" class="l"><a href="#209">209: </a>            {
-</span><span id="210" class="l"><a href="#210">210: </a>                <span class="php-comment">// make string key...</span>
-</span><span id="211" class="l"><a href="#211">211: </a>                <span class="php-var">$key</span> = (singular(<span class="php-var">$basenode</span>) != <span class="php-var">$basenode</span>) ? singular(<span class="php-var">$basenode</span>) : <span class="php-quote">'item'</span>;
-</span><span id="212" class="l"><a href="#212">212: </a>            }
-</span><span id="213" class="l"><a href="#213">213: </a>
-</span><span id="214" class="l"><a href="#214">214: </a>            <span class="php-comment">// replace anything not alpha numeric</span>
-</span><span id="215" class="l"><a href="#215">215: </a>            <span class="php-var">$key</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/[^a-z_\-0-9]/i'</span>, <span class="php-quote">''</span>, <span class="php-var">$key</span>);
-</span><span id="216" class="l"><a href="#216">216: </a>
-</span><span id="217" class="l"><a href="#217">217: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-quote">'_attributes'</span> &amp;&amp; (<span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>)))
-</span><span id="218" class="l"><a href="#218">218: </a>            {
-</span><span id="219" class="l"><a href="#219">219: </a>                <span class="php-var">$attributes</span> = <span class="php-var">$value</span>;
-</span><span id="220" class="l"><a href="#220">220: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_object</span>(<span class="php-var">$attributes</span>))
-</span><span id="221" class="l"><a href="#221">221: </a>                {
-</span><span id="222" class="l"><a href="#222">222: </a>                    <span class="php-var">$attributes</span> = <span class="php-keyword2">get_object_vars</span>(<span class="php-var">$attributes</span>);
-</span><span id="223" class="l"><a href="#223">223: </a>                }
-</span><span id="224" class="l"><a href="#224">224: </a>
-</span><span id="225" class="l"><a href="#225">225: </a>                <span class="php-keyword1">foreach</span> (<span class="php-var">$attributes</span> <span class="php-keyword1">as</span> <span class="php-var">$attribute_name</span> =&gt; <span class="php-var">$attribute_value</span>)
-</span><span id="226" class="l"><a href="#226">226: </a>                {
-</span><span id="227" class="l"><a href="#227">227: </a>                    <span class="php-var">$structure</span>-&gt;addAttribute(<span class="php-var">$attribute_name</span>, <span class="php-var">$attribute_value</span>);
-</span><span id="228" class="l"><a href="#228">228: </a>                }
-</span><span id="229" class="l"><a href="#229">229: </a>            }
-</span><span id="230" class="l"><a href="#230">230: </a>            <span class="php-comment">// if there is another array found recursively call this function</span>
-</span><span id="231" class="l"><a href="#231">231: </a>            <span class="php-keyword1">elseif</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$value</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$value</span>))
-</span><span id="232" class="l"><a href="#232">232: </a>            {
-</span><span id="233" class="l"><a href="#233">233: </a>                <span class="php-var">$node</span> = <span class="php-var">$structure</span>-&gt;addChild(<span class="php-var">$key</span>);
-</span><span id="234" class="l"><a href="#234">234: </a>
-</span><span id="235" class="l"><a href="#235">235: </a>                <span class="php-comment">// recursive call.</span>
-</span><span id="236" class="l"><a href="#236">236: </a>                <span class="php-var">$this</span>-&gt;to_xml(<span class="php-var">$value</span>, <span class="php-var">$node</span>, <span class="php-var">$key</span>);
-</span><span id="237" class="l"><a href="#237">237: </a>            }
-</span><span id="238" class="l"><a href="#238">238: </a>            <span class="php-keyword1">else</span>
-</span><span id="239" class="l"><a href="#239">239: </a>            {
-</span><span id="240" class="l"><a href="#240">240: </a>                <span class="php-comment">// add single node.</span>
-</span><span id="241" class="l"><a href="#241">241: </a>                <span class="php-var">$value</span> = <span class="php-keyword2">htmlspecialchars</span>(<span class="php-keyword2">html_entity_decode</span>(<span class="php-var">$value</span>, ENT_QUOTES, <span class="php-quote">'UTF-8'</span>), ENT_QUOTES, <span class="php-quote">'UTF-8'</span>);
-</span><span id="242" class="l"><a href="#242">242: </a>
-</span><span id="243" class="l"><a href="#243">243: </a>                <span class="php-var">$structure</span>-&gt;addChild(<span class="php-var">$key</span>, <span class="php-var">$value</span>);
-</span><span id="244" class="l"><a href="#244">244: </a>            }
-</span><span id="245" class="l"><a href="#245">245: </a>        }
-</span><span id="246" class="l"><a href="#246">246: </a>
-</span><span id="247" class="l"><a href="#247">247: </a>        <span class="php-keyword1">return</span> <span class="php-var">$structure</span>-&gt;asXML();
-</span><span id="248" class="l"><a href="#248">248: </a>    }
-</span><span id="249" class="l"><a href="#249">249: </a>
-</span><span id="250" class="l"><a href="#250">250: </a>    <span class="php-comment">/**
-</span></span><span id="251" class="l"><a href="#251">251: </a><span class="php-comment">     * Format data as HTML
-</span></span><span id="252" class="l"><a href="#252">252: </a><span class="php-comment">     *
-</span></span><span id="253" class="l"><a href="#253">253: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="254" class="l"><a href="#254">254: </a><span class="php-comment">     * to the constructor
-</span></span><span id="255" class="l"><a href="#255">255: </a><span class="php-comment">     * @return mixed
-</span></span><span id="256" class="l"><a href="#256">256: </a><span class="php-comment">     */</span>
-</span><span id="257" class="l"><a href="#257">257: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_html(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="258" class="l"><a href="#258">258: </a>    {
-</span><span id="259" class="l"><a href="#259">259: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="260" class="l"><a href="#260">260: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="261" class="l"><a href="#261">261: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="262" class="l"><a href="#262">262: </a>        {
-</span><span id="263" class="l"><a href="#263">263: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="264" class="l"><a href="#264">264: </a>        }
-</span><span id="265" class="l"><a href="#265">265: </a>
-</span><span id="266" class="l"><a href="#266">266: </a>        <span class="php-comment">// Cast as an array if not already</span>
-</span><span id="267" class="l"><a href="#267">267: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="268" class="l"><a href="#268">268: </a>        {
-</span><span id="269" class="l"><a href="#269">269: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
-</span><span id="270" class="l"><a href="#270">270: </a>        }
-</span><span id="271" class="l"><a href="#271">271: </a>
-</span><span id="272" class="l"><a href="#272">272: </a>        <span class="php-comment">// Check if it's a multi-dimensional array</span>
-</span><span id="273" class="l"><a href="#273">273: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]) &amp;&amp; <span class="php-keyword2">count</span>(<span class="php-var">$data</span>) !== <span class="php-keyword2">count</span>(<span class="php-var">$data</span>, COUNT_RECURSIVE))
-</span><span id="274" class="l"><a href="#274">274: </a>        {
-</span><span id="275" class="l"><a href="#275">275: </a>            <span class="php-comment">// Multi-dimensional array</span>
-</span><span id="276" class="l"><a href="#276">276: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]);
-</span><span id="277" class="l"><a href="#277">277: </a>        }
-</span><span id="278" class="l"><a href="#278">278: </a>        <span class="php-keyword1">else</span>
-</span><span id="279" class="l"><a href="#279">279: </a>        {
-</span><span id="280" class="l"><a href="#280">280: </a>            <span class="php-comment">// Single array</span>
-</span><span id="281" class="l"><a href="#281">281: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>);
-</span><span id="282" class="l"><a href="#282">282: </a>            <span class="php-var">$data</span> = [<span class="php-var">$data</span>];
-</span><span id="283" class="l"><a href="#283">283: </a>        }
-</span><span id="284" class="l"><a href="#284">284: </a>
-</span><span id="285" class="l"><a href="#285">285: </a>        <span class="php-comment">// Load the table library</span>
-</span><span id="286" class="l"><a href="#286">286: </a>        <span class="php-var">$this</span>-&gt;_CI-&gt;load-&gt;library(<span class="php-quote">'table'</span>);
-</span><span id="287" class="l"><a href="#287">287: </a>
-</span><span id="288" class="l"><a href="#288">288: </a>        <span class="php-var">$this</span>-&gt;_CI-&gt;table-&gt;set_heading(<span class="php-var">$headings</span>);
-</span><span id="289" class="l"><a href="#289">289: </a>
-</span><span id="290" class="l"><a href="#290">290: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$row</span>)
-</span><span id="291" class="l"><a href="#291">291: </a>        {
-</span><span id="292" class="l"><a href="#292">292: </a>            <span class="php-comment">// Suppressing the &quot;array to string conversion&quot; notice</span>
-</span><span id="293" class="l"><a href="#293">293: </a>            <span class="php-comment">// Keep the &quot;evil&quot; @ here</span>
-</span><span id="294" class="l"><a href="#294">294: </a>            <span class="php-var">$row</span> = @<span class="php-keyword2">array_map</span>(<span class="php-quote">'strval'</span>, <span class="php-var">$row</span>);
-</span><span id="295" class="l"><a href="#295">295: </a>
-</span><span id="296" class="l"><a href="#296">296: </a>            <span class="php-var">$this</span>-&gt;_CI-&gt;table-&gt;add_row(<span class="php-var">$row</span>);
-</span><span id="297" class="l"><a href="#297">297: </a>        }
-</span><span id="298" class="l"><a href="#298">298: </a>
-</span><span id="299" class="l"><a href="#299">299: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_CI-&gt;table-&gt;generate();
-</span><span id="300" class="l"><a href="#300">300: </a>    }
-</span><span id="301" class="l"><a href="#301">301: </a>
-</span><span id="302" class="l"><a href="#302">302: </a>    <span class="php-comment">/**
-</span></span><span id="303" class="l"><a href="#303">303: </a><span class="php-comment">     * @link http://www.metashock.de/2014/02/create-csv-file-in-memory-php/
-</span></span><span id="304" class="l"><a href="#304">304: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="305" class="l"><a href="#305">305: </a><span class="php-comment">     * to the constructor
-</span></span><span id="306" class="l"><a href="#306">306: </a><span class="php-comment">     * @param string $delimiter The optional delimiter parameter sets the field
-</span></span><span id="307" class="l"><a href="#307">307: </a><span class="php-comment">     * delimiter (one character only). NULL will use the default value (,)
-</span></span><span id="308" class="l"><a href="#308">308: </a><span class="php-comment">     * @param string $enclosure The optional enclosure parameter sets the field
-</span></span><span id="309" class="l"><a href="#309">309: </a><span class="php-comment">     * enclosure (one character only). NULL will use the default value (&quot;)
-</span></span><span id="310" class="l"><a href="#310">310: </a><span class="php-comment">     * @return string A csv string
-</span></span><span id="311" class="l"><a href="#311">311: </a><span class="php-comment">     */</span>
-</span><span id="312" class="l"><a href="#312">312: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_csv(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>, <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>)
-</span><span id="313" class="l"><a href="#313">313: </a>    {
-</span><span id="314" class="l"><a href="#314">314: </a>        <span class="php-comment">// Use a threshold of 1 MB (1024 * 1024)</span>
-</span><span id="315" class="l"><a href="#315">315: </a>        <span class="php-var">$handle</span> = <span class="php-keyword2">fopen</span>(<span class="php-quote">'php://temp/maxmemory:1048576'</span>, <span class="php-quote">'w'</span>);
-</span><span id="316" class="l"><a href="#316">316: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$handle</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="317" class="l"><a href="#317">317: </a>        {
-</span><span id="318" class="l"><a href="#318">318: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="319" class="l"><a href="#319">319: </a>        }
-</span><span id="320" class="l"><a href="#320">320: </a>
-</span><span id="321" class="l"><a href="#321">321: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="322" class="l"><a href="#322">322: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="323" class="l"><a href="#323">323: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="324" class="l"><a href="#324">324: </a>        {
-</span><span id="325" class="l"><a href="#325">325: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="326" class="l"><a href="#326">326: </a>        }
-</span><span id="327" class="l"><a href="#327">327: </a>
-</span><span id="328" class="l"><a href="#328">328: </a>        <span class="php-comment">// If NULL, then set as the default delimiter</span>
-</span><span id="329" class="l"><a href="#329">329: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$delimiter</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="330" class="l"><a href="#330">330: </a>        {
-</span><span id="331" class="l"><a href="#331">331: </a>            <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>;
-</span><span id="332" class="l"><a href="#332">332: </a>        }
-</span><span id="333" class="l"><a href="#333">333: </a>
-</span><span id="334" class="l"><a href="#334">334: </a>        <span class="php-comment">// If NULL, then set as the default enclosure</span>
-</span><span id="335" class="l"><a href="#335">335: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$enclosure</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="336" class="l"><a href="#336">336: </a>        {
-</span><span id="337" class="l"><a href="#337">337: </a>            <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>;
-</span><span id="338" class="l"><a href="#338">338: </a>        }
-</span><span id="339" class="l"><a href="#339">339: </a>
-</span><span id="340" class="l"><a href="#340">340: </a>        <span class="php-comment">// Cast as an array if not already</span>
-</span><span id="341" class="l"><a href="#341">341: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="342" class="l"><a href="#342">342: </a>        {
-</span><span id="343" class="l"><a href="#343">343: </a>            <span class="php-var">$data</span> = (<span class="php-keyword1">array</span>) <span class="php-var">$data</span>;
-</span><span id="344" class="l"><a href="#344">344: </a>        }
-</span><span id="345" class="l"><a href="#345">345: </a>
-</span><span id="346" class="l"><a href="#346">346: </a>        <span class="php-comment">// Check if it's a multi-dimensional array</span>
-</span><span id="347" class="l"><a href="#347">347: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]) &amp;&amp; <span class="php-keyword2">count</span>(<span class="php-var">$data</span>) !== <span class="php-keyword2">count</span>(<span class="php-var">$data</span>, COUNT_RECURSIVE))
-</span><span id="348" class="l"><a href="#348">348: </a>        {
-</span><span id="349" class="l"><a href="#349">349: </a>            <span class="php-comment">// Multi-dimensional array</span>
-</span><span id="350" class="l"><a href="#350">350: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>[<span class="php-num">0</span>]);
-</span><span id="351" class="l"><a href="#351">351: </a>        }
-</span><span id="352" class="l"><a href="#352">352: </a>        <span class="php-keyword1">else</span>
-</span><span id="353" class="l"><a href="#353">353: </a>        {
-</span><span id="354" class="l"><a href="#354">354: </a>            <span class="php-comment">// Single array</span>
-</span><span id="355" class="l"><a href="#355">355: </a>            <span class="php-var">$headings</span> = <span class="php-keyword2">array_keys</span>(<span class="php-var">$data</span>);
-</span><span id="356" class="l"><a href="#356">356: </a>            <span class="php-var">$data</span> = [<span class="php-var">$data</span>];
-</span><span id="357" class="l"><a href="#357">357: </a>        }
-</span><span id="358" class="l"><a href="#358">358: </a>
-</span><span id="359" class="l"><a href="#359">359: </a>        <span class="php-comment">// Apply the headings</span>
-</span><span id="360" class="l"><a href="#360">360: </a>        <span class="php-keyword2">fputcsv</span>(<span class="php-var">$handle</span>, <span class="php-var">$headings</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
-</span><span id="361" class="l"><a href="#361">361: </a>
-</span><span id="362" class="l"><a href="#362">362: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$data</span> <span class="php-keyword1">as</span> <span class="php-var">$record</span>)
-</span><span id="363" class="l"><a href="#363">363: </a>        {
-</span><span id="364" class="l"><a href="#364">364: </a>            <span class="php-comment">// If the record is not an array, then break. This is because the 2nd param of</span>
-</span><span id="365" class="l"><a href="#365">365: </a>            <span class="php-comment">// fputcsv() should be an array</span>
-</span><span id="366" class="l"><a href="#366">366: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$record</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="367" class="l"><a href="#367">367: </a>            {
-</span><span id="368" class="l"><a href="#368">368: </a>                <span class="php-keyword1">break</span>;
-</span><span id="369" class="l"><a href="#369">369: </a>            }
-</span><span id="370" class="l"><a href="#370">370: </a>
-</span><span id="371" class="l"><a href="#371">371: </a>            <span class="php-comment">// Suppressing the &quot;array to string conversion&quot; notice.</span>
-</span><span id="372" class="l"><a href="#372">372: </a>            <span class="php-comment">// Keep the &quot;evil&quot; @ here.</span>
-</span><span id="373" class="l"><a href="#373">373: </a>            <span class="php-var">$record</span> = @ <span class="php-keyword2">array_map</span>(<span class="php-quote">'strval'</span>, <span class="php-var">$record</span>);
-</span><span id="374" class="l"><a href="#374">374: </a>
-</span><span id="375" class="l"><a href="#375">375: </a>            <span class="php-comment">// Returns the length of the string written or FALSE</span>
-</span><span id="376" class="l"><a href="#376">376: </a>            <span class="php-keyword2">fputcsv</span>(<span class="php-var">$handle</span>, <span class="php-var">$record</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
-</span><span id="377" class="l"><a href="#377">377: </a>        }
-</span><span id="378" class="l"><a href="#378">378: </a>
-</span><span id="379" class="l"><a href="#379">379: </a>        <span class="php-comment">// Reset the file pointer</span>
-</span><span id="380" class="l"><a href="#380">380: </a>        <span class="php-keyword2">rewind</span>(<span class="php-var">$handle</span>);
-</span><span id="381" class="l"><a href="#381">381: </a>
-</span><span id="382" class="l"><a href="#382">382: </a>        <span class="php-comment">// Retrieve the csv contents</span>
-</span><span id="383" class="l"><a href="#383">383: </a>        <span class="php-var">$csv</span> = <span class="php-keyword2">stream_get_contents</span>(<span class="php-var">$handle</span>);
-</span><span id="384" class="l"><a href="#384">384: </a>
-</span><span id="385" class="l"><a href="#385">385: </a>        <span class="php-comment">// Close the handle</span>
-</span><span id="386" class="l"><a href="#386">386: </a>        <span class="php-keyword2">fclose</span>(<span class="php-var">$handle</span>);
-</span><span id="387" class="l"><a href="#387">387: </a>
-</span><span id="388" class="l"><a href="#388">388: </a>        <span class="php-keyword1">return</span> <span class="php-var">$csv</span>;
-</span><span id="389" class="l"><a href="#389">389: </a>    }
-</span><span id="390" class="l"><a href="#390">390: </a>
-</span><span id="391" class="l"><a href="#391">391: </a>    <span class="php-comment">/**
-</span></span><span id="392" class="l"><a href="#392">392: </a><span class="php-comment">     * Encode data as json
-</span></span><span id="393" class="l"><a href="#393">393: </a><span class="php-comment">     *
-</span></span><span id="394" class="l"><a href="#394">394: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="395" class="l"><a href="#395">395: </a><span class="php-comment">     * to the constructor
-</span></span><span id="396" class="l"><a href="#396">396: </a><span class="php-comment">     * @return string Json representation of a value
-</span></span><span id="397" class="l"><a href="#397">397: </a><span class="php-comment">     */</span>
-</span><span id="398" class="l"><a href="#398">398: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_json(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="399" class="l"><a href="#399">399: </a>    {
-</span><span id="400" class="l"><a href="#400">400: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="401" class="l"><a href="#401">401: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="402" class="l"><a href="#402">402: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="403" class="l"><a href="#403">403: </a>        {
-</span><span id="404" class="l"><a href="#404">404: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="405" class="l"><a href="#405">405: </a>        }
-</span><span id="406" class="l"><a href="#406">406: </a>
-</span><span id="407" class="l"><a href="#407">407: </a>        <span class="php-comment">// Get the callback parameter (if set)</span>
-</span><span id="408" class="l"><a href="#408">408: </a>        <span class="php-var">$callback</span> = <span class="php-var">$this</span>-&gt;_CI-&gt;input-&gt;get(<span class="php-quote">'callback'</span>);
-</span><span id="409" class="l"><a href="#409">409: </a>
-</span><span id="410" class="l"><a href="#410">410: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$callback</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="411" class="l"><a href="#411">411: </a>        {
-</span><span id="412" class="l"><a href="#412">412: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
-</span><span id="413" class="l"><a href="#413">413: </a>        }
-</span><span id="414" class="l"><a href="#414">414: </a>
-</span><span id="415" class="l"><a href="#415">415: </a>        <span class="php-comment">// We only honour a jsonp callback which are valid javascript identifiers</span>
-</span><span id="416" class="l"><a href="#416">416: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">preg_match</span>(<span class="php-quote">'/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i'</span>, <span class="php-var">$callback</span>))
-</span><span id="417" class="l"><a href="#417">417: </a>        {
-</span><span id="418" class="l"><a href="#418">418: </a>            <span class="php-comment">// Return the data as encoded json with a callback</span>
-</span><span id="419" class="l"><a href="#419">419: </a>            <span class="php-keyword1">return</span> <span class="php-var">$callback</span>.<span class="php-quote">'('</span>.<span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>).<span class="php-quote">');'</span>;
-</span><span id="420" class="l"><a href="#420">420: </a>        }
-</span><span id="421" class="l"><a href="#421">421: </a>
-</span><span id="422" class="l"><a href="#422">422: </a>        <span class="php-comment">// An invalid jsonp callback function provided.</span>
-</span><span id="423" class="l"><a href="#423">423: </a>        <span class="php-comment">// Though I don't believe this should be hardcoded here</span>
-</span><span id="424" class="l"><a href="#424">424: </a>        <span class="php-var">$data</span>[<span class="php-quote">'warning'</span>] = <span class="php-quote">'INVALID JSONP CALLBACK: '</span>.<span class="php-var">$callback</span>;
-</span><span id="425" class="l"><a href="#425">425: </a>
-</span><span id="426" class="l"><a href="#426">426: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_encode</span>(<span class="php-var">$data</span>);
-</span><span id="427" class="l"><a href="#427">427: </a>    }
-</span><span id="428" class="l"><a href="#428">428: </a>
-</span><span id="429" class="l"><a href="#429">429: </a>    <span class="php-comment">/**
-</span></span><span id="430" class="l"><a href="#430">430: </a><span class="php-comment">     * Encode data as a serialized array
-</span></span><span id="431" class="l"><a href="#431">431: </a><span class="php-comment">     *
-</span></span><span id="432" class="l"><a href="#432">432: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="433" class="l"><a href="#433">433: </a><span class="php-comment">     * to the constructor
-</span></span><span id="434" class="l"><a href="#434">434: </a><span class="php-comment">     * @return string Serialized data
-</span></span><span id="435" class="l"><a href="#435">435: </a><span class="php-comment">     */</span>
-</span><span id="436" class="l"><a href="#436">436: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_serialized(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="437" class="l"><a href="#437">437: </a>    {
-</span><span id="438" class="l"><a href="#438">438: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="439" class="l"><a href="#439">439: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="440" class="l"><a href="#440">440: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="441" class="l"><a href="#441">441: </a>        {
-</span><span id="442" class="l"><a href="#442">442: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="443" class="l"><a href="#443">443: </a>        }
-</span><span id="444" class="l"><a href="#444">444: </a>
-</span><span id="445" class="l"><a href="#445">445: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">serialize</span>(<span class="php-var">$data</span>);
-</span><span id="446" class="l"><a href="#446">446: </a>    }
-</span><span id="447" class="l"><a href="#447">447: </a>
-</span><span id="448" class="l"><a href="#448">448: </a>    <span class="php-comment">/**
-</span></span><span id="449" class="l"><a href="#449">449: </a><span class="php-comment">     * Format data using a PHP structure
-</span></span><span id="450" class="l"><a href="#450">450: </a><span class="php-comment">     *
-</span></span><span id="451" class="l"><a href="#451">451: </a><span class="php-comment">     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-</span></span><span id="452" class="l"><a href="#452">452: </a><span class="php-comment">     * to the constructor
-</span></span><span id="453" class="l"><a href="#453">453: </a><span class="php-comment">     * @return mixed String representation of a variable
-</span></span><span id="454" class="l"><a href="#454">454: </a><span class="php-comment">     */</span>
-</span><span id="455" class="l"><a href="#455">455: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> to_php(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="456" class="l"><a href="#456">456: </a>    {
-</span><span id="457" class="l"><a href="#457">457: </a>        <span class="php-comment">// If no data is passed as a parameter, then use the data passed</span>
-</span><span id="458" class="l"><a href="#458">458: </a>        <span class="php-comment">// via the constructor</span>
-</span><span id="459" class="l"><a href="#459">459: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-keyword2">func_num_args</span>() === <span class="php-num">0</span>)
-</span><span id="460" class="l"><a href="#460">460: </a>        {
-</span><span id="461" class="l"><a href="#461">461: </a>            <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;_data;
-</span><span id="462" class="l"><a href="#462">462: </a>        }
-</span><span id="463" class="l"><a href="#463">463: </a>
-</span><span id="464" class="l"><a href="#464">464: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">var_export</span>(<span class="php-var">$data</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="465" class="l"><a href="#465">465: </a>    }
-</span><span id="466" class="l"><a href="#466">466: </a>
-</span><span id="467" class="l"><a href="#467">467: </a>    <span class="php-comment">// INTERNAL FUNCTIONS</span>
-</span><span id="468" class="l"><a href="#468">468: </a>
-</span><span id="469" class="l"><a href="#469">469: </a>    <span class="php-comment">/**
-</span></span><span id="470" class="l"><a href="#470">470: </a><span class="php-comment">     * @param $data XML string
-</span></span><span id="471" class="l"><a href="#471">471: </a><span class="php-comment">     * @return SimpleXMLElement XML element object; otherwise, empty array
-</span></span><span id="472" class="l"><a href="#472">472: </a><span class="php-comment">     */</span>
-</span><span id="473" class="l"><a href="#473">473: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_xml(<span class="php-var">$data</span>)
-</span><span id="474" class="l"><a href="#474">474: </a>    {
-</span><span id="475" class="l"><a href="#475">475: </a>        <span class="php-keyword1">return</span> <span class="php-var">$data</span> ? (<span class="php-keyword1">array</span>) <span class="php-keyword2">simplexml_load_string</span>(<span class="php-var">$data</span>, <span class="php-quote">'SimpleXMLElement'</span>, LIBXML_NOCDATA) : [];
-</span><span id="476" class="l"><a href="#476">476: </a>    }
-</span><span id="477" class="l"><a href="#477">477: </a>
-</span><span id="478" class="l"><a href="#478">478: </a>    <span class="php-comment">/**
-</span></span><span id="479" class="l"><a href="#479">479: </a><span class="php-comment">     * @param string $data CSV string
-</span></span><span id="480" class="l"><a href="#480">480: </a><span class="php-comment">     * @param string $delimiter The optional delimiter parameter sets the field
-</span></span><span id="481" class="l"><a href="#481">481: </a><span class="php-comment">     * delimiter (one character only). NULL will use the default value (,)
-</span></span><span id="482" class="l"><a href="#482">482: </a><span class="php-comment">     * @param string $enclosure The optional enclosure parameter sets the field
-</span></span><span id="483" class="l"><a href="#483">483: </a><span class="php-comment">     * enclosure (one character only). NULL will use the default value (&quot;)
-</span></span><span id="484" class="l"><a href="#484">484: </a><span class="php-comment">     * @return array A multi-dimensional array with the outer array being the number of rows
-</span></span><span id="485" class="l"><a href="#485">485: </a><span class="php-comment">     * and the inner arrays the individual fields
-</span></span><span id="486" class="l"><a href="#486">486: </a><span class="php-comment">     */</span>
-</span><span id="487" class="l"><a href="#487">487: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_csv(<span class="php-var">$data</span>, <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>, <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>)
-</span><span id="488" class="l"><a href="#488">488: </a>    {
-</span><span id="489" class="l"><a href="#489">489: </a>        <span class="php-comment">// If NULL, then set as the default delimiter</span>
-</span><span id="490" class="l"><a href="#490">490: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$delimiter</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="491" class="l"><a href="#491">491: </a>        {
-</span><span id="492" class="l"><a href="#492">492: </a>            <span class="php-var">$delimiter</span> = <span class="php-quote">','</span>;
-</span><span id="493" class="l"><a href="#493">493: </a>        }
-</span><span id="494" class="l"><a href="#494">494: </a>
-</span><span id="495" class="l"><a href="#495">495: </a>        <span class="php-comment">// If NULL, then set as the default enclosure</span>
-</span><span id="496" class="l"><a href="#496">496: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$enclosure</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="497" class="l"><a href="#497">497: </a>        {
-</span><span id="498" class="l"><a href="#498">498: </a>            <span class="php-var">$enclosure</span> = <span class="php-quote">'&quot;'</span>;
-</span><span id="499" class="l"><a href="#499">499: </a>        }
-</span><span id="500" class="l"><a href="#500">500: </a>
-</span><span id="501" class="l"><a href="#501">501: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">str_getcsv</span>(<span class="php-var">$data</span>, <span class="php-var">$delimiter</span>, <span class="php-var">$enclosure</span>);
-</span><span id="502" class="l"><a href="#502">502: </a>    }
-</span><span id="503" class="l"><a href="#503">503: </a>
-</span><span id="504" class="l"><a href="#504">504: </a>    <span class="php-comment">/**
-</span></span><span id="505" class="l"><a href="#505">505: </a><span class="php-comment">     * @param $data Encoded json string
-</span></span><span id="506" class="l"><a href="#506">506: </a><span class="php-comment">     * @return mixed Decoded json string with leading and trailing whitespace removed
-</span></span><span id="507" class="l"><a href="#507">507: </a><span class="php-comment">     */</span>
-</span><span id="508" class="l"><a href="#508">508: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_json(<span class="php-var">$data</span>)
-</span><span id="509" class="l"><a href="#509">509: </a>    {
-</span><span id="510" class="l"><a href="#510">510: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">json_decode</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
-</span><span id="511" class="l"><a href="#511">511: </a>    }
-</span><span id="512" class="l"><a href="#512">512: </a>
-</span><span id="513" class="l"><a href="#513">513: </a>    <span class="php-comment">/**
-</span></span><span id="514" class="l"><a href="#514">514: </a><span class="php-comment">     * @param string Data to unserialized
-</span></span><span id="515" class="l"><a href="#515">515: </a><span class="php-comment">     * @return mixed Unserialized data
-</span></span><span id="516" class="l"><a href="#516">516: </a><span class="php-comment">     */</span>
-</span><span id="517" class="l"><a href="#517">517: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_serialize(<span class="php-var">$data</span>)
-</span><span id="518" class="l"><a href="#518">518: </a>    {
-</span><span id="519" class="l"><a href="#519">519: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">unserialize</span>(<span class="php-keyword2">trim</span>(<span class="php-var">$data</span>));
-</span><span id="520" class="l"><a href="#520">520: </a>    }
-</span><span id="521" class="l"><a href="#521">521: </a>
-</span><span id="522" class="l"><a href="#522">522: </a>    <span class="php-comment">/**
-</span></span><span id="523" class="l"><a href="#523">523: </a><span class="php-comment">     * @param $data Data to trim leading and trailing whitespace
-</span></span><span id="524" class="l"><a href="#524">524: </a><span class="php-comment">     * @return string Data with leading and trailing whitespace removed
-</span></span><span id="525" class="l"><a href="#525">525: </a><span class="php-comment">     */</span>
-</span><span id="526" class="l"><a href="#526">526: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _from_php(<span class="php-var">$data</span>)
-</span><span id="527" class="l"><a href="#527">527: </a>    {
-</span><span id="528" class="l"><a href="#528">528: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">trim</span>(<span class="php-var">$data</span>);
-</span><span id="529" class="l"><a href="#529">529: </a>    }
-</span><span id="530" class="l"><a href="#530">530: </a>
-</span><span id="531" class="l"><a href="#531">531: </a>}
-</span><span id="532" class="l"><a href="#532">532: </a></span></code></pre>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
-<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
-</body>
-</html>
diff --git a/documentation/source-class-Key.html b/documentation/source-class-Key.html
deleted file mode 100644
index c6a5c28a..00000000
--- a/documentation/source-class-Key.html
+++ /dev/null
@@ -1,377 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="robots" content="noindex">
-
-	<title>File controllers/api/Key.php</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li><a href="http://github.com/class-Example.html">Example</a></li>
-				<li><a href="http://github.com/class-Format.html">Format</a></li>
-				<li><a href="http://github.com/class-Key.html">Key</a></li>
-				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
-				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
-				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
-			</ul>
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li>
-<span>Package</span>			</li>
-			<li>
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<pre><code><span id="1" class="l"><a href="#1">  1: </a><span class="xlang">&lt;?php</span>
-</span><span id="2" class="l"><a href="#2">  2: </a>
-</span><span id="3" class="l"><a href="#3">  3: </a><span class="php-keyword2">defined</span>(<span class="php-quote">'BASEPATH'</span>) <span class="php-keyword1">OR</span> <span class="php-keyword1">exit</span>(<span class="php-quote">'No direct script access allowed'</span>);
-</span><span id="4" class="l"><a href="#4">  4: </a>
-</span><span id="5" class="l"><a href="#5">  5: </a><span class="php-comment">// This can be removed if you use __autoload() in config.php OR use Modular Extensions</span>
-</span><span id="6" class="l"><a href="#6">  6: </a><span class="php-keyword1">require</span> APPPATH . <span class="php-quote">'/libraries/REST_Controller.php'</span>;
-</span><span id="7" class="l"><a href="#7">  7: </a>
-</span><span id="8" class="l"><a href="#8">  8: </a><span class="php-comment">/**
-</span></span><span id="9" class="l"><a href="#9">  9: </a><span class="php-comment"> * Keys Controller
-</span></span><span id="10" class="l"><a href="#10"> 10: </a><span class="php-comment"> * This is a basic Key Management REST controller to make and delete keys
-</span></span><span id="11" class="l"><a href="#11"> 11: </a><span class="php-comment"> *
-</span></span><span id="12" class="l"><a href="#12"> 12: </a><span class="php-comment"> * @package         CodeIgniter
-</span></span><span id="13" class="l"><a href="#13"> 13: </a><span class="php-comment"> * @subpackage      Rest Server
-</span></span><span id="14" class="l"><a href="#14"> 14: </a><span class="php-comment"> * @category        Controller
-</span></span><span id="15" class="l"><a href="#15"> 15: </a><span class="php-comment"> * @author          Phil Sturgeon, Chris Kacerguis
-</span></span><span id="16" class="l"><a href="#16"> 16: </a><span class="php-comment"> * @license         MIT
-</span></span><span id="17" class="l"><a href="#17"> 17: </a><span class="php-comment"> * @link            https://github.com/chriskacerguis/codeigniter-restserver
-</span></span><span id="18" class="l"><a href="#18"> 18: </a><span class="php-comment"> */</span>
-</span><span id="19" class="l"><a href="#19"> 19: </a><span class="php-keyword1">class</span> <span class="php-keyword2">Key</span> <span class="php-keyword1">extends</span> REST_Controller {
-</span><span id="20" class="l"><a href="#20"> 20: </a>
-</span><span id="21" class="l"><a href="#21"> 21: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$methods</span> = [
-</span><span id="22" class="l"><a href="#22"> 22: </a>            <span class="php-quote">'index_put'</span> =&gt; [<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>, <span class="php-quote">'limit'</span> =&gt; <span class="php-num">10</span>],
-</span><span id="23" class="l"><a href="#23"> 23: </a>            <span class="php-quote">'index_delete'</span> =&gt; [<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>],
-</span><span id="24" class="l"><a href="#24"> 24: </a>            <span class="php-quote">'level_post'</span> =&gt; [<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>],
-</span><span id="25" class="l"><a href="#25"> 25: </a>            <span class="php-quote">'regenerate_post'</span> =&gt; [<span class="php-quote">'level'</span> =&gt; <span class="php-num">10</span>],
-</span><span id="26" class="l"><a href="#26"> 26: </a>        ];
-</span><span id="27" class="l"><a href="#27"> 27: </a>
-</span><span id="28" class="l"><a href="#28"> 28: </a>    <span class="php-comment">/**
-</span></span><span id="29" class="l"><a href="#29"> 29: </a><span class="php-comment">     * Insert a key into the database
-</span></span><span id="30" class="l"><a href="#30"> 30: </a><span class="php-comment">     *
-</span></span><span id="31" class="l"><a href="#31"> 31: </a><span class="php-comment">     * @access public
-</span></span><span id="32" class="l"><a href="#32"> 32: </a><span class="php-comment">     * @return void
-</span></span><span id="33" class="l"><a href="#33"> 33: </a><span class="php-comment">     */</span>
-</span><span id="34" class="l"><a href="#34"> 34: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> index_put()
-</span><span id="35" class="l"><a href="#35"> 35: </a>    {
-</span><span id="36" class="l"><a href="#36"> 36: </a>        <span class="php-comment">// Build a new key</span>
-</span><span id="37" class="l"><a href="#37"> 37: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;_generate_key();
-</span><span id="38" class="l"><a href="#38"> 38: </a>
-</span><span id="39" class="l"><a href="#39"> 39: </a>        <span class="php-comment">// If no key level provided, provide a generic key</span>
-</span><span id="40" class="l"><a href="#40"> 40: </a>        <span class="php-var">$level</span> = <span class="php-var">$this</span>-&gt;put(<span class="php-quote">'level'</span>) ? <span class="php-var">$this</span>-&gt;put(<span class="php-quote">'level'</span>) : <span class="php-num">1</span>;
-</span><span id="41" class="l"><a href="#41"> 41: </a>        <span class="php-var">$ignore_limits</span> = <span class="php-keyword2">ctype_digit</span>(<span class="php-var">$this</span>-&gt;put(<span class="php-quote">'ignore_limits'</span>)) ? (int) <span class="php-var">$this</span>-&gt;put(<span class="php-quote">'ignore_limits'</span>) : <span class="php-num">1</span>;
-</span><span id="42" class="l"><a href="#42"> 42: </a>
-</span><span id="43" class="l"><a href="#43"> 43: </a>        <span class="php-comment">// Insert the new key</span>
-</span><span id="44" class="l"><a href="#44"> 44: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_insert_key(<span class="php-var">$key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-var">$level</span>, <span class="php-quote">'ignore_limits'</span> =&gt; <span class="php-var">$ignore_limits</span>]))
-</span><span id="45" class="l"><a href="#45"> 45: </a>        {
-</span><span id="46" class="l"><a href="#46"> 46: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="47" class="l"><a href="#47"> 47: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
-</span><span id="48" class="l"><a href="#48"> 48: </a>                <span class="php-quote">'key'</span> =&gt; <span class="php-var">$key</span>
-</span><span id="49" class="l"><a href="#49"> 49: </a>            ], REST_Controller::HTTP_CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
-</span><span id="50" class="l"><a href="#50"> 50: </a>        }
-</span><span id="51" class="l"><a href="#51"> 51: </a>        <span class="php-keyword1">else</span>
-</span><span id="52" class="l"><a href="#52"> 52: </a>        {
-</span><span id="53" class="l"><a href="#53"> 53: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="54" class="l"><a href="#54"> 54: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="55" class="l"><a href="#55"> 55: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
-</span><span id="56" class="l"><a href="#56"> 56: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
-</span><span id="57" class="l"><a href="#57"> 57: </a>        }
-</span><span id="58" class="l"><a href="#58"> 58: </a>    }
-</span><span id="59" class="l"><a href="#59"> 59: </a>
-</span><span id="60" class="l"><a href="#60"> 60: </a>    <span class="php-comment">/**
-</span></span><span id="61" class="l"><a href="#61"> 61: </a><span class="php-comment">     * Remove a key from the database to stop it working
-</span></span><span id="62" class="l"><a href="#62"> 62: </a><span class="php-comment">     *
-</span></span><span id="63" class="l"><a href="#63"> 63: </a><span class="php-comment">     * @access public
-</span></span><span id="64" class="l"><a href="#64"> 64: </a><span class="php-comment">     * @return void
-</span></span><span id="65" class="l"><a href="#65"> 65: </a><span class="php-comment">     */</span>
-</span><span id="66" class="l"><a href="#66"> 66: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> index_delete()
-</span><span id="67" class="l"><a href="#67"> 67: </a>    {
-</span><span id="68" class="l"><a href="#68"> 68: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;<span class="php-keyword2">delete</span>(<span class="php-quote">'key'</span>);
-</span><span id="69" class="l"><a href="#69"> 69: </a>
-</span><span id="70" class="l"><a href="#70"> 70: </a>        <span class="php-comment">// Does this key exist?</span>
-</span><span id="71" class="l"><a href="#71"> 71: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_key_exists(<span class="php-var">$key</span>))
-</span><span id="72" class="l"><a href="#72"> 72: </a>        {
-</span><span id="73" class="l"><a href="#73"> 73: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
-</span><span id="74" class="l"><a href="#74"> 74: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="75" class="l"><a href="#75"> 75: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="76" class="l"><a href="#76"> 76: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
-</span><span id="77" class="l"><a href="#77"> 77: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
-</span><span id="78" class="l"><a href="#78"> 78: </a>        }
-</span><span id="79" class="l"><a href="#79"> 79: </a>
-</span><span id="80" class="l"><a href="#80"> 80: </a>        <span class="php-comment">// Destroy it</span>
-</span><span id="81" class="l"><a href="#81"> 81: </a>        <span class="php-var">$this</span>-&gt;_delete_key(<span class="php-var">$key</span>);
-</span><span id="82" class="l"><a href="#82"> 82: </a>
-</span><span id="83" class="l"><a href="#83"> 83: </a>        <span class="php-comment">// Respond that the key was destroyed</span>
-</span><span id="84" class="l"><a href="#84"> 84: </a>        <span class="php-var">$this</span>-&gt;response([
-</span><span id="85" class="l"><a href="#85"> 85: </a>            <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
-</span><span id="86" class="l"><a href="#86"> 86: </a>            <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'API key was deleted'</span>
-</span><span id="87" class="l"><a href="#87"> 87: </a>            ], REST_Controller::HTTP_NO_CONTENT); <span class="php-comment">// NO_CONTENT (204) being the HTTP response code</span>
-</span><span id="88" class="l"><a href="#88"> 88: </a>    }
-</span><span id="89" class="l"><a href="#89"> 89: </a>
-</span><span id="90" class="l"><a href="#90"> 90: </a>    <span class="php-comment">/**
-</span></span><span id="91" class="l"><a href="#91"> 91: </a><span class="php-comment">     * Change the level
-</span></span><span id="92" class="l"><a href="#92"> 92: </a><span class="php-comment">     *
-</span></span><span id="93" class="l"><a href="#93"> 93: </a><span class="php-comment">     * @access public
-</span></span><span id="94" class="l"><a href="#94"> 94: </a><span class="php-comment">     * @return void
-</span></span><span id="95" class="l"><a href="#95"> 95: </a><span class="php-comment">     */</span>
-</span><span id="96" class="l"><a href="#96"> 96: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> level_post()
-</span><span id="97" class="l"><a href="#97"> 97: </a>    {
-</span><span id="98" class="l"><a href="#98"> 98: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
-</span><span id="99" class="l"><a href="#99"> 99: </a>        <span class="php-var">$new_level</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'level'</span>);
-</span><span id="100" class="l"><a href="#100">100: </a>
-</span><span id="101" class="l"><a href="#101">101: </a>        <span class="php-comment">// Does this key exist?</span>
-</span><span id="102" class="l"><a href="#102">102: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_key_exists(<span class="php-var">$key</span>))
-</span><span id="103" class="l"><a href="#103">103: </a>        {
-</span><span id="104" class="l"><a href="#104">104: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
-</span><span id="105" class="l"><a href="#105">105: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="106" class="l"><a href="#106">106: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="107" class="l"><a href="#107">107: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
-</span><span id="108" class="l"><a href="#108">108: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
-</span><span id="109" class="l"><a href="#109">109: </a>        }
-</span><span id="110" class="l"><a href="#110">110: </a>
-</span><span id="111" class="l"><a href="#111">111: </a>        <span class="php-comment">// Update the key level</span>
-</span><span id="112" class="l"><a href="#112">112: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_update_key(<span class="php-var">$key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-var">$new_level</span>]))
-</span><span id="113" class="l"><a href="#113">113: </a>        {
-</span><span id="114" class="l"><a href="#114">114: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="115" class="l"><a href="#115">115: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
-</span><span id="116" class="l"><a href="#116">116: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'API key was updated'</span>
-</span><span id="117" class="l"><a href="#117">117: </a>            ], REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
-</span><span id="118" class="l"><a href="#118">118: </a>        }
-</span><span id="119" class="l"><a href="#119">119: </a>        <span class="php-keyword1">else</span>
-</span><span id="120" class="l"><a href="#120">120: </a>        {
-</span><span id="121" class="l"><a href="#121">121: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="122" class="l"><a href="#122">122: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="123" class="l"><a href="#123">123: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Could not update the key level'</span>
-</span><span id="124" class="l"><a href="#124">124: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
-</span><span id="125" class="l"><a href="#125">125: </a>        }
-</span><span id="126" class="l"><a href="#126">126: </a>    }
-</span><span id="127" class="l"><a href="#127">127: </a>
-</span><span id="128" class="l"><a href="#128">128: </a>    <span class="php-comment">/**
-</span></span><span id="129" class="l"><a href="#129">129: </a><span class="php-comment">     * Suspend a key
-</span></span><span id="130" class="l"><a href="#130">130: </a><span class="php-comment">     *
-</span></span><span id="131" class="l"><a href="#131">131: </a><span class="php-comment">     * @access public
-</span></span><span id="132" class="l"><a href="#132">132: </a><span class="php-comment">     * @return void
-</span></span><span id="133" class="l"><a href="#133">133: </a><span class="php-comment">     */</span>
-</span><span id="134" class="l"><a href="#134">134: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> suspend_post()
-</span><span id="135" class="l"><a href="#135">135: </a>    {
-</span><span id="136" class="l"><a href="#136">136: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
-</span><span id="137" class="l"><a href="#137">137: </a>
-</span><span id="138" class="l"><a href="#138">138: </a>        <span class="php-comment">// Does this key exist?</span>
-</span><span id="139" class="l"><a href="#139">139: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$this</span>-&gt;_key_exists(<span class="php-var">$key</span>))
-</span><span id="140" class="l"><a href="#140">140: </a>        {
-</span><span id="141" class="l"><a href="#141">141: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
-</span><span id="142" class="l"><a href="#142">142: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="143" class="l"><a href="#143">143: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="144" class="l"><a href="#144">144: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
-</span><span id="145" class="l"><a href="#145">145: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
-</span><span id="146" class="l"><a href="#146">146: </a>        }
-</span><span id="147" class="l"><a href="#147">147: </a>
-</span><span id="148" class="l"><a href="#148">148: </a>        <span class="php-comment">// Update the key level</span>
-</span><span id="149" class="l"><a href="#149">149: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_update_key(<span class="php-var">$key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-num">0</span>]))
-</span><span id="150" class="l"><a href="#150">150: </a>        {
-</span><span id="151" class="l"><a href="#151">151: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="152" class="l"><a href="#152">152: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
-</span><span id="153" class="l"><a href="#153">153: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Key was suspended'</span>
-</span><span id="154" class="l"><a href="#154">154: </a>            ], REST_Controller::HTTP_OK); <span class="php-comment">// OK (200) being the HTTP response code</span>
-</span><span id="155" class="l"><a href="#155">155: </a>        }
-</span><span id="156" class="l"><a href="#156">156: </a>        <span class="php-keyword1">else</span>
-</span><span id="157" class="l"><a href="#157">157: </a>        {
-</span><span id="158" class="l"><a href="#158">158: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="159" class="l"><a href="#159">159: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="160" class="l"><a href="#160">160: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Could not suspend the user'</span>
-</span><span id="161" class="l"><a href="#161">161: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
-</span><span id="162" class="l"><a href="#162">162: </a>        }
-</span><span id="163" class="l"><a href="#163">163: </a>    }
-</span><span id="164" class="l"><a href="#164">164: </a>
-</span><span id="165" class="l"><a href="#165">165: </a>    <span class="php-comment">/**
-</span></span><span id="166" class="l"><a href="#166">166: </a><span class="php-comment">     * Regenerate a key
-</span></span><span id="167" class="l"><a href="#167">167: </a><span class="php-comment">     *
-</span></span><span id="168" class="l"><a href="#168">168: </a><span class="php-comment">     * @access public
-</span></span><span id="169" class="l"><a href="#169">169: </a><span class="php-comment">     * @return void
-</span></span><span id="170" class="l"><a href="#170">170: </a><span class="php-comment">     */</span>
-</span><span id="171" class="l"><a href="#171">171: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> regenerate_post()
-</span><span id="172" class="l"><a href="#172">172: </a>    {
-</span><span id="173" class="l"><a href="#173">173: </a>        <span class="php-var">$old_key</span> = <span class="php-var">$this</span>-&gt;post(<span class="php-quote">'key'</span>);
-</span><span id="174" class="l"><a href="#174">174: </a>        <span class="php-var">$key_details</span> = <span class="php-var">$this</span>-&gt;_get_key(<span class="php-var">$old_key</span>);
-</span><span id="175" class="l"><a href="#175">175: </a>
-</span><span id="176" class="l"><a href="#176">176: </a>        <span class="php-comment">// Does this key exist?</span>
-</span><span id="177" class="l"><a href="#177">177: </a>        <span class="php-keyword1">if</span> (!<span class="php-var">$key_details</span>)
-</span><span id="178" class="l"><a href="#178">178: </a>        {
-</span><span id="179" class="l"><a href="#179">179: </a>            <span class="php-comment">// It doesn't appear the key exists</span>
-</span><span id="180" class="l"><a href="#180">180: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="181" class="l"><a href="#181">181: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="182" class="l"><a href="#182">182: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Invalid API key'</span>
-</span><span id="183" class="l"><a href="#183">183: </a>            ], REST_Controller::HTTP_BAD_REQUEST); <span class="php-comment">// BAD_REQUEST (400) being the HTTP response code</span>
-</span><span id="184" class="l"><a href="#184">184: </a>        }
-</span><span id="185" class="l"><a href="#185">185: </a>
-</span><span id="186" class="l"><a href="#186">186: </a>        <span class="php-comment">// Build a new key</span>
-</span><span id="187" class="l"><a href="#187">187: </a>        <span class="php-var">$new_key</span> = <span class="php-var">$this</span>-&gt;_generate_key();
-</span><span id="188" class="l"><a href="#188">188: </a>
-</span><span id="189" class="l"><a href="#189">189: </a>        <span class="php-comment">// Insert the new key</span>
-</span><span id="190" class="l"><a href="#190">190: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_insert_key(<span class="php-var">$new_key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-var">$key_details</span>-&gt;level, <span class="php-quote">'ignore_limits'</span> =&gt; <span class="php-var">$key_details</span>-&gt;ignore_limits]))
-</span><span id="191" class="l"><a href="#191">191: </a>        {
-</span><span id="192" class="l"><a href="#192">192: </a>            <span class="php-comment">// Suspend old key</span>
-</span><span id="193" class="l"><a href="#193">193: </a>            <span class="php-var">$this</span>-&gt;_update_key(<span class="php-var">$old_key</span>, [<span class="php-quote">'level'</span> =&gt; <span class="php-num">0</span>]);
-</span><span id="194" class="l"><a href="#194">194: </a>
-</span><span id="195" class="l"><a href="#195">195: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="196" class="l"><a href="#196">196: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">TRUE</span>,
-</span><span id="197" class="l"><a href="#197">197: </a>                <span class="php-quote">'key'</span> =&gt; <span class="php-var">$new_key</span>
-</span><span id="198" class="l"><a href="#198">198: </a>            ], REST_Controller::HTTP_CREATED); <span class="php-comment">// CREATED (201) being the HTTP response code</span>
-</span><span id="199" class="l"><a href="#199">199: </a>        }
-</span><span id="200" class="l"><a href="#200">200: </a>        <span class="php-keyword1">else</span>
-</span><span id="201" class="l"><a href="#201">201: </a>        {
-</span><span id="202" class="l"><a href="#202">202: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="203" class="l"><a href="#203">203: </a>                <span class="php-quote">'status'</span> =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="204" class="l"><a href="#204">204: </a>                <span class="php-quote">'message'</span> =&gt; <span class="php-quote">'Could not save the key'</span>
-</span><span id="205" class="l"><a href="#205">205: </a>            ], REST_Controller::HTTP_INTERNAL_SERVER_ERROR); <span class="php-comment">// INTERNAL_SERVER_ERROR (500) being the HTTP response code</span>
-</span><span id="206" class="l"><a href="#206">206: </a>        }
-</span><span id="207" class="l"><a href="#207">207: </a>    }
-</span><span id="208" class="l"><a href="#208">208: </a>
-</span><span id="209" class="l"><a href="#209">209: </a>    <span class="php-comment">/* Helper Methods */</span>
-</span><span id="210" class="l"><a href="#210">210: </a>
-</span><span id="211" class="l"><a href="#211">211: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _generate_key()
-</span><span id="212" class="l"><a href="#212">212: </a>    {
-</span><span id="213" class="l"><a href="#213">213: </a>        <span class="php-keyword1">do</span>
-</span><span id="214" class="l"><a href="#214">214: </a>        {
-</span><span id="215" class="l"><a href="#215">215: </a>            <span class="php-comment">// Generate a random salt</span>
-</span><span id="216" class="l"><a href="#216">216: </a>            <span class="php-var">$salt</span> = <span class="php-keyword2">base_convert</span>(<span class="php-keyword2">bin2hex</span>(<span class="php-var">$this</span>-&gt;security-&gt;get_random_bytes(<span class="php-num">64</span>)), <span class="php-num">16</span>, <span class="php-num">36</span>);
-</span><span id="217" class="l"><a href="#217">217: </a>
-</span><span id="218" class="l"><a href="#218">218: </a>            <span class="php-comment">// If an error occurred, then fall back to the previous method</span>
-</span><span id="219" class="l"><a href="#219">219: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$salt</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="220" class="l"><a href="#220">220: </a>            {
-</span><span id="221" class="l"><a href="#221">221: </a>                <span class="php-var">$salt</span> = <span class="php-keyword2">hash</span>(<span class="php-quote">'sha256'</span>, <span class="php-keyword2">time</span>() . <span class="php-keyword2">mt_rand</span>());
-</span><span id="222" class="l"><a href="#222">222: </a>            }
-</span><span id="223" class="l"><a href="#223">223: </a>
-</span><span id="224" class="l"><a href="#224">224: </a>            <span class="php-var">$new_key</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$salt</span>, <span class="php-num">0</span>, config_item(<span class="php-quote">'rest_key_length'</span>));
-</span><span id="225" class="l"><a href="#225">225: </a>        }
-</span><span id="226" class="l"><a href="#226">226: </a>        <span class="php-keyword1">while</span> (<span class="php-var">$this</span>-&gt;_key_exists(<span class="php-var">$new_key</span>));
-</span><span id="227" class="l"><a href="#227">227: </a>
-</span><span id="228" class="l"><a href="#228">228: </a>        <span class="php-keyword1">return</span> <span class="php-var">$new_key</span>;
-</span><span id="229" class="l"><a href="#229">229: </a>    }
-</span><span id="230" class="l"><a href="#230">230: </a>
-</span><span id="231" class="l"><a href="#231">231: </a>    <span class="php-comment">/* Private Data Methods */</span>
-</span><span id="232" class="l"><a href="#232">232: </a>
-</span><span id="233" class="l"><a href="#233">233: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _get_key(<span class="php-var">$key</span>)
-</span><span id="234" class="l"><a href="#234">234: </a>    {
-</span><span id="235" class="l"><a href="#235">235: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="236" class="l"><a href="#236">236: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
-</span><span id="237" class="l"><a href="#237">237: </a>            -&gt;get(config_item(<span class="php-quote">'rest_keys_table'</span>))
-</span><span id="238" class="l"><a href="#238">238: </a>            -&gt;row();
-</span><span id="239" class="l"><a href="#239">239: </a>    }
-</span><span id="240" class="l"><a href="#240">240: </a>
-</span><span id="241" class="l"><a href="#241">241: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _key_exists(<span class="php-var">$key</span>)
-</span><span id="242" class="l"><a href="#242">242: </a>    {
-</span><span id="243" class="l"><a href="#243">243: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="244" class="l"><a href="#244">244: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
-</span><span id="245" class="l"><a href="#245">245: </a>            -&gt;count_all_results(config_item(<span class="php-quote">'rest_keys_table'</span>)) &gt; <span class="php-num">0</span>;
-</span><span id="246" class="l"><a href="#246">246: </a>    }
-</span><span id="247" class="l"><a href="#247">247: </a>
-</span><span id="248" class="l"><a href="#248">248: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _insert_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
-</span><span id="249" class="l"><a href="#249">249: </a>    {
-</span><span id="250" class="l"><a href="#250">250: </a>        <span class="php-var">$data</span>[config_item(<span class="php-quote">'rest_key_column'</span>)] = <span class="php-var">$key</span>;
-</span><span id="251" class="l"><a href="#251">251: </a>        <span class="php-var">$data</span>[<span class="php-quote">'date_created'</span>] = <span class="php-keyword2">function_exists</span>(<span class="php-quote">'now'</span>) ? now() : <span class="php-keyword2">time</span>();
-</span><span id="252" class="l"><a href="#252">252: </a>
-</span><span id="253" class="l"><a href="#253">253: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="254" class="l"><a href="#254">254: </a>            -&gt;set(<span class="php-var">$data</span>)
-</span><span id="255" class="l"><a href="#255">255: </a>            -&gt;insert(config_item(<span class="php-quote">'rest_keys_table'</span>));
-</span><span id="256" class="l"><a href="#256">256: </a>    }
-</span><span id="257" class="l"><a href="#257">257: </a>
-</span><span id="258" class="l"><a href="#258">258: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _update_key(<span class="php-var">$key</span>, <span class="php-var">$data</span>)
-</span><span id="259" class="l"><a href="#259">259: </a>    {
-</span><span id="260" class="l"><a href="#260">260: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="261" class="l"><a href="#261">261: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
-</span><span id="262" class="l"><a href="#262">262: </a>            -&gt;update(config_item(<span class="php-quote">'rest_keys_table'</span>), <span class="php-var">$data</span>);
-</span><span id="263" class="l"><a href="#263">263: </a>    }
-</span><span id="264" class="l"><a href="#264">264: </a>
-</span><span id="265" class="l"><a href="#265">265: </a>    <span class="php-keyword1">private</span> <span class="php-keyword1">function</span> _delete_key(<span class="php-var">$key</span>)
-</span><span id="266" class="l"><a href="#266">266: </a>    {
-</span><span id="267" class="l"><a href="#267">267: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;db
-</span><span id="268" class="l"><a href="#268">268: </a>            -&gt;where(config_item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)
-</span><span id="269" class="l"><a href="#269">269: </a>            -&gt;<span class="php-keyword2">delete</span>(config_item(<span class="php-quote">'rest_keys_table'</span>));
-</span><span id="270" class="l"><a href="#270">270: </a>    }
-</span><span id="271" class="l"><a href="#271">271: </a>
-</span><span id="272" class="l"><a href="#272">272: </a>}
-</span><span id="273" class="l"><a href="#273">273: </a></span></code></pre>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
-<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
-</body>
-</html>
diff --git a/documentation/source-class-REST_Controller.html b/documentation/source-class-REST_Controller.html
deleted file mode 100644
index cd14e705..00000000
--- a/documentation/source-class-REST_Controller.html
+++ /dev/null
@@ -1,2316 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="robots" content="noindex">
-
-	<title>File libraries/REST_Controller.php</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li><a href="http://github.com/class-Example.html">Example</a></li>
-				<li><a href="http://github.com/class-Format.html">Format</a></li>
-				<li><a href="http://github.com/class-Key.html">Key</a></li>
-				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
-				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
-				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
-			</ul>
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li>
-<span>Package</span>			</li>
-			<li>
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<pre><code><span id="1" class="l"><a href="#1">   1: </a><span class="xlang">&lt;?php</span>
-</span><span id="2" class="l"><a href="#2">   2: </a>
-</span><span id="3" class="l"><a href="#3">   3: </a><span class="php-keyword2">defined</span>(<span class="php-quote">'BASEPATH'</span>) <span class="php-keyword1">OR</span> <span class="php-keyword1">exit</span>(<span class="php-quote">'No direct script access allowed'</span>);
-</span><span id="4" class="l"><a href="#4">   4: </a>
-</span><span id="5" class="l"><a href="#5">   5: </a><span class="php-comment">/**
-</span></span><span id="6" class="l"><a href="#6">   6: </a><span class="php-comment"> * CodeIgniter Rest Controller
-</span></span><span id="7" class="l"><a href="#7">   7: </a><span class="php-comment"> * A fully RESTful server implementation for CodeIgniter using one library, one config file and one controller.
-</span></span><span id="8" class="l"><a href="#8">   8: </a><span class="php-comment"> *
-</span></span><span id="9" class="l"><a href="#9">   9: </a><span class="php-comment"> * @package         CodeIgniter
-</span></span><span id="10" class="l"><a href="#10">  10: </a><span class="php-comment"> * @subpackage      Libraries
-</span></span><span id="11" class="l"><a href="#11">  11: </a><span class="php-comment"> * @category        Libraries
-</span></span><span id="12" class="l"><a href="#12">  12: </a><span class="php-comment"> * @author          Phil Sturgeon, Chris Kacerguis
-</span></span><span id="13" class="l"><a href="#13">  13: </a><span class="php-comment"> * @license         MIT
-</span></span><span id="14" class="l"><a href="#14">  14: </a><span class="php-comment"> * @link            https://github.com/chriskacerguis/codeigniter-restserver
-</span></span><span id="15" class="l"><a href="#15">  15: </a><span class="php-comment"> * @version         3.0.0
-</span></span><span id="16" class="l"><a href="#16">  16: </a><span class="php-comment"> */</span>
-</span><span id="17" class="l"><a href="#17">  17: </a><span class="php-keyword1">abstract</span> <span class="php-keyword1">class</span> REST_Controller <span class="php-keyword1">extends</span> CI_Controller {
-</span><span id="18" class="l"><a href="#18">  18: </a>
-</span><span id="19" class="l"><a href="#19">  19: </a>    <span class="php-comment">// Note: Only the widely used HTTP status codes are documented</span>
-</span><span id="20" class="l"><a href="#20">  20: </a>
-</span><span id="21" class="l"><a href="#21">  21: </a>    <span class="php-comment">// Informational</span>
-</span><span id="22" class="l"><a href="#22">  22: </a>
-</span><span id="23" class="l"><a href="#23">  23: </a>    <span class="php-keyword1">const</span> HTTP_CONTINUE = <span class="php-num">100</span>;
-</span><span id="24" class="l"><a href="#24">  24: </a>    <span class="php-keyword1">const</span> HTTP_SWITCHING_PROTOCOLS = <span class="php-num">101</span>;
-</span><span id="25" class="l"><a href="#25">  25: </a>    <span class="php-keyword1">const</span> HTTP_PROCESSING = <span class="php-num">102</span>;            <span class="php-comment">// RFC2518</span>
-</span><span id="26" class="l"><a href="#26">  26: </a>
-</span><span id="27" class="l"><a href="#27">  27: </a>    <span class="php-comment">// Success</span>
-</span><span id="28" class="l"><a href="#28">  28: </a>
-</span><span id="29" class="l"><a href="#29">  29: </a>    <span class="php-comment">/**
-</span></span><span id="30" class="l"><a href="#30">  30: </a><span class="php-comment">     * The request has succeeded
-</span></span><span id="31" class="l"><a href="#31">  31: </a><span class="php-comment">     */</span>
-</span><span id="32" class="l"><a href="#32">  32: </a>    <span class="php-keyword1">const</span> HTTP_OK = <span class="php-num">200</span>;
-</span><span id="33" class="l"><a href="#33">  33: </a>
-</span><span id="34" class="l"><a href="#34">  34: </a>    <span class="php-comment">/**
-</span></span><span id="35" class="l"><a href="#35">  35: </a><span class="php-comment">     * The server successfully created a new resource
-</span></span><span id="36" class="l"><a href="#36">  36: </a><span class="php-comment">     */</span>
-</span><span id="37" class="l"><a href="#37">  37: </a>    <span class="php-keyword1">const</span> HTTP_CREATED = <span class="php-num">201</span>;
-</span><span id="38" class="l"><a href="#38">  38: </a>    <span class="php-keyword1">const</span> HTTP_ACCEPTED = <span class="php-num">202</span>;
-</span><span id="39" class="l"><a href="#39">  39: </a>    <span class="php-keyword1">const</span> HTTP_NON_AUTHORITATIVE_INFORMATION = <span class="php-num">203</span>;
-</span><span id="40" class="l"><a href="#40">  40: </a>
-</span><span id="41" class="l"><a href="#41">  41: </a>    <span class="php-comment">/**
-</span></span><span id="42" class="l"><a href="#42">  42: </a><span class="php-comment">     * The server successfully processed the request, though no content is returned
-</span></span><span id="43" class="l"><a href="#43">  43: </a><span class="php-comment">     */</span>
-</span><span id="44" class="l"><a href="#44">  44: </a>    <span class="php-keyword1">const</span> HTTP_NO_CONTENT = <span class="php-num">204</span>;
-</span><span id="45" class="l"><a href="#45">  45: </a>    <span class="php-keyword1">const</span> HTTP_RESET_CONTENT = <span class="php-num">205</span>;
-</span><span id="46" class="l"><a href="#46">  46: </a>    <span class="php-keyword1">const</span> HTTP_PARTIAL_CONTENT = <span class="php-num">206</span>;
-</span><span id="47" class="l"><a href="#47">  47: </a>    <span class="php-keyword1">const</span> HTTP_MULTI_STATUS = <span class="php-num">207</span>;          <span class="php-comment">// RFC4918</span>
-</span><span id="48" class="l"><a href="#48">  48: </a>    <span class="php-keyword1">const</span> HTTP_ALREADY_REPORTED = <span class="php-num">208</span>;      <span class="php-comment">// RFC5842</span>
-</span><span id="49" class="l"><a href="#49">  49: </a>    <span class="php-keyword1">const</span> HTTP_IM_USED = <span class="php-num">226</span>;               <span class="php-comment">// RFC3229</span>
-</span><span id="50" class="l"><a href="#50">  50: </a>
-</span><span id="51" class="l"><a href="#51">  51: </a>    <span class="php-comment">// Redirection</span>
-</span><span id="52" class="l"><a href="#52">  52: </a>
-</span><span id="53" class="l"><a href="#53">  53: </a>    <span class="php-keyword1">const</span> HTTP_MULTIPLE_CHOICES = <span class="php-num">300</span>;
-</span><span id="54" class="l"><a href="#54">  54: </a>    <span class="php-keyword1">const</span> HTTP_MOVED_PERMANENTLY = <span class="php-num">301</span>;
-</span><span id="55" class="l"><a href="#55">  55: </a>    <span class="php-keyword1">const</span> HTTP_FOUND = <span class="php-num">302</span>;
-</span><span id="56" class="l"><a href="#56">  56: </a>    <span class="php-keyword1">const</span> HTTP_SEE_OTHER = <span class="php-num">303</span>;
-</span><span id="57" class="l"><a href="#57">  57: </a>
-</span><span id="58" class="l"><a href="#58">  58: </a>    <span class="php-comment">/**
-</span></span><span id="59" class="l"><a href="#59">  59: </a><span class="php-comment">     * The resource has not been modified since the last request
-</span></span><span id="60" class="l"><a href="#60">  60: </a><span class="php-comment">     */</span>
-</span><span id="61" class="l"><a href="#61">  61: </a>    <span class="php-keyword1">const</span> HTTP_NOT_MODIFIED = <span class="php-num">304</span>;
-</span><span id="62" class="l"><a href="#62">  62: </a>    <span class="php-keyword1">const</span> HTTP_USE_PROXY = <span class="php-num">305</span>;
-</span><span id="63" class="l"><a href="#63">  63: </a>    <span class="php-keyword1">const</span> HTTP_RESERVED = <span class="php-num">306</span>;
-</span><span id="64" class="l"><a href="#64">  64: </a>    <span class="php-keyword1">const</span> HTTP_TEMPORARY_REDIRECT = <span class="php-num">307</span>;
-</span><span id="65" class="l"><a href="#65">  65: </a>    <span class="php-keyword1">const</span> HTTP_PERMANENTLY_REDIRECT = <span class="php-num">308</span>;  <span class="php-comment">// RFC7238</span>
-</span><span id="66" class="l"><a href="#66">  66: </a>
-</span><span id="67" class="l"><a href="#67">  67: </a>    <span class="php-comment">// Client Error</span>
-</span><span id="68" class="l"><a href="#68">  68: </a>
-</span><span id="69" class="l"><a href="#69">  69: </a>    <span class="php-comment">/**
-</span></span><span id="70" class="l"><a href="#70">  70: </a><span class="php-comment">     * The request cannot be fulfilled due to multiple errors
-</span></span><span id="71" class="l"><a href="#71">  71: </a><span class="php-comment">     */</span>
-</span><span id="72" class="l"><a href="#72">  72: </a>    <span class="php-keyword1">const</span> HTTP_BAD_REQUEST = <span class="php-num">400</span>;
-</span><span id="73" class="l"><a href="#73">  73: </a>
-</span><span id="74" class="l"><a href="#74">  74: </a>    <span class="php-comment">/**
-</span></span><span id="75" class="l"><a href="#75">  75: </a><span class="php-comment">     * The user is unauthorized to access the requested resource
-</span></span><span id="76" class="l"><a href="#76">  76: </a><span class="php-comment">     */</span>
-</span><span id="77" class="l"><a href="#77">  77: </a>    <span class="php-keyword1">const</span> HTTP_UNAUTHORIZED = <span class="php-num">401</span>;
-</span><span id="78" class="l"><a href="#78">  78: </a>    <span class="php-keyword1">const</span> HTTP_PAYMENT_REQUIRED = <span class="php-num">402</span>;
-</span><span id="79" class="l"><a href="#79">  79: </a>
-</span><span id="80" class="l"><a href="#80">  80: </a>    <span class="php-comment">/**
-</span></span><span id="81" class="l"><a href="#81">  81: </a><span class="php-comment">     * The requested resource is unavailable at this present time
-</span></span><span id="82" class="l"><a href="#82">  82: </a><span class="php-comment">     */</span>
-</span><span id="83" class="l"><a href="#83">  83: </a>    <span class="php-keyword1">const</span> HTTP_FORBIDDEN = <span class="php-num">403</span>;
-</span><span id="84" class="l"><a href="#84">  84: </a>
-</span><span id="85" class="l"><a href="#85">  85: </a>    <span class="php-comment">/**
-</span></span><span id="86" class="l"><a href="#86">  86: </a><span class="php-comment">     * The requested resource could not be found
-</span></span><span id="87" class="l"><a href="#87">  87: </a><span class="php-comment">     *
-</span></span><span id="88" class="l"><a href="#88">  88: </a><span class="php-comment">     * Note: This is sometimes used to mask if there was an UNAUTHORIZED (401) or
-</span></span><span id="89" class="l"><a href="#89">  89: </a><span class="php-comment">     * FORBIDDEN (403) error, for security reasons
-</span></span><span id="90" class="l"><a href="#90">  90: </a><span class="php-comment">     */</span>
-</span><span id="91" class="l"><a href="#91">  91: </a>    <span class="php-keyword1">const</span> HTTP_NOT_FOUND = <span class="php-num">404</span>;
-</span><span id="92" class="l"><a href="#92">  92: </a>
-</span><span id="93" class="l"><a href="#93">  93: </a>    <span class="php-comment">/**
-</span></span><span id="94" class="l"><a href="#94">  94: </a><span class="php-comment">     * The request method is not supported by the following resource
-</span></span><span id="95" class="l"><a href="#95">  95: </a><span class="php-comment">     */</span>
-</span><span id="96" class="l"><a href="#96">  96: </a>    <span class="php-keyword1">const</span> HTTP_METHOD_NOT_ALLOWED = <span class="php-num">405</span>;
-</span><span id="97" class="l"><a href="#97">  97: </a>
-</span><span id="98" class="l"><a href="#98">  98: </a>    <span class="php-comment">/**
-</span></span><span id="99" class="l"><a href="#99">  99: </a><span class="php-comment">     * The request was not acceptable
-</span></span><span id="100" class="l"><a href="#100"> 100: </a><span class="php-comment">     */</span>
-</span><span id="101" class="l"><a href="#101"> 101: </a>    <span class="php-keyword1">const</span> HTTP_NOT_ACCEPTABLE = <span class="php-num">406</span>;
-</span><span id="102" class="l"><a href="#102"> 102: </a>    <span class="php-keyword1">const</span> HTTP_PROXY_AUTHENTICATION_REQUIRED = <span class="php-num">407</span>;
-</span><span id="103" class="l"><a href="#103"> 103: </a>    <span class="php-keyword1">const</span> HTTP_REQUEST_TIMEOUT = <span class="php-num">408</span>;
-</span><span id="104" class="l"><a href="#104"> 104: </a>
-</span><span id="105" class="l"><a href="#105"> 105: </a>    <span class="php-comment">/**
-</span></span><span id="106" class="l"><a href="#106"> 106: </a><span class="php-comment">     * The request could not be completed due to a conflict with the current state
-</span></span><span id="107" class="l"><a href="#107"> 107: </a><span class="php-comment">     * of the resource
-</span></span><span id="108" class="l"><a href="#108"> 108: </a><span class="php-comment">     */</span>
-</span><span id="109" class="l"><a href="#109"> 109: </a>    <span class="php-keyword1">const</span> HTTP_CONFLICT = <span class="php-num">409</span>;
-</span><span id="110" class="l"><a href="#110"> 110: </a>    <span class="php-keyword1">const</span> HTTP_GONE = <span class="php-num">410</span>;
-</span><span id="111" class="l"><a href="#111"> 111: </a>    <span class="php-keyword1">const</span> HTTP_LENGTH_REQUIRED = <span class="php-num">411</span>;
-</span><span id="112" class="l"><a href="#112"> 112: </a>    <span class="php-keyword1">const</span> HTTP_PRECONDITION_FAILED = <span class="php-num">412</span>;
-</span><span id="113" class="l"><a href="#113"> 113: </a>    <span class="php-keyword1">const</span> HTTP_REQUEST_ENTITY_TOO_LARGE = <span class="php-num">413</span>;
-</span><span id="114" class="l"><a href="#114"> 114: </a>    <span class="php-keyword1">const</span> HTTP_REQUEST_URI_TOO_LONG = <span class="php-num">414</span>;
-</span><span id="115" class="l"><a href="#115"> 115: </a>    <span class="php-keyword1">const</span> HTTP_UNSUPPORTED_MEDIA_TYPE = <span class="php-num">415</span>;
-</span><span id="116" class="l"><a href="#116"> 116: </a>    <span class="php-keyword1">const</span> HTTP_REQUESTED_RANGE_NOT_SATISFIABLE = <span class="php-num">416</span>;
-</span><span id="117" class="l"><a href="#117"> 117: </a>    <span class="php-keyword1">const</span> HTTP_EXPECTATION_FAILED = <span class="php-num">417</span>;
-</span><span id="118" class="l"><a href="#118"> 118: </a>    <span class="php-keyword1">const</span> HTTP_I_AM_A_TEAPOT = <span class="php-num">418</span>;                                               <span class="php-comment">// RFC2324</span>
-</span><span id="119" class="l"><a href="#119"> 119: </a>    <span class="php-keyword1">const</span> HTTP_UNPROCESSABLE_ENTITY = <span class="php-num">422</span>;                                        <span class="php-comment">// RFC4918</span>
-</span><span id="120" class="l"><a href="#120"> 120: </a>    <span class="php-keyword1">const</span> HTTP_LOCKED = <span class="php-num">423</span>;                                                      <span class="php-comment">// RFC4918</span>
-</span><span id="121" class="l"><a href="#121"> 121: </a>    <span class="php-keyword1">const</span> HTTP_FAILED_DEPENDENCY = <span class="php-num">424</span>;                                           <span class="php-comment">// RFC4918</span>
-</span><span id="122" class="l"><a href="#122"> 122: </a>    <span class="php-keyword1">const</span> HTTP_RESERVED_FOR_WEBDAV_ADVANCED_COLLECTIONS_EXPIRED_PROPOSAL = <span class="php-num">425</span>;   <span class="php-comment">// RFC2817</span>
-</span><span id="123" class="l"><a href="#123"> 123: </a>    <span class="php-keyword1">const</span> HTTP_UPGRADE_REQUIRED = <span class="php-num">426</span>;                                            <span class="php-comment">// RFC2817</span>
-</span><span id="124" class="l"><a href="#124"> 124: </a>    <span class="php-keyword1">const</span> HTTP_PRECONDITION_REQUIRED = <span class="php-num">428</span>;                                       <span class="php-comment">// RFC6585</span>
-</span><span id="125" class="l"><a href="#125"> 125: </a>    <span class="php-keyword1">const</span> HTTP_TOO_MANY_REQUESTS = <span class="php-num">429</span>;                                           <span class="php-comment">// RFC6585</span>
-</span><span id="126" class="l"><a href="#126"> 126: </a>    <span class="php-keyword1">const</span> HTTP_REQUEST_HEADER_FIELDS_TOO_LARGE = <span class="php-num">431</span>;                             <span class="php-comment">// RFC6585</span>
-</span><span id="127" class="l"><a href="#127"> 127: </a>
-</span><span id="128" class="l"><a href="#128"> 128: </a>    <span class="php-comment">// Server Error</span>
-</span><span id="129" class="l"><a href="#129"> 129: </a>
-</span><span id="130" class="l"><a href="#130"> 130: </a>    <span class="php-comment">/**
-</span></span><span id="131" class="l"><a href="#131"> 131: </a><span class="php-comment">     * The server encountered an unexpected error
-</span></span><span id="132" class="l"><a href="#132"> 132: </a><span class="php-comment">     *
-</span></span><span id="133" class="l"><a href="#133"> 133: </a><span class="php-comment">     * Note: This is a generic error message when no specific message
-</span></span><span id="134" class="l"><a href="#134"> 134: </a><span class="php-comment">     * is suitable
-</span></span><span id="135" class="l"><a href="#135"> 135: </a><span class="php-comment">     */</span>
-</span><span id="136" class="l"><a href="#136"> 136: </a>    <span class="php-keyword1">const</span> HTTP_INTERNAL_SERVER_ERROR = <span class="php-num">500</span>;
-</span><span id="137" class="l"><a href="#137"> 137: </a>
-</span><span id="138" class="l"><a href="#138"> 138: </a>    <span class="php-comment">/**
-</span></span><span id="139" class="l"><a href="#139"> 139: </a><span class="php-comment">     * The server does not recognise the request method
-</span></span><span id="140" class="l"><a href="#140"> 140: </a><span class="php-comment">     */</span>
-</span><span id="141" class="l"><a href="#141"> 141: </a>    <span class="php-keyword1">const</span> HTTP_NOT_IMPLEMENTED = <span class="php-num">501</span>;
-</span><span id="142" class="l"><a href="#142"> 142: </a>    <span class="php-keyword1">const</span> HTTP_BAD_GATEWAY = <span class="php-num">502</span>;
-</span><span id="143" class="l"><a href="#143"> 143: </a>    <span class="php-keyword1">const</span> HTTP_SERVICE_UNAVAILABLE = <span class="php-num">503</span>;
-</span><span id="144" class="l"><a href="#144"> 144: </a>    <span class="php-keyword1">const</span> HTTP_GATEWAY_TIMEOUT = <span class="php-num">504</span>;
-</span><span id="145" class="l"><a href="#145"> 145: </a>    <span class="php-keyword1">const</span> HTTP_VERSION_NOT_SUPPORTED = <span class="php-num">505</span>;
-</span><span id="146" class="l"><a href="#146"> 146: </a>    <span class="php-keyword1">const</span> HTTP_VARIANT_ALSO_NEGOTIATES_EXPERIMENTAL = <span class="php-num">506</span>;                        <span class="php-comment">// RFC2295</span>
-</span><span id="147" class="l"><a href="#147"> 147: </a>    <span class="php-keyword1">const</span> HTTP_INSUFFICIENT_STORAGE = <span class="php-num">507</span>;                                        <span class="php-comment">// RFC4918</span>
-</span><span id="148" class="l"><a href="#148"> 148: </a>    <span class="php-keyword1">const</span> HTTP_LOOP_DETECTED = <span class="php-num">508</span>;                                               <span class="php-comment">// RFC5842</span>
-</span><span id="149" class="l"><a href="#149"> 149: </a>    <span class="php-keyword1">const</span> HTTP_NOT_EXTENDED = <span class="php-num">510</span>;                                                <span class="php-comment">// RFC2774</span>
-</span><span id="150" class="l"><a href="#150"> 150: </a>    <span class="php-keyword1">const</span> HTTP_NETWORK_AUTHENTICATION_REQUIRED = <span class="php-num">511</span>;
-</span><span id="151" class="l"><a href="#151"> 151: </a>
-</span><span id="152" class="l"><a href="#152"> 152: </a>    <span class="php-comment">/**
-</span></span><span id="153" class="l"><a href="#153"> 153: </a><span class="php-comment">     * This defines the rest format
-</span></span><span id="154" class="l"><a href="#154"> 154: </a><span class="php-comment">     * Must be overridden it in a controller so that it is set
-</span></span><span id="155" class="l"><a href="#155"> 155: </a><span class="php-comment">     *
-</span></span><span id="156" class="l"><a href="#156"> 156: </a><span class="php-comment">     * @var string|NULL
-</span></span><span id="157" class="l"><a href="#157"> 157: </a><span class="php-comment">     */</span>
-</span><span id="158" class="l"><a href="#158"> 158: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$rest_format</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="159" class="l"><a href="#159"> 159: </a>
-</span><span id="160" class="l"><a href="#160"> 160: </a>    <span class="php-comment">/**
-</span></span><span id="161" class="l"><a href="#161"> 161: </a><span class="php-comment">     * Defines the list of method properties such as limit, log and level
-</span></span><span id="162" class="l"><a href="#162"> 162: </a><span class="php-comment">     *
-</span></span><span id="163" class="l"><a href="#163"> 163: </a><span class="php-comment">     * @var array
-</span></span><span id="164" class="l"><a href="#164"> 164: </a><span class="php-comment">     */</span>
-</span><span id="165" class="l"><a href="#165"> 165: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$methods</span> = [];
-</span><span id="166" class="l"><a href="#166"> 166: </a>
-</span><span id="167" class="l"><a href="#167"> 167: </a>    <span class="php-comment">/**
-</span></span><span id="168" class="l"><a href="#168"> 168: </a><span class="php-comment">     * List of allowed HTTP methods
-</span></span><span id="169" class="l"><a href="#169"> 169: </a><span class="php-comment">     *
-</span></span><span id="170" class="l"><a href="#170"> 170: </a><span class="php-comment">     * @var array
-</span></span><span id="171" class="l"><a href="#171"> 171: </a><span class="php-comment">     */</span>
-</span><span id="172" class="l"><a href="#172"> 172: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$allowed_http_methods</span> = [<span class="php-quote">'get'</span>, <span class="php-quote">'delete'</span>, <span class="php-quote">'post'</span>, <span class="php-quote">'put'</span>, <span class="php-quote">'options'</span>, <span class="php-quote">'patch'</span>, <span class="php-quote">'head'</span>];
-</span><span id="173" class="l"><a href="#173"> 173: </a>
-</span><span id="174" class="l"><a href="#174"> 174: </a>    <span class="php-comment">/**
-</span></span><span id="175" class="l"><a href="#175"> 175: </a><span class="php-comment">     * Contains details about the request
-</span></span><span id="176" class="l"><a href="#176"> 176: </a><span class="php-comment">     * Fields: body, format, method, ssl
-</span></span><span id="177" class="l"><a href="#177"> 177: </a><span class="php-comment">     * Note: This is a dynamic object (stdClass)
-</span></span><span id="178" class="l"><a href="#178"> 178: </a><span class="php-comment">     *
-</span></span><span id="179" class="l"><a href="#179"> 179: </a><span class="php-comment">     * @var object
-</span></span><span id="180" class="l"><a href="#180"> 180: </a><span class="php-comment">     */</span>
-</span><span id="181" class="l"><a href="#181"> 181: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$request</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="182" class="l"><a href="#182"> 182: </a>
-</span><span id="183" class="l"><a href="#183"> 183: </a>    <span class="php-comment">/**
-</span></span><span id="184" class="l"><a href="#184"> 184: </a><span class="php-comment">     * Contains details about the response
-</span></span><span id="185" class="l"><a href="#185"> 185: </a><span class="php-comment">     * Fields: format, lang
-</span></span><span id="186" class="l"><a href="#186"> 186: </a><span class="php-comment">     * Note: This is a dynamic object (stdClass)
-</span></span><span id="187" class="l"><a href="#187"> 187: </a><span class="php-comment">     *
-</span></span><span id="188" class="l"><a href="#188"> 188: </a><span class="php-comment">     * @var object
-</span></span><span id="189" class="l"><a href="#189"> 189: </a><span class="php-comment">     */</span>
-</span><span id="190" class="l"><a href="#190"> 190: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$response</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="191" class="l"><a href="#191"> 191: </a>
-</span><span id="192" class="l"><a href="#192"> 192: </a>    <span class="php-comment">/**
-</span></span><span id="193" class="l"><a href="#193"> 193: </a><span class="php-comment">     * Contains details about the REST API
-</span></span><span id="194" class="l"><a href="#194"> 194: </a><span class="php-comment">     * Fields: db, ignore_limits, key, level, user_id
-</span></span><span id="195" class="l"><a href="#195"> 195: </a><span class="php-comment">     * Note: This is a dynamic object (stdClass)
-</span></span><span id="196" class="l"><a href="#196"> 196: </a><span class="php-comment">     *
-</span></span><span id="197" class="l"><a href="#197"> 197: </a><span class="php-comment">     * @var object
-</span></span><span id="198" class="l"><a href="#198"> 198: </a><span class="php-comment">     */</span>
-</span><span id="199" class="l"><a href="#199"> 199: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$rest</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="200" class="l"><a href="#200"> 200: </a>
-</span><span id="201" class="l"><a href="#201"> 201: </a>    <span class="php-comment">/**
-</span></span><span id="202" class="l"><a href="#202"> 202: </a><span class="php-comment">     * The arguments for the GET request method
-</span></span><span id="203" class="l"><a href="#203"> 203: </a><span class="php-comment">     *
-</span></span><span id="204" class="l"><a href="#204"> 204: </a><span class="php-comment">     * @var array
-</span></span><span id="205" class="l"><a href="#205"> 205: </a><span class="php-comment">     */</span>
-</span><span id="206" class="l"><a href="#206"> 206: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_get_args</span> = [];
-</span><span id="207" class="l"><a href="#207"> 207: </a>
-</span><span id="208" class="l"><a href="#208"> 208: </a>    <span class="php-comment">/**
-</span></span><span id="209" class="l"><a href="#209"> 209: </a><span class="php-comment">     * The arguments for the POST request method
-</span></span><span id="210" class="l"><a href="#210"> 210: </a><span class="php-comment">     *
-</span></span><span id="211" class="l"><a href="#211"> 211: </a><span class="php-comment">     * @var array
-</span></span><span id="212" class="l"><a href="#212"> 212: </a><span class="php-comment">     */</span>
-</span><span id="213" class="l"><a href="#213"> 213: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_post_args</span> = [];
-</span><span id="214" class="l"><a href="#214"> 214: </a>
-</span><span id="215" class="l"><a href="#215"> 215: </a>    <span class="php-comment">/**
-</span></span><span id="216" class="l"><a href="#216"> 216: </a><span class="php-comment">     * The arguments for the PUT request method
-</span></span><span id="217" class="l"><a href="#217"> 217: </a><span class="php-comment">     *
-</span></span><span id="218" class="l"><a href="#218"> 218: </a><span class="php-comment">     * @var array
-</span></span><span id="219" class="l"><a href="#219"> 219: </a><span class="php-comment">     */</span>
-</span><span id="220" class="l"><a href="#220"> 220: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_put_args</span> = [];
-</span><span id="221" class="l"><a href="#221"> 221: </a>
-</span><span id="222" class="l"><a href="#222"> 222: </a>    <span class="php-comment">/**
-</span></span><span id="223" class="l"><a href="#223"> 223: </a><span class="php-comment">     * The arguments for the DELETE request method
-</span></span><span id="224" class="l"><a href="#224"> 224: </a><span class="php-comment">     *
-</span></span><span id="225" class="l"><a href="#225"> 225: </a><span class="php-comment">     * @var array
-</span></span><span id="226" class="l"><a href="#226"> 226: </a><span class="php-comment">     */</span>
-</span><span id="227" class="l"><a href="#227"> 227: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_delete_args</span> = [];
-</span><span id="228" class="l"><a href="#228"> 228: </a>
-</span><span id="229" class="l"><a href="#229"> 229: </a>    <span class="php-comment">/**
-</span></span><span id="230" class="l"><a href="#230"> 230: </a><span class="php-comment">     * The arguments for the PATCH request method
-</span></span><span id="231" class="l"><a href="#231"> 231: </a><span class="php-comment">     *
-</span></span><span id="232" class="l"><a href="#232"> 232: </a><span class="php-comment">     * @var array
-</span></span><span id="233" class="l"><a href="#233"> 233: </a><span class="php-comment">     */</span>
-</span><span id="234" class="l"><a href="#234"> 234: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_patch_args</span> = [];
-</span><span id="235" class="l"><a href="#235"> 235: </a>
-</span><span id="236" class="l"><a href="#236"> 236: </a>    <span class="php-comment">/**
-</span></span><span id="237" class="l"><a href="#237"> 237: </a><span class="php-comment">     * The arguments for the HEAD request method
-</span></span><span id="238" class="l"><a href="#238"> 238: </a><span class="php-comment">     *
-</span></span><span id="239" class="l"><a href="#239"> 239: </a><span class="php-comment">     * @var array
-</span></span><span id="240" class="l"><a href="#240"> 240: </a><span class="php-comment">     */</span>
-</span><span id="241" class="l"><a href="#241"> 241: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_head_args</span> = [];
-</span><span id="242" class="l"><a href="#242"> 242: </a>
-</span><span id="243" class="l"><a href="#243"> 243: </a>    <span class="php-comment">/**
-</span></span><span id="244" class="l"><a href="#244"> 244: </a><span class="php-comment">     * The arguments for the OPTIONS request method
-</span></span><span id="245" class="l"><a href="#245"> 245: </a><span class="php-comment">     *
-</span></span><span id="246" class="l"><a href="#246"> 246: </a><span class="php-comment">     * @var array
-</span></span><span id="247" class="l"><a href="#247"> 247: </a><span class="php-comment">     */</span>
-</span><span id="248" class="l"><a href="#248"> 248: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_options_args</span> = [];
-</span><span id="249" class="l"><a href="#249"> 249: </a>
-</span><span id="250" class="l"><a href="#250"> 250: </a>    <span class="php-comment">/**
-</span></span><span id="251" class="l"><a href="#251"> 251: </a><span class="php-comment">     * The arguments for the query parameters
-</span></span><span id="252" class="l"><a href="#252"> 252: </a><span class="php-comment">     *
-</span></span><span id="253" class="l"><a href="#253"> 253: </a><span class="php-comment">     * @var array
-</span></span><span id="254" class="l"><a href="#254"> 254: </a><span class="php-comment">     */</span>
-</span><span id="255" class="l"><a href="#255"> 255: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_query_args</span> = [];
-</span><span id="256" class="l"><a href="#256"> 256: </a>
-</span><span id="257" class="l"><a href="#257"> 257: </a>    <span class="php-comment">/**
-</span></span><span id="258" class="l"><a href="#258"> 258: </a><span class="php-comment">     * The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined
-</span></span><span id="259" class="l"><a href="#259"> 259: </a><span class="php-comment">     *
-</span></span><span id="260" class="l"><a href="#260"> 260: </a><span class="php-comment">     * @var array
-</span></span><span id="261" class="l"><a href="#261"> 261: </a><span class="php-comment">     */</span>
-</span><span id="262" class="l"><a href="#262"> 262: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_args</span> = [];
-</span><span id="263" class="l"><a href="#263"> 263: </a>
-</span><span id="264" class="l"><a href="#264"> 264: </a>    <span class="php-comment">/**
-</span></span><span id="265" class="l"><a href="#265"> 265: </a><span class="php-comment">     * The insert_id of the log entry (if we have one)
-</span></span><span id="266" class="l"><a href="#266"> 266: </a><span class="php-comment">     *
-</span></span><span id="267" class="l"><a href="#267"> 267: </a><span class="php-comment">     * @var string
-</span></span><span id="268" class="l"><a href="#268"> 268: </a><span class="php-comment">     */</span>
-</span><span id="269" class="l"><a href="#269"> 269: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_insert_id</span> = <span class="php-quote">''</span>;
-</span><span id="270" class="l"><a href="#270"> 270: </a>
-</span><span id="271" class="l"><a href="#271"> 271: </a>    <span class="php-comment">/**
-</span></span><span id="272" class="l"><a href="#272"> 272: </a><span class="php-comment">     * If the request is allowed based on the API key provided
-</span></span><span id="273" class="l"><a href="#273"> 273: </a><span class="php-comment">     *
-</span></span><span id="274" class="l"><a href="#274"> 274: </a><span class="php-comment">     * @var bool
-</span></span><span id="275" class="l"><a href="#275"> 275: </a><span class="php-comment">     */</span>
-</span><span id="276" class="l"><a href="#276"> 276: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_allow</span> = <span class="php-keyword1">TRUE</span>;
-</span><span id="277" class="l"><a href="#277"> 277: </a>
-</span><span id="278" class="l"><a href="#278"> 278: </a>    <span class="php-comment">/**
-</span></span><span id="279" class="l"><a href="#279"> 279: </a><span class="php-comment">     * The LDAP Distinguished Name of the User post authentication
-</span></span><span id="280" class="l"><a href="#280"> 280: </a><span class="php-comment">     *
-</span></span><span id="281" class="l"><a href="#281"> 281: </a><span class="php-comment">     * @var string
-</span></span><span id="282" class="l"><a href="#282"> 282: </a><span class="php-comment">     */</span>
-</span><span id="283" class="l"><a href="#283"> 283: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_user_ldap_dn</span> = <span class="php-quote">''</span>;
-</span><span id="284" class="l"><a href="#284"> 284: </a>
-</span><span id="285" class="l"><a href="#285"> 285: </a>    <span class="php-comment">/**
-</span></span><span id="286" class="l"><a href="#286"> 286: </a><span class="php-comment">     * The start of the response time from the server
-</span></span><span id="287" class="l"><a href="#287"> 287: </a><span class="php-comment">     *
-</span></span><span id="288" class="l"><a href="#288"> 288: </a><span class="php-comment">     * @var string
-</span></span><span id="289" class="l"><a href="#289"> 289: </a><span class="php-comment">     */</span>
-</span><span id="290" class="l"><a href="#290"> 290: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_start_rtime</span> = <span class="php-quote">''</span>;
-</span><span id="291" class="l"><a href="#291"> 291: </a>
-</span><span id="292" class="l"><a href="#292"> 292: </a>    <span class="php-comment">/**
-</span></span><span id="293" class="l"><a href="#293"> 293: </a><span class="php-comment">     * The end of the response time from the server
-</span></span><span id="294" class="l"><a href="#294"> 294: </a><span class="php-comment">     *
-</span></span><span id="295" class="l"><a href="#295"> 295: </a><span class="php-comment">     * @var string
-</span></span><span id="296" class="l"><a href="#296"> 296: </a><span class="php-comment">     */</span>
-</span><span id="297" class="l"><a href="#297"> 297: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_end_rtime</span> = <span class="php-quote">''</span>;
-</span><span id="298" class="l"><a href="#298"> 298: </a>
-</span><span id="299" class="l"><a href="#299"> 299: </a>    <span class="php-comment">/**
-</span></span><span id="300" class="l"><a href="#300"> 300: </a><span class="php-comment">     * List all supported methods, the first will be the default format
-</span></span><span id="301" class="l"><a href="#301"> 301: </a><span class="php-comment">     *
-</span></span><span id="302" class="l"><a href="#302"> 302: </a><span class="php-comment">     * @var array
-</span></span><span id="303" class="l"><a href="#303"> 303: </a><span class="php-comment">     */</span>
-</span><span id="304" class="l"><a href="#304"> 304: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_supported_formats</span> = [
-</span><span id="305" class="l"><a href="#305"> 305: </a>            <span class="php-quote">'json'</span> =&gt; <span class="php-quote">'application/json'</span>,
-</span><span id="306" class="l"><a href="#306"> 306: </a>            <span class="php-quote">'array'</span> =&gt; <span class="php-quote">'application/json'</span>,
-</span><span id="307" class="l"><a href="#307"> 307: </a>            <span class="php-quote">'csv'</span> =&gt; <span class="php-quote">'application/csv'</span>,
-</span><span id="308" class="l"><a href="#308"> 308: </a>            <span class="php-quote">'html'</span> =&gt; <span class="php-quote">'text/html'</span>,
-</span><span id="309" class="l"><a href="#309"> 309: </a>            <span class="php-quote">'jsonp'</span> =&gt; <span class="php-quote">'application/javascript'</span>,
-</span><span id="310" class="l"><a href="#310"> 310: </a>            <span class="php-quote">'php'</span> =&gt; <span class="php-quote">'text/plain'</span>,
-</span><span id="311" class="l"><a href="#311"> 311: </a>            <span class="php-quote">'serialized'</span> =&gt; <span class="php-quote">'application/vnd.php.serialized'</span>,
-</span><span id="312" class="l"><a href="#312"> 312: </a>            <span class="php-quote">'xml'</span> =&gt; <span class="php-quote">'application/xml'</span>
-</span><span id="313" class="l"><a href="#313"> 313: </a>        ];
-</span><span id="314" class="l"><a href="#314"> 314: </a>
-</span><span id="315" class="l"><a href="#315"> 315: </a>    <span class="php-comment">/**
-</span></span><span id="316" class="l"><a href="#316"> 316: </a><span class="php-comment">     * Information about the current API user
-</span></span><span id="317" class="l"><a href="#317"> 317: </a><span class="php-comment">     *
-</span></span><span id="318" class="l"><a href="#318"> 318: </a><span class="php-comment">     * @var object
-</span></span><span id="319" class="l"><a href="#319"> 319: </a><span class="php-comment">     */</span>
-</span><span id="320" class="l"><a href="#320"> 320: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_apiuser</span>;
-</span><span id="321" class="l"><a href="#321"> 321: </a>
-</span><span id="322" class="l"><a href="#322"> 322: </a>    <span class="php-comment">/**
-</span></span><span id="323" class="l"><a href="#323"> 323: </a><span class="php-comment">     * Whether or not to perform a CORS check and apply CORS headers to the request
-</span></span><span id="324" class="l"><a href="#324"> 324: </a><span class="php-comment">     *
-</span></span><span id="325" class="l"><a href="#325"> 325: </a><span class="php-comment">     * @var bool
-</span></span><span id="326" class="l"><a href="#326"> 326: </a><span class="php-comment">     */</span>
-</span><span id="327" class="l"><a href="#327"> 327: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$check_cors</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="328" class="l"><a href="#328"> 328: </a>
-</span><span id="329" class="l"><a href="#329"> 329: </a>    <span class="php-comment">/**
-</span></span><span id="330" class="l"><a href="#330"> 330: </a><span class="php-comment">     * Enable XSS flag
-</span></span><span id="331" class="l"><a href="#331"> 331: </a><span class="php-comment">     * Determines whether the XSS filter is always active when
-</span></span><span id="332" class="l"><a href="#332"> 332: </a><span class="php-comment">     * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered
-</span></span><span id="333" class="l"><a href="#333"> 333: </a><span class="php-comment">     * Set automatically based on config setting
-</span></span><span id="334" class="l"><a href="#334"> 334: </a><span class="php-comment">     *
-</span></span><span id="335" class="l"><a href="#335"> 335: </a><span class="php-comment">     * @var bool
-</span></span><span id="336" class="l"><a href="#336"> 336: </a><span class="php-comment">     */</span>
-</span><span id="337" class="l"><a href="#337"> 337: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$_enable_xss</span> = <span class="php-keyword1">FALSE</span>;
-</span><span id="338" class="l"><a href="#338"> 338: </a>
-</span><span id="339" class="l"><a href="#339"> 339: </a>    <span class="php-comment">/**
-</span></span><span id="340" class="l"><a href="#340"> 340: </a><span class="php-comment">     * HTTP status codes and their respective description
-</span></span><span id="341" class="l"><a href="#341"> 341: </a><span class="php-comment">     * Note: Only the widely used HTTP status codes are used
-</span></span><span id="342" class="l"><a href="#342"> 342: </a><span class="php-comment">     *
-</span></span><span id="343" class="l"><a href="#343"> 343: </a><span class="php-comment">     * @var array
-</span></span><span id="344" class="l"><a href="#344"> 344: </a><span class="php-comment">     * @link http://www.restapitutorial.com/httpstatuscodes.html
-</span></span><span id="345" class="l"><a href="#345"> 345: </a><span class="php-comment">     */</span>
-</span><span id="346" class="l"><a href="#346"> 346: </a>    <span class="php-keyword1">protected</span> <span class="php-var">$http_status_codes</span> = [
-</span><span id="347" class="l"><a href="#347"> 347: </a>        self::HTTP_OK =&gt; <span class="php-quote">'OK'</span>,
-</span><span id="348" class="l"><a href="#348"> 348: </a>        self::HTTP_CREATED =&gt; <span class="php-quote">'CREATED'</span>,
-</span><span id="349" class="l"><a href="#349"> 349: </a>        self::HTTP_NO_CONTENT =&gt; <span class="php-quote">'NO CONTENT'</span>,
-</span><span id="350" class="l"><a href="#350"> 350: </a>        self::HTTP_NOT_MODIFIED =&gt; <span class="php-quote">'NOT MODIFIED'</span>,
-</span><span id="351" class="l"><a href="#351"> 351: </a>        self::HTTP_BAD_REQUEST =&gt; <span class="php-quote">'BAD REQUEST'</span>,
-</span><span id="352" class="l"><a href="#352"> 352: </a>        self::HTTP_UNAUTHORIZED =&gt; <span class="php-quote">'UNAUTHORIZED'</span>,
-</span><span id="353" class="l"><a href="#353"> 353: </a>        self::HTTP_FORBIDDEN =&gt; <span class="php-quote">'FORBIDDEN'</span>,
-</span><span id="354" class="l"><a href="#354"> 354: </a>        self::HTTP_NOT_FOUND =&gt; <span class="php-quote">'NOT FOUND'</span>,
-</span><span id="355" class="l"><a href="#355"> 355: </a>        self::HTTP_METHOD_NOT_ALLOWED =&gt; <span class="php-quote">'METHOD NOT ALLOWED'</span>,
-</span><span id="356" class="l"><a href="#356"> 356: </a>        self::HTTP_NOT_ACCEPTABLE =&gt; <span class="php-quote">'NOT ACCEPTABLE'</span>,
-</span><span id="357" class="l"><a href="#357"> 357: </a>        self::HTTP_CONFLICT =&gt; <span class="php-quote">'CONFLICT'</span>,
-</span><span id="358" class="l"><a href="#358"> 358: </a>        self::HTTP_INTERNAL_SERVER_ERROR =&gt; <span class="php-quote">'INTERNAL SERVER ERROR'</span>,
-</span><span id="359" class="l"><a href="#359"> 359: </a>        self::HTTP_NOT_IMPLEMENTED =&gt; <span class="php-quote">'NOT IMPLEMENTED'</span>
-</span><span id="360" class="l"><a href="#360"> 360: </a>    ];
-</span><span id="361" class="l"><a href="#361"> 361: </a>
-</span><span id="362" class="l"><a href="#362"> 362: </a>    <span class="php-comment">/**
-</span></span><span id="363" class="l"><a href="#363"> 363: </a><span class="php-comment">     * Extend this function to apply additional checking early on in the process
-</span></span><span id="364" class="l"><a href="#364"> 364: </a><span class="php-comment">     *
-</span></span><span id="365" class="l"><a href="#365"> 365: </a><span class="php-comment">     * @access protected
-</span></span><span id="366" class="l"><a href="#366"> 366: </a><span class="php-comment">     * @return void
-</span></span><span id="367" class="l"><a href="#367"> 367: </a><span class="php-comment">     */</span>
-</span><span id="368" class="l"><a href="#368"> 368: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> early_checks()
-</span><span id="369" class="l"><a href="#369"> 369: </a>    {
-</span><span id="370" class="l"><a href="#370"> 370: </a>    }
-</span><span id="371" class="l"><a href="#371"> 371: </a>
-</span><span id="372" class="l"><a href="#372"> 372: </a>    <span class="php-comment">/**
-</span></span><span id="373" class="l"><a href="#373"> 373: </a><span class="php-comment">     * Constructor for the REST API
-</span></span><span id="374" class="l"><a href="#374"> 374: </a><span class="php-comment">     *
-</span></span><span id="375" class="l"><a href="#375"> 375: </a><span class="php-comment">     * @access public
-</span></span><span id="376" class="l"><a href="#376"> 376: </a><span class="php-comment">     * @param string $config Configuration filename minus the file extension
-</span></span><span id="377" class="l"><a href="#377"> 377: </a><span class="php-comment">     * e.g: my_rest.php is passed as 'my_rest'
-</span></span><span id="378" class="l"><a href="#378"> 378: </a><span class="php-comment">     * @return void
-</span></span><span id="379" class="l"><a href="#379"> 379: </a><span class="php-comment">     */</span>
-</span><span id="380" class="l"><a href="#380"> 380: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __construct(<span class="php-var">$config</span> = <span class="php-quote">'rest'</span>)
-</span><span id="381" class="l"><a href="#381"> 381: </a>    {
-</span><span id="382" class="l"><a href="#382"> 382: </a>        parent::__construct();
-</span><span id="383" class="l"><a href="#383"> 383: </a>
-</span><span id="384" class="l"><a href="#384"> 384: </a>        <span class="php-comment">// Disable XML Entity (security vulnerability)</span>
-</span><span id="385" class="l"><a href="#385"> 385: </a>        <span class="php-keyword2">libxml_disable_entity_loader</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="386" class="l"><a href="#386"> 386: </a>
-</span><span id="387" class="l"><a href="#387"> 387: </a>        <span class="php-comment">// Check to see if PHP is equal to or greater than 5.4.x</span>
-</span><span id="388" class="l"><a href="#388"> 388: </a>        <span class="php-keyword1">if</span> (is_php(<span class="php-quote">'5.4'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="389" class="l"><a href="#389"> 389: </a>        {
-</span><span id="390" class="l"><a href="#390"> 390: </a>            <span class="php-comment">// CodeIgniter 3 is recommended for v5.4 or above</span>
-</span><span id="391" class="l"><a href="#391"> 391: </a>            <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'Using PHP v'</span>.PHP_VERSION.<span class="php-quote">', though PHP v5.4 or greater is required'</span>);
-</span><span id="392" class="l"><a href="#392"> 392: </a>        }
-</span><span id="393" class="l"><a href="#393"> 393: </a>
-</span><span id="394" class="l"><a href="#394"> 394: </a>        <span class="php-comment">// Check to see if this is CI 3.x</span>
-</span><span id="395" class="l"><a href="#395"> 395: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">explode</span>(<span class="php-quote">'.'</span>, CI_VERSION, <span class="php-num">2</span>)[<span class="php-num">0</span>] &lt; <span class="php-num">3</span>)
-</span><span id="396" class="l"><a href="#396"> 396: </a>        {
-</span><span id="397" class="l"><a href="#397"> 397: </a>            <span class="php-keyword1">throw</span> <span class="php-keyword1">new</span> Exception(<span class="php-quote">'REST Server requires CodeIgniter 3.x'</span>);
-</span><span id="398" class="l"><a href="#398"> 398: </a>        }
-</span><span id="399" class="l"><a href="#399"> 399: </a>
-</span><span id="400" class="l"><a href="#400"> 400: </a>        <span class="php-comment">// Set the default value of global xss filtering. Same approach as CodeIgniter 3</span>
-</span><span id="401" class="l"><a href="#401"> 401: </a>        <span class="php-var">$this</span>-&gt;_enable_xss = (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'global_xss_filtering'</span>) === <span class="php-keyword1">TRUE</span>);
-</span><span id="402" class="l"><a href="#402"> 402: </a>
-</span><span id="403" class="l"><a href="#403"> 403: </a>        <span class="php-comment">// Don't try to parse template variables like {elapsed_time} and {memory_usage}</span>
-</span><span id="404" class="l"><a href="#404"> 404: </a>        <span class="php-comment">// when output is displayed for not damaging data accidentally</span>
-</span><span id="405" class="l"><a href="#405"> 405: </a>        <span class="php-var">$this</span>-&gt;output-&gt;parse_exec_vars = <span class="php-keyword1">FALSE</span>;
-</span><span id="406" class="l"><a href="#406"> 406: </a>
-</span><span id="407" class="l"><a href="#407"> 407: </a>        <span class="php-comment">// Start the timer for how long the request takes</span>
-</span><span id="408" class="l"><a href="#408"> 408: </a>        <span class="php-var">$this</span>-&gt;_start_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="409" class="l"><a href="#409"> 409: </a>
-</span><span id="410" class="l"><a href="#410"> 410: </a>        <span class="php-comment">// Load the rest.php configuration file</span>
-</span><span id="411" class="l"><a href="#411"> 411: </a>        <span class="php-var">$this</span>-&gt;load-&gt;config(<span class="php-var">$config</span>);
-</span><span id="412" class="l"><a href="#412"> 412: </a>
-</span><span id="413" class="l"><a href="#413"> 413: </a>        <span class="php-comment">// At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)</span>
-</span><span id="414" class="l"><a href="#414"> 414: </a>        <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-quote">'format'</span>);
-</span><span id="415" class="l"><a href="#415"> 415: </a>
-</span><span id="416" class="l"><a href="#416"> 416: </a>        <span class="php-comment">// Determine supported output formats from configuration</span>
-</span><span id="417" class="l"><a href="#417"> 417: </a>        <span class="php-var">$supported_formats</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_supported_formats'</span>);
-</span><span id="418" class="l"><a href="#418"> 418: </a>
-</span><span id="419" class="l"><a href="#419"> 419: </a>        <span class="php-comment">// Validate the configuration setting output formats</span>
-</span><span id="420" class="l"><a href="#420"> 420: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$supported_formats</span>))
-</span><span id="421" class="l"><a href="#421"> 421: </a>        {
-</span><span id="422" class="l"><a href="#422"> 422: </a>            <span class="php-var">$supported_formats</span> = [];
-</span><span id="423" class="l"><a href="#423"> 423: </a>        }
-</span><span id="424" class="l"><a href="#424"> 424: </a>
-</span><span id="425" class="l"><a href="#425"> 425: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword2">is_array</span>(<span class="php-var">$supported_formats</span>))
-</span><span id="426" class="l"><a href="#426"> 426: </a>        {
-</span><span id="427" class="l"><a href="#427"> 427: </a>            <span class="php-var">$supported_formats</span> = [<span class="php-var">$supported_formats</span>];
-</span><span id="428" class="l"><a href="#428"> 428: </a>        }
-</span><span id="429" class="l"><a href="#429"> 429: </a>
-</span><span id="430" class="l"><a href="#430"> 430: </a>        <span class="php-comment">// Add silently the default output format if it is missing</span>
-</span><span id="431" class="l"><a href="#431"> 431: </a>        <span class="php-var">$default_format</span> = <span class="php-var">$this</span>-&gt;_get_default_output_format();
-</span><span id="432" class="l"><a href="#432"> 432: </a>        <span class="php-keyword1">if</span> (!<span class="php-keyword2">in_array</span>(<span class="php-var">$default_format</span>, <span class="php-var">$supported_formats</span>))
-</span><span id="433" class="l"><a href="#433"> 433: </a>        {
-</span><span id="434" class="l"><a href="#434"> 434: </a>            <span class="php-var">$supported_formats</span>[] = <span class="php-var">$default_format</span>;
-</span><span id="435" class="l"><a href="#435"> 435: </a>        }
-</span><span id="436" class="l"><a href="#436"> 436: </a>
-</span><span id="437" class="l"><a href="#437"> 437: </a>        <span class="php-comment">// Now update $this-&gt;_supported_formats</span>
-</span><span id="438" class="l"><a href="#438"> 438: </a>        <span class="php-var">$this</span>-&gt;_supported_formats = <span class="php-keyword2">array_intersect_key</span>(<span class="php-var">$this</span>-&gt;_supported_formats, <span class="php-keyword2">array_flip</span>(<span class="php-var">$supported_formats</span>));
-</span><span id="439" class="l"><a href="#439"> 439: </a>
-</span><span id="440" class="l"><a href="#440"> 440: </a>        <span class="php-comment">// Get the language</span>
-</span><span id="441" class="l"><a href="#441"> 441: </a>        <span class="php-var">$language</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_language'</span>);
-</span><span id="442" class="l"><a href="#442"> 442: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$language</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="443" class="l"><a href="#443"> 443: </a>        {
-</span><span id="444" class="l"><a href="#444"> 444: </a>            <span class="php-var">$language</span> = <span class="php-quote">'english'</span>;
-</span><span id="445" class="l"><a href="#445"> 445: </a>        }
-</span><span id="446" class="l"><a href="#446"> 446: </a>
-</span><span id="447" class="l"><a href="#447"> 447: </a>        <span class="php-comment">// Load the language file</span>
-</span><span id="448" class="l"><a href="#448"> 448: </a>        <span class="php-var">$this</span>-&gt;lang-&gt;load(<span class="php-quote">'rest_controller'</span>, <span class="php-var">$language</span>);
-</span><span id="449" class="l"><a href="#449"> 449: </a>
-</span><span id="450" class="l"><a href="#450"> 450: </a>        <span class="php-comment">// Initialise the response, request and rest objects</span>
-</span><span id="451" class="l"><a href="#451"> 451: </a>        <span class="php-var">$this</span>-&gt;request = <span class="php-keyword1">new</span> stdClass();
-</span><span id="452" class="l"><a href="#452"> 452: </a>        <span class="php-var">$this</span>-&gt;response = <span class="php-keyword1">new</span> stdClass();
-</span><span id="453" class="l"><a href="#453"> 453: </a>        <span class="php-var">$this</span>-&gt;rest = <span class="php-keyword1">new</span> stdClass();
-</span><span id="454" class="l"><a href="#454"> 454: </a>
-</span><span id="455" class="l"><a href="#455"> 455: </a>        <span class="php-comment">// Check to see if the current IP address is blacklisted</span>
-</span><span id="456" class="l"><a href="#456"> 456: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="457" class="l"><a href="#457"> 457: </a>        {
-</span><span id="458" class="l"><a href="#458"> 458: </a>            <span class="php-var">$this</span>-&gt;_check_blacklist_auth();
-</span><span id="459" class="l"><a href="#459"> 459: </a>        }
-</span><span id="460" class="l"><a href="#460"> 460: </a>
-</span><span id="461" class="l"><a href="#461"> 461: </a>        <span class="php-comment">// Determine whether the connection is HTTPS</span>
-</span><span id="462" class="l"><a href="#462"> 462: </a>        <span class="php-var">$this</span>-&gt;request-&gt;ssl = is_https();
-</span><span id="463" class="l"><a href="#463"> 463: </a>
-</span><span id="464" class="l"><a href="#464"> 464: </a>        <span class="php-comment">// How is this request being made? GET, POST, PATCH, DELETE, INSERT, PUT, HEAD or OPTIONS</span>
-</span><span id="465" class="l"><a href="#465"> 465: </a>        <span class="php-var">$this</span>-&gt;request-&gt;method = <span class="php-var">$this</span>-&gt;_detect_method();
-</span><span id="466" class="l"><a href="#466"> 466: </a>
-</span><span id="467" class="l"><a href="#467"> 467: </a>        <span class="php-comment">// Check for CORS access request</span>
-</span><span id="468" class="l"><a href="#468"> 468: </a>        <span class="php-var">$check_cors</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'check_cors'</span>);
-</span><span id="469" class="l"><a href="#469"> 469: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$check_cors</span> === <span class="php-keyword1">TRUE</span>)
-</span><span id="470" class="l"><a href="#470"> 470: </a>        {
-</span><span id="471" class="l"><a href="#471"> 471: </a>            <span class="php-var">$this</span>-&gt;_check_cors();
-</span><span id="472" class="l"><a href="#472"> 472: </a>        }
-</span><span id="473" class="l"><a href="#473"> 473: </a>
-</span><span id="474" class="l"><a href="#474"> 474: </a>        <span class="php-comment">// Create an argument container if it doesn't exist e.g. _get_args</span>
-</span><span id="475" class="l"><a href="#475"> 475: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>}) === <span class="php-keyword1">FALSE</span>)
-</span><span id="476" class="l"><a href="#476"> 476: </a>        {
-</span><span id="477" class="l"><a href="#477"> 477: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>} = [];
-</span><span id="478" class="l"><a href="#478"> 478: </a>        }
-</span><span id="479" class="l"><a href="#479"> 479: </a>
-</span><span id="480" class="l"><a href="#480"> 480: </a>        <span class="php-comment">// Set up the query parameters</span>
-</span><span id="481" class="l"><a href="#481"> 481: </a>        <span class="php-var">$this</span>-&gt;_parse_query();
-</span><span id="482" class="l"><a href="#482"> 482: </a>
-</span><span id="483" class="l"><a href="#483"> 483: </a>        <span class="php-comment">// Set up the GET variables</span>
-</span><span id="484" class="l"><a href="#484"> 484: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;uri-&gt;ruri_to_assoc());
-</span><span id="485" class="l"><a href="#485"> 485: </a>
-</span><span id="486" class="l"><a href="#486"> 486: </a>        <span class="php-comment">// Try to find a format for the request (means we have a request body)</span>
-</span><span id="487" class="l"><a href="#487"> 487: </a>        <span class="php-var">$this</span>-&gt;request-&gt;format = <span class="php-var">$this</span>-&gt;_detect_input_format();
-</span><span id="488" class="l"><a href="#488"> 488: </a>
-</span><span id="489" class="l"><a href="#489"> 489: </a>        <span class="php-comment">// Not all methods have a body attached with them</span>
-</span><span id="490" class="l"><a href="#490"> 490: </a>        <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-keyword1">NULL</span>;
-</span><span id="491" class="l"><a href="#491"> 491: </a>
-</span><span id="492" class="l"><a href="#492"> 492: </a>        <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_parse_'</span> . <span class="php-var">$this</span>-&gt;request-&gt;method}();
-</span><span id="493" class="l"><a href="#493"> 493: </a>
-</span><span id="494" class="l"><a href="#494"> 494: </a>        <span class="php-comment">// Now we know all about our request, let's try and parse the body if it exists</span>
-</span><span id="495" class="l"><a href="#495"> 495: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;body)
-</span><span id="496" class="l"><a href="#496"> 496: </a>        {
-</span><span id="497" class="l"><a href="#497"> 497: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$this</span>-&gt;request-&gt;body, <span class="php-var">$this</span>-&gt;request-&gt;format)-&gt;to_array();
-</span><span id="498" class="l"><a href="#498"> 498: </a>            <span class="php-comment">// Assign payload arguments to proper method container</span>
-</span><span id="499" class="l"><a href="#499"> 499: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>} = <span class="php-var">$this</span>-&gt;request-&gt;body;
-</span><span id="500" class="l"><a href="#500"> 500: </a>        }
-</span><span id="501" class="l"><a href="#501"> 501: </a>
-</span><span id="502" class="l"><a href="#502"> 502: </a>        <span class="php-comment">// Merge both for one mega-args variable</span>
-</span><span id="503" class="l"><a href="#503"> 503: </a>        <span class="php-var">$this</span>-&gt;_args = <span class="php-keyword2">array_merge</span>(
-</span><span id="504" class="l"><a href="#504"> 504: </a>            <span class="php-var">$this</span>-&gt;_get_args,
-</span><span id="505" class="l"><a href="#505"> 505: </a>            <span class="php-var">$this</span>-&gt;_options_args,
-</span><span id="506" class="l"><a href="#506"> 506: </a>            <span class="php-var">$this</span>-&gt;_patch_args,
-</span><span id="507" class="l"><a href="#507"> 507: </a>            <span class="php-var">$this</span>-&gt;_head_args,
-</span><span id="508" class="l"><a href="#508"> 508: </a>            <span class="php-var">$this</span>-&gt;_put_args,
-</span><span id="509" class="l"><a href="#509"> 509: </a>            <span class="php-var">$this</span>-&gt;_post_args,
-</span><span id="510" class="l"><a href="#510"> 510: </a>            <span class="php-var">$this</span>-&gt;_delete_args,
-</span><span id="511" class="l"><a href="#511"> 511: </a>            <span class="php-var">$this</span>-&gt;{<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method.<span class="php-quote">'_args'</span>}
-</span><span id="512" class="l"><a href="#512"> 512: </a>        );
-</span><span id="513" class="l"><a href="#513"> 513: </a>
-</span><span id="514" class="l"><a href="#514"> 514: </a>        <span class="php-comment">// Which format should the data be returned in?</span>
-</span><span id="515" class="l"><a href="#515"> 515: </a>        <span class="php-var">$this</span>-&gt;response-&gt;format = <span class="php-var">$this</span>-&gt;_detect_output_format();
-</span><span id="516" class="l"><a href="#516"> 516: </a>
-</span><span id="517" class="l"><a href="#517"> 517: </a>        <span class="php-comment">// Which language should the data be returned in?</span>
-</span><span id="518" class="l"><a href="#518"> 518: </a>        <span class="php-var">$this</span>-&gt;response-&gt;lang = <span class="php-var">$this</span>-&gt;_detect_lang();
-</span><span id="519" class="l"><a href="#519"> 519: </a>
-</span><span id="520" class="l"><a href="#520"> 520: </a>        <span class="php-comment">// Extend this function to apply additional checking early on in the process</span>
-</span><span id="521" class="l"><a href="#521"> 521: </a>        <span class="php-var">$this</span>-&gt;early_checks();
-</span><span id="522" class="l"><a href="#522"> 522: </a>
-</span><span id="523" class="l"><a href="#523"> 523: </a>        <span class="php-comment">// Load DB if its enabled</span>
-</span><span id="524" class="l"><a href="#524"> 524: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>) &amp;&amp; (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) || <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>)))
-</span><span id="525" class="l"><a href="#525"> 525: </a>        {
-</span><span id="526" class="l"><a href="#526"> 526: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;load-&gt;database(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_database_group'</span>), <span class="php-keyword1">TRUE</span>);
-</span><span id="527" class="l"><a href="#527"> 527: </a>        }
-</span><span id="528" class="l"><a href="#528"> 528: </a>
-</span><span id="529" class="l"><a href="#529"> 529: </a>        <span class="php-comment">// Use whatever database is in use (isset returns FALSE)</span>
-</span><span id="530" class="l"><a href="#530"> 530: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">property_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'db'</span>))
-</span><span id="531" class="l"><a href="#531"> 531: </a>        {
-</span><span id="532" class="l"><a href="#532"> 532: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db = <span class="php-var">$this</span>-&gt;db;
-</span><span id="533" class="l"><a href="#533"> 533: </a>        }
-</span><span id="534" class="l"><a href="#534"> 534: </a>
-</span><span id="535" class="l"><a href="#535"> 535: </a>        <span class="php-comment">// Check if there is a specific auth type for the current class/method</span>
-</span><span id="536" class="l"><a href="#536"> 536: </a>        <span class="php-comment">// _auth_override_check could exit so we need $this-&gt;rest-&gt;db initialized before</span>
-</span><span id="537" class="l"><a href="#537"> 537: </a>        <span class="php-var">$this</span>-&gt;auth_override = <span class="php-var">$this</span>-&gt;_auth_override_check();
-</span><span id="538" class="l"><a href="#538"> 538: </a>
-</span><span id="539" class="l"><a href="#539"> 539: </a>        <span class="php-comment">// Checking for keys? GET TO WorK!</span>
-</span><span id="540" class="l"><a href="#540"> 540: </a>        <span class="php-comment">// Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'</span>
-</span><span id="541" class="l"><a href="#541"> 541: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;auth_override !== <span class="php-keyword1">TRUE</span>)
-</span><span id="542" class="l"><a href="#542"> 542: </a>        {
-</span><span id="543" class="l"><a href="#543"> 543: </a>            <span class="php-var">$this</span>-&gt;_allow = <span class="php-var">$this</span>-&gt;_detect_api_key();
-</span><span id="544" class="l"><a href="#544"> 544: </a>        }
-</span><span id="545" class="l"><a href="#545"> 545: </a>
-</span><span id="546" class="l"><a href="#546"> 546: </a>        <span class="php-comment">// Only allow ajax requests</span>
-</span><span id="547" class="l"><a href="#547"> 547: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;is_ajax_request() === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ajax_only'</span>))
-</span><span id="548" class="l"><a href="#548"> 548: </a>        {
-</span><span id="549" class="l"><a href="#549"> 549: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="550" class="l"><a href="#550"> 550: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="551" class="l"><a href="#551"> 551: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="552" class="l"><a href="#552"> 552: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ajax_only'</span>)
-</span><span id="553" class="l"><a href="#553"> 553: </a>                ], self::HTTP_NOT_ACCEPTABLE);
-</span><span id="554" class="l"><a href="#554"> 554: </a>        }
-</span><span id="555" class="l"><a href="#555"> 555: </a>
-</span><span id="556" class="l"><a href="#556"> 556: </a>        <span class="php-comment">// When there is no specific override for the current class/method, use the default auth value set in the config</span>
-</span><span id="557" class="l"><a href="#557"> 557: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;auth_override === <span class="php-keyword1">FALSE</span> &amp;&amp; ! (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>) || (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'allow_auth_and_keys'</span>) === <span class="php-keyword1">TRUE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">TRUE</span>))
-</span><span id="558" class="l"><a href="#558"> 558: </a>        {
-</span><span id="559" class="l"><a href="#559"> 559: </a>            <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="560" class="l"><a href="#560"> 560: </a>            <span class="php-keyword1">switch</span> (<span class="php-var">$rest_auth</span>)
-</span><span id="561" class="l"><a href="#561"> 561: </a>            {
-</span><span id="562" class="l"><a href="#562"> 562: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'basic'</span>:
-</span><span id="563" class="l"><a href="#563"> 563: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="564" class="l"><a href="#564"> 564: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="565" class="l"><a href="#565"> 565: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'digest'</span>:
-</span><span id="566" class="l"><a href="#566"> 566: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="567" class="l"><a href="#567"> 567: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="568" class="l"><a href="#568"> 568: </a>                <span class="php-keyword1">case</span> <span class="php-quote">'session'</span>:
-</span><span id="569" class="l"><a href="#569"> 569: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="570" class="l"><a href="#570"> 570: </a>                    <span class="php-keyword1">break</span>;
-</span><span id="571" class="l"><a href="#571"> 571: </a>            }
-</span><span id="572" class="l"><a href="#572"> 572: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="573" class="l"><a href="#573"> 573: </a>            {
-</span><span id="574" class="l"><a href="#574"> 574: </a>                <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="575" class="l"><a href="#575"> 575: </a>            }
-</span><span id="576" class="l"><a href="#576"> 576: </a>        }
-</span><span id="577" class="l"><a href="#577"> 577: </a>    }
-</span><span id="578" class="l"><a href="#578"> 578: </a>
-</span><span id="579" class="l"><a href="#579"> 579: </a>    <span class="php-comment">/**
-</span></span><span id="580" class="l"><a href="#580"> 580: </a><span class="php-comment">     * Deconstructor
-</span></span><span id="581" class="l"><a href="#581"> 581: </a><span class="php-comment">     *
-</span></span><span id="582" class="l"><a href="#582"> 582: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="583" class="l"><a href="#583"> 583: </a><span class="php-comment">     * @access public
-</span></span><span id="584" class="l"><a href="#584"> 584: </a><span class="php-comment">     * @return void
-</span></span><span id="585" class="l"><a href="#585"> 585: </a><span class="php-comment">     */</span>
-</span><span id="586" class="l"><a href="#586"> 586: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> __destruct()
-</span><span id="587" class="l"><a href="#587"> 587: </a>    {
-</span><span id="588" class="l"><a href="#588"> 588: </a>        <span class="php-comment">// Get the current timestamp</span>
-</span><span id="589" class="l"><a href="#589"> 589: </a>        <span class="php-var">$this</span>-&gt;_end_rtime = <span class="php-keyword2">microtime</span>(<span class="php-keyword1">TRUE</span>);
-</span><span id="590" class="l"><a href="#590"> 590: </a>
-</span><span id="591" class="l"><a href="#591"> 591: </a>        <span class="php-comment">// Log the loading time to the log table</span>
-</span><span id="592" class="l"><a href="#592"> 592: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="593" class="l"><a href="#593"> 593: </a>        {
-</span><span id="594" class="l"><a href="#594"> 594: </a>            <span class="php-var">$this</span>-&gt;_log_access_time();
-</span><span id="595" class="l"><a href="#595"> 595: </a>        }
-</span><span id="596" class="l"><a href="#596"> 596: </a>    }
-</span><span id="597" class="l"><a href="#597"> 597: </a>
-</span><span id="598" class="l"><a href="#598"> 598: </a>    <span class="php-comment">/**
-</span></span><span id="599" class="l"><a href="#599"> 599: </a><span class="php-comment">     * Requests are not made to methods directly, the request will be for
-</span></span><span id="600" class="l"><a href="#600"> 600: </a><span class="php-comment">     * an &quot;object&quot;. This simply maps the object and method to the correct
-</span></span><span id="601" class="l"><a href="#601"> 601: </a><span class="php-comment">     * Controller method
-</span></span><span id="602" class="l"><a href="#602"> 602: </a><span class="php-comment">     *
-</span></span><span id="603" class="l"><a href="#603"> 603: </a><span class="php-comment">     * @access public
-</span></span><span id="604" class="l"><a href="#604"> 604: </a><span class="php-comment">     * @param  string $object_called
-</span></span><span id="605" class="l"><a href="#605"> 605: </a><span class="php-comment">     * @param  array $arguments The arguments passed to the controller method
-</span></span><span id="606" class="l"><a href="#606"> 606: </a><span class="php-comment">     */</span>
-</span><span id="607" class="l"><a href="#607"> 607: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> _remap(<span class="php-var">$object_called</span>, <span class="php-var">$arguments</span> = [])
-</span><span id="608" class="l"><a href="#608"> 608: </a>    {
-</span><span id="609" class="l"><a href="#609"> 609: </a>        <span class="php-comment">// Should we answer if not over SSL?</span>
-</span><span id="610" class="l"><a href="#610"> 610: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'force_https'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;request-&gt;ssl === <span class="php-keyword1">FALSE</span>)
-</span><span id="611" class="l"><a href="#611"> 611: </a>        {
-</span><span id="612" class="l"><a href="#612"> 612: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="613" class="l"><a href="#613"> 613: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="614" class="l"><a href="#614"> 614: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unsupported'</span>)
-</span><span id="615" class="l"><a href="#615"> 615: </a>                ], self::HTTP_FORBIDDEN);
-</span><span id="616" class="l"><a href="#616"> 616: </a>        }
-</span><span id="617" class="l"><a href="#617"> 617: </a>
-</span><span id="618" class="l"><a href="#618"> 618: </a>        <span class="php-comment">// Remove the supported format from the function name e.g. index.json =&gt; index</span>
-</span><span id="619" class="l"><a href="#619"> 619: </a>        <span class="php-var">$object_called</span> = <span class="php-keyword2">preg_replace</span>(<span class="php-quote">'/^(.*)\.(?:'</span>.<span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)).<span class="php-quote">')$/'</span>, <span class="php-quote">'$1'</span>, <span class="php-var">$object_called</span>);
-</span><span id="620" class="l"><a href="#620"> 620: </a>
-</span><span id="621" class="l"><a href="#621"> 621: </a>        <span class="php-var">$controller_method</span> = <span class="php-var">$object_called</span>.<span class="php-quote">'_'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method;
-</span><span id="622" class="l"><a href="#622"> 622: </a>
-</span><span id="623" class="l"><a href="#623"> 623: </a>        <span class="php-comment">// Do we want to log this method (if allowed by config)?</span>
-</span><span id="624" class="l"><a href="#624"> 624: </a>        <span class="php-var">$log_method</span> = ! (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'log'</span>] === <span class="php-keyword1">FALSE</span>);
-</span><span id="625" class="l"><a href="#625"> 625: </a>
-</span><span id="626" class="l"><a href="#626"> 626: </a>        <span class="php-comment">// Use keys for this method?</span>
-</span><span id="627" class="l"><a href="#627"> 627: </a>        <span class="php-var">$use_key</span> = ! (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>]) &amp;&amp; <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'key'</span>] === <span class="php-keyword1">FALSE</span>);
-</span><span id="628" class="l"><a href="#628"> 628: </a>
-</span><span id="629" class="l"><a href="#629"> 629: </a>        <span class="php-comment">// They provided a key, but it wasn't valid, so get them out of here</span>
-</span><span id="630" class="l"><a href="#630"> 630: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_allow === <span class="php-keyword1">FALSE</span>)
-</span><span id="631" class="l"><a href="#631"> 631: </a>        {
-</span><span id="632" class="l"><a href="#632"> 632: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="633" class="l"><a href="#633"> 633: </a>            {
-</span><span id="634" class="l"><a href="#634"> 634: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="635" class="l"><a href="#635"> 635: </a>            }
-</span><span id="636" class="l"><a href="#636"> 636: </a>
-</span><span id="637" class="l"><a href="#637"> 637: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="638" class="l"><a href="#638"> 638: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="639" class="l"><a href="#639"> 639: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-keyword2">sprintf</span>(<span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_invalid_api_key'</span>), <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="640" class="l"><a href="#640"> 640: </a>                ], self::HTTP_FORBIDDEN);
-</span><span id="641" class="l"><a href="#641"> 641: </a>        }
-</span><span id="642" class="l"><a href="#642"> 642: </a>
-</span><span id="643" class="l"><a href="#643"> 643: </a>        <span class="php-comment">// Check to see if this key has access to the requested controller</span>
-</span><span id="644" class="l"><a href="#644"> 644: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-var">$use_key</span> &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$this</span>-&gt;_check_access() === <span class="php-keyword1">FALSE</span>)
-</span><span id="645" class="l"><a href="#645"> 645: </a>        {
-</span><span id="646" class="l"><a href="#646"> 646: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="647" class="l"><a href="#647"> 647: </a>            {
-</span><span id="648" class="l"><a href="#648"> 648: </a>                <span class="php-var">$this</span>-&gt;_log_request();
-</span><span id="649" class="l"><a href="#649"> 649: </a>            }
-</span><span id="650" class="l"><a href="#650"> 650: </a>
-</span><span id="651" class="l"><a href="#651"> 651: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="652" class="l"><a href="#652"> 652: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="653" class="l"><a href="#653"> 653: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_unauthorized'</span>)
-</span><span id="654" class="l"><a href="#654"> 654: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="655" class="l"><a href="#655"> 655: </a>        }
-</span><span id="656" class="l"><a href="#656"> 656: </a>
-</span><span id="657" class="l"><a href="#657"> 657: </a>        <span class="php-comment">// Sure it exists, but can they do anything with it?</span>
-</span><span id="658" class="l"><a href="#658"> 658: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="659" class="l"><a href="#659"> 659: </a>        {
-</span><span id="660" class="l"><a href="#660"> 660: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="661" class="l"><a href="#661"> 661: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="662" class="l"><a href="#662"> 662: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unknown_method'</span>)
-</span><span id="663" class="l"><a href="#663"> 663: </a>                ], self::HTTP_NOT_FOUND);
-</span><span id="664" class="l"><a href="#664"> 664: </a>        }
-</span><span id="665" class="l"><a href="#665"> 665: </a>
-</span><span id="666" class="l"><a href="#666"> 666: </a>        <span class="php-comment">// Doing key related stuff? Can only do it if they have a key right?</span>
-</span><span id="667" class="l"><a href="#667"> 667: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_keys'</span>) &amp;&amp; <span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="668" class="l"><a href="#668"> 668: </a>        {
-</span><span id="669" class="l"><a href="#669"> 669: </a>            <span class="php-comment">// Check the limit</span>
-</span><span id="670" class="l"><a href="#670"> 670: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_limits'</span>) &amp;&amp; <span class="php-var">$this</span>-&gt;_check_limit(<span class="php-var">$controller_method</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="671" class="l"><a href="#671"> 671: </a>            {
-</span><span id="672" class="l"><a href="#672"> 672: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_time_limit'</span>)];
-</span><span id="673" class="l"><a href="#673"> 673: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
-</span><span id="674" class="l"><a href="#674"> 674: </a>            }
-</span><span id="675" class="l"><a href="#675"> 675: </a>
-</span><span id="676" class="l"><a href="#676"> 676: </a>            <span class="php-comment">// If no level is set use 0, they probably aren't using permissions</span>
-</span><span id="677" class="l"><a href="#677"> 677: </a>            <span class="php-var">$level</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$controller_method</span>][<span class="php-quote">'level'</span>] : <span class="php-num">0</span>;
-</span><span id="678" class="l"><a href="#678"> 678: </a>
-</span><span id="679" class="l"><a href="#679"> 679: </a>            <span class="php-comment">// If no level is set, or it is lower than/equal to the key's level</span>
-</span><span id="680" class="l"><a href="#680"> 680: </a>            <span class="php-var">$authorized</span> = <span class="php-var">$level</span> &lt;= <span class="php-var">$this</span>-&gt;rest-&gt;level;
-</span><span id="681" class="l"><a href="#681"> 681: </a>            <span class="php-comment">// IM TELLIN!</span>
-</span><span id="682" class="l"><a href="#682"> 682: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="683" class="l"><a href="#683"> 683: </a>            {
-</span><span id="684" class="l"><a href="#684"> 684: </a>                <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span>);
-</span><span id="685" class="l"><a href="#685"> 685: </a>            }
-</span><span id="686" class="l"><a href="#686"> 686: </a>            <span class="php-keyword1">if</span>(<span class="php-var">$authorized</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="687" class="l"><a href="#687"> 687: </a>            {
-</span><span id="688" class="l"><a href="#688"> 688: </a>                <span class="php-comment">// They don't have good enough perms</span>
-</span><span id="689" class="l"><a href="#689"> 689: </a>                <span class="php-var">$response</span> = [<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_api_key_permissions'</span>)];
-</span><span id="690" class="l"><a href="#690"> 690: </a>                <span class="php-var">$this</span>-&gt;response(<span class="php-var">$response</span>, self::HTTP_UNAUTHORIZED);
-</span><span id="691" class="l"><a href="#691"> 691: </a>            }
-</span><span id="692" class="l"><a href="#692"> 692: </a>        }
-</span><span id="693" class="l"><a href="#693"> 693: </a>
-</span><span id="694" class="l"><a href="#694"> 694: </a>        <span class="php-comment">// No key stuff, but record that stuff is happening</span>
-</span><span id="695" class="l"><a href="#695"> 695: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) &amp;&amp; <span class="php-var">$log_method</span>)
-</span><span id="696" class="l"><a href="#696"> 696: </a>        {
-</span><span id="697" class="l"><a href="#697"> 697: </a>            <span class="php-var">$this</span>-&gt;_log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">TRUE</span>);
-</span><span id="698" class="l"><a href="#698"> 698: </a>        }
-</span><span id="699" class="l"><a href="#699"> 699: </a>
-</span><span id="700" class="l"><a href="#700"> 700: </a>        <span class="php-comment">// Call the controller method and passed arguments</span>
-</span><span id="701" class="l"><a href="#701"> 701: </a>        <span class="php-keyword1">try</span>
-</span><span id="702" class="l"><a href="#702"> 702: </a>        {
-</span><span id="703" class="l"><a href="#703"> 703: </a>            <span class="php-keyword2">call_user_func_array</span>([<span class="php-var">$this</span>, <span class="php-var">$controller_method</span>], <span class="php-var">$arguments</span>);
-</span><span id="704" class="l"><a href="#704"> 704: </a>        }
-</span><span id="705" class="l"><a href="#705"> 705: </a>        <span class="php-keyword1">catch</span> (Exception <span class="php-var">$ex</span>)
-</span><span id="706" class="l"><a href="#706"> 706: </a>        {
-</span><span id="707" class="l"><a href="#707"> 707: </a>            <span class="php-comment">// If the method doesn't exist, then the error will be caught and an error response shown</span>
-</span><span id="708" class="l"><a href="#708"> 708: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="709" class="l"><a href="#709"> 709: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="710" class="l"><a href="#710"> 710: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; [
-</span><span id="711" class="l"><a href="#711"> 711: </a>                        <span class="php-quote">'classname'</span> =&gt; <span class="php-keyword2">get_class</span>(<span class="php-var">$ex</span>),
-</span><span id="712" class="l"><a href="#712"> 712: </a>                        <span class="php-quote">'message'</span> =&gt; <span class="php-var">$ex</span>-&gt;getMessage()
-</span><span id="713" class="l"><a href="#713"> 713: </a>                    ]
-</span><span id="714" class="l"><a href="#714"> 714: </a>                ], self::HTTP_INTERNAL_SERVER_ERROR);
-</span><span id="715" class="l"><a href="#715"> 715: </a>        }
-</span><span id="716" class="l"><a href="#716"> 716: </a>    }
-</span><span id="717" class="l"><a href="#717"> 717: </a>
-</span><span id="718" class="l"><a href="#718"> 718: </a>    <span class="php-comment">/**
-</span></span><span id="719" class="l"><a href="#719"> 719: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
-</span></span><span id="720" class="l"><a href="#720"> 720: </a><span class="php-comment">     *
-</span></span><span id="721" class="l"><a href="#721"> 721: </a><span class="php-comment">     * @access public
-</span></span><span id="722" class="l"><a href="#722"> 722: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
-</span></span><span id="723" class="l"><a href="#723"> 723: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
-</span></span><span id="724" class="l"><a href="#724"> 724: </a><span class="php-comment">     * @param bool $continue TRUE to flush the response to the client and continue
-</span></span><span id="725" class="l"><a href="#725"> 725: </a><span class="php-comment">     * running the script; otherwise, exit
-</span></span><span id="726" class="l"><a href="#726"> 726: </a><span class="php-comment">     */</span>
-</span><span id="727" class="l"><a href="#727"> 727: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$continue</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="728" class="l"><a href="#728"> 728: </a>    {
-</span><span id="729" class="l"><a href="#729"> 729: </a>        <span class="php-comment">// If the HTTP status is not NULL, then cast as an integer</span>
-</span><span id="730" class="l"><a href="#730"> 730: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$http_code</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="731" class="l"><a href="#731"> 731: </a>        {
-</span><span id="732" class="l"><a href="#732"> 732: </a>            <span class="php-comment">// So as to be safe later on in the process</span>
-</span><span id="733" class="l"><a href="#733"> 733: </a>            <span class="php-var">$http_code</span> = (int) <span class="php-var">$http_code</span>;
-</span><span id="734" class="l"><a href="#734"> 734: </a>        }
-</span><span id="735" class="l"><a href="#735"> 735: </a>
-</span><span id="736" class="l"><a href="#736"> 736: </a>        <span class="php-comment">// Set the output as NULL by default</span>
-</span><span id="737" class="l"><a href="#737"> 737: </a>        <span class="php-var">$output</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="738" class="l"><a href="#738"> 738: </a>
-</span><span id="739" class="l"><a href="#739"> 739: </a>        <span class="php-comment">// If data is NULL and no HTTP status code provided, then display, error and exit</span>
-</span><span id="740" class="l"><a href="#740"> 740: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$data</span> === <span class="php-keyword1">NULL</span> &amp;&amp; <span class="php-var">$http_code</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="741" class="l"><a href="#741"> 741: </a>        {
-</span><span id="742" class="l"><a href="#742"> 742: </a>            <span class="php-var">$http_code</span> = self::HTTP_NOT_FOUND;
-</span><span id="743" class="l"><a href="#743"> 743: </a>        }
-</span><span id="744" class="l"><a href="#744"> 744: </a>
-</span><span id="745" class="l"><a href="#745"> 745: </a>        <span class="php-comment">// If data is not NULL and a HTTP status code provided, then continue</span>
-</span><span id="746" class="l"><a href="#746"> 746: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$data</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="747" class="l"><a href="#747"> 747: </a>        {
-</span><span id="748" class="l"><a href="#748"> 748: </a>            <span class="php-comment">// If the format method exists, call and return the output in that format</span>
-</span><span id="749" class="l"><a href="#749"> 749: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>-&gt;format, <span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format))
-</span><span id="750" class="l"><a href="#750"> 750: </a>            {
-</span><span id="751" class="l"><a href="#751"> 751: </a>                <span class="php-comment">// Set the format header</span>
-</span><span id="752" class="l"><a href="#752"> 752: </a>                <span class="php-var">$this</span>-&gt;output-&gt;set_content_type(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$this</span>-&gt;response-&gt;format], <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'charset'</span>)));
-</span><span id="753" class="l"><a href="#753"> 753: </a>                <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_'</span> . <span class="php-var">$this</span>-&gt;response-&gt;format}();
-</span><span id="754" class="l"><a href="#754"> 754: </a>
-</span><span id="755" class="l"><a href="#755"> 755: </a>                <span class="php-comment">// An array must be parsed as a string, so as not to cause an array to string error</span>
-</span><span id="756" class="l"><a href="#756"> 756: </a>                <span class="php-comment">// Json is the most appropriate form for such a datatype</span>
-</span><span id="757" class="l"><a href="#757"> 757: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;response-&gt;format === <span class="php-quote">'array'</span>)
-</span><span id="758" class="l"><a href="#758"> 758: </a>                {
-</span><span id="759" class="l"><a href="#759"> 759: </a>                    <span class="php-var">$output</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$output</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="760" class="l"><a href="#760"> 760: </a>                }
-</span><span id="761" class="l"><a href="#761"> 761: </a>            }
-</span><span id="762" class="l"><a href="#762"> 762: </a>            <span class="php-keyword1">else</span>
-</span><span id="763" class="l"><a href="#763"> 763: </a>            {
-</span><span id="764" class="l"><a href="#764"> 764: </a>                <span class="php-comment">// If an array or object, then parse as a json, so as to be a 'string'</span>
-</span><span id="765" class="l"><a href="#765"> 765: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">is_array</span>(<span class="php-var">$data</span>) || <span class="php-keyword2">is_object</span>(<span class="php-var">$data</span>))
-</span><span id="766" class="l"><a href="#766"> 766: </a>                {
-</span><span id="767" class="l"><a href="#767"> 767: </a>                    <span class="php-var">$data</span> = <span class="php-var">$this</span>-&gt;format-&gt;factory(<span class="php-var">$data</span>)-&gt;{<span class="php-quote">'to_json'</span>}();
-</span><span id="768" class="l"><a href="#768"> 768: </a>                }
-</span><span id="769" class="l"><a href="#769"> 769: </a>
-</span><span id="770" class="l"><a href="#770"> 770: </a>                <span class="php-comment">// Format is not supported, so output the raw data as a string</span>
-</span><span id="771" class="l"><a href="#771"> 771: </a>                <span class="php-var">$output</span> = <span class="php-var">$data</span>;
-</span><span id="772" class="l"><a href="#772"> 772: </a>            }
-</span><span id="773" class="l"><a href="#773"> 773: </a>        }
-</span><span id="774" class="l"><a href="#774"> 774: </a>
-</span><span id="775" class="l"><a href="#775"> 775: </a>        <span class="php-comment">// If not greater than zero, then set the HTTP status code as 200 by default</span>
-</span><span id="776" class="l"><a href="#776"> 776: </a>        <span class="php-comment">// Though perhaps 500 should be set instead, for the developer not passing a</span>
-</span><span id="777" class="l"><a href="#777"> 777: </a>        <span class="php-comment">// correct HTTP status code</span>
-</span><span id="778" class="l"><a href="#778"> 778: </a>        <span class="php-var">$http_code</span> &gt; <span class="php-num">0</span> || <span class="php-var">$http_code</span> = self::HTTP_OK;
-</span><span id="779" class="l"><a href="#779"> 779: </a>
-</span><span id="780" class="l"><a href="#780"> 780: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_status_header(<span class="php-var">$http_code</span>);
-</span><span id="781" class="l"><a href="#781"> 781: </a>
-</span><span id="782" class="l"><a href="#782"> 782: </a>        <span class="php-comment">// JC: Log response code only if rest logging enabled</span>
-</span><span id="783" class="l"><a href="#783"> 783: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_logging'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="784" class="l"><a href="#784"> 784: </a>        {
-</span><span id="785" class="l"><a href="#785"> 785: </a>            <span class="php-var">$this</span>-&gt;_log_response_code(<span class="php-var">$http_code</span>);
-</span><span id="786" class="l"><a href="#786"> 786: </a>        }
-</span><span id="787" class="l"><a href="#787"> 787: </a>
-</span><span id="788" class="l"><a href="#788"> 788: </a>        <span class="php-comment">// Output the data</span>
-</span><span id="789" class="l"><a href="#789"> 789: </a>        <span class="php-var">$this</span>-&gt;output-&gt;set_output(<span class="php-var">$output</span>);
-</span><span id="790" class="l"><a href="#790"> 790: </a>
-</span><span id="791" class="l"><a href="#791"> 791: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$continue</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="792" class="l"><a href="#792"> 792: </a>        {
-</span><span id="793" class="l"><a href="#793"> 793: </a>            <span class="php-comment">// Display the data and exit execution</span>
-</span><span id="794" class="l"><a href="#794"> 794: </a>            <span class="php-var">$this</span>-&gt;output-&gt;_display();
-</span><span id="795" class="l"><a href="#795"> 795: </a>            <span class="php-keyword1">exit</span>;
-</span><span id="796" class="l"><a href="#796"> 796: </a>        }
-</span><span id="797" class="l"><a href="#797"> 797: </a>
-</span><span id="798" class="l"><a href="#798"> 798: </a>        <span class="php-comment">// Otherwise dump the output automatically</span>
-</span><span id="799" class="l"><a href="#799"> 799: </a>    }
-</span><span id="800" class="l"><a href="#800"> 800: </a>
-</span><span id="801" class="l"><a href="#801"> 801: </a>    <span class="php-comment">/**
-</span></span><span id="802" class="l"><a href="#802"> 802: </a><span class="php-comment">     * Takes mixed data and optionally a status code, then creates the response
-</span></span><span id="803" class="l"><a href="#803"> 803: </a><span class="php-comment">     * within the buffers of the Output class. The response is sent to the client
-</span></span><span id="804" class="l"><a href="#804"> 804: </a><span class="php-comment">     * lately by the framework, after the current controller's method termination.
-</span></span><span id="805" class="l"><a href="#805"> 805: </a><span class="php-comment">     * All the hooks after the controller's method termination are executable
-</span></span><span id="806" class="l"><a href="#806"> 806: </a><span class="php-comment">     *
-</span></span><span id="807" class="l"><a href="#807"> 807: </a><span class="php-comment">     * @access public
-</span></span><span id="808" class="l"><a href="#808"> 808: </a><span class="php-comment">     * @param array|NULL $data Data to output to the user
-</span></span><span id="809" class="l"><a href="#809"> 809: </a><span class="php-comment">     * @param int|NULL $http_code HTTP status code
-</span></span><span id="810" class="l"><a href="#810"> 810: </a><span class="php-comment">     */</span>
-</span><span id="811" class="l"><a href="#811"> 811: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> set_response(<span class="php-var">$data</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$http_code</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="812" class="l"><a href="#812"> 812: </a>    {
-</span><span id="813" class="l"><a href="#813"> 813: </a>        <span class="php-var">$this</span>-&gt;response(<span class="php-var">$data</span>, <span class="php-var">$http_code</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="814" class="l"><a href="#814"> 814: </a>    }
-</span><span id="815" class="l"><a href="#815"> 815: </a>
-</span><span id="816" class="l"><a href="#816"> 816: </a>    <span class="php-comment">/**
-</span></span><span id="817" class="l"><a href="#817"> 817: </a><span class="php-comment">     * Get the input format e.g. json or xml
-</span></span><span id="818" class="l"><a href="#818"> 818: </a><span class="php-comment">     *
-</span></span><span id="819" class="l"><a href="#819"> 819: </a><span class="php-comment">     * @access protected
-</span></span><span id="820" class="l"><a href="#820"> 820: </a><span class="php-comment">     * @return string|NULL Supported input format; otherwise, NULL
-</span></span><span id="821" class="l"><a href="#821"> 821: </a><span class="php-comment">     */</span>
-</span><span id="822" class="l"><a href="#822"> 822: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_input_format()
-</span><span id="823" class="l"><a href="#823"> 823: </a>    {
-</span><span id="824" class="l"><a href="#824"> 824: </a>        <span class="php-comment">// Get the CONTENT-TYPE value from the SERVER variable</span>
-</span><span id="825" class="l"><a href="#825"> 825: </a>        <span class="php-var">$content_type</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'CONTENT_TYPE'</span>);
-</span><span id="826" class="l"><a href="#826"> 826: </a>
-</span><span id="827" class="l"><a href="#827"> 827: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$content_type</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="828" class="l"><a href="#828"> 828: </a>        {
-</span><span id="829" class="l"><a href="#829"> 829: </a>            <span class="php-comment">// If a semi-colon exists in the string, then explode by ; and get the value of where</span>
-</span><span id="830" class="l"><a href="#830"> 830: </a>            <span class="php-comment">// the current array pointer resides. This will generally be the first element of the array</span>
-</span><span id="831" class="l"><a href="#831"> 831: </a>            <span class="php-var">$content_type</span> = (<span class="php-keyword2">strpos</span>(<span class="php-var">$content_type</span>, <span class="php-quote">';'</span>) !== <span class="php-keyword1">FALSE</span> ? <span class="php-keyword2">current</span>(<span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$content_type</span>)) : <span class="php-var">$content_type</span>);
-</span><span id="832" class="l"><a href="#832"> 832: </a>
-</span><span id="833" class="l"><a href="#833"> 833: </a>            <span class="php-comment">// Check all formats against the CONTENT-TYPE header</span>
-</span><span id="834" class="l"><a href="#834"> 834: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$this</span>-&gt;_supported_formats <span class="php-keyword1">as</span> <span class="php-var">$type</span> =&gt; <span class="php-var">$mime</span>)
-</span><span id="835" class="l"><a href="#835"> 835: </a>            {
-</span><span id="836" class="l"><a href="#836"> 836: </a>                <span class="php-comment">// $type = format e.g. csv</span>
-</span><span id="837" class="l"><a href="#837"> 837: </a>                <span class="php-comment">// $mime = mime type e.g. application/csv</span>
-</span><span id="838" class="l"><a href="#838"> 838: </a>
-</span><span id="839" class="l"><a href="#839"> 839: </a>                <span class="php-comment">// If both the mime types match, then return the format</span>
-</span><span id="840" class="l"><a href="#840"> 840: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$content_type</span> === <span class="php-var">$mime</span>)
-</span><span id="841" class="l"><a href="#841"> 841: </a>                {
-</span><span id="842" class="l"><a href="#842"> 842: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$type</span>;
-</span><span id="843" class="l"><a href="#843"> 843: </a>                }
-</span><span id="844" class="l"><a href="#844"> 844: </a>            }
-</span><span id="845" class="l"><a href="#845"> 845: </a>        }
-</span><span id="846" class="l"><a href="#846"> 846: </a>
-</span><span id="847" class="l"><a href="#847"> 847: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="848" class="l"><a href="#848"> 848: </a>    }
-</span><span id="849" class="l"><a href="#849"> 849: </a>
-</span><span id="850" class="l"><a href="#850"> 850: </a>    <span class="php-comment">/**
-</span></span><span id="851" class="l"><a href="#851"> 851: </a><span class="php-comment">     * Gets the default format from the configuration. Fallbacks to 'json'
-</span></span><span id="852" class="l"><a href="#852"> 852: </a><span class="php-comment">     * if the corresponding configuration option $config['rest_default_format']
-</span></span><span id="853" class="l"><a href="#853"> 853: </a><span class="php-comment">     * is missing or is empty
-</span></span><span id="854" class="l"><a href="#854"> 854: </a><span class="php-comment">     *
-</span></span><span id="855" class="l"><a href="#855"> 855: </a><span class="php-comment">     * @access protected
-</span></span><span id="856" class="l"><a href="#856"> 856: </a><span class="php-comment">     * @return string The default supported input format
-</span></span><span id="857" class="l"><a href="#857"> 857: </a><span class="php-comment">     */</span>
-</span><span id="858" class="l"><a href="#858"> 858: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _get_default_output_format()
-</span><span id="859" class="l"><a href="#859"> 859: </a>    {
-</span><span id="860" class="l"><a href="#860"> 860: </a>        <span class="php-var">$default_format</span> = (string) <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_default_format'</span>);
-</span><span id="861" class="l"><a href="#861"> 861: </a>        <span class="php-keyword1">return</span> <span class="php-var">$default_format</span> === <span class="php-quote">''</span> ? <span class="php-quote">'json'</span> : <span class="php-var">$default_format</span>;
-</span><span id="862" class="l"><a href="#862"> 862: </a>    }
-</span><span id="863" class="l"><a href="#863"> 863: </a>
-</span><span id="864" class="l"><a href="#864"> 864: </a>    <span class="php-comment">/**
-</span></span><span id="865" class="l"><a href="#865"> 865: </a><span class="php-comment">     * Detect which format should be used to output the data
-</span></span><span id="866" class="l"><a href="#866"> 866: </a><span class="php-comment">     *
-</span></span><span id="867" class="l"><a href="#867"> 867: </a><span class="php-comment">     * @access protected
-</span></span><span id="868" class="l"><a href="#868"> 868: </a><span class="php-comment">     * @return mixed|NULL|string Output format
-</span></span><span id="869" class="l"><a href="#869"> 869: </a><span class="php-comment">     */</span>
-</span><span id="870" class="l"><a href="#870"> 870: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_output_format()
-</span><span id="871" class="l"><a href="#871"> 871: </a>    {
-</span><span id="872" class="l"><a href="#872"> 872: </a>        <span class="php-comment">// Concatenate formats to a regex pattern e.g. \.(csv|json|xml)</span>
-</span><span id="873" class="l"><a href="#873"> 873: </a>        <span class="php-var">$pattern</span> = <span class="php-quote">'/\.('</span>.<span class="php-keyword2">implode</span>(<span class="php-quote">'|'</span>, <span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats)).<span class="php-quote">')($|\/)/'</span>;
-</span><span id="874" class="l"><a href="#874"> 874: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="875" class="l"><a href="#875"> 875: </a>
-</span><span id="876" class="l"><a href="#876"> 876: </a>        <span class="php-comment">// Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2</span>
-</span><span id="877" class="l"><a href="#877"> 877: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(), <span class="php-var">$matches</span>))
-</span><span id="878" class="l"><a href="#878"> 878: </a>        {
-</span><span id="879" class="l"><a href="#879"> 879: </a>            <span class="php-keyword1">return</span> <span class="php-var">$matches</span>[<span class="php-num">1</span>];
-</span><span id="880" class="l"><a href="#880"> 880: </a>        }
-</span><span id="881" class="l"><a href="#881"> 881: </a>
-</span><span id="882" class="l"><a href="#882"> 882: </a>        <span class="php-comment">// Get the format parameter named as 'format'</span>
-</span><span id="883" class="l"><a href="#883"> 883: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]))
-</span><span id="884" class="l"><a href="#884"> 884: </a>        {
-</span><span id="885" class="l"><a href="#885"> 885: </a>            <span class="php-var">$format</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-quote">'format'</span>]);
-</span><span id="886" class="l"><a href="#886"> 886: </a>
-</span><span id="887" class="l"><a href="#887"> 887: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_supported_formats[<span class="php-var">$format</span>]) === <span class="php-keyword1">TRUE</span>)
-</span><span id="888" class="l"><a href="#888"> 888: </a>            {
-</span><span id="889" class="l"><a href="#889"> 889: </a>                <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="890" class="l"><a href="#890"> 890: </a>            }
-</span><span id="891" class="l"><a href="#891"> 891: </a>        }
-</span><span id="892" class="l"><a href="#892"> 892: </a>
-</span><span id="893" class="l"><a href="#893"> 893: </a>        <span class="php-comment">// Get the HTTP_ACCEPT server variable</span>
-</span><span id="894" class="l"><a href="#894"> 894: </a>        <span class="php-var">$http_accept</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT'</span>);
-</span><span id="895" class="l"><a href="#895"> 895: </a>
-</span><span id="896" class="l"><a href="#896"> 896: </a>        <span class="php-comment">// Otherwise, check the HTTP_ACCEPT server variable</span>
-</span><span id="897" class="l"><a href="#897"> 897: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ignore_http_accept'</span>) === <span class="php-keyword1">FALSE</span> &amp;&amp; <span class="php-var">$http_accept</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="898" class="l"><a href="#898"> 898: </a>        {
-</span><span id="899" class="l"><a href="#899"> 899: </a>            <span class="php-comment">// Check all formats against the HTTP_ACCEPT header</span>
-</span><span id="900" class="l"><a href="#900"> 900: </a>            <span class="php-keyword1">foreach</span> (<span class="php-keyword2">array_keys</span>(<span class="php-var">$this</span>-&gt;_supported_formats) <span class="php-keyword1">as</span> <span class="php-var">$format</span>)
-</span><span id="901" class="l"><a href="#901"> 901: </a>            {
-</span><span id="902" class="l"><a href="#902"> 902: </a>                <span class="php-comment">// Has this format been requested?</span>
-</span><span id="903" class="l"><a href="#903"> 903: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-var">$format</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="904" class="l"><a href="#904"> 904: </a>                {
-</span><span id="905" class="l"><a href="#905"> 905: </a>                    <span class="php-keyword1">if</span> (<span class="php-var">$format</span> !== <span class="php-quote">'html'</span> &amp;&amp; <span class="php-var">$format</span> !== <span class="php-quote">'xml'</span>)
-</span><span id="906" class="l"><a href="#906"> 906: </a>                    {
-</span><span id="907" class="l"><a href="#907"> 907: </a>                        <span class="php-comment">// If not HTML or XML assume it's correct</span>
-</span><span id="908" class="l"><a href="#908"> 908: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="909" class="l"><a href="#909"> 909: </a>                    }
-</span><span id="910" class="l"><a href="#910"> 910: </a>                    <span class="php-keyword1">elseif</span> (<span class="php-var">$format</span> === <span class="php-quote">'html'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'xml'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="911" class="l"><a href="#911"> 911: </a>                    {
-</span><span id="912" class="l"><a href="#912"> 912: </a>                        <span class="php-comment">// HTML or XML have shown up as a match</span>
-</span><span id="913" class="l"><a href="#913"> 913: </a>                        <span class="php-comment">// If it is truly HTML, it wont want any XML</span>
-</span><span id="914" class="l"><a href="#914"> 914: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="915" class="l"><a href="#915"> 915: </a>                    }
-</span><span id="916" class="l"><a href="#916"> 916: </a>                    <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$format</span> === <span class="php-quote">'xml'</span> &amp;&amp; <span class="php-keyword2">strpos</span>(<span class="php-var">$http_accept</span>, <span class="php-quote">'html'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="917" class="l"><a href="#917"> 917: </a>                    {
-</span><span id="918" class="l"><a href="#918"> 918: </a>                        <span class="php-comment">// If it is truly XML, it wont want any HTML</span>
-</span><span id="919" class="l"><a href="#919"> 919: </a>                        <span class="php-keyword1">return</span> <span class="php-var">$format</span>;
-</span><span id="920" class="l"><a href="#920"> 920: </a>                    }
-</span><span id="921" class="l"><a href="#921"> 921: </a>                }
-</span><span id="922" class="l"><a href="#922"> 922: </a>            }
-</span><span id="923" class="l"><a href="#923"> 923: </a>        }
-</span><span id="924" class="l"><a href="#924"> 924: </a>
-</span><span id="925" class="l"><a href="#925"> 925: </a>        <span class="php-comment">// Check if the controller has a default format</span>
-</span><span id="926" class="l"><a href="#926"> 926: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest_format) === <span class="php-keyword1">FALSE</span>)
-</span><span id="927" class="l"><a href="#927"> 927: </a>        {
-</span><span id="928" class="l"><a href="#928"> 928: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest_format;
-</span><span id="929" class="l"><a href="#929"> 929: </a>        }
-</span><span id="930" class="l"><a href="#930"> 930: </a>
-</span><span id="931" class="l"><a href="#931"> 931: </a>        <span class="php-comment">// Obtain the default format from the configuration</span>
-</span><span id="932" class="l"><a href="#932"> 932: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_default_output_format();
-</span><span id="933" class="l"><a href="#933"> 933: </a>    }
-</span><span id="934" class="l"><a href="#934"> 934: </a>
-</span><span id="935" class="l"><a href="#935"> 935: </a>    <span class="php-comment">/**
-</span></span><span id="936" class="l"><a href="#936"> 936: </a><span class="php-comment">     * Get the HTTP request string e.g. get or post
-</span></span><span id="937" class="l"><a href="#937"> 937: </a><span class="php-comment">     *
-</span></span><span id="938" class="l"><a href="#938"> 938: </a><span class="php-comment">     * @access protected
-</span></span><span id="939" class="l"><a href="#939"> 939: </a><span class="php-comment">     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
-</span></span><span id="940" class="l"><a href="#940"> 940: </a><span class="php-comment">     */</span>
-</span><span id="941" class="l"><a href="#941"> 941: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_method()
-</span><span id="942" class="l"><a href="#942"> 942: </a>    {
-</span><span id="943" class="l"><a href="#943"> 943: </a>        <span class="php-comment">// Declare a variable to store the method</span>
-</span><span id="944" class="l"><a href="#944"> 944: </a>        <span class="php-var">$method</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="945" class="l"><a href="#945"> 945: </a>
-</span><span id="946" class="l"><a href="#946"> 946: </a>        <span class="php-comment">// Determine whether the 'enable_emulate_request' setting is enabled</span>
-</span><span id="947" class="l"><a href="#947"> 947: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'enable_emulate_request'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="948" class="l"><a href="#948"> 948: </a>        {
-</span><span id="949" class="l"><a href="#949"> 949: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;post(<span class="php-quote">'_method'</span>);
-</span><span id="950" class="l"><a href="#950"> 950: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$method</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="951" class="l"><a href="#951"> 951: </a>            {
-</span><span id="952" class="l"><a href="#952"> 952: </a>                <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_X_HTTP_METHOD_OVERRIDE'</span>);
-</span><span id="953" class="l"><a href="#953"> 953: </a>            }
-</span><span id="954" class="l"><a href="#954"> 954: </a>
-</span><span id="955" class="l"><a href="#955"> 955: </a>            <span class="php-var">$method</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$method</span>);
-</span><span id="956" class="l"><a href="#956"> 956: </a>        }
-</span><span id="957" class="l"><a href="#957"> 957: </a>
-</span><span id="958" class="l"><a href="#958"> 958: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$method</span>))
-</span><span id="959" class="l"><a href="#959"> 959: </a>        {
-</span><span id="960" class="l"><a href="#960"> 960: </a>            <span class="php-comment">// Get the request method as a lowercase string</span>
-</span><span id="961" class="l"><a href="#961"> 961: </a>            <span class="php-var">$method</span> = <span class="php-var">$this</span>-&gt;input-&gt;method();
-</span><span id="962" class="l"><a href="#962"> 962: </a>        }
-</span><span id="963" class="l"><a href="#963"> 963: </a>
-</span><span id="964" class="l"><a href="#964"> 964: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">in_array</span>(<span class="php-var">$method</span>, <span class="php-var">$this</span>-&gt;allowed_http_methods) &amp;&amp; <span class="php-keyword2">method_exists</span>(<span class="php-var">$this</span>, <span class="php-quote">'_parse_'</span> . <span class="php-var">$method</span>) ? <span class="php-var">$method</span> : <span class="php-quote">'get'</span>;
-</span><span id="965" class="l"><a href="#965"> 965: </a>    }
-</span><span id="966" class="l"><a href="#966"> 966: </a>
-</span><span id="967" class="l"><a href="#967"> 967: </a>    <span class="php-comment">/**
-</span></span><span id="968" class="l"><a href="#968"> 968: </a><span class="php-comment">     * See if the user has provided an API key
-</span></span><span id="969" class="l"><a href="#969"> 969: </a><span class="php-comment">     *
-</span></span><span id="970" class="l"><a href="#970"> 970: </a><span class="php-comment">     * @access protected
-</span></span><span id="971" class="l"><a href="#971"> 971: </a><span class="php-comment">     * @return bool
-</span></span><span id="972" class="l"><a href="#972"> 972: </a><span class="php-comment">     */</span>
-</span><span id="973" class="l"><a href="#973"> 973: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_api_key()
-</span><span id="974" class="l"><a href="#974"> 974: </a>    {
-</span><span id="975" class="l"><a href="#975"> 975: </a>        <span class="php-comment">// Get the api key name variable set in the rest config file</span>
-</span><span id="976" class="l"><a href="#976"> 976: </a>        <span class="php-var">$api_key_variable</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_name'</span>);
-</span><span id="977" class="l"><a href="#977"> 977: </a>
-</span><span id="978" class="l"><a href="#978"> 978: </a>        <span class="php-comment">// Work out the name of the SERVER entry based on config</span>
-</span><span id="979" class="l"><a href="#979"> 979: </a>        <span class="php-var">$key_name</span> = <span class="php-quote">'HTTP_'</span> . <span class="php-keyword2">strtoupper</span>(<span class="php-keyword2">str_replace</span>(<span class="php-quote">'-'</span>, <span class="php-quote">'_'</span>, <span class="php-var">$api_key_variable</span>));
-</span><span id="980" class="l"><a href="#980"> 980: </a>
-</span><span id="981" class="l"><a href="#981"> 981: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="982" class="l"><a href="#982"> 982: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-keyword1">NULL</span>;
-</span><span id="983" class="l"><a href="#983"> 983: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-keyword1">NULL</span>;
-</span><span id="984" class="l"><a href="#984"> 984: </a>        <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-keyword1">FALSE</span>;
-</span><span id="985" class="l"><a href="#985"> 985: </a>
-</span><span id="986" class="l"><a href="#986"> 986: </a>        <span class="php-comment">// Find the key from server or arguments</span>
-</span><span id="987" class="l"><a href="#987"> 987: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$key</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>]) ? <span class="php-var">$this</span>-&gt;_args[<span class="php-var">$api_key_variable</span>] : <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-var">$key_name</span>)))
-</span><span id="988" class="l"><a href="#988"> 988: </a>        {
-</span><span id="989" class="l"><a href="#989"> 989: </a>            <span class="php-keyword1">if</span> ( ! (<span class="php-var">$row</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;where(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>), <span class="php-var">$key</span>)-&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_keys_table'</span>))-&gt;row()))
-</span><span id="990" class="l"><a href="#990"> 990: </a>            {
-</span><span id="991" class="l"><a href="#991"> 991: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="992" class="l"><a href="#992"> 992: </a>            }
-</span><span id="993" class="l"><a href="#993"> 993: </a>
-</span><span id="994" class="l"><a href="#994"> 994: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> = <span class="php-var">$row</span>-&gt;{<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_key_column'</span>)};
-</span><span id="995" class="l"><a href="#995"> 995: </a>
-</span><span id="996" class="l"><a href="#996"> 996: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;user_id) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;user_id = <span class="php-var">$row</span>-&gt;user_id;
-</span><span id="997" class="l"><a href="#997"> 997: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;level) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;level = <span class="php-var">$row</span>-&gt;level;
-</span><span id="998" class="l"><a href="#998"> 998: </a>            <span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ignore_limits) &amp;&amp; <span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits = <span class="php-var">$row</span>-&gt;ignore_limits;
-</span><span id="999" class="l"><a href="#999"> 999: </a>
-</span><span id="1000" class="l"><a href="#1000">1000: </a>            <span class="php-var">$this</span>-&gt;_apiuser = <span class="php-var">$row</span>;
-</span><span id="1001" class="l"><a href="#1001">1001: </a>
-</span><span id="1002" class="l"><a href="#1002">1002: </a>            <span class="php-comment">/*
-</span></span><span id="1003" class="l"><a href="#1003">1003: </a><span class="php-comment">             * If &quot;is private key&quot; is enabled, compare the ip address with the list
-</span></span><span id="1004" class="l"><a href="#1004">1004: </a><span class="php-comment">             * of valid ip addresses stored in the database
-</span></span><span id="1005" class="l"><a href="#1005">1005: </a><span class="php-comment">             */</span>
-</span><span id="1006" class="l"><a href="#1006">1006: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$row</span>-&gt;is_private_key) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1007" class="l"><a href="#1007">1007: </a>            {
-</span><span id="1008" class="l"><a href="#1008">1008: </a>                <span class="php-comment">// Check for a list of valid ip addresses</span>
-</span><span id="1009" class="l"><a href="#1009">1009: </a>                <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$row</span>-&gt;ip_addresses))
-</span><span id="1010" class="l"><a href="#1010">1010: </a>                {
-</span><span id="1011" class="l"><a href="#1011">1011: </a>                    <span class="php-comment">// multiple ip addresses must be separated using a comma, explode and loop</span>
-</span><span id="1012" class="l"><a href="#1012">1012: </a>                    <span class="php-var">$list_ip_addresses</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$row</span>-&gt;ip_addresses);
-</span><span id="1013" class="l"><a href="#1013">1013: </a>                    <span class="php-var">$found_address</span> = <span class="php-keyword1">FALSE</span>;
-</span><span id="1014" class="l"><a href="#1014">1014: </a>
-</span><span id="1015" class="l"><a href="#1015">1015: </a>                    <span class="php-keyword1">foreach</span> (<span class="php-var">$list_ip_addresses</span> <span class="php-keyword1">as</span> <span class="php-var">$ip_address</span>)
-</span><span id="1016" class="l"><a href="#1016">1016: </a>                    {
-</span><span id="1017" class="l"><a href="#1017">1017: </a>                        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;ip_address() === <span class="php-keyword2">trim</span>(<span class="php-var">$ip_address</span>))
-</span><span id="1018" class="l"><a href="#1018">1018: </a>                        {
-</span><span id="1019" class="l"><a href="#1019">1019: </a>                            <span class="php-comment">// there is a match, set the the value to TRUE and break out of the loop</span>
-</span><span id="1020" class="l"><a href="#1020">1020: </a>                            <span class="php-var">$found_address</span> = <span class="php-keyword1">TRUE</span>;
-</span><span id="1021" class="l"><a href="#1021">1021: </a>                            <span class="php-keyword1">break</span>;
-</span><span id="1022" class="l"><a href="#1022">1022: </a>                        }
-</span><span id="1023" class="l"><a href="#1023">1023: </a>                    }
-</span><span id="1024" class="l"><a href="#1024">1024: </a>
-</span><span id="1025" class="l"><a href="#1025">1025: </a>                    <span class="php-keyword1">return</span> <span class="php-var">$found_address</span>;
-</span><span id="1026" class="l"><a href="#1026">1026: </a>                }
-</span><span id="1027" class="l"><a href="#1027">1027: </a>                <span class="php-keyword1">else</span>
-</span><span id="1028" class="l"><a href="#1028">1028: </a>                {
-</span><span id="1029" class="l"><a href="#1029">1029: </a>                    <span class="php-comment">// There should be at least one IP address for this private key</span>
-</span><span id="1030" class="l"><a href="#1030">1030: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1031" class="l"><a href="#1031">1031: </a>                }
-</span><span id="1032" class="l"><a href="#1032">1032: </a>            }
-</span><span id="1033" class="l"><a href="#1033">1033: </a>
-</span><span id="1034" class="l"><a href="#1034">1034: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1035" class="l"><a href="#1035">1035: </a>        }
-</span><span id="1036" class="l"><a href="#1036">1036: </a>
-</span><span id="1037" class="l"><a href="#1037">1037: </a>        <span class="php-comment">// No key has been sent</span>
-</span><span id="1038" class="l"><a href="#1038">1038: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1039" class="l"><a href="#1039">1039: </a>    }
-</span><span id="1040" class="l"><a href="#1040">1040: </a>
-</span><span id="1041" class="l"><a href="#1041">1041: </a>    <span class="php-comment">/**
-</span></span><span id="1042" class="l"><a href="#1042">1042: </a><span class="php-comment">     * Preferred return language
-</span></span><span id="1043" class="l"><a href="#1043">1043: </a><span class="php-comment">     *
-</span></span><span id="1044" class="l"><a href="#1044">1044: </a><span class="php-comment">     * @access protected
-</span></span><span id="1045" class="l"><a href="#1045">1045: </a><span class="php-comment">     * @return string|NULL The language code
-</span></span><span id="1046" class="l"><a href="#1046">1046: </a><span class="php-comment">     */</span>
-</span><span id="1047" class="l"><a href="#1047">1047: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _detect_lang()
-</span><span id="1048" class="l"><a href="#1048">1048: </a>    {
-</span><span id="1049" class="l"><a href="#1049">1049: </a>        <span class="php-var">$lang</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ACCEPT_LANGUAGE'</span>);
-</span><span id="1050" class="l"><a href="#1050">1050: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$lang</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1051" class="l"><a href="#1051">1051: </a>        {
-</span><span id="1052" class="l"><a href="#1052">1052: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">NULL</span>;
-</span><span id="1053" class="l"><a href="#1053">1053: </a>        }
-</span><span id="1054" class="l"><a href="#1054">1054: </a>
-</span><span id="1055" class="l"><a href="#1055">1055: </a>        <span class="php-comment">// It appears more than one language has been sent using a comma delimiter</span>
-</span><span id="1056" class="l"><a href="#1056">1056: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-var">$lang</span>, <span class="php-quote">','</span>) !== <span class="php-keyword1">FALSE</span>)
-</span><span id="1057" class="l"><a href="#1057">1057: </a>        {
-</span><span id="1058" class="l"><a href="#1058">1058: </a>            <span class="php-var">$langs</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$lang</span>);
-</span><span id="1059" class="l"><a href="#1059">1059: </a>
-</span><span id="1060" class="l"><a href="#1060">1060: </a>            <span class="php-var">$return_langs</span> = [];
-</span><span id="1061" class="l"><a href="#1061">1061: </a>            <span class="php-keyword1">foreach</span> (<span class="php-var">$langs</span> <span class="php-keyword1">as</span> <span class="php-var">$lang</span>)
-</span><span id="1062" class="l"><a href="#1062">1062: </a>            {
-</span><span id="1063" class="l"><a href="#1063">1063: </a>                <span class="php-comment">// Remove weight and trim leading and trailing whitespace</span>
-</span><span id="1064" class="l"><a href="#1064">1064: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$lang</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">';'</span>, <span class="php-var">$lang</span>);
-</span><span id="1065" class="l"><a href="#1065">1065: </a>                <span class="php-var">$return_langs</span>[] = <span class="php-keyword2">trim</span>(<span class="php-var">$lang</span>);
-</span><span id="1066" class="l"><a href="#1066">1066: </a>            }
-</span><span id="1067" class="l"><a href="#1067">1067: </a>
-</span><span id="1068" class="l"><a href="#1068">1068: </a>            <span class="php-keyword1">return</span> <span class="php-var">$return_langs</span>;
-</span><span id="1069" class="l"><a href="#1069">1069: </a>        }
-</span><span id="1070" class="l"><a href="#1070">1070: </a>
-</span><span id="1071" class="l"><a href="#1071">1071: </a>        <span class="php-comment">// Otherwise simply return as a string</span>
-</span><span id="1072" class="l"><a href="#1072">1072: </a>        <span class="php-keyword1">return</span> <span class="php-var">$lang</span>;
-</span><span id="1073" class="l"><a href="#1073">1073: </a>    }
-</span><span id="1074" class="l"><a href="#1074">1074: </a>
-</span><span id="1075" class="l"><a href="#1075">1075: </a>    <span class="php-comment">/**
-</span></span><span id="1076" class="l"><a href="#1076">1076: </a><span class="php-comment">     * Add the request to the log table
-</span></span><span id="1077" class="l"><a href="#1077">1077: </a><span class="php-comment">     *
-</span></span><span id="1078" class="l"><a href="#1078">1078: </a><span class="php-comment">     * @access protected
-</span></span><span id="1079" class="l"><a href="#1079">1079: </a><span class="php-comment">     * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
-</span></span><span id="1080" class="l"><a href="#1080">1080: </a><span class="php-comment">     * @return bool TRUE the data was inserted; otherwise, FALSE
-</span></span><span id="1081" class="l"><a href="#1081">1081: </a><span class="php-comment">     */</span>
-</span><span id="1082" class="l"><a href="#1082">1082: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_request(<span class="php-var">$authorized</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1083" class="l"><a href="#1083">1083: </a>    {
-</span><span id="1084" class="l"><a href="#1084">1084: </a>        <span class="php-comment">// Insert the request into the log table</span>
-</span><span id="1085" class="l"><a href="#1085">1085: </a>        <span class="php-var">$is_inserted</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1086" class="l"><a href="#1086">1086: </a>            -&gt;insert(
-</span><span id="1087" class="l"><a href="#1087">1087: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), [
-</span><span id="1088" class="l"><a href="#1088">1088: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$this</span>-&gt;uri-&gt;uri_string(),
-</span><span id="1089" class="l"><a href="#1089">1089: </a>                <span class="php-quote">'method'</span> =&gt; <span class="php-var">$this</span>-&gt;request-&gt;method,
-</span><span id="1090" class="l"><a href="#1090">1090: </a>                <span class="php-quote">'params'</span> =&gt; <span class="php-var">$this</span>-&gt;_args ? (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_json_params'</span>) === <span class="php-keyword1">TRUE</span> ? <span class="php-keyword2">json_encode</span>(<span class="php-var">$this</span>-&gt;_args) : <span class="php-keyword2">serialize</span>(<span class="php-var">$this</span>-&gt;_args)) : <span class="php-keyword1">NULL</span>,
-</span><span id="1091" class="l"><a href="#1091">1091: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="1092" class="l"><a href="#1092">1092: </a>                <span class="php-quote">'ip_address'</span> =&gt; <span class="php-var">$this</span>-&gt;input-&gt;ip_address(),
-</span><span id="1093" class="l"><a href="#1093">1093: </a>                <span class="php-quote">'time'</span> =&gt; <span class="php-keyword2">time</span>(),
-</span><span id="1094" class="l"><a href="#1094">1094: </a>                <span class="php-quote">'authorized'</span> =&gt; <span class="php-var">$authorized</span>
-</span><span id="1095" class="l"><a href="#1095">1095: </a>            ]);
-</span><span id="1096" class="l"><a href="#1096">1096: </a>
-</span><span id="1097" class="l"><a href="#1097">1097: </a>        <span class="php-comment">// Get the last insert id to update at a later stage of the request</span>
-</span><span id="1098" class="l"><a href="#1098">1098: </a>        <span class="php-var">$this</span>-&gt;_insert_id = <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert_id();
-</span><span id="1099" class="l"><a href="#1099">1099: </a>
-</span><span id="1100" class="l"><a href="#1100">1100: </a>        <span class="php-keyword1">return</span> <span class="php-var">$is_inserted</span>;
-</span><span id="1101" class="l"><a href="#1101">1101: </a>    }
-</span><span id="1102" class="l"><a href="#1102">1102: </a>
-</span><span id="1103" class="l"><a href="#1103">1103: </a>    <span class="php-comment">/**
-</span></span><span id="1104" class="l"><a href="#1104">1104: </a><span class="php-comment">     * Check if the requests to a controller method exceed a limit
-</span></span><span id="1105" class="l"><a href="#1105">1105: </a><span class="php-comment">     *
-</span></span><span id="1106" class="l"><a href="#1106">1106: </a><span class="php-comment">     * @access protected
-</span></span><span id="1107" class="l"><a href="#1107">1107: </a><span class="php-comment">     * @param  string $controller_method The method being called
-</span></span><span id="1108" class="l"><a href="#1108">1108: </a><span class="php-comment">     * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
-</span></span><span id="1109" class="l"><a href="#1109">1109: </a><span class="php-comment">     */</span>
-</span><span id="1110" class="l"><a href="#1110">1110: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_limit(<span class="php-var">$controller_method</span>)
-</span><span id="1111" class="l"><a href="#1111">1111: </a>    {
-</span><span id="1112" class="l"><a href="#1112">1112: </a>        <span class="php-comment">// They are special, or it might not even have a limit</span>
-</span><span id="1113" class="l"><a href="#1113">1113: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$this</span>-&gt;rest-&gt;ignore_limits) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1114" class="l"><a href="#1114">1114: </a>        {
-</span><span id="1115" class="l"><a href="#1115">1115: </a>            <span class="php-comment">// Everything is fine</span>
-</span><span id="1116" class="l"><a href="#1116">1116: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1117" class="l"><a href="#1117">1117: </a>        }
-</span><span id="1118" class="l"><a href="#1118">1118: </a>
-</span><span id="1119" class="l"><a href="#1119">1119: </a>        <span class="php-keyword1">switch</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_method'</span>))
-</span><span id="1120" class="l"><a href="#1120">1120: </a>        {
-</span><span id="1121" class="l"><a href="#1121">1121: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'API_KEY'</span>:
-</span><span id="1122" class="l"><a href="#1122">1122: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'api-key:'</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>);
-</span><span id="1123" class="l"><a href="#1123">1123: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>;
-</span><span id="1124" class="l"><a href="#1124">1124: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1125" class="l"><a href="#1125">1125: </a>
-</span><span id="1126" class="l"><a href="#1126">1126: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'METHOD_NAME'</span>:
-</span><span id="1127" class="l"><a href="#1127">1127: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'method-name:'</span> . <span class="php-var">$controller_method</span>;
-</span><span id="1128" class="l"><a href="#1128">1128: </a>            <span class="php-var">$limited_method_name</span> =  <span class="php-var">$controller_method</span>;
-</span><span id="1129" class="l"><a href="#1129">1129: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1130" class="l"><a href="#1130">1130: </a>
-</span><span id="1131" class="l"><a href="#1131">1131: </a>          <span class="php-keyword1">case</span> <span class="php-quote">'ROUTED_URL'</span>:
-</span><span id="1132" class="l"><a href="#1132">1132: </a>          <span class="php-keyword1">default</span>:
-</span><span id="1133" class="l"><a href="#1133">1133: </a>            <span class="php-var">$limited_uri</span> = <span class="php-var">$this</span>-&gt;uri-&gt;ruri_string();
-</span><span id="1134" class="l"><a href="#1134">1134: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strrev</span>(<span class="php-var">$limited_uri</span>), <span class="php-keyword2">strrev</span>(<span class="php-var">$this</span>-&gt;response-&gt;format)) === <span class="php-num">0</span>)
-</span><span id="1135" class="l"><a href="#1135">1135: </a>            {
-</span><span id="1136" class="l"><a href="#1136">1136: </a>                <span class="php-var">$limited_uri</span> = <span class="php-keyword2">substr</span>(<span class="php-var">$limited_uri</span>,<span class="php-num">0</span>, -<span class="php-keyword2">strlen</span>(<span class="php-var">$this</span>-&gt;response-&gt;format) - <span class="php-num">1</span>);
-</span><span id="1137" class="l"><a href="#1137">1137: </a>            }
-</span><span id="1138" class="l"><a href="#1138">1138: </a>            <span class="php-var">$limited_uri</span> = <span class="php-quote">'uri:'</span>.<span class="php-var">$limited_uri</span>.<span class="php-quote">':'</span>.<span class="php-var">$this</span>-&gt;request-&gt;method; <span class="php-comment">// It's good to differentiate GET from PUT</span>
-</span><span id="1139" class="l"><a href="#1139">1139: </a>            <span class="php-var">$limited_method_name</span> = <span class="php-var">$controller_method</span>;
-</span><span id="1140" class="l"><a href="#1140">1140: </a>            <span class="php-keyword1">break</span>;
-</span><span id="1141" class="l"><a href="#1141">1141: </a>        }
-</span><span id="1142" class="l"><a href="#1142">1142: </a>
-</span><span id="1143" class="l"><a href="#1143">1143: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>]) === <span class="php-keyword1">FALSE</span> )
-</span><span id="1144" class="l"><a href="#1144">1144: </a>        {
-</span><span id="1145" class="l"><a href="#1145">1145: </a>            <span class="php-comment">// Everything is fine</span>
-</span><span id="1146" class="l"><a href="#1146">1146: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1147" class="l"><a href="#1147">1147: </a>        }
-</span><span id="1148" class="l"><a href="#1148">1148: </a>
-</span><span id="1149" class="l"><a href="#1149">1149: </a>        <span class="php-comment">// How many times can you get to this method in a defined time_limit (default: 1 hour)?</span>
-</span><span id="1150" class="l"><a href="#1150">1150: </a>        <span class="php-var">$limit</span> = <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'limit'</span>];
-</span><span id="1151" class="l"><a href="#1151">1151: </a>
-</span><span id="1152" class="l"><a href="#1152">1152: </a>        <span class="php-var">$time_limit</span> = (<span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>]) ? <span class="php-var">$this</span>-&gt;methods[<span class="php-var">$limited_method_name</span>][<span class="php-quote">'time'</span>] : <span class="php-num">3600</span>); <span class="php-comment">// 3600 = 60 * 60</span>
-</span><span id="1153" class="l"><a href="#1153">1153: </a>
-</span><span id="1154" class="l"><a href="#1154">1154: </a>        <span class="php-comment">// Get data about a keys' usage and limit to one row</span>
-</span><span id="1155" class="l"><a href="#1155">1155: </a>        <span class="php-var">$result</span> = <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1156" class="l"><a href="#1156">1156: </a>            -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1157" class="l"><a href="#1157">1157: </a>            -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1158" class="l"><a href="#1158">1158: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>))
-</span><span id="1159" class="l"><a href="#1159">1159: </a>            -&gt;row();
-</span><span id="1160" class="l"><a href="#1160">1160: </a>
-</span><span id="1161" class="l"><a href="#1161">1161: </a>        <span class="php-comment">// No calls have been made for this key</span>
-</span><span id="1162" class="l"><a href="#1162">1162: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$result</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1163" class="l"><a href="#1163">1163: </a>        {
-</span><span id="1164" class="l"><a href="#1164">1164: </a>            <span class="php-comment">// Create a new row for the following key</span>
-</span><span id="1165" class="l"><a href="#1165">1165: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;insert(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>), [
-</span><span id="1166" class="l"><a href="#1166">1166: </a>                <span class="php-quote">'uri'</span> =&gt; <span class="php-var">$limited_uri</span>,
-</span><span id="1167" class="l"><a href="#1167">1167: </a>                <span class="php-quote">'api_key'</span> =&gt; <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>,
-</span><span id="1168" class="l"><a href="#1168">1168: </a>                <span class="php-quote">'count'</span> =&gt; <span class="php-num">1</span>,
-</span><span id="1169" class="l"><a href="#1169">1169: </a>                <span class="php-quote">'hour_started'</span> =&gt; <span class="php-keyword2">time</span>()
-</span><span id="1170" class="l"><a href="#1170">1170: </a>            ]);
-</span><span id="1171" class="l"><a href="#1171">1171: </a>        }
-</span><span id="1172" class="l"><a href="#1172">1172: </a>
-</span><span id="1173" class="l"><a href="#1173">1173: </a>        <span class="php-comment">// Been a time limit (or by default an hour) since they called</span>
-</span><span id="1174" class="l"><a href="#1174">1174: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$result</span>-&gt;hour_started &lt; (<span class="php-keyword2">time</span>() - <span class="php-var">$time_limit</span>))
-</span><span id="1175" class="l"><a href="#1175">1175: </a>        {
-</span><span id="1176" class="l"><a href="#1176">1176: </a>            <span class="php-comment">// Reset the started period and count</span>
-</span><span id="1177" class="l"><a href="#1177">1177: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1178" class="l"><a href="#1178">1178: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1179" class="l"><a href="#1179">1179: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>) ? <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span> : <span class="php-quote">''</span>)
-</span><span id="1180" class="l"><a href="#1180">1180: </a>                -&gt;set(<span class="php-quote">'hour_started'</span>, <span class="php-keyword2">time</span>())
-</span><span id="1181" class="l"><a href="#1181">1181: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-num">1</span>)
-</span><span id="1182" class="l"><a href="#1182">1182: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1183" class="l"><a href="#1183">1183: </a>        }
-</span><span id="1184" class="l"><a href="#1184">1184: </a>
-</span><span id="1185" class="l"><a href="#1185">1185: </a>        <span class="php-comment">// They have called within the hour, so lets update</span>
-</span><span id="1186" class="l"><a href="#1186">1186: </a>        <span class="php-keyword1">else</span>
-</span><span id="1187" class="l"><a href="#1187">1187: </a>        {
-</span><span id="1188" class="l"><a href="#1188">1188: </a>            <span class="php-comment">// The limit has been exceeded</span>
-</span><span id="1189" class="l"><a href="#1189">1189: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$result</span>-&gt;<span class="php-keyword2">count</span> &gt;= <span class="php-var">$limit</span>)
-</span><span id="1190" class="l"><a href="#1190">1190: </a>            {
-</span><span id="1191" class="l"><a href="#1191">1191: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1192" class="l"><a href="#1192">1192: </a>            }
-</span><span id="1193" class="l"><a href="#1193">1193: </a>
-</span><span id="1194" class="l"><a href="#1194">1194: </a>            <span class="php-comment">// Increase the count by one</span>
-</span><span id="1195" class="l"><a href="#1195">1195: </a>            <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="1196" class="l"><a href="#1196">1196: </a>                -&gt;where(<span class="php-quote">'uri'</span>, <span class="php-var">$limited_uri</span>)
-</span><span id="1197" class="l"><a href="#1197">1197: </a>                -&gt;where(<span class="php-quote">'api_key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="1198" class="l"><a href="#1198">1198: </a>                -&gt;set(<span class="php-quote">'count'</span>, <span class="php-quote">'count + 1'</span>, <span class="php-keyword1">FALSE</span>)
-</span><span id="1199" class="l"><a href="#1199">1199: </a>                -&gt;update(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_limits_table'</span>));
-</span><span id="1200" class="l"><a href="#1200">1200: </a>        }
-</span><span id="1201" class="l"><a href="#1201">1201: </a>
-</span><span id="1202" class="l"><a href="#1202">1202: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1203" class="l"><a href="#1203">1203: </a>    }
-</span><span id="1204" class="l"><a href="#1204">1204: </a>
-</span><span id="1205" class="l"><a href="#1205">1205: </a>    <span class="php-comment">/**
-</span></span><span id="1206" class="l"><a href="#1206">1206: </a><span class="php-comment">     * Check if there is a specific auth type set for the current class/method/HTTP-method being called
-</span></span><span id="1207" class="l"><a href="#1207">1207: </a><span class="php-comment">     *
-</span></span><span id="1208" class="l"><a href="#1208">1208: </a><span class="php-comment">     * @access protected
-</span></span><span id="1209" class="l"><a href="#1209">1209: </a><span class="php-comment">     * @return bool
-</span></span><span id="1210" class="l"><a href="#1210">1210: </a><span class="php-comment">     */</span>
-</span><span id="1211" class="l"><a href="#1211">1211: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _auth_override_check()
-</span><span id="1212" class="l"><a href="#1212">1212: </a>    {
-</span><span id="1213" class="l"><a href="#1213">1213: </a>        <span class="php-comment">// Assign the class/method auth type override array from the config</span>
-</span><span id="1214" class="l"><a href="#1214">1214: </a>        <span class="php-var">$auth_override_class_method</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method'</span>);
-</span><span id="1215" class="l"><a href="#1215">1215: </a>
-</span><span id="1216" class="l"><a href="#1216">1216: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
-</span><span id="1217" class="l"><a href="#1217">1217: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>))
-</span><span id="1218" class="l"><a href="#1218">1218: </a>        {
-</span><span id="1219" class="l"><a href="#1219">1219: </a>            <span class="php-comment">// Check for wildcard flag for rules for classes</span>
-</span><span id="1220" class="l"><a href="#1220">1220: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>])) <span class="php-comment">// Check for class overrides</span>
-</span><span id="1221" class="l"><a href="#1221">1221: </a>            {
-</span><span id="1222" class="l"><a href="#1222">1222: </a>                <span class="php-comment">// No auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1223" class="l"><a href="#1223">1223: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'none'</span>)
-</span><span id="1224" class="l"><a href="#1224">1224: </a>                {
-</span><span id="1225" class="l"><a href="#1225">1225: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1226" class="l"><a href="#1226">1226: </a>                }
-</span><span id="1227" class="l"><a href="#1227">1227: </a>
-</span><span id="1228" class="l"><a href="#1228">1228: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1229" class="l"><a href="#1229">1229: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'basic'</span>)
-</span><span id="1230" class="l"><a href="#1230">1230: </a>                {
-</span><span id="1231" class="l"><a href="#1231">1231: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1232" class="l"><a href="#1232">1232: </a>
-</span><span id="1233" class="l"><a href="#1233">1233: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1234" class="l"><a href="#1234">1234: </a>                }
-</span><span id="1235" class="l"><a href="#1235">1235: </a>
-</span><span id="1236" class="l"><a href="#1236">1236: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1237" class="l"><a href="#1237">1237: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'digest'</span>)
-</span><span id="1238" class="l"><a href="#1238">1238: </a>                {
-</span><span id="1239" class="l"><a href="#1239">1239: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1240" class="l"><a href="#1240">1240: </a>
-</span><span id="1241" class="l"><a href="#1241">1241: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1242" class="l"><a href="#1242">1242: </a>                }
-</span><span id="1243" class="l"><a href="#1243">1243: </a>
-</span><span id="1244" class="l"><a href="#1244">1244: </a>                <span class="php-comment">// Session auth override found, check session</span>
-</span><span id="1245" class="l"><a href="#1245">1245: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'session'</span>)
-</span><span id="1246" class="l"><a href="#1246">1246: </a>                {
-</span><span id="1247" class="l"><a href="#1247">1247: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="1248" class="l"><a href="#1248">1248: </a>
-</span><span id="1249" class="l"><a href="#1249">1249: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1250" class="l"><a href="#1250">1250: </a>                }
-</span><span id="1251" class="l"><a href="#1251">1251: </a>
-</span><span id="1252" class="l"><a href="#1252">1252: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1253" class="l"><a href="#1253">1253: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1254" class="l"><a href="#1254">1254: </a>                {
-</span><span id="1255" class="l"><a href="#1255">1255: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1256" class="l"><a href="#1256">1256: </a>
-</span><span id="1257" class="l"><a href="#1257">1257: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1258" class="l"><a href="#1258">1258: </a>                }
-</span><span id="1259" class="l"><a href="#1259">1259: </a>            }
-</span><span id="1260" class="l"><a href="#1260">1260: </a>
-</span><span id="1261" class="l"><a href="#1261">1261: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method being called</span>
-</span><span id="1262" class="l"><a href="#1262">1262: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method]))
-</span><span id="1263" class="l"><a href="#1263">1263: </a>            {
-</span><span id="1264" class="l"><a href="#1264">1264: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1265" class="l"><a href="#1265">1265: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'none'</span>)
-</span><span id="1266" class="l"><a href="#1266">1266: </a>                {
-</span><span id="1267" class="l"><a href="#1267">1267: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1268" class="l"><a href="#1268">1268: </a>                }
-</span><span id="1269" class="l"><a href="#1269">1269: </a>
-</span><span id="1270" class="l"><a href="#1270">1270: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1271" class="l"><a href="#1271">1271: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'basic'</span>)
-</span><span id="1272" class="l"><a href="#1272">1272: </a>                {
-</span><span id="1273" class="l"><a href="#1273">1273: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1274" class="l"><a href="#1274">1274: </a>
-</span><span id="1275" class="l"><a href="#1275">1275: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1276" class="l"><a href="#1276">1276: </a>                }
-</span><span id="1277" class="l"><a href="#1277">1277: </a>
-</span><span id="1278" class="l"><a href="#1278">1278: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1279" class="l"><a href="#1279">1279: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'digest'</span>)
-</span><span id="1280" class="l"><a href="#1280">1280: </a>                {
-</span><span id="1281" class="l"><a href="#1281">1281: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1282" class="l"><a href="#1282">1282: </a>
-</span><span id="1283" class="l"><a href="#1283">1283: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1284" class="l"><a href="#1284">1284: </a>                }
-</span><span id="1285" class="l"><a href="#1285">1285: </a>
-</span><span id="1286" class="l"><a href="#1286">1286: </a>                <span class="php-comment">// Session auth override found, check session</span>
-</span><span id="1287" class="l"><a href="#1287">1287: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'session'</span>)
-</span><span id="1288" class="l"><a href="#1288">1288: </a>                {
-</span><span id="1289" class="l"><a href="#1289">1289: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="1290" class="l"><a href="#1290">1290: </a>
-</span><span id="1291" class="l"><a href="#1291">1291: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1292" class="l"><a href="#1292">1292: </a>                }
-</span><span id="1293" class="l"><a href="#1293">1293: </a>
-</span><span id="1294" class="l"><a href="#1294">1294: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1295" class="l"><a href="#1295">1295: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1296" class="l"><a href="#1296">1296: </a>                {
-</span><span id="1297" class="l"><a href="#1297">1297: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1298" class="l"><a href="#1298">1298: </a>
-</span><span id="1299" class="l"><a href="#1299">1299: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1300" class="l"><a href="#1300">1300: </a>                }
-</span><span id="1301" class="l"><a href="#1301">1301: </a>            }
-</span><span id="1302" class="l"><a href="#1302">1302: </a>        }
-</span><span id="1303" class="l"><a href="#1303">1303: </a>
-</span><span id="1304" class="l"><a href="#1304">1304: </a>        <span class="php-comment">// Assign the class/method/HTTP-method auth type override array from the config</span>
-</span><span id="1305" class="l"><a href="#1305">1305: </a>        <span class="php-var">$auth_override_class_method_http</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_override_class_method_http'</span>);
-</span><span id="1306" class="l"><a href="#1306">1306: </a>
-</span><span id="1307" class="l"><a href="#1307">1307: </a>        <span class="php-comment">// Check to see if the override array is even populated</span>
-</span><span id="1308" class="l"><a href="#1308">1308: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>))
-</span><span id="1309" class="l"><a href="#1309">1309: </a>        {
-</span><span id="1310" class="l"><a href="#1310">1310: </a>            <span class="php-comment">// check for wildcard flag for rules for classes</span>
-</span><span id="1311" class="l"><a href="#1311">1311: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method]))
-</span><span id="1312" class="l"><a href="#1312">1312: </a>            {
-</span><span id="1313" class="l"><a href="#1313">1313: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1314" class="l"><a href="#1314">1314: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
-</span><span id="1315" class="l"><a href="#1315">1315: </a>                {
-</span><span id="1316" class="l"><a href="#1316">1316: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1317" class="l"><a href="#1317">1317: </a>                }
-</span><span id="1318" class="l"><a href="#1318">1318: </a>
-</span><span id="1319" class="l"><a href="#1319">1319: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1320" class="l"><a href="#1320">1320: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
-</span><span id="1321" class="l"><a href="#1321">1321: </a>                {
-</span><span id="1322" class="l"><a href="#1322">1322: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1323" class="l"><a href="#1323">1323: </a>
-</span><span id="1324" class="l"><a href="#1324">1324: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1325" class="l"><a href="#1325">1325: </a>                }
-</span><span id="1326" class="l"><a href="#1326">1326: </a>
-</span><span id="1327" class="l"><a href="#1327">1327: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1328" class="l"><a href="#1328">1328: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
-</span><span id="1329" class="l"><a href="#1329">1329: </a>                {
-</span><span id="1330" class="l"><a href="#1330">1330: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1331" class="l"><a href="#1331">1331: </a>
-</span><span id="1332" class="l"><a href="#1332">1332: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1333" class="l"><a href="#1333">1333: </a>                }
-</span><span id="1334" class="l"><a href="#1334">1334: </a>
-</span><span id="1335" class="l"><a href="#1335">1335: </a>                <span class="php-comment">// Session auth override found, check session</span>
-</span><span id="1336" class="l"><a href="#1336">1336: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'session'</span>)
-</span><span id="1337" class="l"><a href="#1337">1337: </a>                {
-</span><span id="1338" class="l"><a href="#1338">1338: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="1339" class="l"><a href="#1339">1339: </a>
-</span><span id="1340" class="l"><a href="#1340">1340: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1341" class="l"><a href="#1341">1341: </a>                }
-</span><span id="1342" class="l"><a href="#1342">1342: </a>
-</span><span id="1343" class="l"><a href="#1343">1343: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1344" class="l"><a href="#1344">1344: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-quote">'*'</span>][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1345" class="l"><a href="#1345">1345: </a>                {
-</span><span id="1346" class="l"><a href="#1346">1346: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1347" class="l"><a href="#1347">1347: </a>
-</span><span id="1348" class="l"><a href="#1348">1348: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1349" class="l"><a href="#1349">1349: </a>                }
-</span><span id="1350" class="l"><a href="#1350">1350: </a>            }
-</span><span id="1351" class="l"><a href="#1351">1351: </a>
-</span><span id="1352" class="l"><a href="#1352">1352: </a>            <span class="php-comment">// Check to see if there's an override value set for the current class/method/HTTP-method being called</span>
-</span><span id="1353" class="l"><a href="#1353">1353: </a>            <span class="php-keyword1">if</span> ( ! <span class="php-keyword1">empty</span>(<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method]))
-</span><span id="1354" class="l"><a href="#1354">1354: </a>            {
-</span><span id="1355" class="l"><a href="#1355">1355: </a>                <span class="php-comment">// None auth override found, prepare nothing but send back a TRUE override flag</span>
-</span><span id="1356" class="l"><a href="#1356">1356: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'none'</span>)
-</span><span id="1357" class="l"><a href="#1357">1357: </a>                {
-</span><span id="1358" class="l"><a href="#1358">1358: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1359" class="l"><a href="#1359">1359: </a>                }
-</span><span id="1360" class="l"><a href="#1360">1360: </a>
-</span><span id="1361" class="l"><a href="#1361">1361: </a>                <span class="php-comment">// Basic auth override found, prepare basic</span>
-</span><span id="1362" class="l"><a href="#1362">1362: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'basic'</span>)
-</span><span id="1363" class="l"><a href="#1363">1363: </a>                {
-</span><span id="1364" class="l"><a href="#1364">1364: </a>                    <span class="php-var">$this</span>-&gt;_prepare_basic_auth();
-</span><span id="1365" class="l"><a href="#1365">1365: </a>
-</span><span id="1366" class="l"><a href="#1366">1366: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1367" class="l"><a href="#1367">1367: </a>                }
-</span><span id="1368" class="l"><a href="#1368">1368: </a>
-</span><span id="1369" class="l"><a href="#1369">1369: </a>                <span class="php-comment">// Digest auth override found, prepare digest</span>
-</span><span id="1370" class="l"><a href="#1370">1370: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'digest'</span>)
-</span><span id="1371" class="l"><a href="#1371">1371: </a>                {
-</span><span id="1372" class="l"><a href="#1372">1372: </a>                    <span class="php-var">$this</span>-&gt;_prepare_digest_auth();
-</span><span id="1373" class="l"><a href="#1373">1373: </a>
-</span><span id="1374" class="l"><a href="#1374">1374: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1375" class="l"><a href="#1375">1375: </a>                }
-</span><span id="1376" class="l"><a href="#1376">1376: </a>
-</span><span id="1377" class="l"><a href="#1377">1377: </a>                <span class="php-comment">// Session auth override found, check session</span>
-</span><span id="1378" class="l"><a href="#1378">1378: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'session'</span>)
-</span><span id="1379" class="l"><a href="#1379">1379: </a>                {
-</span><span id="1380" class="l"><a href="#1380">1380: </a>                    <span class="php-var">$this</span>-&gt;_check_php_session();
-</span><span id="1381" class="l"><a href="#1381">1381: </a>
-</span><span id="1382" class="l"><a href="#1382">1382: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1383" class="l"><a href="#1383">1383: </a>                }
-</span><span id="1384" class="l"><a href="#1384">1384: </a>
-</span><span id="1385" class="l"><a href="#1385">1385: </a>                <span class="php-comment">// Whitelist auth override found, check client's ip against config whitelist</span>
-</span><span id="1386" class="l"><a href="#1386">1386: </a>                <span class="php-keyword1">if</span> (<span class="php-var">$auth_override_class_method_http</span>[<span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>][<span class="php-var">$this</span>-&gt;router-&gt;method][<span class="php-var">$this</span>-&gt;request-&gt;method] === <span class="php-quote">'whitelist'</span>)
-</span><span id="1387" class="l"><a href="#1387">1387: </a>                {
-</span><span id="1388" class="l"><a href="#1388">1388: </a>                    <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1389" class="l"><a href="#1389">1389: </a>
-</span><span id="1390" class="l"><a href="#1390">1390: </a>                    <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1391" class="l"><a href="#1391">1391: </a>                }
-</span><span id="1392" class="l"><a href="#1392">1392: </a>            }
-</span><span id="1393" class="l"><a href="#1393">1393: </a>        }
-</span><span id="1394" class="l"><a href="#1394">1394: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1395" class="l"><a href="#1395">1395: </a>    }
-</span><span id="1396" class="l"><a href="#1396">1396: </a>
-</span><span id="1397" class="l"><a href="#1397">1397: </a>    <span class="php-comment">/**
-</span></span><span id="1398" class="l"><a href="#1398">1398: </a><span class="php-comment">     * Parse the GET request arguments
-</span></span><span id="1399" class="l"><a href="#1399">1399: </a><span class="php-comment">     *
-</span></span><span id="1400" class="l"><a href="#1400">1400: </a><span class="php-comment">     * @access protected
-</span></span><span id="1401" class="l"><a href="#1401">1401: </a><span class="php-comment">     * @return void
-</span></span><span id="1402" class="l"><a href="#1402">1402: </a><span class="php-comment">     */</span>
-</span><span id="1403" class="l"><a href="#1403">1403: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_get()
-</span><span id="1404" class="l"><a href="#1404">1404: </a>    {
-</span><span id="1405" class="l"><a href="#1405">1405: </a>        <span class="php-comment">// Merge both the URI segments and query parameters</span>
-</span><span id="1406" class="l"><a href="#1406">1406: </a>        <span class="php-var">$this</span>-&gt;_get_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_get_args, <span class="php-var">$this</span>-&gt;_query_args);
-</span><span id="1407" class="l"><a href="#1407">1407: </a>    }
-</span><span id="1408" class="l"><a href="#1408">1408: </a>
-</span><span id="1409" class="l"><a href="#1409">1409: </a>    <span class="php-comment">/**
-</span></span><span id="1410" class="l"><a href="#1410">1410: </a><span class="php-comment">     * Parse the POST request arguments
-</span></span><span id="1411" class="l"><a href="#1411">1411: </a><span class="php-comment">     *
-</span></span><span id="1412" class="l"><a href="#1412">1412: </a><span class="php-comment">     * @access protected
-</span></span><span id="1413" class="l"><a href="#1413">1413: </a><span class="php-comment">     * @return void
-</span></span><span id="1414" class="l"><a href="#1414">1414: </a><span class="php-comment">     */</span>
-</span><span id="1415" class="l"><a href="#1415">1415: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_post()
-</span><span id="1416" class="l"><a href="#1416">1416: </a>    {
-</span><span id="1417" class="l"><a href="#1417">1417: </a>        <span class="php-var">$this</span>-&gt;_post_args = <span class="php-var">$_POST</span>;
-</span><span id="1418" class="l"><a href="#1418">1418: </a>
-</span><span id="1419" class="l"><a href="#1419">1419: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1420" class="l"><a href="#1420">1420: </a>        {
-</span><span id="1421" class="l"><a href="#1421">1421: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1422" class="l"><a href="#1422">1422: </a>        }
-</span><span id="1423" class="l"><a href="#1423">1423: </a>    }
-</span><span id="1424" class="l"><a href="#1424">1424: </a>
-</span><span id="1425" class="l"><a href="#1425">1425: </a>    <span class="php-comment">/**
-</span></span><span id="1426" class="l"><a href="#1426">1426: </a><span class="php-comment">     * Parse the PUT request arguments
-</span></span><span id="1427" class="l"><a href="#1427">1427: </a><span class="php-comment">     *
-</span></span><span id="1428" class="l"><a href="#1428">1428: </a><span class="php-comment">     * @access protected
-</span></span><span id="1429" class="l"><a href="#1429">1429: </a><span class="php-comment">     * @return void
-</span></span><span id="1430" class="l"><a href="#1430">1430: </a><span class="php-comment">     */</span>
-</span><span id="1431" class="l"><a href="#1431">1431: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_put()
-</span><span id="1432" class="l"><a href="#1432">1432: </a>    {
-</span><span id="1433" class="l"><a href="#1433">1433: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1434" class="l"><a href="#1434">1434: </a>        {
-</span><span id="1435" class="l"><a href="#1435">1435: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1436" class="l"><a href="#1436">1436: </a>        }
-</span><span id="1437" class="l"><a href="#1437">1437: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'put'</span>)
-</span><span id="1438" class="l"><a href="#1438">1438: </a>        {
-</span><span id="1439" class="l"><a href="#1439">1439: </a>           <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1440" class="l"><a href="#1440">1440: </a>           <span class="php-var">$this</span>-&gt;_put_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1441" class="l"><a href="#1441">1441: </a>        }
-</span><span id="1442" class="l"><a href="#1442">1442: </a>    }
-</span><span id="1443" class="l"><a href="#1443">1443: </a>
-</span><span id="1444" class="l"><a href="#1444">1444: </a>    <span class="php-comment">/**
-</span></span><span id="1445" class="l"><a href="#1445">1445: </a><span class="php-comment">     * Parse the HEAD request arguments
-</span></span><span id="1446" class="l"><a href="#1446">1446: </a><span class="php-comment">     *
-</span></span><span id="1447" class="l"><a href="#1447">1447: </a><span class="php-comment">     * @access protected
-</span></span><span id="1448" class="l"><a href="#1448">1448: </a><span class="php-comment">     * @return void
-</span></span><span id="1449" class="l"><a href="#1449">1449: </a><span class="php-comment">     */</span>
-</span><span id="1450" class="l"><a href="#1450">1450: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_head()
-</span><span id="1451" class="l"><a href="#1451">1451: </a>    {
-</span><span id="1452" class="l"><a href="#1452">1452: </a>        <span class="php-comment">// Parse the HEAD variables</span>
-</span><span id="1453" class="l"><a href="#1453">1453: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$head</span>);
-</span><span id="1454" class="l"><a href="#1454">1454: </a>
-</span><span id="1455" class="l"><a href="#1455">1455: </a>        <span class="php-comment">// Merge both the URI segments and HEAD params</span>
-</span><span id="1456" class="l"><a href="#1456">1456: </a>        <span class="php-var">$this</span>-&gt;_head_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_head_args, <span class="php-var">$head</span>);
-</span><span id="1457" class="l"><a href="#1457">1457: </a>    }
-</span><span id="1458" class="l"><a href="#1458">1458: </a>
-</span><span id="1459" class="l"><a href="#1459">1459: </a>    <span class="php-comment">/**
-</span></span><span id="1460" class="l"><a href="#1460">1460: </a><span class="php-comment">     * Parse the OPTIONS request arguments
-</span></span><span id="1461" class="l"><a href="#1461">1461: </a><span class="php-comment">     *
-</span></span><span id="1462" class="l"><a href="#1462">1462: </a><span class="php-comment">     * @access protected
-</span></span><span id="1463" class="l"><a href="#1463">1463: </a><span class="php-comment">     * @return void
-</span></span><span id="1464" class="l"><a href="#1464">1464: </a><span class="php-comment">     */</span>
-</span><span id="1465" class="l"><a href="#1465">1465: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_options()
-</span><span id="1466" class="l"><a href="#1466">1466: </a>    {
-</span><span id="1467" class="l"><a href="#1467">1467: </a>        <span class="php-comment">// Parse the OPTIONS variables</span>
-</span><span id="1468" class="l"><a href="#1468">1468: </a>        <span class="php-keyword2">parse_str</span>(<span class="php-keyword2">parse_url</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'REQUEST_URI'</span>), PHP_URL_QUERY), <span class="php-var">$options</span>);
-</span><span id="1469" class="l"><a href="#1469">1469: </a>
-</span><span id="1470" class="l"><a href="#1470">1470: </a>        <span class="php-comment">// Merge both the URI segments and OPTIONS params</span>
-</span><span id="1471" class="l"><a href="#1471">1471: </a>        <span class="php-var">$this</span>-&gt;_options_args = <span class="php-keyword2">array_merge</span>(<span class="php-var">$this</span>-&gt;_options_args, <span class="php-var">$options</span>);
-</span><span id="1472" class="l"><a href="#1472">1472: </a>    }
-</span><span id="1473" class="l"><a href="#1473">1473: </a>
-</span><span id="1474" class="l"><a href="#1474">1474: </a>    <span class="php-comment">/**
-</span></span><span id="1475" class="l"><a href="#1475">1475: </a><span class="php-comment">     * Parse the PATCH request arguments
-</span></span><span id="1476" class="l"><a href="#1476">1476: </a><span class="php-comment">     *
-</span></span><span id="1477" class="l"><a href="#1477">1477: </a><span class="php-comment">     * @access protected
-</span></span><span id="1478" class="l"><a href="#1478">1478: </a><span class="php-comment">     * @return void
-</span></span><span id="1479" class="l"><a href="#1479">1479: </a><span class="php-comment">     */</span>
-</span><span id="1480" class="l"><a href="#1480">1480: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_patch()
-</span><span id="1481" class="l"><a href="#1481">1481: </a>    {
-</span><span id="1482" class="l"><a href="#1482">1482: </a>        <span class="php-comment">// It might be a HTTP body</span>
-</span><span id="1483" class="l"><a href="#1483">1483: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;request-&gt;format)
-</span><span id="1484" class="l"><a href="#1484">1484: </a>        {
-</span><span id="1485" class="l"><a href="#1485">1485: </a>            <span class="php-var">$this</span>-&gt;request-&gt;body = <span class="php-var">$this</span>-&gt;input-&gt;raw_input_stream;
-</span><span id="1486" class="l"><a href="#1486">1486: </a>        }
-</span><span id="1487" class="l"><a href="#1487">1487: </a>        <span class="php-keyword1">else</span> <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'patch'</span>)
-</span><span id="1488" class="l"><a href="#1488">1488: </a>        {
-</span><span id="1489" class="l"><a href="#1489">1489: </a>            <span class="php-comment">// If no filetype is provided, then there are probably just arguments</span>
-</span><span id="1490" class="l"><a href="#1490">1490: </a>            <span class="php-var">$this</span>-&gt;_patch_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1491" class="l"><a href="#1491">1491: </a>        }
-</span><span id="1492" class="l"><a href="#1492">1492: </a>    }
-</span><span id="1493" class="l"><a href="#1493">1493: </a>
-</span><span id="1494" class="l"><a href="#1494">1494: </a>    <span class="php-comment">/**
-</span></span><span id="1495" class="l"><a href="#1495">1495: </a><span class="php-comment">     * Parse the DELETE request arguments
-</span></span><span id="1496" class="l"><a href="#1496">1496: </a><span class="php-comment">     *
-</span></span><span id="1497" class="l"><a href="#1497">1497: </a><span class="php-comment">     * @access protected
-</span></span><span id="1498" class="l"><a href="#1498">1498: </a><span class="php-comment">     * @return void
-</span></span><span id="1499" class="l"><a href="#1499">1499: </a><span class="php-comment">     */</span>
-</span><span id="1500" class="l"><a href="#1500">1500: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_delete()
-</span><span id="1501" class="l"><a href="#1501">1501: </a>    {
-</span><span id="1502" class="l"><a href="#1502">1502: </a>        <span class="php-comment">// These should exist if a DELETE request</span>
-</span><span id="1503" class="l"><a href="#1503">1503: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'delete'</span>)
-</span><span id="1504" class="l"><a href="#1504">1504: </a>        {
-</span><span id="1505" class="l"><a href="#1505">1505: </a>            <span class="php-var">$this</span>-&gt;_delete_args = <span class="php-var">$this</span>-&gt;input-&gt;input_stream();
-</span><span id="1506" class="l"><a href="#1506">1506: </a>        }
-</span><span id="1507" class="l"><a href="#1507">1507: </a>    }
-</span><span id="1508" class="l"><a href="#1508">1508: </a>
-</span><span id="1509" class="l"><a href="#1509">1509: </a>    <span class="php-comment">/**
-</span></span><span id="1510" class="l"><a href="#1510">1510: </a><span class="php-comment">     * Parse the query parameters
-</span></span><span id="1511" class="l"><a href="#1511">1511: </a><span class="php-comment">     *
-</span></span><span id="1512" class="l"><a href="#1512">1512: </a><span class="php-comment">     * @access protected
-</span></span><span id="1513" class="l"><a href="#1513">1513: </a><span class="php-comment">     * @return void
-</span></span><span id="1514" class="l"><a href="#1514">1514: </a><span class="php-comment">     */</span>
-</span><span id="1515" class="l"><a href="#1515">1515: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _parse_query()
-</span><span id="1516" class="l"><a href="#1516">1516: </a>    {
-</span><span id="1517" class="l"><a href="#1517">1517: </a>        <span class="php-var">$this</span>-&gt;_query_args = <span class="php-var">$this</span>-&gt;input-&gt;get();
-</span><span id="1518" class="l"><a href="#1518">1518: </a>    }
-</span><span id="1519" class="l"><a href="#1519">1519: </a>
-</span><span id="1520" class="l"><a href="#1520">1520: </a>    <span class="php-comment">// INPUT FUNCTION --------------------------------------------------------------</span>
-</span><span id="1521" class="l"><a href="#1521">1521: </a>
-</span><span id="1522" class="l"><a href="#1522">1522: </a>    <span class="php-comment">/**
-</span></span><span id="1523" class="l"><a href="#1523">1523: </a><span class="php-comment">     * Retrieve a value from a GET request
-</span></span><span id="1524" class="l"><a href="#1524">1524: </a><span class="php-comment">     *
-</span></span><span id="1525" class="l"><a href="#1525">1525: </a><span class="php-comment">     * @access public
-</span></span><span id="1526" class="l"><a href="#1526">1526: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the GET request
-</span></span><span id="1527" class="l"><a href="#1527">1527: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1528" class="l"><a href="#1528">1528: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1529" class="l"><a href="#1529">1529: </a><span class="php-comment">     * @return array|string|NULL Value from the GET request; otherwise, NULL
-</span></span><span id="1530" class="l"><a href="#1530">1530: </a><span class="php-comment">     */</span>
-</span><span id="1531" class="l"><a href="#1531">1531: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> get(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1532" class="l"><a href="#1532">1532: </a>    {
-</span><span id="1533" class="l"><a href="#1533">1533: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1534" class="l"><a href="#1534">1534: </a>        {
-</span><span id="1535" class="l"><a href="#1535">1535: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_get_args;
-</span><span id="1536" class="l"><a href="#1536">1536: </a>        }
-</span><span id="1537" class="l"><a href="#1537">1537: </a>
-</span><span id="1538" class="l"><a href="#1538">1538: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_get_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1539" class="l"><a href="#1539">1539: </a>    }
-</span><span id="1540" class="l"><a href="#1540">1540: </a>
-</span><span id="1541" class="l"><a href="#1541">1541: </a>    <span class="php-comment">/**
-</span></span><span id="1542" class="l"><a href="#1542">1542: </a><span class="php-comment">     * Retrieve a value from a OPTIONS request
-</span></span><span id="1543" class="l"><a href="#1543">1543: </a><span class="php-comment">     *
-</span></span><span id="1544" class="l"><a href="#1544">1544: </a><span class="php-comment">     * @access public
-</span></span><span id="1545" class="l"><a href="#1545">1545: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the OPTIONS request.
-</span></span><span id="1546" class="l"><a href="#1546">1546: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1547" class="l"><a href="#1547">1547: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1548" class="l"><a href="#1548">1548: </a><span class="php-comment">     * @return array|string|NULL Value from the OPTIONS request; otherwise, NULL
-</span></span><span id="1549" class="l"><a href="#1549">1549: </a><span class="php-comment">     */</span>
-</span><span id="1550" class="l"><a href="#1550">1550: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> options(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1551" class="l"><a href="#1551">1551: </a>    {
-</span><span id="1552" class="l"><a href="#1552">1552: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1553" class="l"><a href="#1553">1553: </a>        {
-</span><span id="1554" class="l"><a href="#1554">1554: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_options_args;
-</span><span id="1555" class="l"><a href="#1555">1555: </a>        }
-</span><span id="1556" class="l"><a href="#1556">1556: </a>
-</span><span id="1557" class="l"><a href="#1557">1557: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_options_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1558" class="l"><a href="#1558">1558: </a>    }
-</span><span id="1559" class="l"><a href="#1559">1559: </a>
-</span><span id="1560" class="l"><a href="#1560">1560: </a>    <span class="php-comment">/**
-</span></span><span id="1561" class="l"><a href="#1561">1561: </a><span class="php-comment">     * Retrieve a value from a HEAD request
-</span></span><span id="1562" class="l"><a href="#1562">1562: </a><span class="php-comment">     *
-</span></span><span id="1563" class="l"><a href="#1563">1563: </a><span class="php-comment">     * @access public
-</span></span><span id="1564" class="l"><a href="#1564">1564: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the HEAD request
-</span></span><span id="1565" class="l"><a href="#1565">1565: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1566" class="l"><a href="#1566">1566: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1567" class="l"><a href="#1567">1567: </a><span class="php-comment">     * @return array|string|NULL Value from the HEAD request; otherwise, NULL
-</span></span><span id="1568" class="l"><a href="#1568">1568: </a><span class="php-comment">     */</span>
-</span><span id="1569" class="l"><a href="#1569">1569: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> head(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1570" class="l"><a href="#1570">1570: </a>    {
-</span><span id="1571" class="l"><a href="#1571">1571: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1572" class="l"><a href="#1572">1572: </a>        {
-</span><span id="1573" class="l"><a href="#1573">1573: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_head_args;
-</span><span id="1574" class="l"><a href="#1574">1574: </a>        }
-</span><span id="1575" class="l"><a href="#1575">1575: </a>
-</span><span id="1576" class="l"><a href="#1576">1576: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_head_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_head_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1577" class="l"><a href="#1577">1577: </a>    }
-</span><span id="1578" class="l"><a href="#1578">1578: </a>
-</span><span id="1579" class="l"><a href="#1579">1579: </a>    <span class="php-comment">/**
-</span></span><span id="1580" class="l"><a href="#1580">1580: </a><span class="php-comment">     * Retrieve a value from a POST request
-</span></span><span id="1581" class="l"><a href="#1581">1581: </a><span class="php-comment">     *
-</span></span><span id="1582" class="l"><a href="#1582">1582: </a><span class="php-comment">     * @access public
-</span></span><span id="1583" class="l"><a href="#1583">1583: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the POST request
-</span></span><span id="1584" class="l"><a href="#1584">1584: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1585" class="l"><a href="#1585">1585: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1586" class="l"><a href="#1586">1586: </a><span class="php-comment">     * @return array|string|NULL Value from the POST request; otherwise, NULL
-</span></span><span id="1587" class="l"><a href="#1587">1587: </a><span class="php-comment">     */</span>
-</span><span id="1588" class="l"><a href="#1588">1588: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> post(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1589" class="l"><a href="#1589">1589: </a>    {
-</span><span id="1590" class="l"><a href="#1590">1590: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1591" class="l"><a href="#1591">1591: </a>        {
-</span><span id="1592" class="l"><a href="#1592">1592: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_post_args;
-</span><span id="1593" class="l"><a href="#1593">1593: </a>        }
-</span><span id="1594" class="l"><a href="#1594">1594: </a>
-</span><span id="1595" class="l"><a href="#1595">1595: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_post_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1596" class="l"><a href="#1596">1596: </a>    }
-</span><span id="1597" class="l"><a href="#1597">1597: </a>
-</span><span id="1598" class="l"><a href="#1598">1598: </a>    <span class="php-comment">/**
-</span></span><span id="1599" class="l"><a href="#1599">1599: </a><span class="php-comment">     * Retrieve a value from a PUT request
-</span></span><span id="1600" class="l"><a href="#1600">1600: </a><span class="php-comment">     *
-</span></span><span id="1601" class="l"><a href="#1601">1601: </a><span class="php-comment">     * @access public
-</span></span><span id="1602" class="l"><a href="#1602">1602: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PUT request
-</span></span><span id="1603" class="l"><a href="#1603">1603: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1604" class="l"><a href="#1604">1604: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1605" class="l"><a href="#1605">1605: </a><span class="php-comment">     * @return array|string|NULL Value from the PUT request; otherwise, NULL
-</span></span><span id="1606" class="l"><a href="#1606">1606: </a><span class="php-comment">     */</span>
-</span><span id="1607" class="l"><a href="#1607">1607: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> put(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1608" class="l"><a href="#1608">1608: </a>    {
-</span><span id="1609" class="l"><a href="#1609">1609: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1610" class="l"><a href="#1610">1610: </a>        {
-</span><span id="1611" class="l"><a href="#1611">1611: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_put_args;
-</span><span id="1612" class="l"><a href="#1612">1612: </a>        }
-</span><span id="1613" class="l"><a href="#1613">1613: </a>
-</span><span id="1614" class="l"><a href="#1614">1614: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_put_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1615" class="l"><a href="#1615">1615: </a>    }
-</span><span id="1616" class="l"><a href="#1616">1616: </a>
-</span><span id="1617" class="l"><a href="#1617">1617: </a>    <span class="php-comment">/**
-</span></span><span id="1618" class="l"><a href="#1618">1618: </a><span class="php-comment">     * Retrieve a value from a DELETE request
-</span></span><span id="1619" class="l"><a href="#1619">1619: </a><span class="php-comment">     *
-</span></span><span id="1620" class="l"><a href="#1620">1620: </a><span class="php-comment">     * @access public
-</span></span><span id="1621" class="l"><a href="#1621">1621: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the DELETE request
-</span></span><span id="1622" class="l"><a href="#1622">1622: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1623" class="l"><a href="#1623">1623: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1624" class="l"><a href="#1624">1624: </a><span class="php-comment">     * @return array|string|NULL Value from the DELETE request; otherwise, NULL
-</span></span><span id="1625" class="l"><a href="#1625">1625: </a><span class="php-comment">     */</span>
-</span><span id="1626" class="l"><a href="#1626">1626: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> <span class="php-keyword2">delete</span>(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1627" class="l"><a href="#1627">1627: </a>    {
-</span><span id="1628" class="l"><a href="#1628">1628: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1629" class="l"><a href="#1629">1629: </a>        {
-</span><span id="1630" class="l"><a href="#1630">1630: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_delete_args;
-</span><span id="1631" class="l"><a href="#1631">1631: </a>        }
-</span><span id="1632" class="l"><a href="#1632">1632: </a>
-</span><span id="1633" class="l"><a href="#1633">1633: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_delete_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1634" class="l"><a href="#1634">1634: </a>    }
-</span><span id="1635" class="l"><a href="#1635">1635: </a>
-</span><span id="1636" class="l"><a href="#1636">1636: </a>    <span class="php-comment">/**
-</span></span><span id="1637" class="l"><a href="#1637">1637: </a><span class="php-comment">     * Retrieve a value from a PATCH request
-</span></span><span id="1638" class="l"><a href="#1638">1638: </a><span class="php-comment">     *
-</span></span><span id="1639" class="l"><a href="#1639">1639: </a><span class="php-comment">     * @access public
-</span></span><span id="1640" class="l"><a href="#1640">1640: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the PATCH request
-</span></span><span id="1641" class="l"><a href="#1641">1641: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1642" class="l"><a href="#1642">1642: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1643" class="l"><a href="#1643">1643: </a><span class="php-comment">     * @return array|string|NULL Value from the PATCH request; otherwise, NULL
-</span></span><span id="1644" class="l"><a href="#1644">1644: </a><span class="php-comment">     */</span>
-</span><span id="1645" class="l"><a href="#1645">1645: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> patch(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1646" class="l"><a href="#1646">1646: </a>    {
-</span><span id="1647" class="l"><a href="#1647">1647: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1648" class="l"><a href="#1648">1648: </a>        {
-</span><span id="1649" class="l"><a href="#1649">1649: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_patch_args;
-</span><span id="1650" class="l"><a href="#1650">1650: </a>        }
-</span><span id="1651" class="l"><a href="#1651">1651: </a>
-</span><span id="1652" class="l"><a href="#1652">1652: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_patch_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1653" class="l"><a href="#1653">1653: </a>    }
-</span><span id="1654" class="l"><a href="#1654">1654: </a>
-</span><span id="1655" class="l"><a href="#1655">1655: </a>    <span class="php-comment">/**
-</span></span><span id="1656" class="l"><a href="#1656">1656: </a><span class="php-comment">     * Retrieve a value from the query parameters
-</span></span><span id="1657" class="l"><a href="#1657">1657: </a><span class="php-comment">     *
-</span></span><span id="1658" class="l"><a href="#1658">1658: </a><span class="php-comment">     * @access public
-</span></span><span id="1659" class="l"><a href="#1659">1659: </a><span class="php-comment">     * @param NULL $key Key to retrieve from the query parameters
-</span></span><span id="1660" class="l"><a href="#1660">1660: </a><span class="php-comment">     * If NULL an array of arguments is returned
-</span></span><span id="1661" class="l"><a href="#1661">1661: </a><span class="php-comment">     * @param NULL $xss_clean Whether to apply XSS filtering
-</span></span><span id="1662" class="l"><a href="#1662">1662: </a><span class="php-comment">     * @return array|string|NULL Value from the query parameters; otherwise, NULL
-</span></span><span id="1663" class="l"><a href="#1663">1663: </a><span class="php-comment">     */</span>
-</span><span id="1664" class="l"><a href="#1664">1664: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> query(<span class="php-var">$key</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$xss_clean</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1665" class="l"><a href="#1665">1665: </a>    {
-</span><span id="1666" class="l"><a href="#1666">1666: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$key</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1667" class="l"><a href="#1667">1667: </a>        {
-</span><span id="1668" class="l"><a href="#1668">1668: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_query_args;
-</span><span id="1669" class="l"><a href="#1669">1669: </a>        }
-</span><span id="1670" class="l"><a href="#1670">1670: </a>
-</span><span id="1671" class="l"><a href="#1671">1671: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">isset</span>(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>]) ? <span class="php-var">$this</span>-&gt;_xss_clean(<span class="php-var">$this</span>-&gt;_query_args[<span class="php-var">$key</span>], <span class="php-var">$xss_clean</span>) : <span class="php-keyword1">NULL</span>;
-</span><span id="1672" class="l"><a href="#1672">1672: </a>    }
-</span><span id="1673" class="l"><a href="#1673">1673: </a>
-</span><span id="1674" class="l"><a href="#1674">1674: </a>    <span class="php-comment">/**
-</span></span><span id="1675" class="l"><a href="#1675">1675: </a><span class="php-comment">     * Sanitizes data so that Cross Site Scripting Hacks can be
-</span></span><span id="1676" class="l"><a href="#1676">1676: </a><span class="php-comment">     * prevented
-</span></span><span id="1677" class="l"><a href="#1677">1677: </a><span class="php-comment">     *
-</span></span><span id="1678" class="l"><a href="#1678">1678: </a><span class="php-comment">     * @access protected
-</span></span><span id="1679" class="l"><a href="#1679">1679: </a><span class="php-comment">     * @param  string $value Input data
-</span></span><span id="1680" class="l"><a href="#1680">1680: </a><span class="php-comment">     * @param  bool $xss_clean Whether to apply XSS filtering
-</span></span><span id="1681" class="l"><a href="#1681">1681: </a><span class="php-comment">     * @return string
-</span></span><span id="1682" class="l"><a href="#1682">1682: </a><span class="php-comment">     */</span>
-</span><span id="1683" class="l"><a href="#1683">1683: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _xss_clean(<span class="php-var">$value</span>, <span class="php-var">$xss_clean</span>)
-</span><span id="1684" class="l"><a href="#1684">1684: </a>    {
-</span><span id="1685" class="l"><a href="#1685">1685: </a>        <span class="php-keyword2">is_bool</span>(<span class="php-var">$xss_clean</span>) || <span class="php-var">$xss_clean</span> = <span class="php-var">$this</span>-&gt;_enable_xss;
-</span><span id="1686" class="l"><a href="#1686">1686: </a>
-</span><span id="1687" class="l"><a href="#1687">1687: </a>        <span class="php-keyword1">return</span> <span class="php-var">$xss_clean</span> === <span class="php-keyword1">TRUE</span> ? <span class="php-var">$this</span>-&gt;security-&gt;xss_clean(<span class="php-var">$value</span>) : <span class="php-var">$value</span>;
-</span><span id="1688" class="l"><a href="#1688">1688: </a>    }
-</span><span id="1689" class="l"><a href="#1689">1689: </a>
-</span><span id="1690" class="l"><a href="#1690">1690: </a>    <span class="php-comment">/**
-</span></span><span id="1691" class="l"><a href="#1691">1691: </a><span class="php-comment">     * Retrieve the validation errors
-</span></span><span id="1692" class="l"><a href="#1692">1692: </a><span class="php-comment">     *
-</span></span><span id="1693" class="l"><a href="#1693">1693: </a><span class="php-comment">     * @access public
-</span></span><span id="1694" class="l"><a href="#1694">1694: </a><span class="php-comment">     * @return array
-</span></span><span id="1695" class="l"><a href="#1695">1695: </a><span class="php-comment">     */</span>
-</span><span id="1696" class="l"><a href="#1696">1696: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> validation_errors()
-</span><span id="1697" class="l"><a href="#1697">1697: </a>    {
-</span><span id="1698" class="l"><a href="#1698">1698: </a>        <span class="php-var">$string</span> = <span class="php-keyword2">strip_tags</span>(<span class="php-var">$this</span>-&gt;form_validation-&gt;error_string());
-</span><span id="1699" class="l"><a href="#1699">1699: </a>
-</span><span id="1700" class="l"><a href="#1700">1700: </a>        <span class="php-keyword1">return</span> <span class="php-keyword2">explode</span>(PHP_EOL, <span class="php-keyword2">trim</span>(<span class="php-var">$string</span>, PHP_EOL));
-</span><span id="1701" class="l"><a href="#1701">1701: </a>    }
-</span><span id="1702" class="l"><a href="#1702">1702: </a>
-</span><span id="1703" class="l"><a href="#1703">1703: </a>    <span class="php-comment">// SECURITY FUNCTIONS ---------------------------------------------------------</span>
-</span><span id="1704" class="l"><a href="#1704">1704: </a>
-</span><span id="1705" class="l"><a href="#1705">1705: </a>    <span class="php-comment">/**
-</span></span><span id="1706" class="l"><a href="#1706">1706: </a><span class="php-comment">     * Perform LDAP Authentication
-</span></span><span id="1707" class="l"><a href="#1707">1707: </a><span class="php-comment">     *
-</span></span><span id="1708" class="l"><a href="#1708">1708: </a><span class="php-comment">     * @access protected
-</span></span><span id="1709" class="l"><a href="#1709">1709: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1710" class="l"><a href="#1710">1710: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1711" class="l"><a href="#1711">1711: </a><span class="php-comment">     * @return bool
-</span></span><span id="1712" class="l"><a href="#1712">1712: </a><span class="php-comment">     */</span>
-</span><span id="1713" class="l"><a href="#1713">1713: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_ldap_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1714" class="l"><a href="#1714">1714: </a>    {
-</span><span id="1715" class="l"><a href="#1715">1715: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1716" class="l"><a href="#1716">1716: </a>        {
-</span><span id="1717" class="l"><a href="#1717">1717: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: failure, empty username'</span>);
-</span><span id="1718" class="l"><a href="#1718">1718: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1719" class="l"><a href="#1719">1719: </a>        }
-</span><span id="1720" class="l"><a href="#1720">1720: </a>
-</span><span id="1721" class="l"><a href="#1721">1721: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Loading configuration'</span>);
-</span><span id="1722" class="l"><a href="#1722">1722: </a>
-</span><span id="1723" class="l"><a href="#1723">1723: </a>        <span class="php-var">$this</span>-&gt;config-&gt;load(<span class="php-quote">'ldap.php'</span>, <span class="php-keyword1">TRUE</span>);
-</span><span id="1724" class="l"><a href="#1724">1724: </a>
-</span><span id="1725" class="l"><a href="#1725">1725: </a>        <span class="php-var">$ldap</span> = [
-</span><span id="1726" class="l"><a href="#1726">1726: </a>            <span class="php-quote">'timeout'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'timeout'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1727" class="l"><a href="#1727">1727: </a>            <span class="php-quote">'host'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'server'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1728" class="l"><a href="#1728">1728: </a>            <span class="php-quote">'port'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'port'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1729" class="l"><a href="#1729">1729: </a>            <span class="php-quote">'rdn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'binduser'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1730" class="l"><a href="#1730">1730: </a>            <span class="php-quote">'pass'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'bindpw'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1731" class="l"><a href="#1731">1731: </a>            <span class="php-quote">'basedn'</span> =&gt; <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'basedn'</span>, <span class="php-quote">'ldap'</span>),
-</span><span id="1732" class="l"><a href="#1732">1732: </a>        ];
-</span><span id="1733" class="l"><a href="#1733">1733: </a>
-</span><span id="1734" class="l"><a href="#1734">1734: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Connect to '</span> . (<span class="php-keyword1">isset</span>(<span class="php-var">$ldaphost</span>) ? <span class="php-var">$ldaphost</span> : <span class="php-quote">'[ldap not configured]'</span>));
-</span><span id="1735" class="l"><a href="#1735">1735: </a>
-</span><span id="1736" class="l"><a href="#1736">1736: </a>        <span class="php-comment">// Connect to the ldap server</span>
-</span><span id="1737" class="l"><a href="#1737">1737: </a>        <span class="php-var">$ldapconn</span> = <span class="php-keyword2">ldap_connect</span>(<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'port'</span>]);
-</span><span id="1738" class="l"><a href="#1738">1738: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$ldapconn</span>)
-</span><span id="1739" class="l"><a href="#1739">1739: </a>        {
-</span><span id="1740" class="l"><a href="#1740">1740: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Setting timeout to '</span>.<span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>].<span class="php-quote">' seconds'</span>);
-</span><span id="1741" class="l"><a href="#1741">1741: </a>
-</span><span id="1742" class="l"><a href="#1742">1742: </a>            <span class="php-keyword2">ldap_set_option</span>(<span class="php-var">$ldapconn</span>, LDAP_OPT_NETWORK_TIMEOUT, <span class="php-var">$ldap</span>[<span class="php-quote">'timeout'</span>]);
-</span><span id="1743" class="l"><a href="#1743">1743: </a>
-</span><span id="1744" class="l"><a href="#1744">1744: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Binding to '</span>.<span class="php-var">$ldap</span>[<span class="php-quote">'host'</span>].<span class="php-quote">' with dn '</span>.<span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>]);
-</span><span id="1745" class="l"><a href="#1745">1745: </a>
-</span><span id="1746" class="l"><a href="#1746">1746: </a>            <span class="php-comment">// Binding to the ldap server</span>
-</span><span id="1747" class="l"><a href="#1747">1747: </a>            <span class="php-var">$ldapbind</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'rdn'</span>], <span class="php-var">$ldap</span>[<span class="php-quote">'pass'</span>]);
-</span><span id="1748" class="l"><a href="#1748">1748: </a>
-</span><span id="1749" class="l"><a href="#1749">1749: </a>            <span class="php-comment">// Verify the binding</span>
-</span><span id="1750" class="l"><a href="#1750">1750: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$ldapbind</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1751" class="l"><a href="#1751">1751: </a>            {
-</span><span id="1752" class="l"><a href="#1752">1752: </a>                log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: bind was unsuccessful'</span>);
-</span><span id="1753" class="l"><a href="#1753">1753: </a>                <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1754" class="l"><a href="#1754">1754: </a>            }
-</span><span id="1755" class="l"><a href="#1755">1755: </a>
-</span><span id="1756" class="l"><a href="#1756">1756: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: bind successful'</span>);
-</span><span id="1757" class="l"><a href="#1757">1757: </a>        }
-</span><span id="1758" class="l"><a href="#1758">1758: </a>
-</span><span id="1759" class="l"><a href="#1759">1759: </a>        <span class="php-comment">// Search for user</span>
-</span><span id="1760" class="l"><a href="#1760">1760: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$res_id</span> = <span class="php-keyword2">ldap_search</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$ldap</span>[<span class="php-quote">'basedn'</span>], <span class="php-quote">&quot;uid=</span><span class="php-var">$username</span><span class="php-quote">&quot;</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1761" class="l"><a href="#1761">1761: </a>        {
-</span><span id="1762" class="l"><a href="#1762">1762: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: User '</span>.<span class="php-var">$username</span>.<span class="php-quote">' not found in search'</span>);
-</span><span id="1763" class="l"><a href="#1763">1763: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1764" class="l"><a href="#1764">1764: </a>        }
-</span><span id="1765" class="l"><a href="#1765">1765: </a>
-</span><span id="1766" class="l"><a href="#1766">1766: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">ldap_count_entries</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>) !== <span class="php-num">1</span>)
-</span><span id="1767" class="l"><a href="#1767">1767: </a>        {
-</span><span id="1768" class="l"><a href="#1768">1768: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username '</span>.<span class="php-var">$username</span>.<span class="php-quote">'found more than once'</span>);
-</span><span id="1769" class="l"><a href="#1769">1769: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1770" class="l"><a href="#1770">1770: </a>        }
-</span><span id="1771" class="l"><a href="#1771">1771: </a>
-</span><span id="1772" class="l"><a href="#1772">1772: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$entry_id</span> = <span class="php-keyword2">ldap_first_entry</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$res_id</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1773" class="l"><a href="#1773">1773: </a>        {
-</span><span id="1774" class="l"><a href="#1774">1774: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, entry of search result could not be fetched'</span>);
-</span><span id="1775" class="l"><a href="#1775">1775: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1776" class="l"><a href="#1776">1776: </a>        }
-</span><span id="1777" class="l"><a href="#1777">1777: </a>
-</span><span id="1778" class="l"><a href="#1778">1778: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$user_dn</span> = <span class="php-keyword2">ldap_get_dn</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$entry_id</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1779" class="l"><a href="#1779">1779: </a>        {
-</span><span id="1780" class="l"><a href="#1780">1780: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, user-dn could not be fetched'</span>);
-</span><span id="1781" class="l"><a href="#1781">1781: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1782" class="l"><a href="#1782">1782: </a>        }
-</span><span id="1783" class="l"><a href="#1783">1783: </a>
-</span><span id="1784" class="l"><a href="#1784">1784: </a>        <span class="php-comment">// User found, could not authenticate as user</span>
-</span><span id="1785" class="l"><a href="#1785">1785: </a>        <span class="php-keyword1">if</span> ((<span class="php-var">$link_id</span> = <span class="php-keyword2">ldap_bind</span>(<span class="php-var">$ldapconn</span>, <span class="php-var">$user_dn</span>, <span class="php-var">$password</span>)) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1786" class="l"><a href="#1786">1786: </a>        {
-</span><span id="1787" class="l"><a href="#1787">1787: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'LDAP Auth: Failure, username/password did not match: '</span> . <span class="php-var">$user_dn</span>);
-</span><span id="1788" class="l"><a href="#1788">1788: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1789" class="l"><a href="#1789">1789: </a>        }
-</span><span id="1790" class="l"><a href="#1790">1790: </a>
-</span><span id="1791" class="l"><a href="#1791">1791: </a>        log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'LDAP Auth: Success '</span>.<span class="php-var">$user_dn</span>.<span class="php-quote">' authenticated successfully'</span>);
-</span><span id="1792" class="l"><a href="#1792">1792: </a>
-</span><span id="1793" class="l"><a href="#1793">1793: </a>        <span class="php-var">$this</span>-&gt;_user_ldap_dn = <span class="php-var">$user_dn</span>;
-</span><span id="1794" class="l"><a href="#1794">1794: </a>
-</span><span id="1795" class="l"><a href="#1795">1795: </a>        <span class="php-keyword2">ldap_close</span>(<span class="php-var">$ldapconn</span>);
-</span><span id="1796" class="l"><a href="#1796">1796: </a>
-</span><span id="1797" class="l"><a href="#1797">1797: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1798" class="l"><a href="#1798">1798: </a>    }
-</span><span id="1799" class="l"><a href="#1799">1799: </a>
-</span><span id="1800" class="l"><a href="#1800">1800: </a>    <span class="php-comment">/**
-</span></span><span id="1801" class="l"><a href="#1801">1801: </a><span class="php-comment">     * Perform Library Authentication - Override this function to change the way the library is called
-</span></span><span id="1802" class="l"><a href="#1802">1802: </a><span class="php-comment">     *
-</span></span><span id="1803" class="l"><a href="#1803">1803: </a><span class="php-comment">     * @access protected
-</span></span><span id="1804" class="l"><a href="#1804">1804: </a><span class="php-comment">     * @param  string $username The username to validate
-</span></span><span id="1805" class="l"><a href="#1805">1805: </a><span class="php-comment">     * @param  string $password The password to validate
-</span></span><span id="1806" class="l"><a href="#1806">1806: </a><span class="php-comment">     * @return bool
-</span></span><span id="1807" class="l"><a href="#1807">1807: </a><span class="php-comment">     */</span>
-</span><span id="1808" class="l"><a href="#1808">1808: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _perform_library_auth(<span class="php-var">$username</span> = <span class="php-quote">''</span>, <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>)
-</span><span id="1809" class="l"><a href="#1809">1809: </a>    {
-</span><span id="1810" class="l"><a href="#1810">1810: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1811" class="l"><a href="#1811">1811: </a>        {
-</span><span id="1812" class="l"><a href="#1812">1812: </a>            log_message(<span class="php-quote">'error'</span>, <span class="php-quote">'Library Auth: Failure, empty username'</span>);
-</span><span id="1813" class="l"><a href="#1813">1813: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1814" class="l"><a href="#1814">1814: </a>        }
-</span><span id="1815" class="l"><a href="#1815">1815: </a>
-</span><span id="1816" class="l"><a href="#1816">1816: </a>        <span class="php-var">$auth_library_class</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_class'</span>));
-</span><span id="1817" class="l"><a href="#1817">1817: </a>        <span class="php-var">$auth_library_function</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_library_function'</span>));
-</span><span id="1818" class="l"><a href="#1818">1818: </a>
-</span><span id="1819" class="l"><a href="#1819">1819: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_class</span>))
-</span><span id="1820" class="l"><a href="#1820">1820: </a>        {
-</span><span id="1821" class="l"><a href="#1821">1821: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_class'</span>);
-</span><span id="1822" class="l"><a href="#1822">1822: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1823" class="l"><a href="#1823">1823: </a>        }
-</span><span id="1824" class="l"><a href="#1824">1824: </a>
-</span><span id="1825" class="l"><a href="#1825">1825: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$auth_library_function</span>))
-</span><span id="1826" class="l"><a href="#1826">1826: </a>        {
-</span><span id="1827" class="l"><a href="#1827">1827: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">'Library Auth: Failure, empty auth_library_function'</span>);
-</span><span id="1828" class="l"><a href="#1828">1828: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1829" class="l"><a href="#1829">1829: </a>        }
-</span><span id="1830" class="l"><a href="#1830">1830: </a>
-</span><span id="1831" class="l"><a href="#1831">1831: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">is_callable</span>([<span class="php-var">$auth_library_class</span>, <span class="php-var">$auth_library_function</span>]) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1832" class="l"><a href="#1832">1832: </a>        {
-</span><span id="1833" class="l"><a href="#1833">1833: </a>            <span class="php-var">$this</span>-&gt;load-&gt;library(<span class="php-var">$auth_library_class</span>);
-</span><span id="1834" class="l"><a href="#1834">1834: </a>        }
-</span><span id="1835" class="l"><a href="#1835">1835: </a>
-</span><span id="1836" class="l"><a href="#1836">1836: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;{<span class="php-var">$auth_library_class</span>}-&gt;<span class="php-var">$auth_library_function</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1837" class="l"><a href="#1837">1837: </a>    }
-</span><span id="1838" class="l"><a href="#1838">1838: </a>
-</span><span id="1839" class="l"><a href="#1839">1839: </a>    <span class="php-comment">/**
-</span></span><span id="1840" class="l"><a href="#1840">1840: </a><span class="php-comment">     * Check if the user is logged in
-</span></span><span id="1841" class="l"><a href="#1841">1841: </a><span class="php-comment">     *
-</span></span><span id="1842" class="l"><a href="#1842">1842: </a><span class="php-comment">     * @access protected
-</span></span><span id="1843" class="l"><a href="#1843">1843: </a><span class="php-comment">     * @param  string $username The user's name
-</span></span><span id="1844" class="l"><a href="#1844">1844: </a><span class="php-comment">     * @param  bool|string $password The user's password
-</span></span><span id="1845" class="l"><a href="#1845">1845: </a><span class="php-comment">     * @return bool
-</span></span><span id="1846" class="l"><a href="#1846">1846: </a><span class="php-comment">     */</span>
-</span><span id="1847" class="l"><a href="#1847">1847: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_login(<span class="php-var">$username</span> = <span class="php-keyword1">NULL</span>, <span class="php-var">$password</span> = <span class="php-keyword1">FALSE</span>)
-</span><span id="1848" class="l"><a href="#1848">1848: </a>    {
-</span><span id="1849" class="l"><a href="#1849">1849: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$username</span>))
-</span><span id="1850" class="l"><a href="#1850">1850: </a>        {
-</span><span id="1851" class="l"><a href="#1851">1851: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1852" class="l"><a href="#1852">1852: </a>        }
-</span><span id="1853" class="l"><a href="#1853">1853: </a>
-</span><span id="1854" class="l"><a href="#1854">1854: </a>        <span class="php-var">$auth_source</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>));
-</span><span id="1855" class="l"><a href="#1855">1855: </a>        <span class="php-var">$rest_auth</span> = <span class="php-keyword2">strtolower</span>(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>));
-</span><span id="1856" class="l"><a href="#1856">1856: </a>        <span class="php-var">$valid_logins</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_valid_logins'</span>);
-</span><span id="1857" class="l"><a href="#1857">1857: </a>
-</span><span id="1858" class="l"><a href="#1858">1858: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>) &amp;&amp; <span class="php-var">$rest_auth</span> === <span class="php-quote">'digest'</span>)
-</span><span id="1859" class="l"><a href="#1859">1859: </a>        {
-</span><span id="1860" class="l"><a href="#1860">1860: </a>            <span class="php-comment">// For digest we do not have a password passed as argument</span>
-</span><span id="1861" class="l"><a href="#1861">1861: </a>            <span class="php-keyword1">return</span> <span class="php-keyword2">md5</span>(<span class="php-var">$username</span>.<span class="php-quote">':'</span>.<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>).<span class="php-quote">':'</span>.(<span class="php-keyword1">isset</span>(<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>]) ? <span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] : <span class="php-quote">''</span>));
-</span><span id="1862" class="l"><a href="#1862">1862: </a>        }
-</span><span id="1863" class="l"><a href="#1863">1863: </a>
-</span><span id="1864" class="l"><a href="#1864">1864: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$password</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1865" class="l"><a href="#1865">1865: </a>        {
-</span><span id="1866" class="l"><a href="#1866">1866: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1867" class="l"><a href="#1867">1867: </a>        }
-</span><span id="1868" class="l"><a href="#1868">1868: </a>
-</span><span id="1869" class="l"><a href="#1869">1869: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'ldap'</span>)
-</span><span id="1870" class="l"><a href="#1870">1870: </a>        {
-</span><span id="1871" class="l"><a href="#1871">1871: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing LDAP authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
-</span><span id="1872" class="l"><a href="#1872">1872: </a>
-</span><span id="1873" class="l"><a href="#1873">1873: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_ldap_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1874" class="l"><a href="#1874">1874: </a>        }
-</span><span id="1875" class="l"><a href="#1875">1875: </a>
-</span><span id="1876" class="l"><a href="#1876">1876: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$auth_source</span> === <span class="php-quote">'library'</span>)
-</span><span id="1877" class="l"><a href="#1877">1877: </a>        {
-</span><span id="1878" class="l"><a href="#1878">1878: </a>            log_message(<span class="php-quote">'debug'</span>, <span class="php-quote">&quot;Performing Library authentication for </span><span class="php-var">$username</span><span class="php-quote">&quot;</span>);
-</span><span id="1879" class="l"><a href="#1879">1879: </a>
-</span><span id="1880" class="l"><a href="#1880">1880: </a>            <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;_perform_library_auth(<span class="php-var">$username</span>, <span class="php-var">$password</span>);
-</span><span id="1881" class="l"><a href="#1881">1881: </a>        }
-</span><span id="1882" class="l"><a href="#1882">1882: </a>
-</span><span id="1883" class="l"><a href="#1883">1883: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-var">$username</span>, <span class="php-var">$valid_logins</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1884" class="l"><a href="#1884">1884: </a>        {
-</span><span id="1885" class="l"><a href="#1885">1885: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1886" class="l"><a href="#1886">1886: </a>        }
-</span><span id="1887" class="l"><a href="#1887">1887: </a>
-</span><span id="1888" class="l"><a href="#1888">1888: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$valid_logins</span>[<span class="php-var">$username</span>] !== <span class="php-var">$password</span>)
-</span><span id="1889" class="l"><a href="#1889">1889: </a>        {
-</span><span id="1890" class="l"><a href="#1890">1890: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">FALSE</span>;
-</span><span id="1891" class="l"><a href="#1891">1891: </a>        }
-</span><span id="1892" class="l"><a href="#1892">1892: </a>
-</span><span id="1893" class="l"><a href="#1893">1893: </a>        <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="1894" class="l"><a href="#1894">1894: </a>    }
-</span><span id="1895" class="l"><a href="#1895">1895: </a>
-</span><span id="1896" class="l"><a href="#1896">1896: </a>    <span class="php-comment">/**
-</span></span><span id="1897" class="l"><a href="#1897">1897: </a><span class="php-comment">     * Check to see if the user is logged in with a PHP session key
-</span></span><span id="1898" class="l"><a href="#1898">1898: </a><span class="php-comment">     *
-</span></span><span id="1899" class="l"><a href="#1899">1899: </a><span class="php-comment">     * @access protected
-</span></span><span id="1900" class="l"><a href="#1900">1900: </a><span class="php-comment">     * @return void
-</span></span><span id="1901" class="l"><a href="#1901">1901: </a><span class="php-comment">     */</span>
-</span><span id="1902" class="l"><a href="#1902">1902: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_php_session()
-</span><span id="1903" class="l"><a href="#1903">1903: </a>    {
-</span><span id="1904" class="l"><a href="#1904">1904: </a>        <span class="php-comment">// Get the auth_source config item</span>
-</span><span id="1905" class="l"><a href="#1905">1905: </a>        <span class="php-var">$key</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'auth_source'</span>);
-</span><span id="1906" class="l"><a href="#1906">1906: </a>
-</span><span id="1907" class="l"><a href="#1907">1907: </a>        <span class="php-comment">// If falsy, then the user isn't logged in</span>
-</span><span id="1908" class="l"><a href="#1908">1908: </a>        <span class="php-keyword1">if</span> ( ! <span class="php-var">$this</span>-&gt;session-&gt;userdata(<span class="php-var">$key</span>))
-</span><span id="1909" class="l"><a href="#1909">1909: </a>        {
-</span><span id="1910" class="l"><a href="#1910">1910: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="1911" class="l"><a href="#1911">1911: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="1912" class="l"><a href="#1912">1912: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="1913" class="l"><a href="#1913">1913: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unauthorized'</span>)
-</span><span id="1914" class="l"><a href="#1914">1914: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="1915" class="l"><a href="#1915">1915: </a>        }
-</span><span id="1916" class="l"><a href="#1916">1916: </a>    }
-</span><span id="1917" class="l"><a href="#1917">1917: </a>
-</span><span id="1918" class="l"><a href="#1918">1918: </a>    <span class="php-comment">/**
-</span></span><span id="1919" class="l"><a href="#1919">1919: </a><span class="php-comment">     * Prepares for basic authentication
-</span></span><span id="1920" class="l"><a href="#1920">1920: </a><span class="php-comment">     *
-</span></span><span id="1921" class="l"><a href="#1921">1921: </a><span class="php-comment">     * @access protected
-</span></span><span id="1922" class="l"><a href="#1922">1922: </a><span class="php-comment">     * @return void
-</span></span><span id="1923" class="l"><a href="#1923">1923: </a><span class="php-comment">     */</span>
-</span><span id="1924" class="l"><a href="#1924">1924: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_basic_auth()
-</span><span id="1925" class="l"><a href="#1925">1925: </a>    {
-</span><span id="1926" class="l"><a href="#1926">1926: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1927" class="l"><a href="#1927">1927: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
-</span><span id="1928" class="l"><a href="#1928">1928: </a>        {
-</span><span id="1929" class="l"><a href="#1929">1929: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1930" class="l"><a href="#1930">1930: </a>        }
-</span><span id="1931" class="l"><a href="#1931">1931: </a>
-</span><span id="1932" class="l"><a href="#1932">1932: </a>        <span class="php-comment">// Returns NULL if the SERVER variables PHP_AUTH_USER and HTTP_AUTHENTICATION don't exist</span>
-</span><span id="1933" class="l"><a href="#1933">1933: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_USER'</span>);
-</span><span id="1934" class="l"><a href="#1934">1934: </a>        <span class="php-var">$http_auth</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHENTICATION'</span>);
-</span><span id="1935" class="l"><a href="#1935">1935: </a>
-</span><span id="1936" class="l"><a href="#1936">1936: </a>        <span class="php-var">$password</span> = <span class="php-keyword1">NULL</span>;
-</span><span id="1937" class="l"><a href="#1937">1937: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$username</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1938" class="l"><a href="#1938">1938: </a>        {
-</span><span id="1939" class="l"><a href="#1939">1939: </a>            <span class="php-var">$password</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_PW'</span>);
-</span><span id="1940" class="l"><a href="#1940">1940: </a>        }
-</span><span id="1941" class="l"><a href="#1941">1941: </a>        <span class="php-keyword1">elseif</span> (<span class="php-var">$http_auth</span> !== <span class="php-keyword1">NULL</span>)
-</span><span id="1942" class="l"><a href="#1942">1942: </a>        {
-</span><span id="1943" class="l"><a href="#1943">1943: </a>            <span class="php-comment">// If the authentication header is set as basic, then extract the username and password from</span>
-</span><span id="1944" class="l"><a href="#1944">1944: </a>            <span class="php-comment">// HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file</span>
-</span><span id="1945" class="l"><a href="#1945">1945: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">strpos</span>(<span class="php-keyword2">strtolower</span>(<span class="php-var">$http_auth</span>), <span class="php-quote">'basic'</span>) === <span class="php-num">0</span>)
-</span><span id="1946" class="l"><a href="#1946">1946: </a>            {
-</span><span id="1947" class="l"><a href="#1947">1947: </a>                <span class="php-comment">// Search online for HTTP_AUTHORIZATION workaround to explain what this is doing</span>
-</span><span id="1948" class="l"><a href="#1948">1948: </a>                <span class="php-keyword1">list</span>(<span class="php-var">$username</span>, <span class="php-var">$password</span>) = <span class="php-keyword2">explode</span>(<span class="php-quote">':'</span>, <span class="php-keyword2">base64_decode</span>(<span class="php-keyword2">substr</span>(<span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>), <span class="php-num">6</span>)));
-</span><span id="1949" class="l"><a href="#1949">1949: </a>            }
-</span><span id="1950" class="l"><a href="#1950">1950: </a>        }
-</span><span id="1951" class="l"><a href="#1951">1951: </a>
-</span><span id="1952" class="l"><a href="#1952">1952: </a>        <span class="php-comment">// Check if the user is logged into the system</span>
-</span><span id="1953" class="l"><a href="#1953">1953: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$username</span>, <span class="php-var">$password</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="1954" class="l"><a href="#1954">1954: </a>        {
-</span><span id="1955" class="l"><a href="#1955">1955: </a>            <span class="php-var">$this</span>-&gt;_force_login();
-</span><span id="1956" class="l"><a href="#1956">1956: </a>        }
-</span><span id="1957" class="l"><a href="#1957">1957: </a>    }
-</span><span id="1958" class="l"><a href="#1958">1958: </a>
-</span><span id="1959" class="l"><a href="#1959">1959: </a>    <span class="php-comment">/**
-</span></span><span id="1960" class="l"><a href="#1960">1960: </a><span class="php-comment">     * Prepares for digest authentication
-</span></span><span id="1961" class="l"><a href="#1961">1961: </a><span class="php-comment">     *
-</span></span><span id="1962" class="l"><a href="#1962">1962: </a><span class="php-comment">     * @access protected
-</span></span><span id="1963" class="l"><a href="#1963">1963: </a><span class="php-comment">     * @return void
-</span></span><span id="1964" class="l"><a href="#1964">1964: </a><span class="php-comment">     */</span>
-</span><span id="1965" class="l"><a href="#1965">1965: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _prepare_digest_auth()
-</span><span id="1966" class="l"><a href="#1966">1966: </a>    {
-</span><span id="1967" class="l"><a href="#1967">1967: </a>        <span class="php-comment">// If whitelist is enabled it has the first chance to kick them out</span>
-</span><span id="1968" class="l"><a href="#1968">1968: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist_enabled'</span>))
-</span><span id="1969" class="l"><a href="#1969">1969: </a>        {
-</span><span id="1970" class="l"><a href="#1970">1970: </a>            <span class="php-var">$this</span>-&gt;_check_whitelist_auth();
-</span><span id="1971" class="l"><a href="#1971">1971: </a>        }
-</span><span id="1972" class="l"><a href="#1972">1972: </a>
-</span><span id="1973" class="l"><a href="#1973">1973: </a>        <span class="php-comment">// We need to test which server authentication variable to use,</span>
-</span><span id="1974" class="l"><a href="#1974">1974: </a>        <span class="php-comment">// because the PHP ISAPI module in IIS acts different from CGI</span>
-</span><span id="1975" class="l"><a href="#1975">1975: </a>        <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'PHP_AUTH_DIGEST'</span>);
-</span><span id="1976" class="l"><a href="#1976">1976: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$digest_string</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="1977" class="l"><a href="#1977">1977: </a>        {
-</span><span id="1978" class="l"><a href="#1978">1978: </a>            <span class="php-var">$digest_string</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_AUTHORIZATION'</span>);
-</span><span id="1979" class="l"><a href="#1979">1979: </a>        }
-</span><span id="1980" class="l"><a href="#1980">1980: </a>
-</span><span id="1981" class="l"><a href="#1981">1981: </a>        <span class="php-var">$unique_id</span> = <span class="php-keyword2">uniqid</span>();
-</span><span id="1982" class="l"><a href="#1982">1982: </a>
-</span><span id="1983" class="l"><a href="#1983">1983: </a>        <span class="php-comment">// The $_SESSION['error_prompted'] variable is used to ask the password</span>
-</span><span id="1984" class="l"><a href="#1984">1984: </a>        <span class="php-comment">// again if none given or if the user enters wrong auth information</span>
-</span><span id="1985" class="l"><a href="#1985">1985: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword1">empty</span>(<span class="php-var">$digest_string</span>))
-</span><span id="1986" class="l"><a href="#1986">1986: </a>        {
-</span><span id="1987" class="l"><a href="#1987">1987: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
-</span><span id="1988" class="l"><a href="#1988">1988: </a>        }
-</span><span id="1989" class="l"><a href="#1989">1989: </a>
-</span><span id="1990" class="l"><a href="#1990">1990: </a>        <span class="php-comment">// We need to retrieve authentication data from the $digest_string variable</span>
-</span><span id="1991" class="l"><a href="#1991">1991: </a>        <span class="php-var">$matches</span> = [];
-</span><span id="1992" class="l"><a href="#1992">1992: </a>        <span class="php-keyword2">preg_match_all</span>(<span class="php-quote">'@(username|nonce|uri|nc|cnonce|qop|response)=[\'&quot;]?([^\'&quot;,]+)@'</span>, <span class="php-var">$digest_string</span>, <span class="php-var">$matches</span>);
-</span><span id="1993" class="l"><a href="#1993">1993: </a>        <span class="php-var">$digest</span> = (<span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>]) || <span class="php-keyword1">empty</span>(<span class="php-var">$matches</span>[<span class="php-num">2</span>])) ? [] : <span class="php-keyword2">array_combine</span>(<span class="php-var">$matches</span>[<span class="php-num">1</span>], <span class="php-var">$matches</span>[<span class="php-num">2</span>]);
-</span><span id="1994" class="l"><a href="#1994">1994: </a>
-</span><span id="1995" class="l"><a href="#1995">1995: </a>        <span class="php-comment">// For digest authentication the library function should return already stored md5(username:restrealm:password) for that username see rest.php::auth_library_function config</span>
-</span><span id="1996" class="l"><a href="#1996">1996: </a>        <span class="php-var">$username</span> = <span class="php-var">$this</span>-&gt;_check_login(<span class="php-var">$digest</span>[<span class="php-quote">'username'</span>], <span class="php-keyword1">TRUE</span>);
-</span><span id="1997" class="l"><a href="#1997">1997: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">array_key_exists</span>(<span class="php-quote">'username'</span>, <span class="php-var">$digest</span>) === <span class="php-keyword1">FALSE</span> || <span class="php-var">$username</span> === <span class="php-keyword1">FALSE</span>)
-</span><span id="1998" class="l"><a href="#1998">1998: </a>        {
-</span><span id="1999" class="l"><a href="#1999">1999: </a>            <span class="php-var">$this</span>-&gt;_force_login(<span class="php-var">$unique_id</span>);
-</span><span id="2000" class="l"><a href="#2000">2000: </a>        }
-</span><span id="2001" class="l"><a href="#2001">2001: </a>
-</span><span id="2002" class="l"><a href="#2002">2002: </a>        <span class="php-var">$md5</span> = <span class="php-keyword2">md5</span>(<span class="php-keyword2">strtoupper</span>(<span class="php-var">$this</span>-&gt;request-&gt;method).<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'uri'</span>]);
-</span><span id="2003" class="l"><a href="#2003">2003: </a>        <span class="php-var">$valid_response</span> = <span class="php-keyword2">md5</span>(<span class="php-var">$username</span>.<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'nonce'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'nc'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'cnonce'</span>].<span class="php-quote">':'</span>.<span class="php-var">$digest</span>[<span class="php-quote">'qop'</span>].<span class="php-quote">':'</span>.<span class="php-var">$md5</span>);
-</span><span id="2004" class="l"><a href="#2004">2004: </a>
-</span><span id="2005" class="l"><a href="#2005">2005: </a>        <span class="php-comment">// Check if the string don't compare (case-insensitive)</span>
-</span><span id="2006" class="l"><a href="#2006">2006: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strcasecmp</span>(<span class="php-var">$digest</span>[<span class="php-quote">'response'</span>], <span class="php-var">$valid_response</span>) !== <span class="php-num">0</span>)
-</span><span id="2007" class="l"><a href="#2007">2007: </a>        {
-</span><span id="2008" class="l"><a href="#2008">2008: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="2009" class="l"><a href="#2009">2009: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="2010" class="l"><a href="#2010">2010: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="2011" class="l"><a href="#2011">2011: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_invalid_credentials'</span>)
-</span><span id="2012" class="l"><a href="#2012">2012: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="2013" class="l"><a href="#2013">2013: </a>        }
-</span><span id="2014" class="l"><a href="#2014">2014: </a>    }
-</span><span id="2015" class="l"><a href="#2015">2015: </a>
-</span><span id="2016" class="l"><a href="#2016">2016: </a>    <span class="php-comment">/**
-</span></span><span id="2017" class="l"><a href="#2017">2017: </a><span class="php-comment">     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
-</span></span><span id="2018" class="l"><a href="#2018">2018: </a><span class="php-comment">     *
-</span></span><span id="2019" class="l"><a href="#2019">2019: </a><span class="php-comment">     * @access protected
-</span></span><span id="2020" class="l"><a href="#2020">2020: </a><span class="php-comment">     * @return void
-</span></span><span id="2021" class="l"><a href="#2021">2021: </a><span class="php-comment">     */</span>
-</span><span id="2022" class="l"><a href="#2022">2022: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_blacklist_auth()
-</span><span id="2023" class="l"><a href="#2023">2023: </a>    {
-</span><span id="2024" class="l"><a href="#2024">2024: </a>        <span class="php-comment">// Match an ip address in a blacklist e.g. 127.0.0.0, 0.0.0.0</span>
-</span><span id="2025" class="l"><a href="#2025">2025: </a>        <span class="php-var">$pattern</span> = <span class="php-keyword2">sprintf</span>(<span class="php-quote">'/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m'</span>, <span class="php-var">$this</span>-&gt;input-&gt;ip_address());
-</span><span id="2026" class="l"><a href="#2026">2026: </a>
-</span><span id="2027" class="l"><a href="#2027">2027: </a>        <span class="php-comment">// Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE</span>
-</span><span id="2028" class="l"><a href="#2028">2028: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">preg_match</span>(<span class="php-var">$pattern</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_blacklist'</span>)))
-</span><span id="2029" class="l"><a href="#2029">2029: </a>        {
-</span><span id="2030" class="l"><a href="#2030">2030: </a>            <span class="php-comment">// Display an error response</span>
-</span><span id="2031" class="l"><a href="#2031">2031: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="2032" class="l"><a href="#2032">2032: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="2033" class="l"><a href="#2033">2033: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ip_denied'</span>)
-</span><span id="2034" class="l"><a href="#2034">2034: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="2035" class="l"><a href="#2035">2035: </a>        }
-</span><span id="2036" class="l"><a href="#2036">2036: </a>    }
-</span><span id="2037" class="l"><a href="#2037">2037: </a>
-</span><span id="2038" class="l"><a href="#2038">2038: </a>    <span class="php-comment">/**
-</span></span><span id="2039" class="l"><a href="#2039">2039: </a><span class="php-comment">     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
-</span></span><span id="2040" class="l"><a href="#2040">2040: </a><span class="php-comment">     *
-</span></span><span id="2041" class="l"><a href="#2041">2041: </a><span class="php-comment">     * @access protected
-</span></span><span id="2042" class="l"><a href="#2042">2042: </a><span class="php-comment">     * @return void
-</span></span><span id="2043" class="l"><a href="#2043">2043: </a><span class="php-comment">     */</span>
-</span><span id="2044" class="l"><a href="#2044">2044: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_whitelist_auth()
-</span><span id="2045" class="l"><a href="#2045">2045: </a>    {
-</span><span id="2046" class="l"><a href="#2046">2046: </a>        <span class="php-var">$whitelist</span> = <span class="php-keyword2">explode</span>(<span class="php-quote">','</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_ip_whitelist'</span>));
-</span><span id="2047" class="l"><a href="#2047">2047: </a>
-</span><span id="2048" class="l"><a href="#2048">2048: </a>        <span class="php-keyword2">array_push</span>(<span class="php-var">$whitelist</span>, <span class="php-quote">'127.0.0.1'</span>, <span class="php-quote">'0.0.0.0'</span>);
-</span><span id="2049" class="l"><a href="#2049">2049: </a>
-</span><span id="2050" class="l"><a href="#2050">2050: </a>        <span class="php-keyword1">foreach</span> (<span class="php-var">$whitelist</span> <span class="php-keyword1">as</span> &amp;<span class="php-var">$ip</span>)
-</span><span id="2051" class="l"><a href="#2051">2051: </a>        {
-</span><span id="2052" class="l"><a href="#2052">2052: </a>            <span class="php-comment">// As $ip is a reference, trim leading and trailing whitespace, then store the new value</span>
-</span><span id="2053" class="l"><a href="#2053">2053: </a>            <span class="php-comment">// using the reference</span>
-</span><span id="2054" class="l"><a href="#2054">2054: </a>            <span class="php-var">$ip</span> = <span class="php-keyword2">trim</span>(<span class="php-var">$ip</span>);
-</span><span id="2055" class="l"><a href="#2055">2055: </a>        }
-</span><span id="2056" class="l"><a href="#2056">2056: </a>
-</span><span id="2057" class="l"><a href="#2057">2057: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$this</span>-&gt;input-&gt;ip_address(), <span class="php-var">$whitelist</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="2058" class="l"><a href="#2058">2058: </a>        {
-</span><span id="2059" class="l"><a href="#2059">2059: </a>            <span class="php-var">$this</span>-&gt;response([
-</span><span id="2060" class="l"><a href="#2060">2060: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="2061" class="l"><a href="#2061">2061: </a>                    <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_ip_unauthorized'</span>)
-</span><span id="2062" class="l"><a href="#2062">2062: </a>                ], self::HTTP_UNAUTHORIZED);
-</span><span id="2063" class="l"><a href="#2063">2063: </a>        }
-</span><span id="2064" class="l"><a href="#2064">2064: </a>    }
-</span><span id="2065" class="l"><a href="#2065">2065: </a>
-</span><span id="2066" class="l"><a href="#2066">2066: </a>    <span class="php-comment">/**
-</span></span><span id="2067" class="l"><a href="#2067">2067: </a><span class="php-comment">     * Force logging in by setting the WWW-Authenticate header
-</span></span><span id="2068" class="l"><a href="#2068">2068: </a><span class="php-comment">     *
-</span></span><span id="2069" class="l"><a href="#2069">2069: </a><span class="php-comment">     * @access protected
-</span></span><span id="2070" class="l"><a href="#2070">2070: </a><span class="php-comment">     * @param string $nonce A server-specified data string which should be uniquely generated
-</span></span><span id="2071" class="l"><a href="#2071">2071: </a><span class="php-comment">     * each time
-</span></span><span id="2072" class="l"><a href="#2072">2072: </a><span class="php-comment">     * @return void
-</span></span><span id="2073" class="l"><a href="#2073">2073: </a><span class="php-comment">     */</span>
-</span><span id="2074" class="l"><a href="#2074">2074: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _force_login(<span class="php-var">$nonce</span> = <span class="php-quote">''</span>)
-</span><span id="2075" class="l"><a href="#2075">2075: </a>    {
-</span><span id="2076" class="l"><a href="#2076">2076: </a>        <span class="php-var">$rest_auth</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_auth'</span>);
-</span><span id="2077" class="l"><a href="#2077">2077: </a>        <span class="php-var">$rest_realm</span> = <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_realm'</span>);
-</span><span id="2078" class="l"><a href="#2078">2078: </a>        <span class="php-keyword1">if</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'basic'</span>)
-</span><span id="2079" class="l"><a href="#2079">2079: </a>        {
-</span><span id="2080" class="l"><a href="#2080">2080: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-5</span>
-</span><span id="2081" class="l"><a href="#2081">2081: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'WWW-Authenticate: Basic realm=&quot;'</span>.<span class="php-var">$rest_realm</span>.<span class="php-quote">'&quot;'</span>);
-</span><span id="2082" class="l"><a href="#2082">2082: </a>        }
-</span><span id="2083" class="l"><a href="#2083">2083: </a>        <span class="php-keyword1">elseif</span> (<span class="php-keyword2">strtolower</span>(<span class="php-var">$rest_auth</span>) === <span class="php-quote">'digest'</span>)
-</span><span id="2084" class="l"><a href="#2084">2084: </a>        {
-</span><span id="2085" class="l"><a href="#2085">2085: </a>            <span class="php-comment">// See http://tools.ietf.org/html/rfc2617#page-18</span>
-</span><span id="2086" class="l"><a href="#2086">2086: </a>            <span class="php-keyword2">header</span>(
-</span><span id="2087" class="l"><a href="#2087">2087: </a>                <span class="php-quote">'WWW-Authenticate: Digest realm=&quot;'</span>.<span class="php-var">$rest_realm</span>
-</span><span id="2088" class="l"><a href="#2088">2088: </a>                .<span class="php-quote">'&quot;, qop=&quot;auth&quot;, nonce=&quot;'</span>.<span class="php-var">$nonce</span>
-</span><span id="2089" class="l"><a href="#2089">2089: </a>                .<span class="php-quote">'&quot;, opaque=&quot;'</span> . <span class="php-keyword2">md5</span>(<span class="php-var">$rest_realm</span>).<span class="php-quote">'&quot;'</span>);
-</span><span id="2090" class="l"><a href="#2090">2090: </a>        }
-</span><span id="2091" class="l"><a href="#2091">2091: </a>
-</span><span id="2092" class="l"><a href="#2092">2092: </a>        <span class="php-comment">// Display an error response</span>
-</span><span id="2093" class="l"><a href="#2093">2093: </a>        <span class="php-var">$this</span>-&gt;response([
-</span><span id="2094" class="l"><a href="#2094">2094: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_status_field_name'</span>) =&gt; <span class="php-keyword1">FALSE</span>,
-</span><span id="2095" class="l"><a href="#2095">2095: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_message_field_name'</span>) =&gt; <span class="php-var">$this</span>-&gt;lang-&gt;line(<span class="php-quote">'text_rest_unauthorized'</span>)
-</span><span id="2096" class="l"><a href="#2096">2096: </a>            ], self::HTTP_UNAUTHORIZED);
-</span><span id="2097" class="l"><a href="#2097">2097: </a>    }
-</span><span id="2098" class="l"><a href="#2098">2098: </a>
-</span><span id="2099" class="l"><a href="#2099">2099: </a>    <span class="php-comment">/**
-</span></span><span id="2100" class="l"><a href="#2100">2100: </a><span class="php-comment">     * Updates the log table with the total access time
-</span></span><span id="2101" class="l"><a href="#2101">2101: </a><span class="php-comment">     *
-</span></span><span id="2102" class="l"><a href="#2102">2102: </a><span class="php-comment">     * @access protected
-</span></span><span id="2103" class="l"><a href="#2103">2103: </a><span class="php-comment">     * @author Chris Kacerguis
-</span></span><span id="2104" class="l"><a href="#2104">2104: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="2105" class="l"><a href="#2105">2105: </a><span class="php-comment">     */</span>
-</span><span id="2106" class="l"><a href="#2106">2106: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_access_time()
-</span><span id="2107" class="l"><a href="#2107">2107: </a>    {
-</span><span id="2108" class="l"><a href="#2108">2108: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'rtime'</span>] = <span class="php-var">$this</span>-&gt;_end_rtime - <span class="php-var">$this</span>-&gt;_start_rtime;
-</span><span id="2109" class="l"><a href="#2109">2109: </a>
-</span><span id="2110" class="l"><a href="#2110">2110: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
-</span><span id="2111" class="l"><a href="#2111">2111: </a>                <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="2112" class="l"><a href="#2112">2112: </a>                <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="2113" class="l"><a href="#2113">2113: </a>            ]);
-</span><span id="2114" class="l"><a href="#2114">2114: </a>    }
-</span><span id="2115" class="l"><a href="#2115">2115: </a>
-</span><span id="2116" class="l"><a href="#2116">2116: </a>    <span class="php-comment">/**
-</span></span><span id="2117" class="l"><a href="#2117">2117: </a><span class="php-comment">     * Updates the log table with HTTP response code
-</span></span><span id="2118" class="l"><a href="#2118">2118: </a><span class="php-comment">     *
-</span></span><span id="2119" class="l"><a href="#2119">2119: </a><span class="php-comment">     * @access protected
-</span></span><span id="2120" class="l"><a href="#2120">2120: </a><span class="php-comment">     * @author Justin Chen
-</span></span><span id="2121" class="l"><a href="#2121">2121: </a><span class="php-comment">     * @param $http_code int HTTP status code
-</span></span><span id="2122" class="l"><a href="#2122">2122: </a><span class="php-comment">     * @return bool TRUE log table updated; otherwise, FALSE
-</span></span><span id="2123" class="l"><a href="#2123">2123: </a><span class="php-comment">     */</span>
-</span><span id="2124" class="l"><a href="#2124">2124: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _log_response_code(<span class="php-var">$http_code</span>)
-</span><span id="2125" class="l"><a href="#2125">2125: </a>    {
-</span><span id="2126" class="l"><a href="#2126">2126: </a>        <span class="php-var">$payload</span>[<span class="php-quote">'response_code'</span>] = <span class="php-var">$http_code</span>;
-</span><span id="2127" class="l"><a href="#2127">2127: </a>
-</span><span id="2128" class="l"><a href="#2128">2128: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db-&gt;update(
-</span><span id="2129" class="l"><a href="#2129">2129: </a>            <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_logs_table'</span>), <span class="php-var">$payload</span>, [
-</span><span id="2130" class="l"><a href="#2130">2130: </a>            <span class="php-quote">'id'</span> =&gt; <span class="php-var">$this</span>-&gt;_insert_id
-</span><span id="2131" class="l"><a href="#2131">2131: </a>        ]);
-</span><span id="2132" class="l"><a href="#2132">2132: </a>    }
-</span><span id="2133" class="l"><a href="#2133">2133: </a>
-</span><span id="2134" class="l"><a href="#2134">2134: </a>    <span class="php-comment">/**
-</span></span><span id="2135" class="l"><a href="#2135">2135: </a><span class="php-comment">     * Check to see if the API key has access to the controller and methods
-</span></span><span id="2136" class="l"><a href="#2136">2136: </a><span class="php-comment">     *
-</span></span><span id="2137" class="l"><a href="#2137">2137: </a><span class="php-comment">     * @access protected
-</span></span><span id="2138" class="l"><a href="#2138">2138: </a><span class="php-comment">     * @return bool TRUE the API key has access; otherwise, FALSE
-</span></span><span id="2139" class="l"><a href="#2139">2139: </a><span class="php-comment">     */</span>
-</span><span id="2140" class="l"><a href="#2140">2140: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_access()
-</span><span id="2141" class="l"><a href="#2141">2141: </a>    {
-</span><span id="2142" class="l"><a href="#2142">2142: </a>        <span class="php-comment">// If we don't want to check access, just return TRUE</span>
-</span><span id="2143" class="l"><a href="#2143">2143: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_enable_access'</span>) === <span class="php-keyword1">FALSE</span>)
-</span><span id="2144" class="l"><a href="#2144">2144: </a>        {
-</span><span id="2145" class="l"><a href="#2145">2145: </a>            <span class="php-keyword1">return</span> <span class="php-keyword1">TRUE</span>;
-</span><span id="2146" class="l"><a href="#2146">2146: </a>        }
-</span><span id="2147" class="l"><a href="#2147">2147: </a>
-</span><span id="2148" class="l"><a href="#2148">2148: </a>        <span class="php-comment">// Fetch controller based on path and controller name</span>
-</span><span id="2149" class="l"><a href="#2149">2149: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">implode</span>(
-</span><span id="2150" class="l"><a href="#2150">2150: </a>            <span class="php-quote">'/'</span>, [
-</span><span id="2151" class="l"><a href="#2151">2151: </a>            <span class="php-var">$this</span>-&gt;router-&gt;directory,
-</span><span id="2152" class="l"><a href="#2152">2152: </a>            <span class="php-var">$this</span>-&gt;router-&gt;<span class="php-keyword1">class</span>
-</span><span id="2153" class="l"><a href="#2153">2153: </a>        ]);
-</span><span id="2154" class="l"><a href="#2154">2154: </a>
-</span><span id="2155" class="l"><a href="#2155">2155: </a>        <span class="php-comment">// Remove any double slashes for safety</span>
-</span><span id="2156" class="l"><a href="#2156">2156: </a>        <span class="php-var">$controller</span> = <span class="php-keyword2">str_replace</span>(<span class="php-quote">'//'</span>, <span class="php-quote">'/'</span>, <span class="php-var">$controller</span>);
-</span><span id="2157" class="l"><a href="#2157">2157: </a>
-</span><span id="2158" class="l"><a href="#2158">2158: </a>        <span class="php-comment">// Query the access table and get the number of results</span>
-</span><span id="2159" class="l"><a href="#2159">2159: </a>        <span class="php-keyword1">return</span> <span class="php-var">$this</span>-&gt;rest-&gt;db
-</span><span id="2160" class="l"><a href="#2160">2160: </a>            -&gt;where(<span class="php-quote">'key'</span>, <span class="php-var">$this</span>-&gt;rest-&gt;<span class="php-keyword2">key</span>)
-</span><span id="2161" class="l"><a href="#2161">2161: </a>            -&gt;where(<span class="php-quote">'controller'</span>, <span class="php-var">$controller</span>)
-</span><span id="2162" class="l"><a href="#2162">2162: </a>            -&gt;get(<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'rest_access_table'</span>))
-</span><span id="2163" class="l"><a href="#2163">2163: </a>            -&gt;num_rows() &gt; <span class="php-num">0</span>;
-</span><span id="2164" class="l"><a href="#2164">2164: </a>    }
-</span><span id="2165" class="l"><a href="#2165">2165: </a>
-</span><span id="2166" class="l"><a href="#2166">2166: </a>    <span class="php-comment">/**
-</span></span><span id="2167" class="l"><a href="#2167">2167: </a><span class="php-comment">     * Checks allowed domains, and adds appropriate headers for HTTP access control (CORS)
-</span></span><span id="2168" class="l"><a href="#2168">2168: </a><span class="php-comment">     *
-</span></span><span id="2169" class="l"><a href="#2169">2169: </a><span class="php-comment">     * @access protected
-</span></span><span id="2170" class="l"><a href="#2170">2170: </a><span class="php-comment">     * @return void
-</span></span><span id="2171" class="l"><a href="#2171">2171: </a><span class="php-comment">     */</span>
-</span><span id="2172" class="l"><a href="#2172">2172: </a>    <span class="php-keyword1">protected</span> <span class="php-keyword1">function</span> _check_cors()
-</span><span id="2173" class="l"><a href="#2173">2173: </a>    {
-</span><span id="2174" class="l"><a href="#2174">2174: </a>        <span class="php-comment">// Convert the config items into strings</span>
-</span><span id="2175" class="l"><a href="#2175">2175: </a>        <span class="php-var">$allowed_headers</span> = <span class="php-keyword2">implode</span>(<span class="php-quote">' ,'</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'allowed_cors_headers'</span>));
-</span><span id="2176" class="l"><a href="#2176">2176: </a>        <span class="php-var">$allowed_methods</span> = <span class="php-keyword2">implode</span>(<span class="php-quote">' ,'</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'allowed_cors_methods'</span>));
-</span><span id="2177" class="l"><a href="#2177">2177: </a>
-</span><span id="2178" class="l"><a href="#2178">2178: </a>        <span class="php-comment">// If we want to allow any domain to access the API</span>
-</span><span id="2179" class="l"><a href="#2179">2179: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'allow_any_cors_domain'</span>) === <span class="php-keyword1">TRUE</span>)
-</span><span id="2180" class="l"><a href="#2180">2180: </a>        {
-</span><span id="2181" class="l"><a href="#2181">2181: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'Access-Control-Allow-Origin: *'</span>);
-</span><span id="2182" class="l"><a href="#2182">2182: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'Access-Control-Allow-Headers: '</span>.<span class="php-var">$allowed_headers</span>);
-</span><span id="2183" class="l"><a href="#2183">2183: </a>            <span class="php-keyword2">header</span>(<span class="php-quote">'Access-Control-Allow-Methods: '</span>.<span class="php-var">$allowed_methods</span>);
-</span><span id="2184" class="l"><a href="#2184">2184: </a>        }
-</span><span id="2185" class="l"><a href="#2185">2185: </a>        <span class="php-keyword1">else</span>
-</span><span id="2186" class="l"><a href="#2186">2186: </a>        {
-</span><span id="2187" class="l"><a href="#2187">2187: </a>            <span class="php-comment">// We're going to allow only certain domains access</span>
-</span><span id="2188" class="l"><a href="#2188">2188: </a>            <span class="php-comment">// Store the HTTP Origin header</span>
-</span><span id="2189" class="l"><a href="#2189">2189: </a>            <span class="php-var">$origin</span> = <span class="php-var">$this</span>-&gt;input-&gt;server(<span class="php-quote">'HTTP_ORIGIN'</span>);
-</span><span id="2190" class="l"><a href="#2190">2190: </a>            <span class="php-keyword1">if</span> (<span class="php-var">$origin</span> === <span class="php-keyword1">NULL</span>)
-</span><span id="2191" class="l"><a href="#2191">2191: </a>            {
-</span><span id="2192" class="l"><a href="#2192">2192: </a>                <span class="php-var">$origin</span> = <span class="php-quote">''</span>;
-</span><span id="2193" class="l"><a href="#2193">2193: </a>            }
-</span><span id="2194" class="l"><a href="#2194">2194: </a>
-</span><span id="2195" class="l"><a href="#2195">2195: </a>            <span class="php-comment">// If the origin domain is in the allowed_cors_origins list, then add the Access Control headers</span>
-</span><span id="2196" class="l"><a href="#2196">2196: </a>            <span class="php-keyword1">if</span> (<span class="php-keyword2">in_array</span>(<span class="php-var">$origin</span>, <span class="php-var">$this</span>-&gt;config-&gt;item(<span class="php-quote">'allowed_cors_origins'</span>)))
-</span><span id="2197" class="l"><a href="#2197">2197: </a>            {
-</span><span id="2198" class="l"><a href="#2198">2198: </a>                <span class="php-keyword2">header</span>(<span class="php-quote">'Access-Control-Allow-Origin: '</span>.<span class="php-var">$origin</span>);
-</span><span id="2199" class="l"><a href="#2199">2199: </a>                <span class="php-keyword2">header</span>(<span class="php-quote">'Access-Control-Allow-Headers: '</span>.<span class="php-var">$allowed_headers</span>);
-</span><span id="2200" class="l"><a href="#2200">2200: </a>                <span class="php-keyword2">header</span>(<span class="php-quote">'Access-Control-Allow-Methods: '</span>.<span class="php-var">$allowed_methods</span>);
-</span><span id="2201" class="l"><a href="#2201">2201: </a>            }
-</span><span id="2202" class="l"><a href="#2202">2202: </a>        }
-</span><span id="2203" class="l"><a href="#2203">2203: </a>
-</span><span id="2204" class="l"><a href="#2204">2204: </a>        <span class="php-comment">// If the request HTTP method is 'OPTIONS', kill the response and send it to the client</span>
-</span><span id="2205" class="l"><a href="#2205">2205: </a>        <span class="php-keyword1">if</span> (<span class="php-var">$this</span>-&gt;input-&gt;method() === <span class="php-quote">'options'</span>)
-</span><span id="2206" class="l"><a href="#2206">2206: </a>        {
-</span><span id="2207" class="l"><a href="#2207">2207: </a>            <span class="php-keyword1">exit</span>;
-</span><span id="2208" class="l"><a href="#2208">2208: </a>        }
-</span><span id="2209" class="l"><a href="#2209">2209: </a>    }
-</span><span id="2210" class="l"><a href="#2210">2210: </a>
-</span><span id="2211" class="l"><a href="#2211">2211: </a>}
-</span><span id="2212" class="l"><a href="#2212">2212: </a></span></code></pre>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
-<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
-</body>
-</html>
diff --git a/documentation/source-class-Rest_server.html b/documentation/source-class-Rest_server.html
deleted file mode 100644
index 4a18ebd3..00000000
--- a/documentation/source-class-Rest_server.html
+++ /dev/null
@@ -1,118 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="robots" content="noindex">
-
-	<title>File controllers/Rest_server.php</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li><a href="http://github.com/class-Example.html">Example</a></li>
-				<li><a href="http://github.com/class-Format.html">Format</a></li>
-				<li><a href="http://github.com/class-Key.html">Key</a></li>
-				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
-				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
-				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
-			</ul>
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li>
-<span>Package</span>			</li>
-			<li>
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<pre><code><span id="1" class="l"><a href="#1"> 1: </a><span class="xlang">&lt;?php</span>
-</span><span id="2" class="l"><a href="#2"> 2: </a>
-</span><span id="3" class="l"><a href="#3"> 3: </a><span class="php-keyword2">defined</span>(<span class="php-quote">'BASEPATH'</span>) <span class="php-keyword1">OR</span> <span class="php-keyword1">exit</span>(<span class="php-quote">'No direct script access allowed'</span>);
-</span><span id="4" class="l"><a href="#4"> 4: </a>
-</span><span id="5" class="l"><a href="#5"> 5: </a><span class="php-keyword1">class</span> Rest_server <span class="php-keyword1">extends</span> CI_Controller {
-</span><span id="6" class="l"><a href="#6"> 6: </a>
-</span><span id="7" class="l"><a href="#7"> 7: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> index()
-</span><span id="8" class="l"><a href="#8"> 8: </a>    {
-</span><span id="9" class="l"><a href="#9"> 9: </a>        <span class="php-var">$this</span>-&gt;load-&gt;helper(<span class="php-quote">'url'</span>);
-</span><span id="10" class="l"><a href="#10">10: </a>
-</span><span id="11" class="l"><a href="#11">11: </a>        <span class="php-var">$this</span>-&gt;load-&gt;view(<span class="php-quote">'rest_server'</span>);
-</span><span id="12" class="l"><a href="#12">12: </a>    }
-</span><span id="13" class="l"><a href="#13">13: </a>}
-</span><span id="14" class="l"><a href="#14">14: </a></span></code></pre>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
-<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
-</body>
-</html>
diff --git a/documentation/source-class-Welcome.html b/documentation/source-class-Welcome.html
deleted file mode 100644
index a32b765a..00000000
--- a/documentation/source-class-Welcome.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8">
-	<meta name="robots" content="noindex">
-
-	<title>File controllers/Welcome.php</title>
-
-	<link rel="stylesheet" href="http://github.com/resources/style.css?e99947befd7bf673c6b43ff75e9e0f170c88a60e">
-
-</head>
-
-<body>
-<div id="left">
-	<div id="menu">
-		<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-
-
-		<div id="groups">
-				<h3>Packages</h3>
-			<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.html">
-						CodeIgniter<span></span>
-					</a>
-
-						<ul>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Libraries.html">
-						Libraries					</a>
-
-						</li>
-				<li>
-					<a href="http://github.com/package-CodeIgniter.Rest.html">
-						Rest					</a>
-
-						</li>
-							</ul></li>
-				<li>
-					<a href="http://github.com/package-None.html">
-						None					</a>
-
-						</li>
-			</ul>
-		</div>
-
-		<hr>
-
-
-		<div id="elements">
-			<h3>Classes</h3>
-			<ul>
-				<li><a href="http://github.com/class-Example.html">Example</a></li>
-				<li><a href="http://github.com/class-Format.html">Format</a></li>
-				<li><a href="http://github.com/class-Key.html">Key</a></li>
-				<li><a href="http://github.com/class-REST_Controller.html">REST_Controller</a></li>
-				<li><a href="http://github.com/class-Rest_server.html">Rest_server</a></li>
-				<li><a href="http://github.com/class-Welcome.html">Welcome</a></li>
-			</ul>
-
-
-
-
-
-		</div>
-	</div>
-</div>
-
-<div id="splitter"></div>
-
-<div id="right">
-<div id="rightInner">
-	<form id="search">
-		<input type="hidden" name="cx" value="">
-		<input type="hidden" name="ie" value="UTF-8">
-		<input type="text" name="q" class="text" placeholder="Search">
-	</form>
-
-	<div id="navigation">
-		<ul>
-			<li>
-				<a href="http://github.com/index.html" title="Overview"><span>Overview</span></a>
-			</li>
-			<li>
-<span>Package</span>			</li>
-			<li>
-<span>Class</span>			</li>
-		</ul>
-		<ul>
-		</ul>
-		<ul>
-		</ul>
-	</div>
-
-<pre><code><span id="1" class="l"><a href="#1"> 1: </a><span class="xlang">&lt;?php</span>
-</span><span id="2" class="l"><a href="#2"> 2: </a><span class="php-keyword2">defined</span>(<span class="php-quote">'BASEPATH'</span>) <span class="php-keyword1">OR</span> <span class="php-keyword1">exit</span>(<span class="php-quote">'No direct script access allowed'</span>);
-</span><span id="3" class="l"><a href="#3"> 3: </a>
-</span><span id="4" class="l"><a href="#4"> 4: </a><span class="php-keyword1">class</span> Welcome <span class="php-keyword1">extends</span> CI_Controller {
-</span><span id="5" class="l"><a href="#5"> 5: </a>
-</span><span id="6" class="l"><a href="#6"> 6: </a>    <span class="php-comment">/**
-</span></span><span id="7" class="l"><a href="#7"> 7: </a><span class="php-comment">     * Index Page for this controller.
-</span></span><span id="8" class="l"><a href="#8"> 8: </a><span class="php-comment">     *
-</span></span><span id="9" class="l"><a href="#9"> 9: </a><span class="php-comment">     * Maps to the following URL
-</span></span><span id="10" class="l"><a href="#10">10: </a><span class="php-comment">     *      http://example.com/index.php/welcome
-</span></span><span id="11" class="l"><a href="#11">11: </a><span class="php-comment">     *  - or -
-</span></span><span id="12" class="l"><a href="#12">12: </a><span class="php-comment">     *      http://example.com/index.php/welcome/index
-</span></span><span id="13" class="l"><a href="#13">13: </a><span class="php-comment">     *  - or -
-</span></span><span id="14" class="l"><a href="#14">14: </a><span class="php-comment">     * Since this controller is set as the default controller in
-</span></span><span id="15" class="l"><a href="#15">15: </a><span class="php-comment">     * config/routes.php, it's displayed at http://example.com/
-</span></span><span id="16" class="l"><a href="#16">16: </a><span class="php-comment">     *
-</span></span><span id="17" class="l"><a href="#17">17: </a><span class="php-comment">     * So any other public methods not prefixed with an underscore will
-</span></span><span id="18" class="l"><a href="#18">18: </a><span class="php-comment">     * map to /index.php/welcome/&lt;method_name&gt;
-</span></span><span id="19" class="l"><a href="#19">19: </a><span class="php-comment">     * @see https://codeigniter.com/user_guide/general/urls.html
-</span></span><span id="20" class="l"><a href="#20">20: </a><span class="php-comment">     */</span>
-</span><span id="21" class="l"><a href="#21">21: </a>    <span class="php-keyword1">public</span> <span class="php-keyword1">function</span> index()
-</span><span id="22" class="l"><a href="#22">22: </a>    {
-</span><span id="23" class="l"><a href="#23">23: </a>        <span class="php-var">$this</span>-&gt;load-&gt;helper(<span class="php-quote">'url'</span>);
-</span><span id="24" class="l"><a href="#24">24: </a>
-</span><span id="25" class="l"><a href="#25">25: </a>        <span class="php-var">$this</span>-&gt;load-&gt;view(<span class="php-quote">'welcome_message'</span>);
-</span><span id="26" class="l"><a href="#26">26: </a>    }
-</span><span id="27" class="l"><a href="#27">27: </a>}
-</span><span id="28" class="l"><a href="#28">28: </a></span></code></pre>
-
-	<div id="footer">
-		 API documentation generated by <a href="http://apigen.org/">ApiGen</a>
-	</div>
-</div>
-</div>
-<script src="http://github.com/resources/combined.js?9b19127dc1973cca467c5196ef1ff03e486369ac"></script>
-<script src="http://github.com/elementlist.js?af98f5e580ce1d5af01f3e613339e1bf53dfaa8f"></script>
-</body>
-</html>
diff --git a/application/config/index.html b/language/bulgarian/index.html
similarity index 100%
rename from application/config/index.html
rename to language/bulgarian/index.html
diff --git a/application/language/bulgarian/rest_controller_lang.php b/language/bulgarian/rest_controller_lang.php
similarity index 100%
rename from application/language/bulgarian/rest_controller_lang.php
rename to language/bulgarian/rest_controller_lang.php
diff --git a/application/controllers/api/index.html b/language/dutch/index.html
similarity index 100%
rename from application/controllers/api/index.html
rename to language/dutch/index.html
diff --git a/language/dutch/rest_controller_lang.php b/language/dutch/rest_controller_lang.php
new file mode 100644
index 00000000..45fd9c25
--- /dev/null
+++ b/language/dutch/rest_controller_lang.php
@@ -0,0 +1,16 @@
+<?php
+/*
+ * Dutch language
+ */
+$lang['text_rest_invalid_api_key'] = 'Ongeldige API sleutel %s'; // %s is the REST API key
+$lang['text_rest_invalid_credentials'] = 'Ongeldige gegevens';
+$lang['text_rest_ip_denied'] = 'IP-adres geweigerd';
+$lang['text_rest_ip_unauthorized'] = 'IP-adres niet toegestaan';
+$lang['text_rest_unauthorized'] = 'Niet toegestaan';
+$lang['text_rest_ajax_only'] = 'Alleen AJAX requests zijn toegestaan';
+$lang['text_rest_api_key_unauthorized'] = 'De API sleutel heeft geen toegang tot de gevraagde informatie';
+$lang['text_rest_api_key_permissions'] = 'De API sleutel heeft niet genoeg bevoegdheden';
+$lang['text_rest_api_key_time_limit'] = 'De API sleutel heeft de tijdslimiet bereikt';
+$lang['text_rest_ip_address_time_limit'] = 'Het IP-adres heeft de tijdslimiet bereikt';
+$lang['text_rest_unknown_method'] = 'Onbekende actie';
+$lang['text_rest_unsupported'] = 'Protocol wordt niet ondersteund';
diff --git a/application/controllers/index.html b/language/english/index.html
similarity index 100%
rename from application/controllers/index.html
rename to language/english/index.html
diff --git a/application/language/english/rest_controller_lang.php b/language/english/rest_controller_lang.php
similarity index 100%
rename from application/language/english/rest_controller_lang.php
rename to language/english/rest_controller_lang.php
diff --git a/application/helpers/index.html b/language/french/index.html
similarity index 100%
rename from application/helpers/index.html
rename to language/french/index.html
diff --git a/application/language/french/rest_controller_lang.php b/language/french/rest_controller_lang.php
similarity index 94%
rename from application/language/french/rest_controller_lang.php
rename to language/french/rest_controller_lang.php
index f8c0d13f..20641de8 100644
--- a/application/language/french/rest_controller_lang.php
+++ b/language/french/rest_controller_lang.php
@@ -13,6 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Cette clef d\'API n\'a pas accès au contrôleur demandé';
 $lang['text_rest_api_key_permissions'] = 'Cette clef d\'API n\'a pas les permissions requises';
 $lang['text_rest_api_key_time_limit'] = 'Cette clef d\'API a atteint sa limite de temps pour cette méthode';
-$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
+$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method'; //todo translate
 $lang['text_rest_unknown_method'] = 'Méthode inconnue';
 $lang['text_rest_unsupported'] = 'Protocole non-supporté';
diff --git a/application/language/bulgarian/index.html b/language/german/index.html
similarity index 100%
rename from application/language/bulgarian/index.html
rename to language/german/index.html
diff --git a/application/language/german/rest_controller_lang.php b/language/german/rest_controller_lang.php
similarity index 94%
rename from application/language/german/rest_controller_lang.php
rename to language/german/rest_controller_lang.php
index 4230c3cd..3099d932 100644
--- a/application/language/german/rest_controller_lang.php
+++ b/language/german/rest_controller_lang.php
@@ -13,6 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Dieser API Schlüssel hat keinen Zugriff auf den angeforderten Controller';
 $lang['text_rest_api_key_permissions'] = 'Dieser API Schlüssel besitzt die erforderlichen Rechte nicht';
 $lang['text_rest_api_key_time_limit'] = 'Dieser API Schlüssel ist abgelaufen';
-$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
+$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method'; //todo translate
 $lang['text_rest_unknown_method'] = 'Unbekannte Methode';
 $lang['text_rest_unsupported'] = 'Protokoll nicht unterstützt';
diff --git a/application/language/greek/rest_controller_lang.php b/language/greek/rest_controller_lang.php
similarity index 95%
rename from application/language/greek/rest_controller_lang.php
rename to language/greek/rest_controller_lang.php
index f85b0673..eb68c39e 100644
--- a/application/language/greek/rest_controller_lang.php
+++ b/language/greek/rest_controller_lang.php
@@ -13,6 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Αυτό το API key δεν έχει πρόσβαση στον συγκεκριμένο controller';
 $lang['text_rest_api_key_permissions'] = 'Αυτό το API key δεν έχει αρκετά δικαιώματα';
 $lang['text_rest_api_key_time_limit'] = 'Αυτό το API key έχει φτάσει στο μέγιστο όριο requests για την συγκεκριμένη μέθοδο';
-$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
+$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method'; //todo translate
 $lang['text_rest_unknown_method'] = 'Άγνωστη μέθοδος';
 $lang['text_rest_unsupported'] = 'Το συγκεκριμένο πρωτόκολλο δεν υποστηρίζεται';
diff --git a/application/language/dutch/index.html b/language/index.html
similarity index 100%
rename from application/language/dutch/index.html
rename to language/index.html
diff --git a/application/language/english/index.html b/language/indonesia/index.html
similarity index 100%
rename from application/language/english/index.html
rename to language/indonesia/index.html
diff --git a/application/language/indonesia/rest_controller_lang.php b/language/indonesia/rest_controller_lang.php
similarity index 100%
rename from application/language/indonesia/rest_controller_lang.php
rename to language/indonesia/rest_controller_lang.php
diff --git a/application/language/french/index.html b/language/italian/index.html
similarity index 100%
rename from application/language/french/index.html
rename to language/italian/index.html
diff --git a/application/language/italian/rest_controller_lang.php b/language/italian/rest_controller_lang.php
similarity index 100%
rename from application/language/italian/rest_controller_lang.php
rename to language/italian/rest_controller_lang.php
diff --git a/application/language/german/index.html b/language/korean/index.html
similarity index 100%
rename from application/language/german/index.html
rename to language/korean/index.html
diff --git a/application/language/korean/rest_controller_lang.php b/language/korean/rest_controller_lang.php
similarity index 98%
rename from application/language/korean/rest_controller_lang.php
rename to language/korean/rest_controller_lang.php
index df6f9b46..fd2fb483 100644
--- a/application/language/korean/rest_controller_lang.php
+++ b/language/korean/rest_controller_lang.php
@@ -13,4 +13,4 @@
 $lang['text_rest_api_key_time_limit'] = '해당 API 키는 메서드의 시간 제한에 도달했습니다.';
 $lang['text_rest_ip_address_time_limit'] = '해당 IP 주소는 메서드의 시간 제한에 도달했습니다.';
 $lang['text_rest_unknown_method'] = '알 수 없는 메서드입니다.';
-$lang['text_rest_unsupported'] = '지원하지 않는 프로토콜입니다.';
\ No newline at end of file
+$lang['text_rest_unsupported'] = '지원하지 않는 프로토콜입니다.';
diff --git a/application/language/index.html b/language/portuguese-brazilian/index.html
similarity index 100%
rename from application/language/index.html
rename to language/portuguese-brazilian/index.html
diff --git a/application/language/portuguese-brazilian/rest_controller_lang.php b/language/portuguese-brazilian/rest_controller_lang.php
similarity index 100%
rename from application/language/portuguese-brazilian/rest_controller_lang.php
rename to language/portuguese-brazilian/rest_controller_lang.php
diff --git a/application/language/indonesia/index.html b/language/romanian/index.html
similarity index 100%
rename from application/language/indonesia/index.html
rename to language/romanian/index.html
diff --git a/application/language/romanian/rest_controller_lang.php b/language/romanian/rest_controller_lang.php
similarity index 93%
rename from application/language/romanian/rest_controller_lang.php
rename to language/romanian/rest_controller_lang.php
index f151d527..3231a7c5 100644
--- a/application/language/romanian/rest_controller_lang.php
+++ b/language/romanian/rest_controller_lang.php
@@ -13,6 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Această cheie API nu are acees la controller-ul solicitat';
 $lang['text_rest_api_key_permissions'] = 'Această cheie API nu are suficiente permisiuni';
 $lang['text_rest_api_key_time_limit'] = 'Această cheie API a atins limita de timp pentru această metodă';
-$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
+$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method'; //todo translate
 $lang['text_rest_unknown_method'] = 'Metodă necunoscută';
 $lang['text_rest_unsupported'] = 'Protocol neacceptat';
diff --git a/application/language/italian/index.html b/language/serbian_cyr/index.html
similarity index 100%
rename from application/language/italian/index.html
rename to language/serbian_cyr/index.html
diff --git a/application/language/serbian_cyr/rest_controller_lang.php b/language/serbian_cyr/rest_controller_lang.php
similarity index 96%
rename from application/language/serbian_cyr/rest_controller_lang.php
rename to language/serbian_cyr/rest_controller_lang.php
index e83ff4db..c828cc0a 100644
--- a/application/language/serbian_cyr/rest_controller_lang.php
+++ b/language/serbian_cyr/rest_controller_lang.php
@@ -13,6 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Овај *API* кључ нема овлашћења за захтевани контролер';
 $lang['text_rest_api_key_permissions'] = 'Овај *API* кључ нема дозвољен степен овлашћења';
 $lang['text_rest_api_key_time_limit'] = 'Овај *API* кључ је прекорачио временски лимит за дати метод';
-$lang['text_rest_ip_address_time_limit'] = 'Ова *IP* адреса је прекорачила временски лимит за дати метод';//todo translate
+$lang['text_rest_ip_address_time_limit'] = 'Ова *IP* адреса је прекорачила временски лимит за дати метод'; //todo translate
 $lang['text_rest_unknown_method'] = 'Непознат метод';
 $lang['text_rest_unsupported'] = 'Неподржан протокол';
diff --git a/application/language/korean/index.html b/language/serbian_lat/index.html
similarity index 100%
rename from application/language/korean/index.html
rename to language/serbian_lat/index.html
diff --git a/application/language/serbian_lat/rest_controller_lang.php b/language/serbian_lat/rest_controller_lang.php
similarity index 100%
rename from application/language/serbian_lat/rest_controller_lang.php
rename to language/serbian_lat/rest_controller_lang.php
diff --git a/application/language/simplified-chinese/index.html b/language/simplified-chinese/index.html
similarity index 100%
rename from application/language/simplified-chinese/index.html
rename to language/simplified-chinese/index.html
diff --git a/application/language/simplified-chinese/rest_controller_lang.php b/language/simplified-chinese/rest_controller_lang.php
similarity index 93%
rename from application/language/simplified-chinese/rest_controller_lang.php
rename to language/simplified-chinese/rest_controller_lang.php
index f32e9e7d..9e762973 100644
--- a/application/language/simplified-chinese/rest_controller_lang.php
+++ b/language/simplified-chinese/rest_controller_lang.php
@@ -13,6 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = '此 API key无法存取指定的 controller';
 $lang['text_rest_api_key_permissions'] = '此 API key没有足够的权限';
 $lang['text_rest_api_key_time_limit'] = '此 API key已经超过有效期限';
-$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method';//todo translate
+$lang['text_rest_ip_address_time_limit'] = 'This IP Address has reached the time limit for this method'; //todo translate
 $lang['text_rest_unknown_method'] = '未知的方法';
 $lang['text_rest_unsupported'] = '不支持的请求方法';
diff --git a/application/language/portuguese-brazilian/index.html b/language/spanish/index.html
similarity index 100%
rename from application/language/portuguese-brazilian/index.html
rename to language/spanish/index.html
diff --git a/application/language/spanish/rest_controller_lang.php b/language/spanish/rest_controller_lang.php
similarity index 92%
rename from application/language/spanish/rest_controller_lang.php
rename to language/spanish/rest_controller_lang.php
index d96c62bc..f98078fb 100644
--- a/application/language/spanish/rest_controller_lang.php
+++ b/language/spanish/rest_controller_lang.php
@@ -13,6 +13,6 @@
 $lang['text_rest_api_key_unauthorized'] = 'Esta clave de API no tiene acceso al controlador solicitado';
 $lang['text_rest_api_key_permissions'] = 'Esta clave de API no tiene suficientes permisos';
 $lang['text_rest_api_key_time_limit'] = 'Esta clave de API ha alcanzado el límite de tiempo para este método';
-$lang['text_rest_ip_address_time_limit'] = 'Esta dirección IP ha alcanzado el límite de tiempo para este método';//todo translate
+$lang['text_rest_ip_address_time_limit'] = 'Esta dirección IP ha alcanzado el límite de tiempo para este método'; //todo translate
 $lang['text_rest_unknown_method'] = 'Método desconocido';
 $lang['text_rest_unsupported'] = 'Protocolo no soportado';
diff --git a/application/language/romanian/index.html b/language/traditional-chinese/index.html
similarity index 100%
rename from application/language/romanian/index.html
rename to language/traditional-chinese/index.html
diff --git a/application/language/traditional-chinese/rest_controller_lang.php b/language/traditional-chinese/rest_controller_lang.php
similarity index 100%
rename from application/language/traditional-chinese/rest_controller_lang.php
rename to language/traditional-chinese/rest_controller_lang.php
diff --git a/application/language/serbian_cyr/index.html b/language/turkish/index.html
similarity index 100%
rename from application/language/serbian_cyr/index.html
rename to language/turkish/index.html
diff --git a/application/language/turkish/rest_controller_lang.php b/language/turkish/rest_controller_lang.php
similarity index 100%
rename from application/language/turkish/rest_controller_lang.php
rename to language/turkish/rest_controller_lang.php
diff --git a/application/libraries/Format.php b/src/Format.php
similarity index 68%
rename from application/libraries/Format.php
rename to src/Format.php
index 5ecb63f7..ce5b2de6 100644
--- a/application/libraries/Format.php
+++ b/src/Format.php
@@ -1,8 +1,10 @@
 <?php
-namespace Restserver\Libraries;
+
+namespace chriskacerguis\RestServer;
+
 use Exception;
 
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /**
  * Format class
@@ -11,78 +13,78 @@
  * @author    Phil Sturgeon, Chris Kacerguis, @softwarespot
  * @license   http://www.dbad-license.org/
  */
-class Format {
-
+class Format
+{
     /**
-     * Array output format
+     * Array output format.
      */
     const ARRAY_FORMAT = 'array';
 
     /**
-     * Comma Separated Value (CSV) output format
+     * Comma Separated Value (CSV) output format.
      */
     const CSV_FORMAT = 'csv';
 
     /**
-     * Json output format
+     * Json output format.
      */
     const JSON_FORMAT = 'json';
 
     /**
-     * HTML output format
+     * HTML output format.
      */
     const HTML_FORMAT = 'html';
 
     /**
-     * PHP output format
+     * PHP output format.
      */
     const PHP_FORMAT = 'php';
 
     /**
-     * Serialized output format
+     * Serialized output format.
      */
     const SERIALIZED_FORMAT = 'serialized';
 
     /**
-     * XML output format
+     * XML output format.
      */
     const XML_FORMAT = 'xml';
 
     /**
-     * Default format of this class
+     * Default format of this class.
      */
     const DEFAULT_FORMAT = self::JSON_FORMAT; // Couldn't be DEFAULT, as this is a keyword
 
     /**
-     * CodeIgniter instance
+     * CodeIgniter instance.
      *
      * @var object
      */
     private $_CI;
 
     /**
-     * Data to parse
+     * Data to parse.
      *
      * @var mixed
      */
     protected $_data = [];
 
     /**
-     * Type to convert from
+     * Type to convert from.
      *
      * @var string
      */
-    protected $_from_type = NULL;
+    protected $_from_type = null;
 
     /**
-     * DO NOT CALL THIS DIRECTLY, USE factory()
+     * DO NOT CALL THIS DIRECTLY, USE factory().
+     *
+     * @param null $data
+     * @param null $from_type
      *
-     * @param NULL $data
-     * @param NULL $from_type
      * @throws Exception
      */
-
-    public function __construct($data = NULL, $from_type = NULL)
+    public function __construct($data = null, $from_type = null)
     {
         // Get the CodeIgniter reference
         $this->_CI = &get_instance();
@@ -91,14 +93,10 @@ public function __construct($data = NULL, $from_type = NULL)
         $this->_CI->load->helper('inflector');
 
         // If the provided data is already formatted we should probably convert it to an array
-        if ($from_type !== NULL)
-        {
-            if (method_exists($this, '_from_'.$from_type))
-            {
+        if ($from_type !== null) {
+            if (method_exists($this, '_from_'.$from_type)) {
                 $data = call_user_func([$this, '_from_'.$from_type], $data);
-            }
-            else
-            {
+            } else {
                 throw new Exception('Format class does not support conversion from "'.$from_type.'".');
             }
         }
@@ -109,14 +107,14 @@ public function __construct($data = NULL, $from_type = NULL)
 
     /**
      * Create an instance of the format class
-     * e.g: echo $this->format->factory(['foo' => 'bar'])->to_csv();
+     * e.g: echo $this->format->factory(['foo' => 'bar'])->to_csv();.
      *
-     * @param mixed $data Data to convert/parse
+     * @param mixed  $data      Data to convert/parse
      * @param string $from_type Type to convert from e.g. json, csv, html
      *
      * @return object Instance of the format class
      */
-    public static function factory($data, $from_type = NULL)
+    public static function factory($data, $from_type = null)
     {
         // $class = __CLASS__;
         // return new $class();
@@ -127,36 +125,31 @@ public static function factory($data, $from_type = NULL)
     // FORMATTING OUTPUT ---------------------------------------------------------
 
     /**
-     * Format data as an array
+     * Format data as an array.
+     *
+     * @param mixed|null $data Optional data to pass, so as to override the data passed
+     *                         to the constructor
      *
-     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-     * to the constructor
      * @return array Data parsed as an array; otherwise, an empty array
      */
-    public function to_array($data = NULL)
+    public function to_array($data = null)
     {
         // If no data is passed as a parameter, then use the data passed
         // via the constructor
-        if ($data === NULL && func_num_args() === 0)
-        {
+        if ($data === null && func_num_args() === 0) {
             $data = $this->_data;
         }
 
         // Cast as an array if not already
-        if (is_array($data) === FALSE)
-        {
+        if (is_array($data) === false) {
             $data = (array) $data;
         }
 
         $array = [];
-        foreach ((array) $data as $key => $value)
-        {
-            if (is_object($value) === TRUE || is_array($value) === TRUE)
-            {
+        foreach ((array) $data as $key => $value) {
+            if (is_object($value) === true || is_array($value) === true) {
                 $array[$key] = $this->to_array($value);
-            }
-            else
-            {
+            } else {
                 $array[$key] = $value;
             }
         }
@@ -165,44 +158,39 @@ public function to_array($data = NULL)
     }
 
     /**
-     * Format data as XML
+     * Format data as XML.
+     *
+     * @param mixed|null $data      Optional data to pass, so as to override the data passed
+     *                              to the constructor
+     * @param null       $structure
+     * @param string     $basenode
      *
-     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-     * to the constructor
-     * @param NULL $structure
-     * @param string $basenode
      * @return mixed
      */
-    public function to_xml($data = NULL, $structure = NULL, $basenode = 'xml')
+    public function to_xml($data = null, $structure = null, $basenode = 'xml')
     {
-        if ($data === NULL && func_num_args() === 0)
-        {
+        if ($data === null && func_num_args() === 0) {
             $data = $this->_data;
         }
 
-        if ($structure === NULL)
-        {
+        if ($structure === null) {
             $structure = simplexml_load_string("<?xml version='1.0' encoding='utf-8'?><$basenode />");
         }
 
         // Force it to be something useful
-        if (is_array($data) === FALSE && is_object($data) === FALSE)
-        {
+        if (is_array($data) === false && is_object($data) === false) {
             $data = (array) $data;
         }
 
-        foreach ($data as $key => $value)
-        {
+        foreach ($data as $key => $value) {
 
             //change false/true to 0/1
-            if (is_bool($value))
-            {
+            if (is_bool($value)) {
                 $value = (int) $value;
             }
 
             // no numeric keys in our xml please!
-            if (is_numeric($key))
-            {
+            if (is_numeric($key)) {
                 // make string key...
                 $key = (singular($basenode) != $basenode) ? singular($basenode) : 'item';
             }
@@ -210,29 +198,23 @@ public function to_xml($data = NULL, $structure = NULL, $basenode = 'xml')
             // replace anything not alpha numeric
             $key = preg_replace('/[^a-z_\-0-9]/i', '', $key);
 
-            if ($key === '_attributes' && (is_array($value) || is_object($value)))
-            {
+            if ($key === '_attributes' && (is_array($value) || is_object($value))) {
                 $attributes = $value;
-                if (is_object($attributes))
-                {
+                if (is_object($attributes)) {
                     $attributes = get_object_vars($attributes);
                 }
 
-                foreach ($attributes as $attribute_name => $attribute_value)
-                {
+                foreach ($attributes as $attribute_name => $attribute_value) {
                     $structure->addAttribute($attribute_name, $attribute_value);
                 }
             }
             // if there is another array found recursively call this function
-            elseif (is_array($value) || is_object($value))
-            {
+            elseif (is_array($value) || is_object($value)) {
                 $node = $structure->addChild($key);
 
                 // recursive call.
                 $this->to_xml($value, $node, $key);
-            }
-            else
-            {
+            } else {
                 // add single node.
                 $value = htmlspecialchars(html_entity_decode($value, ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'UTF-8');
 
@@ -244,35 +226,31 @@ public function to_xml($data = NULL, $structure = NULL, $basenode = 'xml')
     }
 
     /**
-     * Format data as HTML
+     * Format data as HTML.
+     *
+     * @param mixed|null $data Optional data to pass, so as to override the data passed
+     *                         to the constructor
      *
-     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-     * to the constructor
      * @return mixed
      */
-    public function to_html($data = NULL)
+    public function to_html($data = null)
     {
         // If no data is passed as a parameter, then use the data passed
         // via the constructor
-        if ($data === NULL && func_num_args() === 0)
-        {
+        if ($data === null && func_num_args() === 0) {
             $data = $this->_data;
         }
 
         // Cast as an array if not already
-        if (is_array($data) === FALSE)
-        {
+        if (is_array($data) === false) {
             $data = (array) $data;
         }
 
         // Check if it's a multi-dimensional array
-        if (isset($data[0]) && count($data) !== count($data, COUNT_RECURSIVE))
-        {
+        if (isset($data[0]) && count($data) !== count($data, COUNT_RECURSIVE)) {
             // Multi-dimensional array
             $headings = array_keys($data[0]);
-        }
-        else
-        {
+        } else {
             // Single array
             $headings = array_keys($data);
             $data = [$data];
@@ -283,8 +261,7 @@ public function to_html($data = NULL)
 
         $this->_CI->table->set_heading($headings);
 
-        foreach ($data as $row)
-        {
+        foreach ($data as $row) {
             // Suppressing the "array to string conversion" notice
             // Keep the "evil" @ here
             $row = @array_map('strval', $row);
@@ -297,56 +274,50 @@ public function to_html($data = NULL)
 
     /**
      * @link http://www.metashock.de/2014/02/create-csv-file-in-memory-php/
-     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-     * to the constructor
-     * @param string $delimiter The optional delimiter parameter sets the field
-     * delimiter (one character only). NULL will use the default value (,)
-     * @param string $enclosure The optional enclosure parameter sets the field
-     * enclosure (one character only). NULL will use the default value (")
+     *
+     * @param mixed|null $data      Optional data to pass, so as to override the data passed
+     *                              to the constructor
+     * @param string     $delimiter The optional delimiter parameter sets the field
+     *                              delimiter (one character only). NULL will use the default value (,)
+     * @param string     $enclosure The optional enclosure parameter sets the field
+     *                              enclosure (one character only). NULL will use the default value (")
+     *
      * @return string A csv string
      */
-    public function to_csv($data = NULL, $delimiter = ',', $enclosure = '"')
+    public function to_csv($data = null, $delimiter = ',', $enclosure = '"')
     {
         // Use a threshold of 1 MB (1024 * 1024)
         $handle = fopen('php://temp/maxmemory:1048576', 'w');
-        if ($handle === FALSE)
-        {
-            return NULL;
+        if ($handle === false) {
+            return;
         }
 
         // If no data is passed as a parameter, then use the data passed
         // via the constructor
-        if ($data === NULL && func_num_args() === 0)
-        {
+        if ($data === null && func_num_args() === 0) {
             $data = $this->_data;
         }
 
         // If NULL, then set as the default delimiter
-        if ($delimiter === NULL)
-        {
+        if ($delimiter === null) {
             $delimiter = ',';
         }
 
         // If NULL, then set as the default enclosure
-        if ($enclosure === NULL)
-        {
+        if ($enclosure === null) {
             $enclosure = '"';
         }
 
         // Cast as an array if not already
-        if (is_array($data) === FALSE)
-        {
+        if (is_array($data) === false) {
             $data = (array) $data;
         }
 
         // Check if it's a multi-dimensional array
-        if (isset($data[0]) && count($data) !== count($data, COUNT_RECURSIVE))
-        {
+        if (isset($data[0]) && count($data) !== count($data, COUNT_RECURSIVE)) {
             // Multi-dimensional array
             $headings = array_keys($data[0]);
-        }
-        else
-        {
+        } else {
             // Single array
             $headings = array_keys($data);
             $data = [$data];
@@ -355,18 +326,16 @@ public function to_csv($data = NULL, $delimiter = ',', $enclosure = '"')
         // Apply the headings
         fputcsv($handle, $headings, $delimiter, $enclosure);
 
-        foreach ($data as $record)
-        {
+        foreach ($data as $record) {
             // If the record is not an array, then break. This is because the 2nd param of
             // fputcsv() should be an array
-            if (is_array($record) === FALSE)
-            {
+            if (is_array($record) === false) {
                 break;
             }
 
             // Suppressing the "array to string conversion" notice.
             // Keep the "evil" @ here.
-            $record = @ array_map('strval', $record);
+            $record = @array_map('strval', $record);
 
             // Returns the length of the string written or FALSE
             fputcsv($handle, $record, $delimiter, $enclosure);
@@ -388,32 +357,30 @@ public function to_csv($data = NULL, $delimiter = ',', $enclosure = '"')
     }
 
     /**
-     * Encode data as json
+     * Encode data as json.
+     *
+     * @param mixed|null $data Optional data to pass, so as to override the data passed
+     *                         to the constructor
      *
-     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-     * to the constructor
      * @return string Json representation of a value
      */
-    public function to_json($data = NULL)
+    public function to_json($data = null)
     {
         // If no data is passed as a parameter, then use the data passed
         // via the constructor
-        if ($data === NULL && func_num_args() === 0)
-        {
+        if ($data === null && func_num_args() === 0) {
             $data = $this->_data;
         }
 
         // Get the callback parameter (if set)
         $callback = $this->_CI->input->get('callback');
 
-        if (empty($callback) === TRUE)
-        {
+        if (empty($callback) === true) {
             return json_encode($data, JSON_UNESCAPED_UNICODE);
         }
 
         // We only honour a jsonp callback which are valid javascript identifiers
-        elseif (preg_match('/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i', $callback))
-        {
+        elseif (preg_match('/^[a-z_\$][a-z0-9\$_]*(\.[a-z_\$][a-z0-9\$_]*)*$/i', $callback)) {
             // Return the data as encoded json with a callback
             return $callback.'('.json_encode($data, JSON_UNESCAPED_UNICODE).');';
         }
@@ -426,18 +393,18 @@ public function to_json($data = NULL)
     }
 
     /**
-     * Encode data as a serialized array
+     * Encode data as a serialized array.
+     *
+     * @param mixed|null $data Optional data to pass, so as to override the data passed
+     *                         to the constructor
      *
-     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-     * to the constructor
      * @return string Serialized data
      */
-    public function to_serialized($data = NULL)
+    public function to_serialized($data = null)
     {
         // If no data is passed as a parameter, then use the data passed
         // via the constructor
-        if ($data === NULL && func_num_args() === 0)
-        {
+        if ($data === null && func_num_args() === 0) {
             $data = $this->_data;
         }
 
@@ -445,28 +412,29 @@ public function to_serialized($data = NULL)
     }
 
     /**
-     * Format data using a PHP structure
+     * Format data using a PHP structure.
+     *
+     * @param mixed|null $data Optional data to pass, so as to override the data passed
+     *                         to the constructor
      *
-     * @param mixed|NULL $data Optional data to pass, so as to override the data passed
-     * to the constructor
      * @return mixed String representation of a variable
      */
-    public function to_php($data = NULL)
+    public function to_php($data = null)
     {
         // If no data is passed as a parameter, then use the data passed
         // via the constructor
-        if ($data === NULL && func_num_args() === 0)
-        {
+        if ($data === null && func_num_args() === 0) {
             $data = $this->_data;
         }
 
-        return var_export($data, TRUE);
+        return var_export($data, true);
     }
 
     // INTERNAL FUNCTIONS
 
     /**
      * @param string $data XML string
+     *
      * @return array XML element object; otherwise, empty array
      */
     protected function _from_xml($data)
@@ -475,25 +443,24 @@ protected function _from_xml($data)
     }
 
     /**
-     * @param string $data CSV string
+     * @param string $data      CSV string
      * @param string $delimiter The optional delimiter parameter sets the field
-     * delimiter (one character only). NULL will use the default value (,)
+     *                          delimiter (one character only). NULL will use the default value (,)
      * @param string $enclosure The optional enclosure parameter sets the field
-     * enclosure (one character only). NULL will use the default value (")
+     *                          enclosure (one character only). NULL will use the default value (")
+     *
      * @return array A multi-dimensional array with the outer array being the number of rows
-     * and the inner arrays the individual fields
+     *               and the inner arrays the individual fields
      */
     protected function _from_csv($data, $delimiter = ',', $enclosure = '"')
     {
         // If NULL, then set as the default delimiter
-        if ($delimiter === NULL)
-        {
+        if ($delimiter === null) {
             $delimiter = ',';
         }
 
         // If NULL, then set as the default enclosure
-        if ($enclosure === NULL)
-        {
+        if ($enclosure === null) {
             $enclosure = '"';
         }
 
@@ -502,6 +469,7 @@ protected function _from_csv($data, $delimiter = ',', $enclosure = '"')
 
     /**
      * @param string $data Encoded json string
+     *
      * @return mixed Decoded json string with leading and trailing whitespace removed
      */
     protected function _from_json($data)
@@ -511,6 +479,7 @@ protected function _from_json($data)
 
     /**
      * @param string $data Data to unserialize
+     *
      * @return mixed Unserialized data
      */
     protected function _from_serialize($data)
@@ -520,6 +489,7 @@ protected function _from_serialize($data)
 
     /**
      * @param string $data Data to trim leading and trailing whitespace
+     *
      * @return string Data with leading and trailing whitespace removed
      */
     protected function _from_php($data)
diff --git a/application/libraries/REST_Controller.php b/src/RestController.php
similarity index 63%
rename from application/libraries/REST_Controller.php
rename to src/RestController.php
index ab836c3c..6ae504a1 100644
--- a/application/libraries/REST_Controller.php
+++ b/src/RestController.php
@@ -1,42 +1,39 @@
 <?php
 
-namespace Restserver\Libraries;
+namespace chriskacerguis\RestServer;
+
 use Exception;
 use stdClass;
 
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /**
  * CodeIgniter Rest Controller
  * A fully RESTful server implementation for CodeIgniter using one library, one config file and one controller.
  *
- * @package         CodeIgniter
- * @subpackage      Libraries
- * @category        Libraries
- * @author          Phil Sturgeon, Chris Kacerguis
- * @license         MIT
- * @link            https://github.com/chriskacerguis/codeigniter-restserver
- * @version         3.0.0
+ * @link            https://github.com/chriskacerguis/ci-restserver
+ *
+ * @version         4.0.0
  */
-trait REST_Controller {
-
+class RestController extends \CI_Controller
+{
     /**
      * This defines the rest format
-     * Must be overridden it in a controller so that it is set
+     * Must be overridden it in a controller so that it is set.
      *
-     * @var string|NULL
+     * @var string|null
      */
-    protected $rest_format = NULL;
+    protected $rest_format = null;
 
     /**
-     * Defines the list of method properties such as limit, log and level
+     * Defines the list of method properties such as limit, log and level.
      *
      * @var array
      */
     protected $methods = [];
 
     /**
-     * List of allowed HTTP methods
+     * List of allowed HTTP methods.
      *
      * @var array
      */
@@ -45,206 +42,198 @@ trait REST_Controller {
     /**
      * Contains details about the request
      * Fields: body, format, method, ssl
-     * Note: This is a dynamic object (stdClass)
+     * Note: This is a dynamic object (stdClass).
      *
      * @var object
      */
-    protected $request = NULL;
+    protected $request = null;
 
     /**
      * Contains details about the response
      * Fields: format, lang
-     * Note: This is a dynamic object (stdClass)
+     * Note: This is a dynamic object (stdClass).
      *
      * @var object
      */
-    protected $response = NULL;
+    protected $response = null;
 
     /**
      * Contains details about the REST API
      * Fields: db, ignore_limits, key, level, user_id
-     * Note: This is a dynamic object (stdClass)
+     * Note: This is a dynamic object (stdClass).
      *
      * @var object
      */
-    protected $rest = NULL;
+    protected $rest = null;
 
     /**
-     * The arguments for the GET request method
+     * The arguments for the GET request method.
      *
      * @var array
      */
     protected $_get_args = [];
 
     /**
-     * The arguments for the POST request method
+     * The arguments for the POST request method.
      *
      * @var array
      */
     protected $_post_args = [];
 
     /**
-     * The arguments for the PUT request method
+     * The arguments for the PUT request method.
      *
      * @var array
      */
     protected $_put_args = [];
 
     /**
-     * The arguments for the DELETE request method
+     * The arguments for the DELETE request method.
      *
      * @var array
      */
     protected $_delete_args = [];
 
     /**
-     * The arguments for the PATCH request method
+     * The arguments for the PATCH request method.
      *
      * @var array
      */
     protected $_patch_args = [];
 
     /**
-     * The arguments for the HEAD request method
+     * The arguments for the HEAD request method.
      *
      * @var array
      */
     protected $_head_args = [];
 
     /**
-     * The arguments for the OPTIONS request method
+     * The arguments for the OPTIONS request method.
      *
      * @var array
      */
     protected $_options_args = [];
 
     /**
-     * The arguments for the query parameters
+     * The arguments for the query parameters.
      *
      * @var array
      */
     protected $_query_args = [];
 
     /**
-     * The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined
+     * The arguments from GET, POST, PUT, DELETE, PATCH, HEAD and OPTIONS request methods combined.
      *
      * @var array
      */
     protected $_args = [];
 
     /**
-     * The insert_id of the log entry (if we have one)
+     * The insert_id of the log entry (if we have one).
      *
      * @var string
      */
     protected $_insert_id = '';
 
     /**
-     * If the request is allowed based on the API key provided
+     * If the request is allowed based on the API key provided.
      *
      * @var bool
      */
-    protected $_allow = TRUE;
+    protected $_allow = true;
 
     /**
-     * The LDAP Distinguished Name of the User post authentication
+     * The LDAP Distinguished Name of the User post authentication.
      *
      * @var string
      */
     protected $_user_ldap_dn = '';
 
     /**
-     * The start of the response time from the server
+     * The start of the response time from the server.
      *
      * @var number
      */
     protected $_start_rtime;
 
     /**
-     * The end of the response time from the server
+     * The end of the response time from the server.
      *
      * @var number
      */
     protected $_end_rtime;
 
     /**
-     * List all supported methods, the first will be the default format
+     * List all supported methods, the first will be the default format.
      *
      * @var array
      */
     protected $_supported_formats = [
-        'json' => 'application/json',
-        'array' => 'application/json',
-        'csv' => 'application/csv',
-        'html' => 'text/html',
-        'jsonp' => 'application/javascript',
-        'php' => 'text/plain',
+        'json'       => 'application/json',
+        'array'      => 'application/json',
+        'csv'        => 'application/csv',
+        'html'       => 'text/html',
+        'jsonp'      => 'application/javascript',
+        'php'        => 'text/plain',
         'serialized' => 'application/vnd.php.serialized',
-        'xml' => 'application/xml'
+        'xml'        => 'application/xml',
     ];
 
     /**
-     * Information about the current API user
+     * Information about the current API user.
      *
      * @var object
      */
     protected $_apiuser;
 
     /**
-     * Whether or not to perform a CORS check and apply CORS headers to the request
+     * Whether or not to perform a CORS check and apply CORS headers to the request.
      *
      * @var bool
      */
-    protected $check_cors = NULL;
+    protected $check_cors = null;
 
     /**
      * Enable XSS flag
      * Determines whether the XSS filter is always active when
      * GET, OPTIONS, HEAD, POST, PUT, DELETE and PATCH data is encountered
-     * Set automatically based on config setting
+     * Set automatically based on config setting.
      *
      * @var bool
      */
-    protected $_enable_xss = FALSE;
+    protected $_enable_xss = false;
 
-    private $is_valid_request = TRUE;
+    private $is_valid_request = true;
 
     /**
-     * HTTP status codes and their respective description
-     * Note: Only the widely used HTTP status codes are used
+     * Common HTTP status codes and their respective description.
      *
-     * @var array
      * @link http://www.restapitutorial.com/httpstatuscodes.html
      */
-    protected $http_status_codes = [
-        REST_Controller_Definitions::HTTP_OK => 'OK',
-        REST_Controller_Definitions::HTTP_CREATED => 'CREATED',
-        REST_Controller_Definitions::HTTP_NO_CONTENT => 'NO CONTENT',
-        REST_Controller_Definitions::HTTP_NOT_MODIFIED => 'NOT MODIFIED',
-        REST_Controller_Definitions::HTTP_BAD_REQUEST => 'BAD REQUEST',
-        REST_Controller_Definitions::HTTP_UNAUTHORIZED => 'UNAUTHORIZED',
-        REST_Controller_Definitions::HTTP_FORBIDDEN => 'FORBIDDEN',
-        REST_Controller_Definitions::HTTP_NOT_FOUND => 'NOT FOUND',
-        REST_Controller_Definitions::HTTP_METHOD_NOT_ALLOWED => 'METHOD NOT ALLOWED',
-        REST_Controller_Definitions::HTTP_NOT_ACCEPTABLE => 'NOT ACCEPTABLE',
-        REST_Controller_Definitions::HTTP_CONFLICT => 'CONFLICT',
-        REST_Controller_Definitions::HTTP_INTERNAL_SERVER_ERROR => 'INTERNAL SERVER ERROR',
-        REST_Controller_Definitions::HTTP_NOT_IMPLEMENTED => 'NOT IMPLEMENTED'
-    ];
+    const HTTP_OK = 200;
+    const HTTP_CREATED = 201;
+    const HTTP_NOT_MODIFIED = 304;
+    const HTTP_BAD_REQUEST = 400;
+    const HTTP_UNAUTHORIZED = 401;
+    const HTTP_FORBIDDEN = 403;
+    const HTTP_NOT_FOUND = 404;
+    const HTTP_NOT_ACCEPTABLE = 406;
+    const HTTP_INTERNAL_ERROR = 500;
 
     /**
      * @var Format
      */
     private $format;
+
     /**
      * @var bool
      */
     protected $auth_override;
 
     /**
-     * Extend this function to apply additional checking early on in the process
+     * Extend this function to apply additional checking early on in the process.
      *
-     * @access protected
      * @return void
      */
     protected function early_checks()
@@ -252,65 +241,46 @@ protected function early_checks()
     }
 
     /**
-     * Constructor for the REST API
+     * Constructor for the REST API.
      *
-     * @access public
      * @param string $config Configuration filename minus the file extension
-     * e.g: my_rest.php is passed as 'my_rest'
+     *                       e.g: my_rest.php is passed as 'my_rest'
      */
     public function __construct($config = 'rest')
     {
         parent::__construct();
 
-        $this->preflight_checks();
-
         // Set the default value of global xss filtering. Same approach as CodeIgniter 3
-        $this->_enable_xss = ($this->config->item('global_xss_filtering') === TRUE);
+        $this->_enable_xss = ($this->config->item('global_xss_filtering') === true);
 
         // Don't try to parse template variables like {elapsed_time} and {memory_usage}
         // when output is displayed for not damaging data accidentally
-        $this->output->parse_exec_vars = FALSE;
+        $this->output->parse_exec_vars = false;
 
         // Log the loading time to the log table
-        if ($this->config->item('rest_enable_logging') === TRUE)
-        {
-                // Start the timer for how long the request takes
-        $this->_start_rtime = microtime(TRUE);
-    }
+        if ($this->config->item('rest_enable_logging') === true) {
+            // Start the timer for how long the request takes
+            $this->_start_rtime = microtime(true);
+        }
 
         // Load the rest.php configuration file
         $this->get_local_config($config);
 
-        // At present the library is bundled with REST_Controller 2.5+, but will eventually be part of CodeIgniter (no citation)
-        //if(class_exists('Format'))
-        //{
-        //    $this->format = new Format();
-        //}
-        //else
-        //{
-        //    $this->load->library('Format', NULL, 'libraryFormat');
-        //    $this->format = $this->libraryFormat;
-        //}
-
-
         // Determine supported output formats from configuration
         $supported_formats = $this->config->item('rest_supported_formats');
 
         // Validate the configuration setting output formats
-        if (empty($supported_formats))
-        {
+        if (empty($supported_formats)) {
             $supported_formats = [];
         }
 
-        if ( ! is_array($supported_formats))
-        {
+        if (!is_array($supported_formats)) {
             $supported_formats = [$supported_formats];
         }
 
         // Add silently the default output format if it is missing
         $default_format = $this->_get_default_output_format();
-        if (!in_array($default_format, $supported_formats))
-        {
+        if (!in_array($default_format, $supported_formats)) {
             $supported_formats[] = $default_format;
         }
 
@@ -319,13 +289,12 @@ public function __construct($config = 'rest')
 
         // Get the language
         $language = $this->config->item('rest_language');
-        if ($language === NULL)
-        {
+        if ($language === null) {
             $language = 'english';
         }
 
         // Load the language file
-        $this->lang->load('rest_controller', $language, FALSE, TRUE, __DIR__.'/../');
+        $this->lang->load('rest_controller', $language, false, true, __DIR__.'/../');
 
         // Initialise the response, request and rest objects
         $this->request = new stdClass();
@@ -333,8 +302,7 @@ public function __construct($config = 'rest')
         $this->rest = new stdClass();
 
         // Check to see if the current IP address is blacklisted
-        if ($this->config->item('rest_ip_blacklist_enabled') === TRUE)
-        {
+        if ($this->config->item('rest_ip_blacklist_enabled') === true) {
             $this->_check_blacklist_auth();
         }
 
@@ -346,14 +314,12 @@ public function __construct($config = 'rest')
 
         // Check for CORS access request
         $check_cors = $this->config->item('check_cors');
-        if ($check_cors === TRUE)
-        {
+        if ($check_cors === true) {
             $this->_check_cors();
         }
 
         // Create an argument container if it doesn't exist e.g. _get_args
-        if (isset($this->{'_'.$this->request->method.'_args'}) === FALSE)
-        {
+        if (isset($this->{'_'.$this->request->method.'_args'}) === false) {
             $this->{'_'.$this->request->method.'_args'} = [];
         }
 
@@ -367,13 +333,12 @@ public function __construct($config = 'rest')
         $this->request->format = $this->_detect_input_format();
 
         // Not all methods have a body attached with them
-        $this->request->body = NULL;
+        $this->request->body = null;
 
-        $this->{'_parse_' . $this->request->method}();
+        $this->{'_parse_'.$this->request->method}();
 
         // Fix parse method return arguments null
-        if($this->{'_'.$this->request->method.'_args'} === null)
-        {
+        if ($this->{'_'.$this->request->method.'_args'} === null) {
             $this->{'_'.$this->request->method.'_args'} = [];
         }
 
@@ -384,11 +349,10 @@ public function __construct($config = 'rest')
         $this->response->lang = $this->_detect_lang();
 
         // Now we know all about our request, let's try and parse the body if it exists
-        if ($this->request->format && $this->request->body)
-        {
+        if ($this->request->format && $this->request->body) {
             $this->request->body = Format::factory($this->request->body, $this->request->format)->to_array();
 
-        // Assign payload arguments to proper method container
+            // Assign payload arguments to proper method container
             $this->{'_'.$this->request->method.'_args'} = $this->request->body;
         }
 
@@ -411,14 +375,12 @@ public function __construct($config = 'rest')
         $this->early_checks();
 
         // Load DB if its enabled
-        if ($this->config->item('rest_database_group') && ($this->config->item('rest_enable_keys') || $this->config->item('rest_enable_logging')))
-        {
-            $this->rest->db = $this->load->database($this->config->item('rest_database_group'), TRUE);
+        if ($this->config->item('rest_database_group') && ($this->config->item('rest_enable_keys') || $this->config->item('rest_enable_logging'))) {
+            $this->rest->db = $this->load->database($this->config->item('rest_database_group'), true);
         }
 
         // Use whatever database is in use (isset returns FALSE)
-        elseif (property_exists($this, 'db'))
-        {
+        elseif (property_exists($this, 'db')) {
             $this->rest->db = $this->db;
         }
 
@@ -428,29 +390,25 @@ public function __construct($config = 'rest')
 
         // Checking for keys? GET TO WorK!
         // Skip keys test for $config['auth_override_class_method']['class'['method'] = 'none'
-        if ($this->config->item('rest_enable_keys') && $this->auth_override !== TRUE)
-        {
+        if ($this->config->item('rest_enable_keys') && $this->auth_override !== true) {
             $this->_allow = $this->_detect_api_key();
         }
 
         // Only allow ajax requests
-        if ($this->input->is_ajax_request() === FALSE && $this->config->item('rest_ajax_only'))
-        {
+        if ($this->input->is_ajax_request() === false && $this->config->item('rest_ajax_only')) {
             // Display an error response
             $this->response([
-                $this->config->item('rest_status_field_name') => FALSE,
-                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ajax_only')
-            ], REST_Controller_Definitions::HTTP_NOT_ACCEPTABLE);
+                $this->config->item('rest_status_field_name')  => false,
+                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ajax_only'),
+            ], HTTP_NOT_ACCEPTABLE);
         }
 
         // When there is no specific override for the current class/method, use the default auth value set in the config
-        if ($this->auth_override === FALSE &&
-            (! ($this->config->item('rest_enable_keys') && $this->_allow === TRUE) ||
-                ($this->config->item('allow_auth_and_keys') === TRUE && $this->_allow === TRUE)))
-        {
+        if ($this->auth_override === false &&
+            (!($this->config->item('rest_enable_keys') && $this->_allow === true) ||
+                ($this->config->item('allow_auth_and_keys') === true && $this->_allow === true))) {
             $rest_auth = strtolower($this->config->item('rest_auth'));
-            switch ($rest_auth)
-            {
+            switch ($rest_auth) {
                 case 'basic':
                     $this->_prepare_basic_auth();
                     break;
@@ -464,85 +422,74 @@ public function __construct($config = 'rest')
         }
     }
 
+    /**
+     * Does the auth stuff.
+     */
+    private function do_auth($method = false)
+    {
+        // If we don't want to do auth, then just return true
+        if ($method === false) {
+            return true;
+        }
+
+        if (file_exists(__DIR__.'/auth-'.$method.'.php')) {
+            include __DIR__.'/auth-'.$method.'.php';
+        }
+    }
+
     /**
      * @param $config_file
      */
     private function get_local_config($config_file)
     {
-        if(file_exists(__DIR__."/../config/".$config_file.".php"))
-        {
-            $config = array();
-            include(__DIR__ . "/../config/" . $config_file . ".php");
+        if (file_exists(__DIR__.'/'.$config_file.'.php')) {
+            $config = [];
+            include __DIR__.'/'.$config_file.'.php';
 
-            foreach($config AS $key => $value)
-            {
+            foreach ($config as $key => $value) {
                 $this->config->set_item($key, $value);
             }
+        } else {
+            $this->load->config($config_file, false, true);
         }
-
-        $this->load->config($config_file, FALSE, TRUE);
     }
 
     /**
-     * De-constructor
+     * De-constructor.
      *
      * @author Chris Kacerguis
-     * @access public
+     *
      * @return void
      */
     public function __destruct()
     {
         // Log the loading time to the log table
-        if ($this->config->item('rest_enable_logging') === TRUE)
-        {
+        if ($this->config->item('rest_enable_logging') === true) {
             // Get the current timestamp
-            $this->_end_rtime = microtime(TRUE);
+            $this->_end_rtime = microtime(true);
 
             $this->_log_access_time();
         }
     }
 
-    /**
-     * Checks to see if we have everything we need to run this library.
-     *
-     * @access protected
-     * @throws Exception
-     */
-    protected function preflight_checks()
-    {
-        // Check to see if PHP is equal to or greater than 5.4.x
-        if (is_php('5.4') === FALSE)
-        {
-            // CodeIgniter 3 is recommended for v5.4 or above
-            throw new Exception('Using PHP v'.PHP_VERSION.', though PHP v5.4 or greater is required');
-        }
-
-        // Check to see if this is CI 3.x
-        if (explode('.', CI_VERSION, 2)[0] < 3)
-        {
-            throw new Exception('REST Server requires CodeIgniter 3.x');
-        }
-    }
-
     /**
      * Requests are not made to methods directly, the request will be for
      * an "object". This simply maps the object and method to the correct
-     * Controller method
+     * Controller method.
      *
-     * @access public
      * @param string $object_called
-     * @param array $arguments The arguments passed to the controller method
+     * @param array  $arguments     The arguments passed to the controller method
+     *
      * @throws Exception
      */
     public function _remap($object_called, $arguments = [])
     {
         // Should we answer if not over SSL?
-        if ($this->config->item('force_https') && $this->request->ssl === FALSE)
-        {
+        if ($this->config->item('force_https') && $this->request->ssl === false) {
             $this->response([
-                $this->config->item('rest_status_field_name') => FALSE,
-                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unsupported')
-            ], REST_Controller_Definitions::HTTP_FORBIDDEN);
+                $this->config->item('rest_status_field_name')  => false,
+                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unsupported'),
+            ], HTTP_FORBIDDEN);
         }
 
         // Remove the supported format from the function name e.g. index.json => index
@@ -551,66 +498,59 @@ public function _remap($object_called, $arguments = [])
         $controller_method = $object_called.'_'.$this->request->method;
         // Does this method exist? If not, try executing an index method
         if (!method_exists($this, $controller_method)) {
-            $controller_method = "index_" . $this->request->method;
+            $controller_method = 'index_'.$this->request->method;
             array_unshift($arguments, $object_called);
         }
 
         // Do we want to log this method (if allowed by config)?
-        $log_method = ! (isset($this->methods[$controller_method]['log']) && $this->methods[$controller_method]['log'] === FALSE);
+        $log_method = !(isset($this->methods[$controller_method]['log']) && $this->methods[$controller_method]['log'] === false);
 
         // Use keys for this method?
-        $use_key = ! (isset($this->methods[$controller_method]['key']) && $this->methods[$controller_method]['key'] === FALSE);
+        $use_key = !(isset($this->methods[$controller_method]['key']) && $this->methods[$controller_method]['key'] === false);
 
         // They provided a key, but it wasn't valid, so get them out of here
-        if ($this->config->item('rest_enable_keys') && $use_key && $this->_allow === FALSE)
-        {
-            if ($this->config->item('rest_enable_logging') && $log_method)
-            {
+        if ($this->config->item('rest_enable_keys') && $use_key && $this->_allow === false) {
+            if ($this->config->item('rest_enable_logging') && $log_method) {
                 $this->_log_request();
             }
 
             // fix cross site to option request error
-            if($this->request->method == 'options') {
+            if ($this->request->method == 'options') {
                 exit;
             }
 
             $this->response([
-                $this->config->item('rest_status_field_name') => FALSE,
-                $this->config->item('rest_message_field_name') => sprintf($this->lang->line('text_rest_invalid_api_key'), $this->rest->key)
-            ], REST_Controller_Definitions::HTTP_FORBIDDEN);
+                $this->config->item('rest_status_field_name')  => false,
+                $this->config->item('rest_message_field_name') => sprintf($this->lang->line('text_rest_invalid_api_key'), $this->rest->key),
+            ], HTTP_FORBIDDEN);
         }
 
         // Check to see if this key has access to the requested controller
-        if ($this->config->item('rest_enable_keys') && $use_key && empty($this->rest->key) === FALSE && $this->_check_access() === FALSE)
-        {
-            if ($this->config->item('rest_enable_logging') && $log_method)
-            {
+        if ($this->config->item('rest_enable_keys') && $use_key && empty($this->rest->key) === false && $this->_check_access() === false) {
+            if ($this->config->item('rest_enable_logging') && $log_method) {
                 $this->_log_request();
             }
 
             $this->response([
-                $this->config->item('rest_status_field_name') => FALSE,
-                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_unauthorized')
-            ], REST_Controller_Definitions::HTTP_UNAUTHORIZED);
+                $this->config->item('rest_status_field_name')  => false,
+                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_unauthorized'),
+            ], HTTP_UNAUTHORIZED);
         }
 
         // Sure it exists, but can they do anything with it?
-        if (! method_exists($this, $controller_method))
-        {
+        if (!method_exists($this, $controller_method)) {
             $this->response([
-                $this->config->item('rest_status_field_name') => FALSE,
-                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unknown_method')
-            ], REST_Controller_Definitions::HTTP_METHOD_NOT_ALLOWED);
+                $this->config->item('rest_status_field_name')  => false,
+                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unknown_method'),
+            ], $this->http_status['METHOD_NOT_ALLOWED']);
         }
 
         // Doing key related stuff? Can only do it if they have a key right?
-        if ($this->config->item('rest_enable_keys') && empty($this->rest->key) === FALSE)
-        {
+        if ($this->config->item('rest_enable_keys') && empty($this->rest->key) === false) {
             // Check the limit
-            if ($this->config->item('rest_enable_limits') && $this->_check_limit($controller_method) === FALSE)
-            {
-                $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_time_limit')];
-                $this->response($response, REST_Controller_Definitions::HTTP_UNAUTHORIZED);
+            if ($this->config->item('rest_enable_limits') && $this->_check_limit($controller_method) === false) {
+                $response = [$this->config->item('rest_status_field_name') => false, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_time_limit')];
+                $this->response($response, HTTP_UNAUTHORIZED);
             }
 
             // If no level is set use 0, they probably aren't using permissions
@@ -619,41 +559,34 @@ public function _remap($object_called, $arguments = [])
             // If no level is set, or it is lower than/equal to the key's level
             $authorized = $level <= $this->rest->level;
             // IM TELLIN!
-            if ($this->config->item('rest_enable_logging') && $log_method)
-            {
+            if ($this->config->item('rest_enable_logging') && $log_method) {
                 $this->_log_request($authorized);
             }
-            if($authorized === FALSE)
-            {
+            if ($authorized === false) {
                 // They don't have good enough perms
-                $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_permissions')];
-                $this->response($response, REST_Controller_Definitions::HTTP_UNAUTHORIZED);
+                $response = [$this->config->item('rest_status_field_name') => false, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_permissions')];
+                $this->response($response, HTTP_UNAUTHORIZED);
             }
         }
 
         //check request limit by ip without login
-        elseif ($this->config->item('rest_limits_method') == "IP_ADDRESS" && $this->config->item('rest_enable_limits') && $this->_check_limit($controller_method) === FALSE)
-        {
-            $response = [$this->config->item('rest_status_field_name') => FALSE, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_address_time_limit')];
-            $this->response($response, REST_Controller_Definitions::HTTP_UNAUTHORIZED);
+        elseif ($this->config->item('rest_limits_method') == 'IP_ADDRESS' && $this->config->item('rest_enable_limits') && $this->_check_limit($controller_method) === false) {
+            $response = [$this->config->item('rest_status_field_name') => false, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_address_time_limit')];
+            $this->response($response, HTTP_UNAUTHORIZED);
         }
 
         // No key stuff, but record that stuff is happening
-        elseif ($this->config->item('rest_enable_logging') && $log_method)
-        {
-            $this->_log_request($authorized = TRUE);
+        elseif ($this->config->item('rest_enable_logging') && $log_method) {
+            $this->_log_request($authorized = true);
         }
 
         // Call the controller method and passed arguments
-        try
-        {
+        try {
             if ($this->is_valid_request) {
                 call_user_func_array([$this, $controller_method], $arguments);
             }
-        }
-        catch (Exception $ex)
-        {
-            if ($this->config->item('rest_handle_exceptions') === FALSE) {
+        } catch (Exception $ex) {
+            if ($this->config->item('rest_handle_exceptions') === false) {
                 throw $ex;
             }
 
@@ -664,58 +597,49 @@ public function _remap($object_called, $arguments = [])
     }
 
     /**
-     * Takes mixed data and optionally a status code, then creates the response
+     * Takes mixed data and optionally a status code, then creates the response.
      *
-     * @access public
-     * @param array|NULL $data Data to output to the user
-     * @param int|NULL $http_code HTTP status code
-     * @param bool $continue TRUE to flush the response to the client and continue
-     * running the script; otherwise, exit
+     * @param array|null $data      Data to output to the user
+     * @param int|null   $http_code HTTP status code
+     * @param bool       $continue  TRUE to flush the response to the client and continue
+     *                              running the script; otherwise, exit
      */
-    public function response($data = NULL, $http_code = NULL, $continue = FALSE)
+    public function response($data = null, $http_code = null, $continue = false)
     {
         //if profiling enabled then print profiling data
         $isProfilingEnabled = $this->config->item('enable_profiling');
-        if(!$isProfilingEnabled){
+        if (!$isProfilingEnabled) {
             ob_start();
             // If the HTTP status is not NULL, then cast as an integer
-            if ($http_code !== NULL)
-            {
+            if ($http_code !== null) {
                 // So as to be safe later on in the process
                 $http_code = (int) $http_code;
             }
 
             // Set the output as NULL by default
-            $output = NULL;
+            $output = null;
 
             // If data is NULL and no HTTP status code provided, then display, error and exit
-            if ($data === NULL && $http_code === NULL)
-            {
-                $http_code = REST_Controller_Definitions::HTTP_NOT_FOUND;
+            if ($data === null && $http_code === null) {
+                $http_code = HTTP_NOT_FOUND;
             }
 
             // If data is not NULL and a HTTP status code provided, then continue
-            elseif ($data !== NULL)
-            {
+            elseif ($data !== null) {
                 // If the format method exists, call and return the output in that format
-                if (method_exists(Format::class, 'to_' . $this->response->format))
-                {
+                if (method_exists(Format::class, 'to_'.$this->response->format)) {
                     // Set the format header
                     $this->output->set_content_type($this->_supported_formats[$this->response->format], strtolower($this->config->item('charset')));
-                    $output = Format::factory($data)->{'to_' . $this->response->format}();
+                    $output = Format::factory($data)->{'to_'.$this->response->format}();
 
                     // An array must be parsed as a string, so as not to cause an array to string error
                     // Json is the most appropriate form for such a data type
-                    if ($this->response->format === 'array')
-                    {
+                    if ($this->response->format === 'array') {
                         $output = Format::factory($output)->{'to_json'}();
                     }
-                }
-                else
-                {
+                } else {
                     // If an array or object, then parse as a json, so as to be a 'string'
-                    if (is_array($data) || is_object($data))
-                    {
+                    if (is_array($data) || is_object($data)) {
                         $data = Format::factory($data)->{'to_json'}();
                     }
 
@@ -727,45 +651,37 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
             // If not greater than zero, then set the HTTP status code as 200 by default
             // Though perhaps 500 should be set instead, for the developer not passing a
             // correct HTTP status code
-            $http_code > 0 || $http_code = REST_Controller_Definitions::HTTP_OK;
+            $http_code > 0 || $http_code = HTTP_OK;
 
             $this->output->set_status_header($http_code);
 
             // JC: Log response code only if rest logging enabled
-            if ($this->config->item('rest_enable_logging') === TRUE)
-            {
+            if ($this->config->item('rest_enable_logging') === true) {
                 $this->_log_response_code($http_code);
             }
 
             // Output the data
             $this->output->set_output($output);
 
-            if ($continue === FALSE)
-            {
+            if ($continue === false) {
                 // Display the data and exit execution
                 $this->output->_display();
                 exit;
-            }
-            else
-            {
-                if (is_callable('fastcgi_finish_request')) 
-                {
+            } else {
+                if (is_callable('fastcgi_finish_request')) {
                     // Terminates connection and returns response to client on PHP-FPM.
                     $this->output->_display();
                     ob_end_flush();
                     fastcgi_finish_request();
                     ignore_user_abort(true);
-                }
-                else
-                {
+                } else {
                     // Legacy compatibility.
                     ob_end_flush();
                 }
             }
 
             // Otherwise dump the output automatically
-        }
-        else{
+        } else {
             echo json_encode($data);
         }
     }
@@ -774,70 +690,62 @@ public function response($data = NULL, $http_code = NULL, $continue = FALSE)
      * Takes mixed data and optionally a status code, then creates the response
      * within the buffers of the Output class. The response is sent to the client
      * lately by the framework, after the current controller's method termination.
-     * All the hooks after the controller's method termination are executable
+     * All the hooks after the controller's method termination are executable.
      *
-     * @access public
-     * @param array|NULL $data Data to output to the user
-     * @param int|NULL $http_code HTTP status code
+     * @param array|null $data      Data to output to the user
+     * @param int|null   $http_code HTTP status code
      */
-    public function set_response($data = NULL, $http_code = NULL)
+    public function set_response($data = null, $http_code = null)
     {
-        $this->response($data, $http_code, TRUE);
+        $this->response($data, $http_code, true);
     }
 
     /**
-     * Get the input format e.g. json or xml
+     * Get the input format e.g. json or xml.
      *
-     * @access protected
-     * @return string|NULL Supported input format; otherwise, NULL
+     * @return string|null Supported input format; otherwise, NULL
      */
     protected function _detect_input_format()
     {
         // Get the CONTENT-TYPE value from the SERVER variable
         $content_type = $this->input->server('CONTENT_TYPE');
 
-        if (empty($content_type) === FALSE)
-        {
+        if (empty($content_type) === false) {
             // If a semi-colon exists in the string, then explode by ; and get the value of where
             // the current array pointer resides. This will generally be the first element of the array
-            $content_type = (strpos($content_type, ';') !== FALSE ? current(explode(';', $content_type)) : $content_type);
+            $content_type = (strpos($content_type, ';') !== false ? current(explode(';', $content_type)) : $content_type);
 
             // Check all formats against the CONTENT-TYPE header
-            foreach ($this->_supported_formats as $type => $mime)
-            {
+            foreach ($this->_supported_formats as $type => $mime) {
                 // $type = format e.g. csv
                 // $mime = mime type e.g. application/csv
 
                 // If both the mime types match, then return the format
-                if ($content_type === $mime)
-                {
+                if ($content_type === $mime) {
                     return $type;
                 }
             }
         }
-
-        return NULL;
     }
 
     /**
      * Gets the default format from the configuration. Fallbacks to 'json'
      * if the corresponding configuration option $config['rest_default_format']
-     * is missing or is empty
+     * is missing or is empty.
      *
-     * @access protected
      * @return string The default supported input format
      */
     protected function _get_default_output_format()
     {
         $default_format = (string) $this->config->item('rest_default_format');
+
         return $default_format === '' ? 'json' : $default_format;
     }
 
     /**
-     * Detect which format should be used to output the data
+     * Detect which format should be used to output the data.
      *
-     * @access protected
-     * @return mixed|NULL|string Output format
+     * @return mixed|null|string Output format
      */
     protected function _detect_output_format()
     {
@@ -846,18 +754,15 @@ protected function _detect_output_format()
         $matches = [];
 
         // Check if a file extension is used e.g. http://example.com/api/index.json?param1=param2
-        if (preg_match($pattern, $this->uri->uri_string(), $matches))
-        {
+        if (preg_match($pattern, $this->uri->uri_string(), $matches)) {
             return $matches[1];
         }
 
         // Get the format parameter named as 'format'
-        if (isset($this->_get_args['format']))
-        {
+        if (isset($this->_get_args['format'])) {
             $format = strtolower($this->_get_args['format']);
 
-            if (isset($this->_supported_formats[$format]) === TRUE)
-            {
+            if (isset($this->_supported_formats[$format]) === true) {
                 return $format;
             }
         }
@@ -866,27 +771,19 @@ protected function _detect_output_format()
         $http_accept = $this->input->server('HTTP_ACCEPT');
 
         // Otherwise, check the HTTP_ACCEPT server variable
-        if ($this->config->item('rest_ignore_http_accept') === FALSE && $http_accept !== NULL)
-        {
+        if ($this->config->item('rest_ignore_http_accept') === false && $http_accept !== null) {
             // Check all formats against the HTTP_ACCEPT header
-            foreach (array_keys($this->_supported_formats) as $format)
-            {
+            foreach (array_keys($this->_supported_formats) as $format) {
                 // Has this format been requested?
-                if (strpos($http_accept, $format) !== FALSE)
-                {
-                    if ($format !== 'html' && $format !== 'xml')
-                    {
+                if (strpos($http_accept, $format) !== false) {
+                    if ($format !== 'html' && $format !== 'xml') {
                         // If not HTML or XML assume it's correct
                         return $format;
-                    }
-                    elseif ($format === 'html' && strpos($http_accept, 'xml') === FALSE)
-                    {
+                    } elseif ($format === 'html' && strpos($http_accept, 'xml') === false) {
                         // HTML or XML have shown up as a match
                         // If it is truly HTML, it wont want any XML
                         return $format;
-                    }
-                    else if ($format === 'xml' && strpos($http_accept, 'html') === FALSE)
-                    {
+                    } elseif ($format === 'xml' && strpos($http_accept, 'html') === false) {
                         // If it is truly XML, it wont want any HTML
                         return $format;
                     }
@@ -895,8 +792,7 @@ protected function _detect_output_format()
         }
 
         // Check if the controller has a default format
-        if (empty($this->rest_format) === FALSE)
-        {
+        if (empty($this->rest_format) === false) {
             return $this->rest_format;
         }
 
@@ -905,41 +801,36 @@ protected function _detect_output_format()
     }
 
     /**
-     * Get the HTTP request string e.g. get or post
+     * Get the HTTP request string e.g. get or post.
      *
-     * @access protected
-     * @return string|NULL Supported request method as a lowercase string; otherwise, NULL if not supported
+     * @return string|null Supported request method as a lowercase string; otherwise, NULL if not supported
      */
     protected function _detect_method()
     {
         // Declare a variable to store the method
-        $method = NULL;
+        $method = null;
 
         // Determine whether the 'enable_emulate_request' setting is enabled
-        if ($this->config->item('enable_emulate_request') === TRUE)
-        {
+        if ($this->config->item('enable_emulate_request') === true) {
             $method = $this->input->post('_method');
-            if ($method === NULL)
-            {
+            if ($method === null) {
                 $method = $this->input->server('HTTP_X_HTTP_METHOD_OVERRIDE');
             }
 
             $method = strtolower($method);
         }
 
-        if (empty($method))
-        {
+        if (empty($method)) {
             // Get the request method as a lowercase string
             $method = $this->input->method();
         }
 
-        return in_array($method, $this->allowed_http_methods) && method_exists($this, '_parse_' . $method) ? $method : 'get';
+        return in_array($method, $this->allowed_http_methods) && method_exists($this, '_parse_'.$method) ? $method : 'get';
     }
 
     /**
-     * See if the user has provided an API key
+     * See if the user has provided an API key.
      *
-     * @access protected
      * @return bool
      */
     protected function _detect_api_key()
@@ -948,19 +839,17 @@ protected function _detect_api_key()
         $api_key_variable = $this->config->item('rest_key_name');
 
         // Work out the name of the SERVER entry based on config
-        $key_name = 'HTTP_' . strtoupper(str_replace('-', '_', $api_key_variable));
+        $key_name = 'HTTP_'.strtoupper(str_replace('-', '_', $api_key_variable));
 
-        $this->rest->key = NULL;
-        $this->rest->level = NULL;
-        $this->rest->user_id = NULL;
-        $this->rest->ignore_limits = FALSE;
+        $this->rest->key = null;
+        $this->rest->level = null;
+        $this->rest->user_id = null;
+        $this->rest->ignore_limits = false;
 
         // 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($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row()))
-            {
-                return FALSE;
+        if (($key = isset($this->_args[$api_key_variable]) ? $this->_args[$api_key_variable] : $this->input->server($key_name))) {
+            if (!($row = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row())) {
+                return false;
             }
 
             $this->rest->key = $row->{$this->config->item('rest_key_column')};
@@ -975,64 +864,54 @@ protected function _detect_api_key()
              * If "is private key" is enabled, compare the ip address with the list
              * of valid ip addresses stored in the database
              */
-            if (empty($row->is_private_key) === FALSE)
-            {
+            if (empty($row->is_private_key) === false) {
                 // Check for a list of valid ip addresses
-                if (isset($row->ip_addresses))
-                {
+                if (isset($row->ip_addresses)) {
                     // multiple ip addresses must be separated using a comma, explode and loop
                     $list_ip_addresses = explode(',', $row->ip_addresses);
-            $ip_address = $this->input->ip_address();
-                    $found_address = FALSE;
+                    $ip_address = $this->input->ip_address();
+                    $found_address = false;
 
-                    foreach ($list_ip_addresses as $ip_address)
-                    {
-                        if ($ip_address === trim($ip_address))
-                        {
+                    foreach ($list_ip_addresses as $ip_address) {
+                        if ($ip_address === trim($ip_address)) {
                             // there is a match, set the the value to TRUE and break out of the loop
-                            $found_address = TRUE;
+                            $found_address = true;
                             break;
                         }
                     }
 
                     return $found_address;
-                }
-                else
-                {
+                } else {
                     // There should be at least one IP address for this private key
-                    return FALSE;
+                    return false;
                 }
             }
 
-            return TRUE;
+            return true;
         }
 
         // No key has been sent
-        return FALSE;
+        return false;
     }
 
     /**
-     * Preferred return language
+     * Preferred return language.
      *
-     * @access protected
-     * @return string|NULL|array The language code
+     * @return string|null|array The language code
      */
     protected function _detect_lang()
     {
         $lang = $this->input->server('HTTP_ACCEPT_LANGUAGE');
-        if ($lang === NULL)
-        {
-            return NULL;
+        if ($lang === null) {
+            return;
         }
 
         // It appears more than one language has been sent using a comma delimiter
-        if (strpos($lang, ',') !== FALSE)
-        {
+        if (strpos($lang, ',') !== false) {
             $langs = explode(',', $lang);
 
             $return_langs = [];
-            foreach ($langs as $lang)
-            {
+            foreach ($langs as $lang) {
                 // Remove weight and trim leading and trailing whitespace
                 list($lang) = explode(';', $lang);
                 $return_langs[] = trim($lang);
@@ -1046,25 +925,25 @@ protected function _detect_lang()
     }
 
     /**
-     * Add the request to the log table
+     * Add the request to the log table.
      *
-     * @access protected
      * @param bool $authorized TRUE the user is authorized; otherwise, FALSE
+     *
      * @return bool TRUE the data was inserted; otherwise, FALSE
      */
-    protected function _log_request($authorized = FALSE)
+    protected function _log_request($authorized = false)
     {
         // Insert the request into the log table
         $is_inserted = $this->rest->db
             ->insert(
                 $this->config->item('rest_logs_table'), [
-                'uri' => $this->uri->uri_string(),
-                'method' => $this->request->method,
-                'params' => $this->_args ? ($this->config->item('rest_logs_json_params') === TRUE ? json_encode($this->_args) : serialize($this->_args)) : NULL,
-                'api_key' => isset($this->rest->key) ? $this->rest->key : '',
+                'uri'        => $this->uri->uri_string(),
+                'method'     => $this->request->method,
+                'params'     => $this->_args ? ($this->config->item('rest_logs_json_params') === true ? json_encode($this->_args) : serialize($this->_args)) : null,
+                'api_key'    => isset($this->rest->key) ? $this->rest->key : '',
                 'ip_address' => $this->input->ip_address(),
-                'time' => time(),
-                'authorized' => $authorized
+                'time'       => time(),
+                'authorized' => $authorized,
             ]);
 
         // Get the last insert id to update at a later stage of the request
@@ -1074,53 +953,49 @@ protected function _log_request($authorized = FALSE)
     }
 
     /**
-     * Check if the requests to a controller method exceed a limit
+     * Check if the requests to a controller method exceed a limit.
      *
-     * @access protected
      * @param string $controller_method The method being called
+     *
      * @return bool TRUE the call limit is below the threshold; otherwise, FALSE
      */
     protected function _check_limit($controller_method)
     {
         // They are special, or it might not even have a limit
-        if (empty($this->rest->ignore_limits) === FALSE)
-        {
+        if (empty($this->rest->ignore_limits) === false) {
             // Everything is fine
-            return TRUE;
+            return true;
         }
 
         $api_key = isset($this->rest->key) ? $this->rest->key : '';
 
-        switch ($this->config->item('rest_limits_method'))
-        {
+        switch ($this->config->item('rest_limits_method')) {
             case 'IP_ADDRESS':
                 $api_key = $this->input->ip_address();
-                $limited_uri = 'ip-address:' . $api_key;
+                $limited_uri = 'ip-address:'.$api_key;
                 break;
 
             case 'API_KEY':
-                $limited_uri = 'api-key:' . $api_key;
+                $limited_uri = 'api-key:'.$api_key;
                 break;
 
             case 'METHOD_NAME':
-                $limited_uri = 'method-name:' . $controller_method;
+                $limited_uri = 'method-name:'.$controller_method;
                 break;
 
             case 'ROUTED_URL':
             default:
                 $limited_uri = $this->uri->ruri_string();
-                if (strpos(strrev($limited_uri), strrev($this->response->format)) === 0)
-                {
-                    $limited_uri = substr($limited_uri,0, -strlen($this->response->format) - 1);
+                if (strpos(strrev($limited_uri), strrev($this->response->format)) === 0) {
+                    $limited_uri = substr($limited_uri, 0, -strlen($this->response->format) - 1);
                 }
                 $limited_uri = 'uri:'.$limited_uri.':'.$this->request->method; // It's good to differentiate GET from PUT
                 break;
         }
 
-        if (isset($this->methods[$controller_method]['limit']) === FALSE )
-        {
+        if (isset($this->methods[$controller_method]['limit']) === false) {
             // Everything is fine
-            return TRUE;
+            return true;
         }
 
         // How many times can you get to this method in a defined time_limit (default: 1 hour)?
@@ -1136,20 +1011,18 @@ protected function _check_limit($controller_method)
             ->row();
 
         // No calls have been made for this key
-        if ($result === NULL)
-        {
+        if ($result === null) {
             // Create a new row for the following key
             $this->rest->db->insert($this->config->item('rest_limits_table'), [
-                'uri' => $limited_uri,
-                'api_key' =>$api_key,
-                'count' => 1,
-                'hour_started' => time()
+                'uri'          => $limited_uri,
+                'api_key'      => $api_key,
+                'count'        => 1,
+                'hour_started' => time(),
             ]);
         }
 
         // Been a time limit (or by default an hour) since they called
-        elseif ($result->hour_started < (time() - $time_limit))
-        {
+        elseif ($result->hour_started < (time() - $time_limit)) {
             // Reset the started period and count
             $this->rest->db
                 ->where('uri', $limited_uri)
@@ -1160,29 +1033,26 @@ protected function _check_limit($controller_method)
         }
 
         // They have called within the hour, so lets update
-        else
-        {
+        else {
             // The limit has been exceeded
-            if ($result->count >= $limit)
-            {
-                return FALSE;
+            if ($result->count >= $limit) {
+                return false;
             }
 
             // Increase the count by one
             $this->rest->db
                 ->where('uri', $limited_uri)
                 ->where('api_key', $api_key)
-                ->set('count', 'count + 1', FALSE)
+                ->set('count', 'count + 1', false)
                 ->update($this->config->item('rest_limits_table'));
         }
 
-        return TRUE;
+        return true;
     }
 
     /**
-     * Check if there is a specific auth type set for the current class/method/HTTP-method being called
+     * Check if there is a specific auth type set for the current class/method/HTTP-method being called.
      *
-     * @access protected
      * @return bool
      */
     protected function _auth_override_check()
@@ -1191,89 +1061,76 @@ protected function _auth_override_check()
         $auth_override_class_method = $this->config->item('auth_override_class_method');
 
         // Check to see if the override array is even populated
-        if ( ! empty($auth_override_class_method))
-        {
+        if (!empty($auth_override_class_method)) {
             // Check for wildcard flag for rules for classes
-            if ( ! empty($auth_override_class_method[$this->router->class]['*'])) // Check for class overrides
-            {
+            if (!empty($auth_override_class_method[$this->router->class]['*'])) { // Check for class overrides
                 // No auth override found, prepare nothing but send back a TRUE override flag
-                if ($auth_override_class_method[$this->router->class]['*'] === 'none')
-                {
-                    return TRUE;
+                if ($auth_override_class_method[$this->router->class]['*'] === 'none') {
+                    return true;
                 }
 
                 // Basic auth override found, prepare basic
-                if ($auth_override_class_method[$this->router->class]['*'] === 'basic')
-                {
+                if ($auth_override_class_method[$this->router->class]['*'] === 'basic') {
                     $this->_prepare_basic_auth();
 
-                    return TRUE;
+                    return true;
                 }
 
                 // Digest auth override found, prepare digest
-                if ($auth_override_class_method[$this->router->class]['*'] === 'digest')
-                {
+                if ($auth_override_class_method[$this->router->class]['*'] === 'digest') {
                     $this->_prepare_digest_auth();
 
-                    return TRUE;
+                    return true;
                 }
 
                 // Session auth override found, check session
-                if ($auth_override_class_method[$this->router->class]['*'] === 'session')
-                {
+                if ($auth_override_class_method[$this->router->class]['*'] === 'session') {
                     $this->_check_php_session();
 
-                    return TRUE;
+                    return true;
                 }
 
                 // Whitelist auth override found, check client's ip against config whitelist
-                if ($auth_override_class_method[$this->router->class]['*'] === 'whitelist')
-                {
+                if ($auth_override_class_method[$this->router->class]['*'] === 'whitelist') {
                     $this->_check_whitelist_auth();
 
-                    return TRUE;
+                    return true;
                 }
             }
 
             // Check to see if there's an override value set for the current class/method being called
-            if ( ! empty($auth_override_class_method[$this->router->class][$this->router->method]))
-            {
+            if (!empty($auth_override_class_method[$this->router->class][$this->router->method])) {
                 // None auth override found, prepare nothing but send back a TRUE override flag
-                if ($auth_override_class_method[$this->router->class][$this->router->method] === 'none')
-                {
-                    return TRUE;
+                if ($auth_override_class_method[$this->router->class][$this->router->method] === 'none') {
+                    return true;
                 }
 
                 // Basic auth override found, prepare basic
-                if ($auth_override_class_method[$this->router->class][$this->router->method] === 'basic')
-                {
+                if ($auth_override_class_method[$this->router->class][$this->router->method] === 'basic') {
                     $this->_prepare_basic_auth();
 
-                    return TRUE;
+                    return true;
                 }
 
                 // Digest auth override found, prepare digest
-                if ($auth_override_class_method[$this->router->class][$this->router->method] === 'digest')
-                {
+                if ($auth_override_class_method[$this->router->class][$this->router->method] === 'digest') {
                     $this->_prepare_digest_auth();
 
-                    return TRUE;
+                    return true;
                 }
 
                 // Session auth override found, check session
-                if ($auth_override_class_method[$this->router->class][$this->router->method] === 'session')
-                {
+                if ($auth_override_class_method[$this->router->class][$this->router->method] === 'session') {
                     $this->_check_php_session();
 
-                    return TRUE;
+                    return true;
                 }
 
                 // Whitelist auth override found, check client's ip against config whitelist
-                if ($auth_override_class_method[$this->router->class][$this->router->method] === 'whitelist')
-                {
+                if ($auth_override_class_method[$this->router->class][$this->router->method] === 'whitelist') {
                     $this->_check_whitelist_auth();
 
-                    return TRUE;
+                    return true;
                 }
             }
         }
@@ -1282,99 +1139,86 @@ protected function _auth_override_check()
         $auth_override_class_method_http = $this->config->item('auth_override_class_method_http');
 
         // Check to see if the override array is even populated
-        if ( ! empty($auth_override_class_method_http))
-        {
+        if (!empty($auth_override_class_method_http)) {
             // check for wildcard flag for rules for classes
-            if ( ! empty($auth_override_class_method_http[$this->router->class]['*'][$this->request->method]))
-            {
+            if (!empty($auth_override_class_method_http[$this->router->class]['*'][$this->request->method])) {
                 // None auth override found, prepare nothing but send back a TRUE override flag
-                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'none')
-                {
-                    return TRUE;
+                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'none') {
+                    return true;
                 }
 
                 // Basic auth override found, prepare basic
-                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'basic')
-                {
+                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'basic') {
                     $this->_prepare_basic_auth();
 
-                    return TRUE;
+                    return true;
                 }
 
                 // Digest auth override found, prepare digest
-                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'digest')
-                {
+                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'digest') {
                     $this->_prepare_digest_auth();
 
-                    return TRUE;
+                    return true;
                 }
 
                 // Session auth override found, check session
-                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'session')
-                {
+                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'session') {
                     $this->_check_php_session();
 
-                    return TRUE;
+                    return true;
                 }
 
                 // Whitelist auth override found, check client's ip against config whitelist
-                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'whitelist')
-                {
+                if ($auth_override_class_method_http[$this->router->class]['*'][$this->request->method] === 'whitelist') {
                     $this->_check_whitelist_auth();
 
-                    return TRUE;
+                    return true;
                 }
             }
 
             // Check to see if there's an override value set for the current class/method/HTTP-method being called
-            if ( ! empty($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method]))
-            {
+            if (!empty($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method])) {
                 // None auth override found, prepare nothing but send back a TRUE override flag
-                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'none')
-                {
-                    return TRUE;
+                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'none') {
+                    return true;
                 }
 
                 // Basic auth override found, prepare basic
-                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'basic')
-                {
+                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'basic') {
                     $this->_prepare_basic_auth();
 
-                    return TRUE;
+                    return true;
                 }
 
                 // Digest auth override found, prepare digest
-                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'digest')
-                {
+                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'digest') {
                     $this->_prepare_digest_auth();
 
-                    return TRUE;
+                    return true;
                 }
 
                 // Session auth override found, check session
-                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'session')
-                {
+                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'session') {
                     $this->_check_php_session();
 
-                    return TRUE;
+                    return true;
                 }
 
                 // Whitelist auth override found, check client's ip against config whitelist
-                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'whitelist')
-                {
+                if ($auth_override_class_method_http[$this->router->class][$this->router->method][$this->request->method] === 'whitelist') {
                     $this->_check_whitelist_auth();
 
-                    return TRUE;
+                    return true;
                 }
             }
         }
-        return FALSE;
+
+        return false;
     }
 
     /**
-     * Parse the GET request arguments
+     * Parse the GET request arguments.
      *
-     * @access protected
      * @return void
      */
     protected function _parse_get()
@@ -1384,48 +1228,40 @@ protected function _parse_get()
     }
 
     /**
-     * Parse the POST request arguments
+     * Parse the POST request arguments.
      *
-     * @access protected
      * @return void
      */
     protected function _parse_post()
     {
         $this->_post_args = $_POST;
 
-        if ($this->request->format)
-        {
+        if ($this->request->format) {
             $this->request->body = $this->input->raw_input_stream;
         }
     }
 
     /**
-     * Parse the PUT request arguments
+     * Parse the PUT request arguments.
      *
-     * @access protected
      * @return void
      */
     protected function _parse_put()
     {
-        if ($this->request->format)
-        {
+        if ($this->request->format) {
             $this->request->body = $this->input->raw_input_stream;
-            if ($this->request->format === 'json')
-            {
+            if ($this->request->format === 'json') {
                 $this->_put_args = json_decode($this->input->raw_input_stream);
             }
-        }
-        else if ($this->input->method() === 'put')
-        {
+        } elseif ($this->input->method() === 'put') {
             // If no file type is provided, then there are probably just arguments
             $this->_put_args = $this->input->input_stream();
         }
     }
 
     /**
-     * Parse the HEAD request arguments
+     * Parse the HEAD request arguments.
      *
-     * @access protected
      * @return void
      */
     protected function _parse_head()
@@ -1438,9 +1274,8 @@ protected function _parse_head()
     }
 
     /**
-     * Parse the OPTIONS request arguments
+     * Parse the OPTIONS request arguments.
      *
-     * @access protected
      * @return void
      */
     protected function _parse_options()
@@ -1453,44 +1288,37 @@ protected function _parse_options()
     }
 
     /**
-     * Parse the PATCH request arguments
+     * Parse the PATCH request arguments.
      *
-     * @access protected
      * @return void
      */
     protected function _parse_patch()
     {
         // It might be a HTTP body
-        if ($this->request->format)
-        {
+        if ($this->request->format) {
             $this->request->body = $this->input->raw_input_stream;
-        }
-        else if ($this->input->method() === 'patch')
-        {
+        } elseif ($this->input->method() === 'patch') {
             // If no file type is provided, then there are probably just arguments
             $this->_patch_args = $this->input->input_stream();
         }
     }
 
     /**
-     * Parse the DELETE request arguments
+     * Parse the DELETE request arguments.
      *
-     * @access protected
      * @return void
      */
     protected function _parse_delete()
     {
         // These should exist if a DELETE request
-        if ($this->input->method() === 'delete')
-        {
+        if ($this->input->method() === 'delete') {
             $this->_delete_args = $this->input->input_stream();
         }
     }
 
     /**
-     * Parse the query parameters
+     * Parse the query parameters.
      *
-     * @access protected
      * @return void
      */
     protected function _parse_query()
@@ -1501,177 +1329,168 @@ protected function _parse_query()
     // INPUT FUNCTION --------------------------------------------------------------
 
     /**
-     * Retrieve a value from a GET request
+     * Retrieve a value from a GET request.
+     *
+     * @param null $key       Key to retrieve from the GET request
+     *                        If NULL an array of arguments is returned
+     * @param null $xss_clean Whether to apply XSS filtering
      *
-     * @access public
-     * @param NULL $key Key to retrieve from the GET request
-     * If NULL an array of arguments is returned
-     * @param NULL $xss_clean Whether to apply XSS filtering
-     * @return array|string|NULL Value from the GET request; otherwise, NULL
+     * @return array|string|null Value from the GET request; otherwise, NULL
      */
-    public function get($key = NULL, $xss_clean = NULL)
+    public function get($key = null, $xss_clean = null)
     {
-        if ($key === NULL)
-        {
+        if ($key === null) {
             return $this->_get_args;
         }
 
-        return isset($this->_get_args[$key]) ? $this->_xss_clean($this->_get_args[$key], $xss_clean) : NULL;
+        return isset($this->_get_args[$key]) ? $this->_xss_clean($this->_get_args[$key], $xss_clean) : null;
     }
 
     /**
-     * Retrieve a value from a OPTIONS request
+     * Retrieve a value from a OPTIONS request.
+     *
+     * @param null $key       Key to retrieve from the OPTIONS request.
+     *                        If NULL an array of arguments is returned
+     * @param null $xss_clean Whether to apply XSS filtering
      *
-     * @access public
-     * @param NULL $key Key to retrieve from the OPTIONS request.
-     * If NULL an array of arguments is returned
-     * @param NULL $xss_clean Whether to apply XSS filtering
-     * @return array|string|NULL Value from the OPTIONS request; otherwise, NULL
+     * @return array|string|null Value from the OPTIONS request; otherwise, NULL
      */
-    public function options($key = NULL, $xss_clean = NULL)
+    public function options($key = null, $xss_clean = null)
     {
-        if ($key === NULL)
-        {
+        if ($key === null) {
             return $this->_options_args;
         }
 
-        return isset($this->_options_args[$key]) ? $this->_xss_clean($this->_options_args[$key], $xss_clean) : NULL;
+        return isset($this->_options_args[$key]) ? $this->_xss_clean($this->_options_args[$key], $xss_clean) : null;
     }
 
     /**
-     * Retrieve a value from a HEAD request
+     * Retrieve a value from a HEAD request.
      *
-     * @access public
-     * @param NULL $key Key to retrieve from the HEAD request
-     * If NULL an array of arguments is returned
-     * @param NULL $xss_clean Whether to apply XSS filtering
-     * @return array|string|NULL Value from the HEAD request; otherwise, NULL
+     * @param null $key       Key to retrieve from the HEAD request
+     *                        If NULL an array of arguments is returned
+     * @param null $xss_clean Whether to apply XSS filtering
+     *
+     * @return array|string|null Value from the HEAD request; otherwise, NULL
      */
-    public function head($key = NULL, $xss_clean = NULL)
+    public function head($key = null, $xss_clean = null)
     {
-        if ($key === NULL)
-        {
+        if ($key === null) {
             return $this->_head_args;
         }
 
-        return isset($this->_head_args[$key]) ? $this->_xss_clean($this->_head_args[$key], $xss_clean) : NULL;
+        return isset($this->_head_args[$key]) ? $this->_xss_clean($this->_head_args[$key], $xss_clean) : null;
     }
 
     /**
-     * Retrieve a value from a POST request
+     * Retrieve a value from a POST request.
+     *
+     * @param null $key       Key to retrieve from the POST request
+     *                        If NULL an array of arguments is returned
+     * @param null $xss_clean Whether to apply XSS filtering
      *
-     * @access public
-     * @param NULL $key Key to retrieve from the POST request
-     * If NULL an array of arguments is returned
-     * @param NULL $xss_clean Whether to apply XSS filtering
-     * @return array|string|NULL Value from the POST request; otherwise, NULL
+     * @return array|string|null Value from the POST request; otherwise, NULL
      */
-    public function post($key = NULL, $xss_clean = NULL)
+    public function post($key = null, $xss_clean = null)
     {
-        if ($key === NULL)
-        {
+        if ($key === null) {
             return $this->_post_args;
         }
 
-        return isset($this->_post_args[$key]) ? $this->_xss_clean($this->_post_args[$key], $xss_clean) : NULL;
+        return isset($this->_post_args[$key]) ? $this->_xss_clean($this->_post_args[$key], $xss_clean) : null;
     }
 
     /**
-     * Retrieve a value from a PUT request
+     * Retrieve a value from a PUT request.
+     *
+     * @param null $key       Key to retrieve from the PUT request
+     *                        If NULL an array of arguments is returned
+     * @param null $xss_clean Whether to apply XSS filtering
      *
-     * @access public
-     * @param NULL $key Key to retrieve from the PUT request
-     * If NULL an array of arguments is returned
-     * @param NULL $xss_clean Whether to apply XSS filtering
-     * @return array|string|NULL Value from the PUT request; otherwise, NULL
+     * @return array|string|null Value from the PUT request; otherwise, NULL
      */
-    public function put($key = NULL, $xss_clean = NULL)
+    public function put($key = null, $xss_clean = null)
     {
-        if ($key === NULL)
-        {
+        if ($key === null) {
             return $this->_put_args;
         }
 
-        return isset($this->_put_args[$key]) ? $this->_xss_clean($this->_put_args[$key], $xss_clean) : NULL;
+        return isset($this->_put_args[$key]) ? $this->_xss_clean($this->_put_args[$key], $xss_clean) : null;
     }
 
     /**
-     * Retrieve a value from a DELETE request
+     * Retrieve a value from a DELETE request.
      *
-     * @access public
-     * @param NULL $key Key to retrieve from the DELETE request
-     * If NULL an array of arguments is returned
-     * @param NULL $xss_clean Whether to apply XSS filtering
-     * @return array|string|NULL Value from the DELETE request; otherwise, NULL
+     * @param null $key       Key to retrieve from the DELETE request
+     *                        If NULL an array of arguments is returned
+     * @param null $xss_clean Whether to apply XSS filtering
+     *
+     * @return array|string|null Value from the DELETE request; otherwise, NULL
      */
-    public function delete($key = NULL, $xss_clean = NULL)
+    public function delete($key = null, $xss_clean = null)
     {
-        if ($key === NULL)
-        {
+        if ($key === null) {
             return $this->_delete_args;
         }
 
-        return isset($this->_delete_args[$key]) ? $this->_xss_clean($this->_delete_args[$key], $xss_clean) : NULL;
+        return isset($this->_delete_args[$key]) ? $this->_xss_clean($this->_delete_args[$key], $xss_clean) : null;
     }
 
     /**
-     * Retrieve a value from a PATCH request
+     * Retrieve a value from a PATCH request.
+     *
+     * @param null $key       Key to retrieve from the PATCH request
+     *                        If NULL an array of arguments is returned
+     * @param null $xss_clean Whether to apply XSS filtering
      *
-     * @access public
-     * @param NULL $key Key to retrieve from the PATCH request
-     * If NULL an array of arguments is returned
-     * @param NULL $xss_clean Whether to apply XSS filtering
-     * @return array|string|NULL Value from the PATCH request; otherwise, NULL
+     * @return array|string|null Value from the PATCH request; otherwise, NULL
      */
-    public function patch($key = NULL, $xss_clean = NULL)
+    public function patch($key = null, $xss_clean = null)
     {
-        if ($key === NULL)
-        {
+        if ($key === null) {
             return $this->_patch_args;
         }
 
-        return isset($this->_patch_args[$key]) ? $this->_xss_clean($this->_patch_args[$key], $xss_clean) : NULL;
+        return isset($this->_patch_args[$key]) ? $this->_xss_clean($this->_patch_args[$key], $xss_clean) : null;
     }
 
     /**
-     * Retrieve a value from the query parameters
+     * Retrieve a value from the query parameters.
+     *
+     * @param null $key       Key to retrieve from the query parameters
+     *                        If NULL an array of arguments is returned
+     * @param null $xss_clean Whether to apply XSS filtering
      *
-     * @access public
-     * @param NULL $key Key to retrieve from the query parameters
-     * If NULL an array of arguments is returned
-     * @param NULL $xss_clean Whether to apply XSS filtering
-     * @return array|string|NULL Value from the query parameters; otherwise, NULL
+     * @return array|string|null Value from the query parameters; otherwise, NULL
      */
-    public function query($key = NULL, $xss_clean = NULL)
+    public function query($key = null, $xss_clean = null)
     {
-        if ($key === NULL)
-        {
+        if ($key === null) {
             return $this->_query_args;
         }
 
-        return isset($this->_query_args[$key]) ? $this->_xss_clean($this->_query_args[$key], $xss_clean) : NULL;
+        return isset($this->_query_args[$key]) ? $this->_xss_clean($this->_query_args[$key], $xss_clean) : null;
     }
 
     /**
      * Sanitizes data so that Cross Site Scripting Hacks can be
-     * prevented
+     * prevented.
+     *
+     * @param string $value     Input data
+     * @param bool   $xss_clean Whether to apply XSS filtering
      *
-     * @access protected
-     * @param string $value Input data
-     * @param bool $xss_clean Whether to apply XSS filtering
      * @return string
      */
     protected function _xss_clean($value, $xss_clean)
     {
         is_bool($xss_clean) || $xss_clean = $this->_enable_xss;
 
-        return $xss_clean === TRUE ? $this->security->xss_clean($value) : $value;
+        return $xss_clean === true ? $this->security->xss_clean($value) : $value;
     }
 
     /**
-     * Retrieve the validation errors
+     * Retrieve the validation errors.
      *
-     * @access public
      * @return array
      */
     public function validation_errors()
@@ -1684,40 +1503,39 @@ public function validation_errors()
     // SECURITY FUNCTIONS ---------------------------------------------------------
 
     /**
-     * Perform LDAP Authentication
+     * Perform LDAP Authentication.
      *
-     * @access protected
      * @param string $username The username to validate
      * @param string $password The password to validate
+     *
      * @return bool
      */
-    protected function _perform_ldap_auth($username = '', $password = NULL)
+    protected function _perform_ldap_auth($username = '', $password = null)
     {
-        if (empty($username))
-        {
+        if (empty($username)) {
             log_message('debug', 'LDAP Auth: failure, empty username');
-            return FALSE;
+
+            return false;
         }
 
         log_message('debug', 'LDAP Auth: Loading configuration');
 
-        $this->config->load('ldap', TRUE);
+        $this->config->load('ldap', true);
 
         $ldap = [
             'timeout' => $this->config->item('timeout', 'ldap'),
-            'host' => $this->config->item('server', 'ldap'),
-            'port' => $this->config->item('port', 'ldap'),
-            'rdn' => $this->config->item('binduser', 'ldap'),
-            'pass' => $this->config->item('bindpw', 'ldap'),
-            'basedn' => $this->config->item('basedn', 'ldap'),
+            'host'    => $this->config->item('server', 'ldap'),
+            'port'    => $this->config->item('port', 'ldap'),
+            'rdn'     => $this->config->item('binduser', 'ldap'),
+            'pass'    => $this->config->item('bindpw', 'ldap'),
+            'basedn'  => $this->config->item('basedn', 'ldap'),
         ];
 
-        log_message('debug', 'LDAP Auth: Connect to ' . (isset($ldaphost) ? $ldaphost : '[ldap not configured]'));
+        log_message('debug', 'LDAP Auth: Connect to '.(isset($ldaphost) ? $ldaphost : '[ldap not configured]'));
 
         // Connect to the ldap server
         $ldapconn = ldap_connect($ldap['host'], $ldap['port']);
-        if ($ldapconn)
-        {
+        if ($ldapconn) {
             log_message('debug', 'Setting timeout to '.$ldap['timeout'].' seconds');
 
             ldap_set_option($ldapconn, LDAP_OPT_NETWORK_TIMEOUT, $ldap['timeout']);
@@ -1728,45 +1546,45 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
             $ldapbind = ldap_bind($ldapconn, $ldap['rdn'], $ldap['pass']);
 
             // Verify the binding
-            if ($ldapbind === FALSE)
-            {
+            if ($ldapbind === false) {
                 log_message('error', 'LDAP Auth: bind was unsuccessful');
-                return FALSE;
+
+                return false;
             }
 
             log_message('debug', 'LDAP Auth: bind successful');
         }
 
         // Search for user
-        if (($res_id = ldap_search($ldapconn, $ldap['basedn'], "uid=$username")) === FALSE)
-        {
+        if (($res_id = ldap_search($ldapconn, $ldap['basedn'], "uid=$username")) === false) {
             log_message('error', 'LDAP Auth: User '.$username.' not found in search');
-            return FALSE;
+
+            return false;
         }
 
-        if (ldap_count_entries($ldapconn, $res_id) !== 1)
-        {
+        if (ldap_count_entries($ldapconn, $res_id) !== 1) {
             log_message('error', 'LDAP Auth: Failure, username '.$username.'found more than once');
-            return FALSE;
+
+            return false;
         }
 
-        if (($entry_id = ldap_first_entry($ldapconn, $res_id)) === FALSE)
-        {
+        if (($entry_id = ldap_first_entry($ldapconn, $res_id)) === false) {
             log_message('error', 'LDAP Auth: Failure, entry of search result could not be fetched');
-            return FALSE;
+
+            return false;
         }
 
-        if (($user_dn = ldap_get_dn($ldapconn, $entry_id)) === FALSE)
-        {
+        if (($user_dn = ldap_get_dn($ldapconn, $entry_id)) === false) {
             log_message('error', 'LDAP Auth: Failure, user-dn could not be fetched');
-            return FALSE;
+
+            return false;
         }
 
         // User found, could not authenticate as user
-        if (($link_id = ldap_bind($ldapconn, $user_dn, $password)) === FALSE)
-        {
-            log_message('error', 'LDAP Auth: Failure, username/password did not match: ' . $user_dn);
-            return FALSE;
+        if (($link_id = ldap_bind($ldapconn, $user_dn, $password)) === false) {
+            log_message('error', 'LDAP Auth: Failure, username/password did not match: '.$user_dn);
+
+            return false;
         }
 
         log_message('debug', 'LDAP Auth: Success '.$user_dn.' authenticated successfully');
@@ -1775,42 +1593,41 @@ protected function _perform_ldap_auth($username = '', $password = NULL)
 
         ldap_close($ldapconn);
 
-        return TRUE;
+        return true;
     }
 
     /**
-     * Perform Library Authentication - Override this function to change the way the library is called
+     * Perform Library Authentication - Override this function to change the way the library is called.
      *
-     * @access protected
      * @param string $username The username to validate
      * @param string $password The password to validate
+     *
      * @return bool
      */
-    protected function _perform_library_auth($username = '', $password = NULL)
+    protected function _perform_library_auth($username = '', $password = null)
     {
-        if (empty($username))
-        {
+        if (empty($username)) {
             log_message('error', 'Library Auth: Failure, empty username');
-            return FALSE;
+
+            return false;
         }
 
         $auth_library_class = strtolower($this->config->item('auth_library_class'));
         $auth_library_function = strtolower($this->config->item('auth_library_function'));
 
-        if (empty($auth_library_class))
-        {
+        if (empty($auth_library_class)) {
             log_message('debug', 'Library Auth: Failure, empty auth_library_class');
-            return FALSE;
+
+            return false;
         }
 
-        if (empty($auth_library_function))
-        {
+        if (empty($auth_library_function)) {
             log_message('debug', 'Library Auth: Failure, empty auth_library_function');
-            return FALSE;
+
+            return false;
         }
 
-        if (is_callable([$auth_library_class, $auth_library_function]) === FALSE)
-        {
+        if (is_callable([$auth_library_class, $auth_library_function]) === false) {
             $this->load->library($auth_library_class);
         }
 
@@ -1818,73 +1635,64 @@ protected function _perform_library_auth($username = '', $password = NULL)
     }
 
     /**
-     * Check if the user is logged in
+     * Check if the user is logged in.
      *
-     * @access protected
-     * @param string $username The user's name
+     * @param string      $username The user's name
      * @param bool|string $password The user's password
+     *
      * @return bool
      */
-    protected function _check_login($username = NULL, $password = FALSE)
+    protected function _check_login($username = null, $password = false)
     {
-        if (empty($username))
-        {
-            return FALSE;
+        if (empty($username)) {
+            return false;
         }
 
         $auth_source = strtolower($this->config->item('auth_source'));
         $rest_auth = strtolower($this->config->item('rest_auth'));
         $valid_logins = $this->config->item('rest_valid_logins');
 
-        if ( ! $this->config->item('auth_source') && $rest_auth === 'digest')
-        {
+        if (!$this->config->item('auth_source') && $rest_auth === 'digest') {
             // For digest we do not have a password passed as argument
             return md5($username.':'.$this->config->item('rest_realm').':'.(isset($valid_logins[$username]) ? $valid_logins[$username] : ''));
         }
 
-        if ($password === FALSE)
-        {
-            return FALSE;
+        if ($password === false) {
+            return false;
         }
 
-        if ($auth_source === 'ldap')
-        {
+        if ($auth_source === 'ldap') {
             log_message('debug', "Performing LDAP authentication for $username");
 
             return $this->_perform_ldap_auth($username, $password);
         }
 
-        if ($auth_source === 'library')
-        {
+        if ($auth_source === 'library') {
             log_message('debug', "Performing Library authentication for $username");
 
             return $this->_perform_library_auth($username, $password);
         }
 
-        if (array_key_exists($username, $valid_logins) === FALSE)
-        {
-            return FALSE;
+        if (array_key_exists($username, $valid_logins) === false) {
+            return false;
         }
 
-        if ($valid_logins[$username] !== $password)
-        {
-            return FALSE;
+        if ($valid_logins[$username] !== $password) {
+            return false;
         }
 
-        return TRUE;
+        return true;
     }
 
     /**
-     * Check to see if the user is logged in with a PHP session key
+     * Check to see if the user is logged in with a PHP session key.
      *
-     * @access protected
      * @return void
      */
     protected function _check_php_session()
     {
         // If whitelist is enabled it has the first chance to kick them out
-        if ($this->config->item('rest_ip_whitelist_enabled'))
-        {
+        if ($this->config->item('rest_ip_whitelist_enabled')) {
             $this->_check_whitelist_auth();
         }
 
@@ -1892,27 +1700,24 @@ protected function _check_php_session()
         $key = $this->config->item('auth_source');
 
         // If false, then the user isn't logged in
-        if ( ! $this->session->userdata($key))
-        {
+        if (!$this->session->userdata($key)) {
             // Display an error response
             $this->response([
-                $this->config->item('rest_status_field_name') => FALSE,
-                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized')
-            ], REST_Controller_Definitions::HTTP_UNAUTHORIZED);
+                $this->config->item('rest_status_field_name')  => false,
+                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized'),
+            ], $this->http_status['UNAUTHORIZED']);
         }
     }
 
     /**
-     * Prepares for basic authentication
+     * Prepares for basic authentication.
      *
-     * @access protected
      * @return void
      */
     protected function _prepare_basic_auth()
     {
         // If whitelist is enabled it has the first chance to kick them out
-        if ($this->config->item('rest_ip_whitelist_enabled'))
-        {
+        if ($this->config->item('rest_ip_whitelist_enabled')) {
             $this->_check_whitelist_auth();
         }
 
@@ -1920,48 +1725,40 @@ protected function _prepare_basic_auth()
         $username = $this->input->server('PHP_AUTH_USER');
         $http_auth = $this->input->server('HTTP_AUTHENTICATION') ?: $this->input->server('HTTP_AUTHORIZATION');
 
-        $password = NULL;
-        if ($username !== NULL)
-        {
+        $password = null;
+        if ($username !== null) {
             $password = $this->input->server('PHP_AUTH_PW');
-        }
-        elseif ($http_auth !== NULL)
-        {
+        } elseif ($http_auth !== null) {
             // If the authentication header is set as basic, then extract the username and password from
             // HTTP_AUTHORIZATION e.g. my_username:my_password. This is passed in the .htaccess file
-            if (strpos(strtolower($http_auth), 'basic') === 0)
-            {
+            if (strpos(strtolower($http_auth), 'basic') === 0) {
                 // Search online for HTTP_AUTHORIZATION workaround to explain what this is doing
                 list($username, $password) = explode(':', base64_decode(substr($this->input->server('HTTP_AUTHORIZATION'), 6)));
             }
         }
 
         // Check if the user is logged into the system
-        if ($this->_check_login($username, $password) === FALSE)
-        {
+        if ($this->_check_login($username, $password) === false) {
             $this->_force_login();
         }
     }
 
     /**
-     * Prepares for digest authentication
+     * Prepares for digest authentication.
      *
-     * @access protected
      * @return void
      */
     protected function _prepare_digest_auth()
     {
         // If whitelist is enabled it has the first chance to kick them out
-        if ($this->config->item('rest_ip_whitelist_enabled'))
-        {
+        if ($this->config->item('rest_ip_whitelist_enabled')) {
             $this->_check_whitelist_auth();
         }
 
         // We need to test which server authentication variable to use,
         // because the PHP ISAPI module in IIS acts different from CGI
         $digest_string = $this->input->server('PHP_AUTH_DIGEST');
-        if ($digest_string === NULL)
-        {
+        if ($digest_string === null) {
             $digest_string = $this->input->server('HTTP_AUTHORIZATION');
         }
 
@@ -1969,8 +1766,7 @@ protected function _prepare_digest_auth()
 
         // The $_SESSION['error_prompted'] variable is used to ask the password
         // again if none given or if the user enters wrong auth information
-        if (empty($digest_string))
-        {
+        if (empty($digest_string)) {
             $this->_force_login($unique_id);
         }
 
@@ -1980,8 +1776,7 @@ protected function _prepare_digest_auth()
         $digest = (empty($matches[1]) || empty($matches[2])) ? [] : array_combine($matches[1], $matches[2]);
 
         // For digest authentication the library function should return already stored md5(username:restrealm:password) for that username see rest.php::auth_library_function config
-        if (isset($digest['username']) === FALSE || $this->_check_login($digest['username'], TRUE) === FALSE)
-        {
+        if (isset($digest['username']) === false || $this->_check_login($digest['username'], true) === false) {
             $this->_force_login($unique_id);
         }
 
@@ -1989,20 +1784,18 @@ protected function _prepare_digest_auth()
         $valid_response = md5($digest['username'].':'.$digest['nonce'].':'.$digest['nc'].':'.$digest['cnonce'].':'.$digest['qop'].':'.$md5);
 
         // Check if the string don't compare (case-insensitive)
-        if (strcasecmp($digest['response'], $valid_response) !== 0)
-        {
+        if (strcasecmp($digest['response'], $valid_response) !== 0) {
             // Display an error response
             $this->response([
-                $this->config->item('rest_status_field_name') => FALSE,
-                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_invalid_credentials')
-            ], REST_Controller_Definitions::HTTP_UNAUTHORIZED);
+                $this->config->item('rest_status_field_name')  => false,
+                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_invalid_credentials'),
+            ], $this->http_status['UNAUTHORIZED']);
         }
     }
 
     /**
-     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response
+     * Checks if the client's ip is in the 'rest_ip_blacklist' config and generates a 401 response.
      *
-     * @access protected
      * @return void
      */
     protected function _check_blacklist_auth()
@@ -2011,20 +1804,18 @@ protected function _check_blacklist_auth()
         $pattern = sprintf('/(?:,\s*|^)\Q%s\E(?=,\s*|$)/m', $this->input->ip_address());
 
         // Returns 1, 0 or FALSE (on error only). Therefore implicitly convert 1 to TRUE
-        if (preg_match($pattern, $this->config->item('rest_ip_blacklist')))
-        {
+        if (preg_match($pattern, $this->config->item('rest_ip_blacklist'))) {
             // Display an error response
             $this->response([
-                $this->config->item('rest_status_field_name') => FALSE,
-                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_denied')
-            ], REST_Controller_Definitions::HTTP_UNAUTHORIZED);
+                $this->config->item('rest_status_field_name')  => false,
+                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_denied'),
+            ], $this->http_status['UNAUTHORIZED']);
         }
     }
 
     /**
-     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response
+     * Check if the client's ip is in the 'rest_ip_whitelist' config and generates a 401 response.
      *
-     * @access protected
      * @return void
      */
     protected function _check_whitelist_auth()
@@ -2033,46 +1824,41 @@ protected function _check_whitelist_auth()
 
         array_push($whitelist, '127.0.0.1', '0.0.0.0');
 
-        foreach ($whitelist as &$ip)
-        {
+        foreach ($whitelist as &$ip) {
             // As $ip is a reference, trim leading and trailing whitespace, then store the new value
             // using the reference
             $ip = trim($ip);
         }
 
-        if (in_array($this->input->ip_address(), $whitelist) === FALSE)
-        {
+        if (in_array($this->input->ip_address(), $whitelist) === false) {
             $this->response([
-                $this->config->item('rest_status_field_name') => FALSE,
-                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_unauthorized')
-            ], REST_Controller_Definitions::HTTP_UNAUTHORIZED);
+                $this->config->item('rest_status_field_name')  => false,
+                $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_unauthorized'),
+            ], $this->http_status['UNAUTHORIZED']);
         }
     }
 
     /**
-     * Force logging in by setting the WWW-Authenticate header
+     * Force logging in by setting the WWW-Authenticate header.
      *
-     * @access protected
      * @param string $nonce A server-specified data string which should be uniquely generated
-     * each time
+     *                      each time
+     *
      * @return void
      */
     protected function _force_login($nonce = '')
     {
         $rest_auth = strtolower($this->config->item('rest_auth'));
         $rest_realm = $this->config->item('rest_realm');
-        if ($rest_auth === 'basic')
-        {
+        if ($rest_auth === 'basic') {
             // See http://tools.ietf.org/html/rfc2617#page-5
             header('WWW-Authenticate: Basic realm="'.$rest_realm.'"');
-        }
-        elseif ($rest_auth === 'digest')
-        {
+        } elseif ($rest_auth === 'digest') {
             // See http://tools.ietf.org/html/rfc2617#page-18
             header(
                 'WWW-Authenticate: Digest realm="'.$rest_realm
                 .'", qop="auth", nonce="'.$nonce
-                .'", opaque="' . md5($rest_realm).'"');
+                .'", opaque="'.md5($rest_realm).'"');
         }
 
         if ($this->config->item('strict_api_and_auth') === true) {
@@ -2081,21 +1867,21 @@ protected function _force_login($nonce = '')
 
         // Display an error response
         $this->response([
-            $this->config->item('rest_status_field_name') => FALSE,
-            $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized')
-        ], REST_Controller_Definitions::HTTP_UNAUTHORIZED);
+            $this->config->item('rest_status_field_name')  => false,
+            $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized'),
+        ], $this->http_status['UNAUTHORIZED']);
     }
 
     /**
-     * Updates the log table with the total access time
+     * Updates the log table with the total access time.
      *
-     * @access protected
      * @author Chris Kacerguis
+     *
      * @return bool TRUE log table updated; otherwise, FALSE
      */
     protected function _log_access_time()
     {
-        if($this->_insert_id == ''){
+        if ($this->_insert_id == '') {
             return false;
         }
 
@@ -2103,21 +1889,22 @@ protected function _log_access_time()
 
         return $this->rest->db->update(
             $this->config->item('rest_logs_table'), $payload, [
-            'id' => $this->_insert_id
+            'id' => $this->_insert_id,
         ]);
     }
 
     /**
-     * Updates the log table with HTTP response code
+     * Updates the log table with HTTP response code.
      *
-     * @access protected
      * @author Justin Chen
+     *
      * @param $http_code int HTTP status code
+     *
      * @return bool TRUE log table updated; otherwise, FALSE
      */
     protected function _log_response_code($http_code)
     {
-        if($this->_insert_id == ''){
+        if ($this->_insert_id == '') {
             return false;
         }
 
@@ -2125,29 +1912,27 @@ protected function _log_response_code($http_code)
 
         return $this->rest->db->update(
             $this->config->item('rest_logs_table'), $payload, [
-            'id' => $this->_insert_id
+            'id' => $this->_insert_id,
         ]);
     }
 
     /**
-     * Check to see if the API key has access to the controller and methods
+     * Check to see if the API key has access to the controller and methods.
      *
-     * @access protected
      * @return bool TRUE the API key has access; otherwise, FALSE
      */
     protected function _check_access()
     {
         // If we don't want to check access, just return TRUE
-        if ($this->config->item('rest_enable_access') === FALSE)
-        {
-            return TRUE;
+        if ($this->config->item('rest_enable_access') === false) {
+            return true;
         }
 
         // Fetch controller based on path and controller name
         $controller = implode(
             '/', [
             $this->router->directory,
-            $this->router->class
+            $this->router->class,
         ]);
 
         // Remove any double slashes for safety
@@ -2159,18 +1944,16 @@ protected function _check_access()
             ->where('controller', $controller)
             ->get($this->config->item('rest_access_table'))->row_array();
 
-        if (!empty($accessRow) && !empty($accessRow['all_access']))
-        {
-            return TRUE;
+        if (!empty($accessRow) && !empty($accessRow['all_access'])) {
+            return true;
         }
 
         return false;
     }
 
     /**
-     * Checks allowed domains, and adds appropriate headers for HTTP access control (CORS)
+     * Checks allowed domains, and adds appropriate headers for HTTP access control (CORS).
      *
-     * @access protected
      * @return void
      */
     protected function _check_cors()
@@ -2180,25 +1963,20 @@ protected function _check_cors()
         $allowed_methods = implode(', ', $this->config->item('allowed_cors_methods'));
 
         // If we want to allow any domain to access the API
-        if ($this->config->item('allow_any_cors_domain') === TRUE)
-        {
+        if ($this->config->item('allow_any_cors_domain') === true) {
             header('Access-Control-Allow-Origin: *');
             header('Access-Control-Allow-Headers: '.$allowed_headers);
             header('Access-Control-Allow-Methods: '.$allowed_methods);
-        }
-        else
-        {
+        } else {
             // We're going to allow only certain domains access
             // Store the HTTP Origin header
             $origin = $this->input->server('HTTP_ORIGIN');
-            if ($origin === NULL)
-            {
+            if ($origin === null) {
                 $origin = '';
             }
 
             // If the origin domain is in the allowed_cors_origins list, then add the Access Control headers
-            if (in_array($origin, $this->config->item('allowed_cors_origins')))
-            {
+            if (in_array($origin, $this->config->item('allowed_cors_origins'))) {
                 header('Access-Control-Allow-Origin: '.$origin);
                 header('Access-Control-Allow-Headers: '.$allowed_headers);
                 header('Access-Control-Allow-Methods: '.$allowed_methods);
@@ -2206,21 +1984,17 @@ protected function _check_cors()
         }
 
         // If there are headers that should be forced in the CORS check, add them now
-        if (is_array($this->config->item('forced_cors_headers')))
-        {
-            foreach ($this->config->item('forced_cors_headers') as $header => $value)
-            {
-                header($header . ': ' . $value);
+        if (is_array($this->config->item('forced_cors_headers'))) {
+            foreach ($this->config->item('forced_cors_headers') as $header => $value) {
+                header($header.': '.$value);
             }
         }
 
         // If the request HTTP method is 'OPTIONS', kill the response and send it to the client
-        if ($this->input->method() === 'options')
-        {
+        if ($this->input->method() === 'options') {
             // Load DB if needed for logging
-            if (!isset($this->rest->db) && $this->config->item('rest_enable_logging'))
-            {
-                $this->rest->db = $this->load->database($this->config->item('rest_database_group'), TRUE);
+            if (!isset($this->rest->db) && $this->config->item('rest_enable_logging')) {
+                $this->rest->db = $this->load->database($this->config->item('rest_database_group'), true);
             }
             exit;
         }
diff --git a/src/auth/apikey.php b/src/auth/apikey.php
new file mode 100644
index 00000000..e69de29b
diff --git a/src/auth/basic.php b/src/auth/basic.php
new file mode 100644
index 00000000..e69de29b
diff --git a/src/auth/ldap.php b/src/auth/ldap.php
new file mode 100644
index 00000000..e69de29b
diff --git a/application/language/serbian_lat/index.html b/src/index.html
old mode 100644
new mode 100755
similarity index 100%
rename from application/language/serbian_lat/index.html
rename to src/index.html
diff --git a/application/config/rest.php b/src/rest.php
similarity index 99%
rename from application/config/rest.php
rename to src/rest.php
index 394937ce..887141c6 100644
--- a/application/config/rest.php
+++ b/src/rest.php
@@ -1,6 +1,6 @@
 <?php
 
-defined('BASEPATH') OR exit('No direct script access allowed');
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------
@@ -184,7 +184,6 @@
 // $config['auth_override_class_method']['accounts']['user'] = 'basic';
 // $config['auth_override_class_method']['dashboard']['*'] = 'basic';
 
-
 // ---Uncomment list line for the wildard unit test
 // $config['auth_override_class_method']['wildcard_test_cases']['*'] = 'basic';
 
@@ -561,7 +560,7 @@
   'X-Requested-With',
   'Content-Type',
   'Accept',
-  'Access-Control-Request-Method'
+  'Access-Control-Request-Method',
 ];
 
 /*
@@ -578,7 +577,7 @@
   'OPTIONS',
   'PUT',
   'PATCH',
-  'DELETE'
+  'DELETE',
 ];
 
 /*
@@ -610,7 +609,7 @@
 | CORS Forced Headers
 |--------------------------------------------------------------------------
 |
-| If using CORS checks, always include the headers and values specified here 
+| If using CORS checks, always include the headers and values specified here
 | in the OPTIONS client preflight.
 | Example:
 | $config['forced_cors_headers'] = [
@@ -619,7 +618,7 @@
 |
 | Added because of how Sencha Ext JS framework requires the header
 | Access-Control-Allow-Credentials to be set to true to allow the use of
-| credentials in the REST Proxy. 
+| credentials in the REST Proxy.
 | See documentation here:
 | http://docs.sencha.com/extjs/6.5.2/classic/Ext.data.proxy.Rest.html#cfg-withCredentials
 |

From 169ccd9710ed6f83d5eff0edffcc1abca3b9a9fe Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chris@cowdog.io>
Date: Sun, 10 Nov 2019 13:58:04 -0600
Subject: [PATCH 302/354] fix correct repo

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4955bb84..0a7b6b4b 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # CodeIgniter RestServer
 
-[![StyleCI](https://github.styleci.io/repos/219224674/shield?branch=master)](https://github.styleci.io/repos/219224674)
+[![StyleCI](https://github.styleci.io/repos/230589/shield?branch=master)](https://github.styleci.io/repos/230589)
 
 A fully RESTful server implementation for CodeIgniter using one library, one config file and one controller.
 

From 1ec3b03ad566203643b7c21d6f4ffa68d10f5894 Mon Sep 17 00:00:00 2001
From: Flor27 <flor27@gmail.com>
Date: Tue, 12 Nov 2019 11:21:39 +0100
Subject: [PATCH 303/354] response method update for CORB protection

CORB protection was added to Chromium based browsers to add further cross-origin resource loads protection.
Details about the protection here : https://chromium.googlesource.com/chromium/src/+/master/services/network/cross_origin_read_blocking_explainer.md
Without this update, some AJAX requests from those browsers fall in the CORB and fail.

The update consists of sending the right Content-Type header for callback encapsuled JSON output : application/javascript instead of application/json
---
 src/RestController.php | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/RestController.php b/src/RestController.php
index 6ae504a1..b6555713 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -628,10 +628,18 @@ public function response($data = null, $http_code = null, $continue = false)
             elseif ($data !== null) {
                 // If the format method exists, call and return the output in that format
                 if (method_exists(Format::class, 'to_'.$this->response->format)) {
-                    // Set the format header
-                    $this->output->set_content_type($this->_supported_formats[$this->response->format], strtolower($this->config->item('charset')));
+                    // CORB protection
+                    // First, get the output content.
                     $output = Format::factory($data)->{'to_'.$this->response->format}();
-
+                    
+                    // Set the format header
+                    // Then, check if the client asked for a callback, and if the output contains this callback :
+                    if (isset($this->_get_args['callback']) && $this->response->format == 'json' && preg_match('/^' . $this->_get_args['callback'] . '/', $output)) {
+                        $this->output->set_content_type($this->_supported_formats['jsonp'], strtolower($this->config->item('charset')));
+                    } else {
+                        $this->output->set_content_type($this->_supported_formats[$this->response->format], strtolower($this->config->item('charset')));
+                    }
+                    
                     // An array must be parsed as a string, so as not to cause an array to string error
                     // Json is the most appropriate form for such a data type
                     if ($this->response->format === 'array') {

From 8bbcf0d5ae26982b5c6f9a65faed35832bc06284 Mon Sep 17 00:00:00 2001
From: Flor27 <flor27@gmail.com>
Date: Tue, 12 Nov 2019 11:30:37 +0100
Subject: [PATCH 304/354] continuous-integration/styleci/pr corrections

continuous-integration/styleci/pr corrections
---
 src/RestController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/RestController.php b/src/RestController.php
index b6555713..a98efd39 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -631,15 +631,15 @@ public function response($data = null, $http_code = null, $continue = false)
                     // CORB protection
                     // First, get the output content.
                     $output = Format::factory($data)->{'to_'.$this->response->format}();
-                    
+
                     // Set the format header
                     // Then, check if the client asked for a callback, and if the output contains this callback :
-                    if (isset($this->_get_args['callback']) && $this->response->format == 'json' && preg_match('/^' . $this->_get_args['callback'] . '/', $output)) {
+                    if (isset($this->_get_args['callback']) && $this->response->format == 'json' && preg_match('/^'.$this->_get_args['callback'].'/', $output)) {
                         $this->output->set_content_type($this->_supported_formats['jsonp'], strtolower($this->config->item('charset')));
                     } else {
                         $this->output->set_content_type($this->_supported_formats[$this->response->format], strtolower($this->config->item('charset')));
                     }
-                    
+
                     // An array must be parsed as a string, so as not to cause an array to string error
                     // Json is the most appropriate form for such a data type
                     if ($this->response->format === 'array') {

From 6155eb0df588470f9d71ac0c4a5ba962d4c11cdf Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chris@cowdog.io>
Date: Tue, 12 Nov 2019 08:37:51 -0600
Subject: [PATCH 305/354] fixes #1032

---
 src/RestController.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/RestController.php b/src/RestController.php
index a98efd39..7b23106c 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -442,15 +442,13 @@ private function do_auth($method = false)
      */
     private function get_local_config($config_file)
     {
-        if (file_exists(__DIR__.'/'.$config_file.'.php')) {
+        if (!$this->load->config($config_file, false))
+        {
             $config = [];
             include __DIR__.'/'.$config_file.'.php';
-
             foreach ($config as $key => $value) {
                 $this->config->set_item($key, $value);
             }
-        } else {
-            $this->load->config($config_file, false, true);
         }
     }
 

From 1086cb3ab7e9165183fb298bf32d51fd07db7759 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chris@cowdog.io>
Date: Tue, 12 Nov 2019 08:38:55 -0600
Subject: [PATCH 306/354] style ci fix

---
 src/RestController.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/RestController.php b/src/RestController.php
index 7b23106c..534338bc 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -442,8 +442,7 @@ private function do_auth($method = false)
      */
     private function get_local_config($config_file)
     {
-        if (!$this->load->config($config_file, false))
-        {
+        if (!$this->load->config($config_file, false)) {
             $config = [];
             include __DIR__.'/'.$config_file.'.php';
             foreach ($config as $key => $value) {

From f7eb9a8a03aee3fc81fefef934292a748792d467 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chris@cowdog.io>
Date: Tue, 12 Nov 2019 08:40:14 -0600
Subject: [PATCH 307/354] fixes #1027

---
 src/RestController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/RestController.php b/src/RestController.php
index 534338bc..e7b8d914 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -877,8 +877,8 @@ protected function _detect_api_key()
                     $ip_address = $this->input->ip_address();
                     $found_address = false;
 
-                    foreach ($list_ip_addresses as $ip_address) {
-                        if ($ip_address === trim($ip_address)) {
+                    foreach ($list_ip_addresses as $list_ip) {
+                        if ($ip_address === trim($list_ip)) {
                             // there is a match, set the the value to TRUE and break out of the loop
                             $found_address = true;
                             break;

From 69e4cc1b005cfae60a162ac04e7748be3f3720c0 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chris@cowdog.io>
Date: Tue, 12 Nov 2019 08:50:46 -0600
Subject: [PATCH 308/354] fixes #933 and #877

---
 src/RestController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/RestController.php b/src/RestController.php
index e7b8d914..6886f9a1 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -684,7 +684,7 @@ public function response($data = null, $http_code = null, $continue = false)
                     ob_end_flush();
                 }
             }
-
+            ob_end_flush();
             // Otherwise dump the output automatically
         } else {
             echo json_encode($data);

From ed4d5d7184c1d6cf58bdeb6914882f19ea2479d5 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@me.com>
Date: Tue, 12 Nov 2019 14:54:30 +0000
Subject: [PATCH 309/354] Apply fixes from StyleCI

---
 src/RestController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/RestController.php b/src/RestController.php
index 6886f9a1..6ee932eb 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -685,7 +685,7 @@ public function response($data = null, $http_code = null, $continue = false)
                 }
             }
             ob_end_flush();
-            // Otherwise dump the output automatically
+        // Otherwise dump the output automatically
         } else {
             echo json_encode($data);
         }

From 03403924968cae8bb46883611409061585e782f6 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chris@cowdog.io>
Date: Tue, 12 Nov 2019 09:39:30 -0600
Subject: [PATCH 310/354] added github sponsor stuff

---
 .github/FUNDING.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 00000000..a7b75f10
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: chriskacerguis
\ No newline at end of file

From e1910747f5a044aa3691efd9dc604a289bec1579 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chris@cowdog.io>
Date: Tue, 12 Nov 2019 17:16:09 -0600
Subject: [PATCH 311/354] added example

---
 examples/get.php | 55 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 examples/get.php

diff --git a/examples/get.php b/examples/get.php
new file mode 100644
index 00000000..cd15405f
--- /dev/null
+++ b/examples/get.php
@@ -0,0 +1,55 @@
+<?php
+defined('BASEPATH') OR exit('No direct script access allowed');
+
+/*
+|--------------------------------------------------------------------------
+| Example GET controller
+|--------------------------------------------------------------------------
+|
+| Place this file in the application/controllers/api directory
+|
+| Add this to your routes.php config file:
+| $route['api/get/users/(:num)'] = 'api/example/get/id/$1';
+|
+*/
+
+
+use chriskacerguis\RestServer\RestController;
+
+class Example extends REST_Controller {
+
+    function __construct()
+    {
+        // Construct the parent class
+        parent::__construct();
+    }
+
+    public function users_get()
+    {
+        // Users from a data store e.g. database
+        $users = [
+            ['id' => 1, 'name' => 'John', 'email' => 'john@example.com'],
+            ['id' => 2, 'name' => 'Jim', 'email' => 'jim@example.com'],
+        ];
+
+        $id = $this->get('id');
+
+        if ($id === null)
+        {
+            // Check if the users data store contains users
+            if ($users)
+            {
+                // Set the response and exit
+                $this->response($users, 200);
+            }
+            else
+            {
+                // Set the response and exit
+                $this->response([
+                    'status' => false,
+                    'message' => 'No users were found'
+                ], 404);
+            }
+        }
+    }
+}
\ No newline at end of file

From 29d10878cacda817d15bd9cf639dc71ae8485663 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@me.com>
Date: Tue, 12 Nov 2019 23:17:07 +0000
Subject: [PATCH 312/354] Apply fixes from StyleCI

---
 examples/get.php | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/examples/get.php b/examples/get.php
index cd15405f..bb2c94d0 100644
--- a/examples/get.php
+++ b/examples/get.php
@@ -1,5 +1,6 @@
 <?php
-defined('BASEPATH') OR exit('No direct script access allowed');
+
+defined('BASEPATH') or exit('No direct script access allowed');
 
 /*
 |--------------------------------------------------------------------------
@@ -13,12 +14,9 @@
 |
 */
 
-
-use chriskacerguis\RestServer\RestController;
-
-class Example extends REST_Controller {
-
-    function __construct()
+class Example extends REST_Controller
+{
+    public function __construct()
     {
         // Construct the parent class
         parent::__construct();
@@ -34,22 +32,18 @@ public function users_get()
 
         $id = $this->get('id');
 
-        if ($id === null)
-        {
+        if ($id === null) {
             // Check if the users data store contains users
-            if ($users)
-            {
+            if ($users) {
                 // Set the response and exit
                 $this->response($users, 200);
-            }
-            else
-            {
+            } else {
                 // Set the response and exit
                 $this->response([
-                    'status' => false,
-                    'message' => 'No users were found'
+                    'status'  => false,
+                    'message' => 'No users were found',
                 ], 404);
             }
         }
     }
-}
\ No newline at end of file
+}

From 4df17d7681155b45bbab0c7df97611ba7fef50f9 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chris@cowdog.io>
Date: Tue, 12 Nov 2019 18:33:01 -0600
Subject: [PATCH 313/354] quick doc fix

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0a7b6b4b..82d6e35c 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ A fully RESTful server implementation for CodeIgniter using one library, one con
 ## Installation
 
 ```sh
-composer require chriskacerguis/ci-restserver
+composer require chriskacerguis/codeigniter-restserver
 ```
 
 ## Usage

From 7bbf32df32db7f1e8a6b0d1c7e3eb88c0ab81e88 Mon Sep 17 00:00:00 2001
From: Hojjat Salmasian <salmasian@users.noreply.github.com>
Date: Tue, 19 Nov 2019 14:20:25 -0500
Subject: [PATCH 314/354] Delete example

The example in README.md is sufficient
---
 examples/get.php | 49 ------------------------------------------------
 1 file changed, 49 deletions(-)
 delete mode 100644 examples/get.php

diff --git a/examples/get.php b/examples/get.php
deleted file mode 100644
index bb2c94d0..00000000
--- a/examples/get.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-defined('BASEPATH') or exit('No direct script access allowed');
-
-/*
-|--------------------------------------------------------------------------
-| Example GET controller
-|--------------------------------------------------------------------------
-|
-| Place this file in the application/controllers/api directory
-|
-| Add this to your routes.php config file:
-| $route['api/get/users/(:num)'] = 'api/example/get/id/$1';
-|
-*/
-
-class Example extends REST_Controller
-{
-    public function __construct()
-    {
-        // Construct the parent class
-        parent::__construct();
-    }
-
-    public function users_get()
-    {
-        // Users from a data store e.g. database
-        $users = [
-            ['id' => 1, 'name' => 'John', 'email' => 'john@example.com'],
-            ['id' => 2, 'name' => 'Jim', 'email' => 'jim@example.com'],
-        ];
-
-        $id = $this->get('id');
-
-        if ($id === null) {
-            // Check if the users data store contains users
-            if ($users) {
-                // Set the response and exit
-                $this->response($users, 200);
-            } else {
-                // Set the response and exit
-                $this->response([
-                    'status'  => false,
-                    'message' => 'No users were found',
-                ], 404);
-            }
-        }
-    }
-}

From b471a60514dfcf1651927f2f58c65070135d776e Mon Sep 17 00:00:00 2001
From: Hojjat Salmasian <salmasian@users.noreply.github.com>
Date: Tue, 19 Nov 2019 14:26:54 -0500
Subject: [PATCH 315/354] Making the example in README.md work

Also expanding the example to demonstrate how the id parameter is used
---
 README.md | 41 ++++++++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 82d6e35c..f7f4e305 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,8 @@ or run
 composer require chriskacerguis/codeigniter-restserver
 ```
 
+Note that you will need to copy `rest.php` to your `config` directory (e.g. `application/config`)
+
 Step 1: Add this to your controller (should be before any of your code)
 
 ```php
@@ -43,7 +45,10 @@ class Example extends RestController
 
 ## Basic GET example
 
-Here is a basic example of 
+Here is a basic example. This controller, which should be saved as `Api.php`, can be called in two ways:
+
+* `http://domain/api/users/` will return the list of all users
+* `http://domain/api/users/id/1` will only return information about the user with id = 1
 
 ```php
 <?php
@@ -51,7 +56,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
 
 use chriskacerguis\RestServer\RestController;
 
-class Example extends REST_Controller {
+class Api extends RestController {
 
     function __construct()
     {
@@ -63,29 +68,43 @@ class Example extends REST_Controller {
     {
         // Users from a data store e.g. database
         $users = [
-            ['id' => 1, 'name' => 'John', 'email' => 'john@example.com'],
-            ['id' => 2, 'name' => 'Jim', 'email' => 'jim@example.com'],
+            ['id' => 0, 'name' => 'John', 'email' => 'john@example.com'],
+            ['id' => 1, 'name' => 'Jim', 'email' => 'jim@example.com'],
         ];
 
-        $id = $this->get('id');
+        $id = $this->get( 'id' );
 
-        if ($id === null)
+        if ( $id === null )
         {
             // Check if the users data store contains users
-            if ($users)
+            if ( $users )
             {
                 // Set the response and exit
-                $this->response($users, 200);
+                $this->response( $users, 200 );
             }
             else
             {
                 // Set the response and exit
-                $this->response([
+                $this->response( [
                     'status' => false,
                     'message' => 'No users were found'
-                ], 404);
+                ], 404 );
+            }
+        }
+        else
+        {
+            if ( array_key_exists( $id, $users ) )
+            {
+                $this->response( $users[$id], 200 );
+            }
+            else
+            {
+                $this->response( [
+                    'status' => false,
+                    'message' => 'No such user found'
+                ], 404 );
             }
         }
     }
 }
-```
\ No newline at end of file
+```

From d708cbbb8ddc3e4beae2030e3f44b3434d896fdd Mon Sep 17 00:00:00 2001
From: Ale <adg@wandu.com.ar>
Date: Sat, 23 Nov 2019 08:22:24 -0300
Subject: [PATCH 316/354] Repair undefined variable.

---
 src/RestController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/RestController.php b/src/RestController.php
index 6ee932eb..f7a2d8bf 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -1536,7 +1536,7 @@ protected function _perform_ldap_auth($username = '', $password = null)
             'basedn'  => $this->config->item('basedn', 'ldap'),
         ];
 
-        log_message('debug', 'LDAP Auth: Connect to '.(isset($ldaphost) ? $ldaphost : '[ldap not configured]'));
+        log_message('debug', 'LDAP Auth: Connect to '.(isset($ldap['host']) ? $ldap['host'] : '[ldap not configured]'));
 
         // Connect to the ldap server
         $ldapconn = ldap_connect($ldap['host'], $ldap['port']);

From 3aa10fe1f48eca967cc5e63bfd2a7ef20f75591d Mon Sep 17 00:00:00 2001
From: Ale <adg@wandu.com.ar>
Date: Sat, 23 Nov 2019 20:04:43 -0300
Subject: [PATCH 317/354] Replace old http_status array by http status
 constants

---
 src/RestController.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/RestController.php b/src/RestController.php
index f7a2d8bf..c31e0b18 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -218,6 +218,7 @@ class RestController extends \CI_Controller
     const HTTP_UNAUTHORIZED = 401;
     const HTTP_FORBIDDEN = 403;
     const HTTP_NOT_FOUND = 404;
+    const HTTP_METHOD_NOT_ALLOWED = 405;
     const HTTP_NOT_ACCEPTABLE = 406;
     const HTTP_INTERNAL_ERROR = 500;
 
@@ -539,7 +540,7 @@ public function _remap($object_called, $arguments = [])
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unknown_method'),
-            ], $this->http_status['METHOD_NOT_ALLOWED']);
+            ], HTTP_METHOD_NOT_ALLOWED);
         }
 
         // Doing key related stuff? Can only do it if they have a key right?
@@ -1710,7 +1711,7 @@ protected function _check_php_session()
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized'),
-            ], $this->http_status['UNAUTHORIZED']);
+            ], HTTP_UNAUTHORIZED);
         }
     }
 
@@ -1794,7 +1795,7 @@ protected function _prepare_digest_auth()
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_invalid_credentials'),
-            ], $this->http_status['UNAUTHORIZED']);
+            ], HTTP_UNAUTHORIZED);
         }
     }
 
@@ -1814,7 +1815,7 @@ protected function _check_blacklist_auth()
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_denied'),
-            ], $this->http_status['UNAUTHORIZED']);
+            ], HTTP_UNAUTHORIZED);
         }
     }
 
@@ -1839,7 +1840,7 @@ protected function _check_whitelist_auth()
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_unauthorized'),
-            ], $this->http_status['UNAUTHORIZED']);
+            ], HTTP_UNAUTHORIZED);
         }
     }
 
@@ -1874,7 +1875,7 @@ protected function _force_login($nonce = '')
         $this->response([
             $this->config->item('rest_status_field_name')  => false,
             $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized'),
-        ], $this->http_status['UNAUTHORIZED']);
+        ], HTTP_UNAUTHORIZED);
     }
 
     /**

From 39443559e39afc509e4b6e8064623c99f35592b3 Mon Sep 17 00:00:00 2001
From: Ale <adg@wandu.com.ar>
Date: Tue, 3 Dec 2019 17:55:22 -0300
Subject: [PATCH 318/354] Add self before the http constants for prevent php 7
 warning of undefined constants

---
 src/RestController.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/RestController.php b/src/RestController.php
index c31e0b18..722575c5 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -401,7 +401,7 @@ public function __construct($config = 'rest')
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ajax_only'),
-            ], HTTP_NOT_ACCEPTABLE);
+            ], self::HTTP_NOT_ACCEPTABLE);
         }
 
         // When there is no specific override for the current class/method, use the default auth value set in the config
@@ -487,7 +487,7 @@ public function _remap($object_called, $arguments = [])
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unsupported'),
-            ], HTTP_FORBIDDEN);
+            ], self::HTTP_FORBIDDEN);
         }
 
         // Remove the supported format from the function name e.g. index.json => index
@@ -520,7 +520,7 @@ public function _remap($object_called, $arguments = [])
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => sprintf($this->lang->line('text_rest_invalid_api_key'), $this->rest->key),
-            ], HTTP_FORBIDDEN);
+            ], self::HTTP_FORBIDDEN);
         }
 
         // Check to see if this key has access to the requested controller
@@ -532,7 +532,7 @@ public function _remap($object_called, $arguments = [])
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_unauthorized'),
-            ], HTTP_UNAUTHORIZED);
+            ], self::HTTP_UNAUTHORIZED);
         }
 
         // Sure it exists, but can they do anything with it?
@@ -540,7 +540,7 @@ public function _remap($object_called, $arguments = [])
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unknown_method'),
-            ], HTTP_METHOD_NOT_ALLOWED);
+            ], self::HTTP_METHOD_NOT_ALLOWED);
         }
 
         // Doing key related stuff? Can only do it if they have a key right?
@@ -548,7 +548,7 @@ public function _remap($object_called, $arguments = [])
             // Check the limit
             if ($this->config->item('rest_enable_limits') && $this->_check_limit($controller_method) === false) {
                 $response = [$this->config->item('rest_status_field_name') => false, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_time_limit')];
-                $this->response($response, HTTP_UNAUTHORIZED);
+                $this->response($response, self::HTTP_UNAUTHORIZED);
             }
 
             // If no level is set use 0, they probably aren't using permissions
@@ -563,14 +563,14 @@ public function _remap($object_called, $arguments = [])
             if ($authorized === false) {
                 // They don't have good enough perms
                 $response = [$this->config->item('rest_status_field_name') => false, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_api_key_permissions')];
-                $this->response($response, HTTP_UNAUTHORIZED);
+                $this->response($response, self::HTTP_UNAUTHORIZED);
             }
         }
 
         //check request limit by ip without login
         elseif ($this->config->item('rest_limits_method') == 'IP_ADDRESS' && $this->config->item('rest_enable_limits') && $this->_check_limit($controller_method) === false) {
             $response = [$this->config->item('rest_status_field_name') => false, $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_address_time_limit')];
-            $this->response($response, HTTP_UNAUTHORIZED);
+            $this->response($response, self::HTTP_UNAUTHORIZED);
         }
 
         // No key stuff, but record that stuff is happening
@@ -619,7 +619,7 @@ public function response($data = null, $http_code = null, $continue = false)
 
             // If data is NULL and no HTTP status code provided, then display, error and exit
             if ($data === null && $http_code === null) {
-                $http_code = HTTP_NOT_FOUND;
+                $http_code = self::HTTP_NOT_FOUND;
             }
 
             // If data is not NULL and a HTTP status code provided, then continue
@@ -657,7 +657,7 @@ public function response($data = null, $http_code = null, $continue = false)
             // If not greater than zero, then set the HTTP status code as 200 by default
             // Though perhaps 500 should be set instead, for the developer not passing a
             // correct HTTP status code
-            $http_code > 0 || $http_code = HTTP_OK;
+            $http_code > 0 || $http_code = self::HTTP_OK;
 
             $this->output->set_status_header($http_code);
 
@@ -1711,7 +1711,7 @@ protected function _check_php_session()
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized'),
-            ], HTTP_UNAUTHORIZED);
+            ], self::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -1795,7 +1795,7 @@ protected function _prepare_digest_auth()
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_invalid_credentials'),
-            ], HTTP_UNAUTHORIZED);
+            ], self::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -1815,7 +1815,7 @@ protected function _check_blacklist_auth()
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_denied'),
-            ], HTTP_UNAUTHORIZED);
+            ], self::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -1840,7 +1840,7 @@ protected function _check_whitelist_auth()
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_unauthorized'),
-            ], HTTP_UNAUTHORIZED);
+            ], self::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -1875,7 +1875,7 @@ protected function _force_login($nonce = '')
         $this->response([
             $this->config->item('rest_status_field_name')  => false,
             $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized'),
-        ], HTTP_UNAUTHORIZED);
+        ], self::HTTP_UNAUTHORIZED);
     }
 
     /**

From cb24641947accfa0bf0a9208073a780f300cccfe Mon Sep 17 00:00:00 2001
From: wandu-ar <adg@wandu.com.ar>
Date: Sun, 22 Dec 2019 08:36:11 -0300
Subject: [PATCH 319/354] Bug fix: Load config before call it

---
 src/RestController.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/RestController.php b/src/RestController.php
index 722575c5..2147f83b 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -258,15 +258,15 @@ public function __construct($config = 'rest')
         // when output is displayed for not damaging data accidentally
         $this->output->parse_exec_vars = false;
 
+        // Load the rest.php configuration file
+        $this->get_local_config($config);
+
         // Log the loading time to the log table
         if ($this->config->item('rest_enable_logging') === true) {
             // Start the timer for how long the request takes
             $this->_start_rtime = microtime(true);
         }
 
-        // Load the rest.php configuration file
-        $this->get_local_config($config);
-
         // Determine supported output formats from configuration
         $supported_formats = $this->config->item('rest_supported_formats');
 

From 98457e649b3dfa0887500f32e7e77408d9529cf1 Mon Sep 17 00:00:00 2001
From: Leandro Corsino <lcorsino@zettasys.com.ar>
Date: Sun, 12 Apr 2020 15:23:27 -0300
Subject: [PATCH 320/354] Fix valid_response on _prepare_digest_auth

---
 src/RestController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/RestController.php b/src/RestController.php
index 2147f83b..9a2711f1 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -1782,12 +1782,13 @@ protected function _prepare_digest_auth()
         $digest = (empty($matches[1]) || empty($matches[2])) ? [] : array_combine($matches[1], $matches[2]);
 
         // For digest authentication the library function should return already stored md5(username:restrealm:password) for that username see rest.php::auth_library_function config
-        if (isset($digest['username']) === false || $this->_check_login($digest['username'], true) === false) {
+        $username = $this->_check_login($digest['username'], true);
+        if (isset($digest['username']) === false || $username === false) {
             $this->_force_login($unique_id);
         }
 
         $md5 = md5(strtoupper($this->request->method).':'.$digest['uri']);
-        $valid_response = md5($digest['username'].':'.$digest['nonce'].':'.$digest['nc'].':'.$digest['cnonce'].':'.$digest['qop'].':'.$md5);
+        $valid_response = md5($username.':'.$digest['nonce'].':'.$digest['nc'].':'.$digest['cnonce'].':'.$digest['qop'].':'.$md5);
 
         // Check if the string don't compare (case-insensitive)
         if (strcasecmp($digest['response'], $valid_response) !== 0) {

From 750b92820a1408b31bff4812207396c92f977ac8 Mon Sep 17 00:00:00 2001
From: =W530 Lenovo Cmder Vendor Git <=w530.lenovo@ericariyanto.com>
Date: Mon, 23 Mar 2020 22:45:38 +0700
Subject: [PATCH 321/354] ^ Fix Bugs - failed load custom rest config - failed
 access constant HTTP return code

---
 src/RestController.php | 38 +++++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/RestController.php b/src/RestController.php
index 9a2711f1..09ca48f0 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -258,15 +258,15 @@ public function __construct($config = 'rest')
         // when output is displayed for not damaging data accidentally
         $this->output->parse_exec_vars = false;
 
-        // Load the rest.php configuration file
-        $this->get_local_config($config);
-
         // Log the loading time to the log table
         if ($this->config->item('rest_enable_logging') === true) {
             // Start the timer for how long the request takes
             $this->_start_rtime = microtime(true);
         }
 
+        // Load the rest.php configuration file
+        $this->get_local_config($config);
+
         // Determine supported output formats from configuration
         $supported_formats = $this->config->item('rest_supported_formats');
 
@@ -443,11 +443,15 @@ private function do_auth($method = false)
      */
     private function get_local_config($config_file)
     {
-        if (!$this->load->config($config_file, false)) {
-            $config = [];
-            include __DIR__.'/'.$config_file.'.php';
-            foreach ($config as $key => $value) {
-                $this->config->set_item($key, $value);
+        if ( file_exists(APPPATH . 'config/' . $config_file . '.php') ) {
+            $this->load->config($config_file, false);
+        } else {
+            if ( file_exists(__DIR__.'/'.$config_file.'.php') ) {
+                $config = [];
+                include __DIR__.'/'.$config_file.'.php';
+                foreach ($config as $key => $value) {
+                    $this->config->set_item($key, $value);
+                }
             }
         }
     }
@@ -540,7 +544,7 @@ public function _remap($object_called, $arguments = [])
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unknown_method'),
-            ], self::HTTP_METHOD_NOT_ALLOWED);
+            ], $this->http_status['METHOD_NOT_ALLOWED']);
         }
 
         // Doing key related stuff? Can only do it if they have a key right?
@@ -619,7 +623,7 @@ public function response($data = null, $http_code = null, $continue = false)
 
             // If data is NULL and no HTTP status code provided, then display, error and exit
             if ($data === null && $http_code === null) {
-                $http_code = self::HTTP_NOT_FOUND;
+                $http_code = HTTP_NOT_FOUND;
             }
 
             // If data is not NULL and a HTTP status code provided, then continue
@@ -657,7 +661,7 @@ public function response($data = null, $http_code = null, $continue = false)
             // If not greater than zero, then set the HTTP status code as 200 by default
             // Though perhaps 500 should be set instead, for the developer not passing a
             // correct HTTP status code
-            $http_code > 0 || $http_code = self::HTTP_OK;
+            $http_code > 0 || $http_code = HTTP_OK;
 
             $this->output->set_status_header($http_code);
 
@@ -1537,7 +1541,7 @@ protected function _perform_ldap_auth($username = '', $password = null)
             'basedn'  => $this->config->item('basedn', 'ldap'),
         ];
 
-        log_message('debug', 'LDAP Auth: Connect to '.(isset($ldap['host']) ? $ldap['host'] : '[ldap not configured]'));
+        log_message('debug', 'LDAP Auth: Connect to '.(isset($ldaphost) ? $ldaphost : '[ldap not configured]'));
 
         // Connect to the ldap server
         $ldapconn = ldap_connect($ldap['host'], $ldap['port']);
@@ -1711,7 +1715,7 @@ protected function _check_php_session()
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized'),
-            ], self::HTTP_UNAUTHORIZED);
+            ], $this->http_status['UNAUTHORIZED']);
         }
     }
 
@@ -1796,7 +1800,7 @@ protected function _prepare_digest_auth()
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_invalid_credentials'),
-            ], self::HTTP_UNAUTHORIZED);
+            ], $this->http_status['UNAUTHORIZED']);
         }
     }
 
@@ -1816,7 +1820,7 @@ protected function _check_blacklist_auth()
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_denied'),
-            ], self::HTTP_UNAUTHORIZED);
+            ], $this->http_status['UNAUTHORIZED']);
         }
     }
 
@@ -1841,7 +1845,7 @@ protected function _check_whitelist_auth()
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_unauthorized'),
-            ], self::HTTP_UNAUTHORIZED);
+            ], $this->http_status['UNAUTHORIZED']);
         }
     }
 
@@ -1876,7 +1880,7 @@ protected function _force_login($nonce = '')
         $this->response([
             $this->config->item('rest_status_field_name')  => false,
             $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized'),
-        ], self::HTTP_UNAUTHORIZED);
+        ], $this->http_status['UNAUTHORIZED']);
     }
 
     /**

From c726a496c0d72f05cf05cf9193fcd44590fe5e5c Mon Sep 17 00:00:00 2001
From: Moch Zawaruddin Abdullah <zawaruddin@users.noreply.github.com>
Date: Tue, 18 Feb 2020 22:37:16 +0700
Subject: [PATCH 322/354] maybe "auth" is a folder than prefix-file

---
 src/RestController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/RestController.php b/src/RestController.php
index 09ca48f0..cfc80fb5 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -433,8 +433,8 @@ private function do_auth($method = false)
             return true;
         }
 
-        if (file_exists(__DIR__.'/auth-'.$method.'.php')) {
-            include __DIR__.'/auth-'.$method.'.php';
+        if (file_exists(__DIR__.'/auth/'.$method.'.php')) {
+            include __DIR__.'/auth/'.$method.'.php';
         }
     }
 

From 4f0777c5231a7a13d3f884e0e2d08ae51bffea71 Mon Sep 17 00:00:00 2001
From: krishna0102 <krishnaitbpl@gmail.com>
Date: Fri, 20 Dec 2019 18:00:30 +0530
Subject: [PATCH 323/354] For fixing use of undefined constant issue

---
 src/RestController.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/RestController.php b/src/RestController.php
index cfc80fb5..fe250e3c 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -32,6 +32,11 @@ class RestController extends \CI_Controller
      */
     protected $methods = [];
 
+    /**
+     * Defines https status
+     */
+    protected $http_status = [];
+
     /**
      * List of allowed HTTP methods.
      *
@@ -218,7 +223,6 @@ class RestController extends \CI_Controller
     const HTTP_UNAUTHORIZED = 401;
     const HTTP_FORBIDDEN = 403;
     const HTTP_NOT_FOUND = 404;
-    const HTTP_METHOD_NOT_ALLOWED = 405;
     const HTTP_NOT_ACCEPTABLE = 406;
     const HTTP_INTERNAL_ERROR = 500;
 
@@ -623,7 +627,7 @@ public function response($data = null, $http_code = null, $continue = false)
 
             // If data is NULL and no HTTP status code provided, then display, error and exit
             if ($data === null && $http_code === null) {
-                $http_code = HTTP_NOT_FOUND;
+                $http_code = self::HTTP_NOT_FOUND;
             }
 
             // If data is not NULL and a HTTP status code provided, then continue
@@ -661,7 +665,7 @@ public function response($data = null, $http_code = null, $continue = false)
             // If not greater than zero, then set the HTTP status code as 200 by default
             // Though perhaps 500 should be set instead, for the developer not passing a
             // correct HTTP status code
-            $http_code > 0 || $http_code = HTTP_OK;
+            $http_code > 0 || $http_code = self::HTTP_OK;
 
             $this->output->set_status_header($http_code);
 

From 88a63ccd8a1dec23e1373c0a2a8a7658d44600e2 Mon Sep 17 00:00:00 2001
From: Syaiful Huda <49975659+hudamida@users.noreply.github.com>
Date: Thu, 23 Apr 2020 10:03:46 +0700
Subject: [PATCH 324/354] Update RestController.php

It looks like the _check_php_session function needs a Codeigniter session library.
---
 src/RestController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/RestController.php b/src/RestController.php
index fe250e3c..ba82b731 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -1709,6 +1709,9 @@ protected function _check_php_session()
         if ($this->config->item('rest_ip_whitelist_enabled')) {
             $this->_check_whitelist_auth();
         }
+        
+        // Load library session of CodeIgniter
+        $this->load->library('session');
 
         // Get the auth_source config item
         $key = $this->config->item('auth_source');

From becfe9b44b6239d12663feafd13cbf6dc2d80c40 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@users.noreply.github.com>
Date: Wed, 6 May 2020 17:27:48 -0500
Subject: [PATCH 325/354] Delete FUNDING.yml

---
 .github/FUNDING.yml | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
deleted file mode 100644
index a7b75f10..00000000
--- a/.github/FUNDING.yml
+++ /dev/null
@@ -1 +0,0 @@
-github: chriskacerguis
\ No newline at end of file

From b1c15aa13b803bc01e2df1f5d5271190c95386c3 Mon Sep 17 00:00:00 2001
From: leanec <lcorsino@zettasys.com.ar>
Date: Wed, 15 Apr 2020 11:11:42 -0300
Subject: [PATCH 326/354] Restoring deleted fixes

---
 src/RestController.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/RestController.php b/src/RestController.php
index ba82b731..0127f49e 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -262,15 +262,15 @@ public function __construct($config = 'rest')
         // when output is displayed for not damaging data accidentally
         $this->output->parse_exec_vars = false;
 
+        // Load the rest.php configuration file
+        $this->get_local_config($config);
+
         // Log the loading time to the log table
         if ($this->config->item('rest_enable_logging') === true) {
             // Start the timer for how long the request takes
             $this->_start_rtime = microtime(true);
         }
 
-        // Load the rest.php configuration file
-        $this->get_local_config($config);
-
         // Determine supported output formats from configuration
         $supported_formats = $this->config->item('rest_supported_formats');
 
@@ -548,7 +548,7 @@ public function _remap($object_called, $arguments = [])
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unknown_method'),
-            ], $this->http_status['METHOD_NOT_ALLOWED']);
+            ], self::HTTP_METHOD_NOT_ALLOWED);
         }
 
         // Doing key related stuff? Can only do it if they have a key right?
@@ -1545,7 +1545,7 @@ protected function _perform_ldap_auth($username = '', $password = null)
             'basedn'  => $this->config->item('basedn', 'ldap'),
         ];
 
-        log_message('debug', 'LDAP Auth: Connect to '.(isset($ldaphost) ? $ldaphost : '[ldap not configured]'));
+        log_message('debug', 'LDAP Auth: Connect to '.(isset($ldap['host']) ? $ldap['host'] : '[ldap not configured]'));
 
         // Connect to the ldap server
         $ldapconn = ldap_connect($ldap['host'], $ldap['port']);
@@ -1722,7 +1722,7 @@ protected function _check_php_session()
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized'),
-            ], $this->http_status['UNAUTHORIZED']);
+            ], self::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -1807,7 +1807,7 @@ protected function _prepare_digest_auth()
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_invalid_credentials'),
-            ], $this->http_status['UNAUTHORIZED']);
+            ], self::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -1827,7 +1827,7 @@ protected function _check_blacklist_auth()
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_denied'),
-            ], $this->http_status['UNAUTHORIZED']);
+            ], self::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -1852,7 +1852,7 @@ protected function _check_whitelist_auth()
             $this->response([
                 $this->config->item('rest_status_field_name')  => false,
                 $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_ip_unauthorized'),
-            ], $this->http_status['UNAUTHORIZED']);
+            ], self::HTTP_UNAUTHORIZED);
         }
     }
 
@@ -1887,7 +1887,7 @@ protected function _force_login($nonce = '')
         $this->response([
             $this->config->item('rest_status_field_name')  => false,
             $this->config->item('rest_message_field_name') => $this->lang->line('text_rest_unauthorized'),
-        ], $this->http_status['UNAUTHORIZED']);
+        ], self::HTTP_UNAUTHORIZED);
     }
 
     /**

From 49e02df8effae4d37c721b809c46c034d4323ebb Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@users.noreply.github.com>
Date: Sat, 15 Aug 2020 13:34:52 -0500
Subject: [PATCH 327/354] Create stale.yml

---
 .github/workflows/stale.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/workflows/stale.yml

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
new file mode 100644
index 00000000..34045177
--- /dev/null
+++ b/.github/workflows/stale.yml
@@ -0,0 +1,19 @@
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: "30 1 * * *"
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/stale@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'Stale issue message'
+        stale-pr-message: 'Stale pull request message'
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'

From 65828c3556a012a94d90f514ac812317a2130fe8 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@gmail.com>
Date: Sat, 15 Aug 2020 13:37:26 -0500
Subject: [PATCH 328/354] fixes #1099

---
 src/RestController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/RestController.php b/src/RestController.php
index 0127f49e..6e433378 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -223,6 +223,7 @@ class RestController extends \CI_Controller
     const HTTP_UNAUTHORIZED = 401;
     const HTTP_FORBIDDEN = 403;
     const HTTP_NOT_FOUND = 404;
+    const HTTP_METHOD_NOT_ALLOWED = 405;
     const HTTP_NOT_ACCEPTABLE = 406;
     const HTTP_INTERNAL_ERROR = 500;
 

From 0f683ff9579500f1f5a17a8e781ca10c2f27d522 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@users.noreply.github.com>
Date: Sat, 15 Aug 2020 13:45:47 -0500
Subject: [PATCH 329/354] Update issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md | 38 ++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 00000000..b2676296
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior, or a code snippet (properly formatted):
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

From 6e3335c6a08b2320c810530cfbc08b8380413447 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@users.noreply.github.com>
Date: Sat, 15 Aug 2020 13:49:23 -0500
Subject: [PATCH 330/354] Update bug_report.md

---
 .github/ISSUE_TEMPLATE/bug_report.md | 29 +++++++++++++---------------
 1 file changed, 13 insertions(+), 16 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index b2676296..34ee3d3c 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -11,27 +11,24 @@ assignees: ''
 A clear and concise description of what the bug is.
 
 **To Reproduce**
-Steps to reproduce the behavior, or a code snippet (properly formatted):
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
+Please provide either a cleanly formatted code snippet or a link to repo / gist with code that I can use to reproduce:
+
+```php
+    public function set_response($data = null, $http_code = null)
+    {
+        $this->response($data, $http_code, true);
+    }
+```
 
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+**Screenshots / Error Messages**
+If applicable, add screenshots and/or error messages to help explain your problem.
 
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
+**Environment (please complete the following information):**
+ - PHP Version: [e.g. 7.2.1]
+ - CodeIgniter Version [e.g. 4.0.1]
  - Version [e.g. 22]
 
 **Additional context**

From f05eafea520633028bcae9a6c12fe45463b7ee5a Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@users.noreply.github.com>
Date: Sat, 15 Aug 2020 19:00:21 +0000
Subject: [PATCH 331/354] Apply fixes from StyleCI

---
 src/RestController.php | 59 +++++++++++++++++++++++++-----------------
 src/rest.php           | 22 ++++++++--------
 2 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/src/RestController.php b/src/RestController.php
index 6e433378..078cf535 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -33,7 +33,7 @@ class RestController extends \CI_Controller
     protected $methods = [];
 
     /**
-     * Defines https status
+     * Defines https status.
      */
     protected $http_status = [];
 
@@ -448,10 +448,10 @@ private function do_auth($method = false)
      */
     private function get_local_config($config_file)
     {
-        if ( file_exists(APPPATH . 'config/' . $config_file . '.php') ) {
+        if (file_exists(APPPATH.'config/'.$config_file.'.php')) {
             $this->load->config($config_file, false);
         } else {
-            if ( file_exists(__DIR__.'/'.$config_file.'.php') ) {
+            if (file_exists(__DIR__.'/'.$config_file.'.php')) {
                 $config = [];
                 include __DIR__.'/'.$config_file.'.php';
                 foreach ($config as $key => $value) {
@@ -951,15 +951,17 @@ protected function _log_request($authorized = false)
         // Insert the request into the log table
         $is_inserted = $this->rest->db
             ->insert(
-                $this->config->item('rest_logs_table'), [
-                'uri'        => $this->uri->uri_string(),
-                'method'     => $this->request->method,
-                'params'     => $this->_args ? ($this->config->item('rest_logs_json_params') === true ? json_encode($this->_args) : serialize($this->_args)) : null,
-                'api_key'    => isset($this->rest->key) ? $this->rest->key : '',
-                'ip_address' => $this->input->ip_address(),
-                'time'       => time(),
-                'authorized' => $authorized,
-            ]);
+                $this->config->item('rest_logs_table'),
+                [
+                    'uri'        => $this->uri->uri_string(),
+                    'method'     => $this->request->method,
+                    'params'     => $this->_args ? ($this->config->item('rest_logs_json_params') === true ? json_encode($this->_args) : serialize($this->_args)) : null,
+                    'api_key'    => isset($this->rest->key) ? $this->rest->key : '',
+                    'ip_address' => $this->input->ip_address(),
+                    'time'       => time(),
+                    'authorized' => $authorized,
+                ]
+            );
 
         // Get the last insert id to update at a later stage of the request
         $this->_insert_id = $this->rest->db->insert_id();
@@ -1710,7 +1712,7 @@ protected function _check_php_session()
         if ($this->config->item('rest_ip_whitelist_enabled')) {
             $this->_check_whitelist_auth();
         }
-        
+
         // Load library session of CodeIgniter
         $this->load->library('session');
 
@@ -1877,7 +1879,8 @@ protected function _force_login($nonce = '')
             header(
                 'WWW-Authenticate: Digest realm="'.$rest_realm
                 .'", qop="auth", nonce="'.$nonce
-                .'", opaque="'.md5($rest_realm).'"');
+                .'", opaque="'.md5($rest_realm).'"'
+            );
         }
 
         if ($this->config->item('strict_api_and_auth') === true) {
@@ -1907,9 +1910,12 @@ protected function _log_access_time()
         $payload['rtime'] = $this->_end_rtime - $this->_start_rtime;
 
         return $this->rest->db->update(
-            $this->config->item('rest_logs_table'), $payload, [
-            'id' => $this->_insert_id,
-        ]);
+            $this->config->item('rest_logs_table'),
+            $payload,
+            [
+                'id' => $this->_insert_id,
+            ]
+        );
     }
 
     /**
@@ -1930,9 +1936,12 @@ protected function _log_response_code($http_code)
         $payload['response_code'] = $http_code;
 
         return $this->rest->db->update(
-            $this->config->item('rest_logs_table'), $payload, [
-            'id' => $this->_insert_id,
-        ]);
+            $this->config->item('rest_logs_table'),
+            $payload,
+            [
+                'id' => $this->_insert_id,
+            ]
+        );
     }
 
     /**
@@ -1949,10 +1958,12 @@ protected function _check_access()
 
         // Fetch controller based on path and controller name
         $controller = implode(
-            '/', [
-            $this->router->directory,
-            $this->router->class,
-        ]);
+            '/',
+            [
+                $this->router->directory,
+                $this->router->class,
+            ]
+        );
 
         // Remove any double slashes for safety
         $controller = str_replace('//', '/', $controller);
diff --git a/src/rest.php b/src/rest.php
index 887141c6..d58d7ce1 100644
--- a/src/rest.php
+++ b/src/rest.php
@@ -556,11 +556,11 @@
 |
 */
 $config['allowed_cors_headers'] = [
-  'Origin',
-  'X-Requested-With',
-  'Content-Type',
-  'Accept',
-  'Access-Control-Request-Method',
+    'Origin',
+    'X-Requested-With',
+    'Content-Type',
+    'Accept',
+    'Access-Control-Request-Method',
 ];
 
 /*
@@ -572,12 +572,12 @@
 |
 */
 $config['allowed_cors_methods'] = [
-  'GET',
-  'POST',
-  'OPTIONS',
-  'PUT',
-  'PATCH',
-  'DELETE',
+    'GET',
+    'POST',
+    'OPTIONS',
+    'PUT',
+    'PATCH',
+    'DELETE',
 ];
 
 /*

From 24eab8a5231608cd1fc89c17e90e2e432a23d410 Mon Sep 17 00:00:00 2001
From: Kobus Myburgh <kobus.myburgh@impero.co.za>
Date: Sat, 19 Sep 2020 01:20:19 +0200
Subject: [PATCH 332/354] Attempt to fix issue 1069 - XSS filtering

---
 src/RestController.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/RestController.php b/src/RestController.php
index 078cf535..879c8998 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -1411,6 +1411,9 @@ public function head($key = null, $xss_clean = null)
     public function post($key = null, $xss_clean = null)
     {
         if ($key === null) {
+            foreach (new RecursiveIteratorIterator(new RecursiveArrayIterator($this->_post_args), RecursiveIteratorIterator::CATCH_GET_CHILD) as $key => $value) {
+                $this->_post_args[$key] = $this->_xss_clean($this->_post_args[$key], $xss_clean);
+            }
             return $this->_post_args;
         }
 

From 399d9bcefabf19242260581aa12bcd6245b6b5e3 Mon Sep 17 00:00:00 2001
From: Kobus Myburgh <kobus.myburgh@impero.co.za>
Date: Sat, 19 Sep 2020 01:26:38 +0200
Subject: [PATCH 333/354] Added new line, as per CI error.

---
 src/RestController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/RestController.php b/src/RestController.php
index 879c8998..a5ac91f7 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -1414,6 +1414,7 @@ public function post($key = null, $xss_clean = null)
             foreach (new RecursiveIteratorIterator(new RecursiveArrayIterator($this->_post_args), RecursiveIteratorIterator::CATCH_GET_CHILD) as $key => $value) {
                 $this->_post_args[$key] = $this->_xss_clean($this->_post_args[$key], $xss_clean);
             }
+
             return $this->_post_args;
         }
 

From 949d5ad8b35962d74bd8510a9d429c9b43e19cd6 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@users.noreply.github.com>
Date: Sun, 28 Feb 2021 09:33:53 -0600
Subject: [PATCH 334/354] Update RestController.php

fixes #1115
---
 src/RestController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/RestController.php b/src/RestController.php
index a5ac91f7..83d9f2d2 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -11,7 +11,7 @@
  * CodeIgniter Rest Controller
  * A fully RESTful server implementation for CodeIgniter using one library, one config file and one controller.
  *
- * @link            https://github.com/chriskacerguis/ci-restserver
+ * @link            https://github.com/chriskacerguis/codeigniter-restserver
  *
  * @version         4.0.0
  */

From 99d996275ebc323a00f35a4ab004f18c2f48be3d Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chriskacerguis@users.noreply.github.com>
Date: Sun, 28 Feb 2021 09:35:11 -0600
Subject: [PATCH 335/354] Update stale.yml

---
 .github/workflows/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 34045177..0a753df8 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -13,7 +13,7 @@ jobs:
     - uses: actions/stale@v1
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'Stale issue message'
+        stale-issue-message: 'There has been no activity on this issue, so it will be closed.'
         stale-pr-message: 'Stale pull request message'
         stale-issue-label: 'no-issue-activity'
         stale-pr-label: 'no-pr-activity'

From 4c5b88b08f10089a1b939e484c8f26e067c04dda Mon Sep 17 00:00:00 2001
From: Jamie Burchell <jamieburchell@users.noreply.github.com>
Date: Thu, 3 Feb 2022 10:11:19 +0000
Subject: [PATCH 336/354] Fix RecursiveIteratorIterator not found

Fixes https://github.com/chriskacerguis/codeigniter-restserver/issues/1111
---
 src/RestController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/RestController.php b/src/RestController.php
index 83d9f2d2..b8f36c71 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -4,6 +4,7 @@
 
 use Exception;
 use stdClass;
+use RecursiveIteratorIterator;
 
 defined('BASEPATH') or exit('No direct script access allowed');
 

From c01570892b25bf87c49a92c8889be20c3813bfd0 Mon Sep 17 00:00:00 2001
From: Jamie Burchell <jamieburchell@users.noreply.github.com>
Date: Thu, 3 Feb 2022 10:12:51 +0000
Subject: [PATCH 337/354] Fix code style

---
 src/RestController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/RestController.php b/src/RestController.php
index b8f36c71..765f0598 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -3,8 +3,8 @@
 namespace chriskacerguis\RestServer;
 
 use Exception;
-use stdClass;
 use RecursiveIteratorIterator;
+use stdClass;
 
 defined('BASEPATH') or exit('No direct script access allowed');
 

From 4571473e69fc830176cdd132938f5b8d25bea511 Mon Sep 17 00:00:00 2001
From: Jamie Burchell <jamieburchell@users.noreply.github.com>
Date: Thu, 3 Feb 2022 10:15:29 +0000
Subject: [PATCH 338/354] Fix RecursiveArrayIterator not found

---
 src/RestController.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/RestController.php b/src/RestController.php
index 765f0598..9ab38913 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -3,6 +3,7 @@
 namespace chriskacerguis\RestServer;
 
 use Exception;
+use RecursiveArrayIterator;
 use RecursiveIteratorIterator;
 use stdClass;
 

From f386f4e0013daadaa213681a0a41af69aa81d9de Mon Sep 17 00:00:00 2001
From: Jamie Burchell <jamieburchell@users.noreply.github.com>
Date: Wed, 23 Feb 2022 14:52:03 +0000
Subject: [PATCH 339/354] Don't attempt to lowercase a NULL

Fixes PHP 8.1 deprecation notice when trying to `strtolower` `NULL`
---
 src/RestController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/RestController.php b/src/RestController.php
index 9ab38913..0e0aa4bc 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -834,7 +834,9 @@ protected function _detect_method()
                 $method = $this->input->server('HTTP_X_HTTP_METHOD_OVERRIDE');
             }
 
-            $method = strtolower($method);
+            if ($method !== null) {
+                $method = strtolower($method);
+            }
         }
 
         if (empty($method)) {

From 2e1cbd347625cb489776528696f7980984e9b7f5 Mon Sep 17 00:00:00 2001
From: alex-monte <61494531+alex-monte@users.noreply.github.com>
Date: Fri, 21 Apr 2023 14:16:18 +0200
Subject: [PATCH 340/354] Update RestController.php

I propose this simple change so that in case $row is false, the message 'text_rest_invalid_api_key' has the information in '$this->rest->key' to display it correctly.
---
 src/RestController.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/RestController.php b/src/RestController.php
index 0e0aa4bc..ab46a570 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -867,12 +867,13 @@ 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))) {
+
+            $this->rest->key = $key;
+
             if (!($row = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row())) {
                 return false;
             }
 
-            $this->rest->key = $row->{$this->config->item('rest_key_column')};
-
             isset($row->user_id) && $this->rest->user_id = $row->user_id;
             isset($row->level) && $this->rest->level = $row->level;
             isset($row->ignore_limits) && $this->rest->ignore_limits = $row->ignore_limits;

From a16bdd648db2fa2cb3c386e7bb9b06d3ddb73fb9 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <chris@plainrock.com>
Date: Tue, 2 May 2023 11:16:52 -0500
Subject: [PATCH 341/354] Update README.md

---
 README.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/README.md b/README.md
index f7f4e305..2078f9fd 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,12 @@
 
 A fully RESTful server implementation for CodeIgniter using one library, one config file and one controller.
 
+## Important!!
+
+CodeIgniter 4 includes REST support out of the box and therefore does not require the RestServer.
+
+See the documentation here: [RESTful Resource Handling](https://codeigniter4.github.io/userguide/incoming/restful.html)
+
 ## Requirements
 
 - PHP 7.2 or greater

From f36aa04e1d31ff83d447b170cef31ffb557ff0c3 Mon Sep 17 00:00:00 2001
From: tenzap <fabstz-it@yahoo.fr>
Date: Tue, 20 Jun 2023 12:35:39 +0200
Subject: [PATCH 342/354] add SQL CREATE TABLE queries for PostgreSQL

---
 src/rest.php | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)

diff --git a/src/rest.php b/src/rest.php
index d58d7ce1..b4cc7984 100644
--- a/src/rest.php
+++ b/src/rest.php
@@ -322,6 +322,19 @@
 |       PRIMARY KEY (`id`)
 |   ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 |
+| For PostgreSQL
+|   CREATE TABLE keys (
+|       id SERIAL,
+|       user_id INT NOT NULL,
+|       key VARCHAR(40) NOT NULL,
+|       level INT NOT NULL,
+|       ignore_limits SMALLINT NOT NULL DEFAULT '0',
+|       is_private_key SMALLINT NOT NULL DEFAULT '0',
+|       ip_addresses TEXT NULL DEFAULT NULL,
+|       date_created INT NOT NULL,
+|       PRIMARY KEY (id)
+|   ) ;
+|  |
 */
 $config['rest_enable_keys'] = false;
 
@@ -402,6 +415,20 @@
 |       PRIMARY KEY (`id`)
 |   ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 |
+| For PostgreSQL
+|   CREATE TABLE logs (
+|       id SERIAL,
+|       uri VARCHAR(255) NOT NULL,
+|       method VARCHAR(6) NOT NULL,
+|       params TEXT DEFAULT NULL,
+|       api_key VARCHAR(40) NOT NULL,
+|       ip_address VARCHAR(45) NOT NULL,
+|       time INT NOT NULL,
+|       rtime DOUBLE PRECISION DEFAULT NULL,
+|       authorized boolean NOT NULL,
+|       response_code smallint DEFAULT '0',
+|       PRIMARY KEY (id)
+|   ) ;
 */
 $config['rest_enable_logging'] = false;
 
@@ -435,6 +462,31 @@
 |       PRIMARY KEY (`id`)
 |    ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 |
+| For PostgreSQL
+|   CREATE TABLE access (
+|       id SERIAL,
+|       key VARCHAR(40) NOT NULL DEFAULT '',
+|       all_access SMALLINT NOT NULL DEFAULT '0',
+|       controller VARCHAR(50) NOT NULL DEFAULT '',
+|       date_created TIMESTAMP(0) DEFAULT NULL,
+|       date_modified TIMESTAMP(0) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+|       PRIMARY KEY (id)
+|    ) ;
+|    CREATE OR REPLACE FUNCTION upd_timestamp() RETURNS TRIGGER
+|    LANGUAGE plpgsql
+|    AS
+|    $$
+|    BEGIN
+|        NEW.modified = CURRENT_TIMESTAMP;
+|        RETURN NEW;
+|    END;
+|    $$;
+|    CREATE TRIGGER trigger_access
+|      BEFORE UPDATE
+|      ON access
+|      FOR EACH ROW
+|      EXECUTE PROCEDURE upd_timestamp();
+|
 */
 $config['rest_enable_access'] = false;
 
@@ -479,6 +531,16 @@
 |       PRIMARY KEY (`id`)
 |   ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 |
+| For PostgreSQL
+|   CREATE TABLE limits (
+|       id SERIAL,
+|       uri VARCHAR(255) NOT NULL,
+|       count INT NOT NULL,
+|       hour_started INT NOT NULL,
+|       api_key VARCHAR(40) NOT NULL,
+|       PRIMARY KEY (id)
+|   ) ;
+|
 | To specify the limits within the controller's __construct() method, add per-method
 | limits with:
 |

From 57b74957b95e0f1b2cd85d1adf6607b11ab3eda2 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <2414647+chriskacerguis@users.noreply.github.com>
Date: Sat, 29 Jul 2023 13:14:25 -0500
Subject: [PATCH 343/354] Updated to MIT license

---
 src/Format.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Format.php b/src/Format.php
index ce5b2de6..d2058634 100644
--- a/src/Format.php
+++ b/src/Format.php
@@ -11,7 +11,7 @@
  * Help convert between various formats such as XML, JSON, CSV, etc.
  *
  * @author    Phil Sturgeon, Chris Kacerguis, @softwarespot
- * @license   http://www.dbad-license.org/
+ * @license   MIT (See LICENSE)
  */
 class Format
 {

From 63c5ccad5581c3e0035c400aa929ba1ef0822418 Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Sat, 29 Jul 2023 18:18:03 +0000
Subject: [PATCH 344/354] Apply fixes from StyleCI

---
 src/Format.php         | 1 -
 src/RestController.php | 5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Format.php b/src/Format.php
index d2058634..54dc4c46 100644
--- a/src/Format.php
+++ b/src/Format.php
@@ -183,7 +183,6 @@ public function to_xml($data = null, $structure = null, $basenode = 'xml')
         }
 
         foreach ($data as $key => $value) {
-
             //change false/true to 0/1
             if (is_bool($value)) {
                 $value = (int) $value;
diff --git a/src/RestController.php b/src/RestController.php
index ab46a570..09f37163 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -697,7 +697,7 @@ public function response($data = null, $http_code = null, $continue = false)
                 }
             }
             ob_end_flush();
-        // Otherwise dump the output automatically
+            // Otherwise dump the output automatically
         } else {
             echo json_encode($data);
         }
@@ -866,8 +866,7 @@ protected function _detect_api_key()
         $this->rest->ignore_limits = false;
 
         // 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 ($key = isset($this->_args[$api_key_variable]) ? $this->_args[$api_key_variable] : $this->input->server($key_name)) {
             $this->rest->key = $key;
 
             if (!($row = $this->rest->db->where($this->config->item('rest_key_column'), $key)->get($this->config->item('rest_keys_table'))->row())) {

From 94c779f0f995fddedb00b703ac1e3682c71574fe Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <2414647+chriskacerguis@users.noreply.github.com>
Date: Sat, 29 Jul 2023 13:23:44 -0500
Subject: [PATCH 345/354] Delete stale.yml

---
 .github/workflows/stale.yml | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 .github/workflows/stale.yml

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
deleted file mode 100644
index 0a753df8..00000000
--- a/.github/workflows/stale.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Mark stale issues and pull requests
-
-on:
-  schedule:
-  - cron: "30 1 * * *"
-
-jobs:
-  stale:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/stale@v1
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'There has been no activity on this issue, so it will be closed.'
-        stale-pr-message: 'Stale pull request message'
-        stale-issue-label: 'no-issue-activity'
-        stale-pr-label: 'no-pr-activity'

From bdf3548de32dc7305de6b93a47c6adb5c99c9878 Mon Sep 17 00:00:00 2001
From: Ivan Peevski <133036+ipeevski@users.noreply.github.com>
Date: Wed, 11 Sep 2024 09:32:43 +0930
Subject: [PATCH 346/354] Fix handling null in to_xml()

---
 src/Format.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Format.php b/src/Format.php
index 54dc4c46..4c55a430 100644
--- a/src/Format.php
+++ b/src/Format.php
@@ -215,7 +215,7 @@ public function to_xml($data = null, $structure = null, $basenode = 'xml')
                 $this->to_xml($value, $node, $key);
             } else {
                 // add single node.
-                $value = htmlspecialchars(html_entity_decode($value, ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'UTF-8');
+                $value = htmlspecialchars(html_entity_decode($value ?? '', ENT_QUOTES, 'UTF-8'), ENT_QUOTES, 'UTF-8');
 
                 $structure->addChild($key, $value);
             }

From 548cc4161f86aefdab7059e9ef6b29745c7152eb Mon Sep 17 00:00:00 2001
From: StyleCI Bot <bot@styleci.io>
Date: Wed, 11 Sep 2024 00:05:07 +0000
Subject: [PATCH 347/354] Apply fixes from StyleCI

---
 src/RestController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/RestController.php b/src/RestController.php
index 09f37163..99a99148 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -697,7 +697,7 @@ public function response($data = null, $http_code = null, $continue = false)
                 }
             }
             ob_end_flush();
-            // Otherwise dump the output automatically
+        // Otherwise dump the output automatically
         } else {
             echo json_encode($data);
         }

From 8ab48d53ea542030dea71f96dfbd28a0ba6efb1a Mon Sep 17 00:00:00 2001
From: Ivan Peevski <ivan@personifycare.com>
Date: Wed, 11 Sep 2024 15:39:08 +0930
Subject: [PATCH 348/354] Allow extending Formatter class

---
 src/RestController.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/RestController.php b/src/RestController.php
index 99a99148..9c2c9b13 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -232,7 +232,7 @@ class RestController extends \CI_Controller
     /**
      * @var Format
      */
-    private $format;
+    protected $format;
 
     /**
      * @var bool
@@ -636,10 +636,17 @@ public function response($data = null, $http_code = null, $continue = false)
             // If data is not NULL and a HTTP status code provided, then continue
             elseif ($data !== null) {
                 // If the format method exists, call and return the output in that format
-                if (method_exists(Format::class, 'to_'.$this->response->format)) {
+                $formatter = null;
+                if ($this->format && method_exists($this->format, 'to_'.$this->response->format)) {
+                    $formatter = $this->format::factory($data);
+                } else if (method_exists(Format::class, 'to_'.$this->response->format)) {
+                    $formatter = Format::factory($data);
+                }
+
+                if ($formatter !== null) {
                     // CORB protection
                     // First, get the output content.
-                    $output = Format::factory($data)->{'to_'.$this->response->format}();
+                    $output = $formatter->{'to_'.$this->response->format}();
 
                     // Set the format header
                     // Then, check if the client asked for a callback, and if the output contains this callback :

From d0e5bd68cd5f704645b63fb79eafe520e596283a Mon Sep 17 00:00:00 2001
From: Ivan Peevski <ivan@personifycare.com>
Date: Wed, 11 Sep 2024 15:50:30 +0930
Subject: [PATCH 349/354] Fix style

---
 src/RestController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/RestController.php b/src/RestController.php
index 9c2c9b13..c5fddefb 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -639,7 +639,7 @@ public function response($data = null, $http_code = null, $continue = false)
                 $formatter = null;
                 if ($this->format && method_exists($this->format, 'to_'.$this->response->format)) {
                     $formatter = $this->format::factory($data);
-                } else if (method_exists(Format::class, 'to_'.$this->response->format)) {
+                } elseif (method_exists(Format::class, 'to_'.$this->response->format)) {
                     $formatter = Format::factory($data);
                 }
 

From 70bcd18e590df90b33949153455695ac8a6e2bd7 Mon Sep 17 00:00:00 2001
From: Ivan Peevski <ivan@personifycare.com>
Date: Tue, 17 Sep 2024 11:36:09 +0930
Subject: [PATCH 350/354] Update Readme file to add example for extending
 Format

---
 README.md | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/README.md b/README.md
index 2078f9fd..0390fcff 100644
--- a/README.md
+++ b/README.md
@@ -114,3 +114,56 @@ class Api extends RestController {
     }
 }
 ```
+
+## Extending supported formats
+
+If you need to be able to support more formats for replies, you can extend the
+`Format` class to add the required `to_...` methods
+
+1. Extend the `RestController` class (in `libraries/MY_REST_Controller.php`)
+```php
+<?php
+
+use chriskacerguis\RestServer\RestController;
+
+class MY_REST_Controller extends RestController
+{
+    public function __construct()
+    {
+        parent::__construct();
+        // This can be the library's chriskacerguis\RestServer\Format
+        // or your own custom overloaded Format class (see bellow)
+        $this->format = new Format();
+    }
+}
+```
+
+2. Extend the `Format` class (can be created as a CodeIgniter library in `libraries/Format.php`).
+Following is an example to add support for PDF output
+
+```php
+<?php
+
+use chriskacerguis\RestServer\Format as RestServerFormat;
+
+class Format extends RestServerFormat
+{
+    public function to_pdf($data = null)
+    {
+        if ($data === null && func_num_args() === 0) {
+            $data = $this->_data;
+        }
+
+        if (is_array($data) || substr($data, 0, 4) != '%PDF') {
+            $html = $this->to_html($data);
+
+            // Use your PDF lib of choice. For example mpdf
+            $mpdf = new \Mpdf\Mpdf();
+            $mpdf->WriteHTML($html);
+            return $mpdf->Output('', 'S');
+        }
+
+        return $data;
+    }
+}
+```

From 05245888ae49dc97a34fafe1dd4ffa068c690f26 Mon Sep 17 00:00:00 2001
From: Ashton Smith <ashton.smith@ubteam.com>
Date: Thu, 21 Nov 2024 15:01:00 +1300
Subject: [PATCH 351/354] add support for expiring api keys

---
 src/RestController.php |  4 ++++
 src/rest.php           | 15 +++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/src/RestController.php b/src/RestController.php
index c5fddefb..3c7298c2 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -880,6 +880,10 @@ protected function _detect_api_key()
                 return false;
             }
 
+            if ($this->config->item('rest_keys_expire')===true && $row->{$this->config->item('rest_keys_expiry_column')} < time()) {
+                return false;
+            }
+
             isset($row->user_id) && $this->rest->user_id = $row->user_id;
             isset($row->level) && $this->rest->level = $row->level;
             isset($row->ignore_limits) && $this->rest->ignore_limits = $row->ignore_limits;
diff --git a/src/rest.php b/src/rest.php
index b4cc7984..28cd6ea8 100644
--- a/src/rest.php
+++ b/src/rest.php
@@ -319,6 +319,7 @@
 |       `is_private_key` TINYINT(1)  NOT NULL DEFAULT '0',
 |       `ip_addresses` TEXT NULL DEFAULT NULL,
 |       `date_created` INT(11) NOT NULL,
+|       `expires` INT(11) NOT NULL
 |       PRIMARY KEY (`id`)
 |   ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 |
@@ -332,6 +333,7 @@
 |       is_private_key SMALLINT NOT NULL DEFAULT '0',
 |       ip_addresses TEXT NULL DEFAULT NULL,
 |       date_created INT NOT NULL,
+|       expires INT NOT NULL,
 |       PRIMARY KEY (id)
 |   ) ;
 |  |
@@ -348,6 +350,19 @@
 |
 */
 $config['rest_key_column'] = 'key';
+/*
+|--------------------------------------------------------------------------
+| REST Table Key Expiry Config and Column Name
+|--------------------------------------------------------------------------
+|
+| Configure wether or not api keys should expire, and the column name to 
+| match e.g. expires
+| Note: the value in the column will be treated as a unix timestamp and 
+| compared with php function time()
+|
+*/
+$config['rest_keys_expire'] = false;
+$config['rest_keys_expiry_column'] = 'expires';
 
 /*
 |--------------------------------------------------------------------------

From 60b2009982b27ff29e7b7554d2de776519e4ca8e Mon Sep 17 00:00:00 2001
From: Ashton Smith <ashton.smith@ubteam.com>
Date: Thu, 21 Nov 2024 15:07:30 +1300
Subject: [PATCH 352/354] style fixes for #1159

---
 src/RestController.php | 2 +-
 src/rest.php           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/RestController.php b/src/RestController.php
index 3c7298c2..7f292a98 100644
--- a/src/RestController.php
+++ b/src/RestController.php
@@ -880,7 +880,7 @@ protected function _detect_api_key()
                 return false;
             }
 
-            if ($this->config->item('rest_keys_expire')===true && $row->{$this->config->item('rest_keys_expiry_column')} < time()) {
+            if ($this->config->item('rest_keys_expire') === true && $row->{$this->config->item('rest_keys_expiry_column')} < time()) {
                 return false;
             }
 
diff --git a/src/rest.php b/src/rest.php
index 28cd6ea8..7c8c4c9b 100644
--- a/src/rest.php
+++ b/src/rest.php
@@ -355,9 +355,9 @@
 | REST Table Key Expiry Config and Column Name
 |--------------------------------------------------------------------------
 |
-| Configure wether or not api keys should expire, and the column name to 
+| Configure wether or not api keys should expire, and the column name to
 | match e.g. expires
-| Note: the value in the column will be treated as a unix timestamp and 
+| Note: the value in the column will be treated as a unix timestamp and
 | compared with php function time()
 |
 */

From 55c1a5b099f581d2a3cabf5d9bd5887b175737f3 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <2414647+chriskacerguis@users.noreply.github.com>
Date: Thu, 25 Sep 2025 08:33:11 -0500
Subject: [PATCH 353/354] Update README to reflect current CodeIgniter status

Removed outdated information about CodeIgniter 4 and updated the description.

Signed-off-by: Chris Kacerguis <2414647+chriskacerguis@users.noreply.github.com>
---
 README.md | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 0390fcff..59776fe9 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,9 @@
 # CodeIgniter RestServer
 
-[![StyleCI](https://github.styleci.io/repos/230589/shield?branch=master)](https://github.styleci.io/repos/230589)
+A fully RESTful server implementation for CodeIgniter 3 using one library, one config file and one controller.
 
-A fully RESTful server implementation for CodeIgniter using one library, one config file and one controller.
-
-## Important!!
-
-CodeIgniter 4 includes REST support out of the box and therefore does not require the RestServer.
-
-See the documentation here: [RESTful Resource Handling](https://codeigniter4.github.io/userguide/incoming/restful.html)
+> [!IMPORTANT]
+> I have published the first "beta" of codeigniter-restserver 4.  See the "development" branch.  Please be sure to note the system requirments.
 
 ## Requirements
 

From 13811da74d1eb259e76f0a8fce4255cb571b5795 Mon Sep 17 00:00:00 2001
From: Chris Kacerguis <2414647+chriskacerguis@users.noreply.github.com>
Date: Thu, 25 Sep 2025 18:36:07 -0500
Subject: [PATCH 354/354] Add CODEOWNERS file for repository ownership

Signed-off-by: Chris Kacerguis <2414647+chriskacerguis@users.noreply.github.com>
---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000..5d609ac7
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+* @chriskacerguis